From 00feb3eee0145d9d9511d017d9c9de56e23e1a21 Mon Sep 17 00:00:00 2001 From: rpoplin Date: Tue, 20 Apr 2010 13:26:22 +0000 Subject: [PATCH] Moving over to VariationContext in CountCovariates. Removed references to class Variation. git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@3199 348d0f76-0448-11de-a6fe-93d51630548a --- .../walkers/recalibration/CovariateCounterWalker.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/java/src/org/broadinstitute/sting/gatk/walkers/recalibration/CovariateCounterWalker.java b/java/src/org/broadinstitute/sting/gatk/walkers/recalibration/CovariateCounterWalker.java index 5993a2af1..f5cd28960 100755 --- a/java/src/org/broadinstitute/sting/gatk/walkers/recalibration/CovariateCounterWalker.java +++ b/java/src/org/broadinstitute/sting/gatk/walkers/recalibration/CovariateCounterWalker.java @@ -25,10 +25,10 @@ package org.broadinstitute.sting.gatk.walkers.recalibration; import org.broadinstitute.sting.gatk.contexts.AlignmentContext; import org.broadinstitute.sting.gatk.contexts.ReferenceContext; +import org.broadinstitute.sting.gatk.contexts.variantcontext.VariantContext; import org.broadinstitute.sting.gatk.datasources.simpleDataSources.ReferenceOrderedDataSource; import org.broadinstitute.sting.gatk.filters.ZeroMappingQualityReadFilter; import org.broadinstitute.sting.gatk.refdata.RefMetaDataTracker; -import org.broadinstitute.sting.gatk.refdata.utils.GATKFeature; import org.broadinstitute.sting.gatk.walkers.*; import org.broadinstitute.sting.utils.*; import org.broadinstitute.sting.utils.classloader.PackageUtils; @@ -36,7 +36,6 @@ import org.broadinstitute.sting.utils.collections.NestedHashMap; import org.broadinstitute.sting.utils.collections.Pair; import org.broadinstitute.sting.commandline.Argument; import org.broadinstitute.sting.commandline.ArgumentCollection; -import org.broadinstitute.sting.utils.genotype.Variation; import org.broadinstitute.sting.utils.pileup.PileupElement; import org.broadinstitute.sting.utils.sam.GATKSAMRecord; @@ -250,13 +249,13 @@ public class CovariateCounterWalker extends LocusWalker { // Pull out data for this locus for all the input RODs and check if this is a known variant site in any of them boolean isSNP = false; - for( GATKFeature rod : tracker.getAllRods() ) { - if( rod != null && rod.getUnderlyingObject() instanceof Variation && ((Variation)rod.getUnderlyingObject()).isSNP() ) { - isSNP = true; // At least one of the rods says this is a snp site + for( final VariantContext vc : tracker.getAllVariantContexts(ref, null, context.getLocation(), false, false) ) { + if( vc != null && vc.isSNP() ) { + isSNP = true; break; } } - + // Only use data from non-dbsnp sites // Assume every mismatch at a non-dbsnp site is indicative of poor quality if( !isSNP && ( ++numUnprocessed >= PROCESS_EVERY_NTH_LOCUS ) ) {