From 76fd4b3848baeecfd23679131da19f2147842211 Mon Sep 17 00:00:00 2001
From: ebanks <ebanks@348d0f76-0448-11de-a6fe-93d51630548a>
Date: Wed, 1 Jul 2009 19:17:27 +0000
Subject: [PATCH] deal with different contigs

git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@1146 348d0f76-0448-11de-a6fe-93d51630548a
---
 .../gatk/walkers/indels/CleanedReadInjector.java          | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/java/src/org/broadinstitute/sting/playground/gatk/walkers/indels/CleanedReadInjector.java b/java/src/org/broadinstitute/sting/playground/gatk/walkers/indels/CleanedReadInjector.java
index 74c49d44b..2074e1899 100644
--- a/java/src/org/broadinstitute/sting/playground/gatk/walkers/indels/CleanedReadInjector.java
+++ b/java/src/org/broadinstitute/sting/playground/gatk/walkers/indels/CleanedReadInjector.java
@@ -66,7 +66,6 @@ public class CleanedReadInjector extends ReadWalker<Integer,Integer> {
         while ( allReads.hasNext() ) {
             SAMRecord read = allReads.next();
             cleanedReads.add(read);
-            String uniquifiedReadName = getUniquifiedReadName(read);
             cleanedReadHash.add(getUniquifiedReadName(read));
         }
         allReads.close();
@@ -94,15 +93,16 @@ public class CleanedReadInjector extends ReadWalker<Integer,Integer> {
         // first emit reads from the cleaned set if appropriate
         int cleanedReadCount = 0;
         SAMRecord firstCleanedRead = cleanedReads.peek();
-        while ( firstCleanedRead != null && firstCleanedRead.getAlignmentStart() <= read.getAlignmentStart() ) {
+        while ( firstCleanedRead != null &&
+                firstCleanedRead.getReferenceIndex() <= read.getReferenceIndex() &&
+                firstCleanedRead.getAlignmentStart() <= read.getAlignmentStart() ) {
             outputBAM.addAlignment(firstCleanedRead);
             cleanedReadCount++;
             cleanedReads.remove();
             firstCleanedRead = cleanedReads.peek();
         }
 
-        String uniquifiedReadName = getUniquifiedReadName(read);
-        if ( !cleanedReadHash.contains(uniquifiedReadName) )
+        if ( !cleanedReadHash.contains(getUniquifiedReadName(read)) )
             outputBAM.addAlignment(read);
         return cleanedReadCount;
     }