From f9c7803d4e8c1cd174bc107770802aed1ced4b37 Mon Sep 17 00:00:00 2001 From: aaron Date: Fri, 25 Jun 2010 02:42:44 +0000 Subject: [PATCH] this got left off my last commit git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@3635 348d0f76-0448-11de-a6fe-93d51630548a --- .../coverage/DepthOfCoverageWalker.java | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/java/src/org/broadinstitute/sting/gatk/walkers/coverage/DepthOfCoverageWalker.java b/java/src/org/broadinstitute/sting/gatk/walkers/coverage/DepthOfCoverageWalker.java index 2276b1a21..78398a30f 100644 --- a/java/src/org/broadinstitute/sting/gatk/walkers/coverage/DepthOfCoverageWalker.java +++ b/java/src/org/broadinstitute/sting/gatk/walkers/coverage/DepthOfCoverageWalker.java @@ -26,16 +26,16 @@ package org.broadinstitute.sting.gatk.walkers.coverage; import net.sf.samtools.SAMReadGroupRecord; +import org.broad.tribble.FeatureReader; import org.broadinstitute.sting.gatk.contexts.AlignmentContext; import org.broadinstitute.sting.gatk.contexts.ReferenceContext; import org.broadinstitute.sting.gatk.refdata.RefMetaDataTracker; import org.broadinstitute.sting.gatk.refdata.ReferenceOrderedData; import org.broadinstitute.sting.gatk.refdata.SeekableRODIterator; -import org.broadinstitute.sting.gatk.refdata.rodRefSeq; -import org.broadinstitute.sting.gatk.refdata.utils.GATKFeature; -import org.broadinstitute.sting.gatk.refdata.utils.GATKFeatureIterator; -import org.broadinstitute.sting.gatk.refdata.utils.LocationAwareSeekableRODIterator; -import org.broadinstitute.sting.gatk.refdata.utils.RODRecordList; +import org.broadinstitute.sting.gatk.refdata.features.refseq.RefSeqCodec; +import org.broadinstitute.sting.gatk.refdata.features.refseq.RefSeqFeature; +import org.broadinstitute.sting.gatk.refdata.tracks.builders.TribbleRMDTrackBuilder; +import org.broadinstitute.sting.gatk.refdata.utils.*; import org.broadinstitute.sting.gatk.walkers.By; import org.broadinstitute.sting.gatk.walkers.DataSource; import org.broadinstitute.sting.gatk.walkers.LocusWalker; @@ -414,8 +414,8 @@ public class DepthOfCoverageWalker extends LocusWalker refseq = new ReferenceOrderedData("refseq", - refSeqGeneList, rodRefSeq.class); - return new SeekableRODIterator(new GATKFeatureIterator(refseq.iterator())); + TribbleRMDTrackBuilder builder = new TribbleRMDTrackBuilder(); + FeatureReader refseq = builder.createFeatureReader(RefSeqCodec.class,refSeqGeneList).first; + try { + return new SeekableRODIterator(new FeatureToGATKFeatureIterator(refseq.iterator(),"refseq")); + } catch (IOException e) { + throw new StingException("Unable to open file " + refSeqGeneList, e); + } } private void printTargetSummary(PrintStream output, Pair intervalStats) {