From fb09835ef82d1daccd891ecdb38548bcf3bb469c Mon Sep 17 00:00:00 2001 From: asivache Date: Mon, 21 Sep 2009 17:10:56 +0000 Subject: [PATCH] Changed to accomodate new ROD system git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@1671 348d0f76-0448-11de-a6fe-93d51630548a --- .../gatk/walkers/indels/IndelGenotyperWalker.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/java/src/org/broadinstitute/sting/playground/gatk/walkers/indels/IndelGenotyperWalker.java b/java/src/org/broadinstitute/sting/playground/gatk/walkers/indels/IndelGenotyperWalker.java index 082883a2d..fc5b4973a 100644 --- a/java/src/org/broadinstitute/sting/playground/gatk/walkers/indels/IndelGenotyperWalker.java +++ b/java/src/org/broadinstitute/sting/playground/gatk/walkers/indels/IndelGenotyperWalker.java @@ -2,10 +2,7 @@ package org.broadinstitute.sting.playground.gatk.walkers.indels; import net.sf.samtools.*; -import org.broadinstitute.sting.gatk.refdata.RODIterator; -import org.broadinstitute.sting.gatk.refdata.ReferenceOrderedData; -import org.broadinstitute.sting.gatk.refdata.Transcript; -import org.broadinstitute.sting.gatk.refdata.rodRefSeq; +import org.broadinstitute.sting.gatk.refdata.*; import org.broadinstitute.sting.gatk.walkers.ReadWalker; import org.broadinstitute.sting.gatk.walkers.ReadFilters; import org.broadinstitute.sting.gatk.filters.Platform454Filter; @@ -70,7 +67,7 @@ public class IndelGenotyperWalker extends ReadWalker { private java.io.Writer output = null; private GenomeLoc location = null; - private RODIterator refseqIterator=null; + private SeekableRODIterator refseqIterator=null; private Set normalReadGroups; private Set tumorReadGroups ; @@ -412,8 +409,8 @@ public class IndelGenotyperWalker extends ReadWalker { } location = GenomeLocParser.setStart(location,pos); location = GenomeLocParser.setStop(location,pos); // retrieve annotation data - rodRefSeq annotation = (refseqIterator == null ? null : refseqIterator.seekForward(location)); - + RODRecordList annotationList = (refseqIterator == null ? null : refseqIterator.seekForward(location)); + rodRefSeq annotation = ( annotationList == null ? null : annotationList.getRecords().get(0) ) ; Pair p = findConsensus(variants); if ( isCall(p,cov) ) { String message = makeBedLine(p,cov,pos,output); @@ -513,7 +510,8 @@ public class IndelGenotyperWalker extends ReadWalker { continue; // too dirty } location = GenomeLocParser.setStart(location,pos); location = GenomeLocParser.setStop(location,pos); // retrieve annotation data - rodRefSeq annotation = (refseqIterator == null ? null : refseqIterator.seekForward(location)); + RODRecordList annotationList = (refseqIterator == null ? null : refseqIterator.seekForward(location)); + rodRefSeq annotation = ( annotationList == null ? null : annotationList.getRecords().get(0) ) ; Pair p_tumor = findConsensus(tumor_variants); if ( isCall(p_tumor,tumor_cov) ) {