From 02006954bcdcd7b9b4f9684635101411b3428a90 Mon Sep 17 00:00:00 2001 From: carneiro Date: Mon, 7 Mar 2011 22:51:04 +0000 Subject: [PATCH] UG: small bug fix when creating empty variant contexts in UG for the -EMIT_ALL_SITES to allow indels. GAV: First version of the walker that validates reads from a BAM file based on an annotated VCF with TP/FP annotations. git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@5396 348d0f76-0448-11de-a6fe-93d51630548a --- .../genotyper/UnifiedGenotyperEngine.java | 2 +- .../walkers/GenotypeAndValidateWalker.java | 53 ++++++++++--------- 2 files changed, 28 insertions(+), 27 deletions(-) diff --git a/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedGenotyperEngine.java b/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedGenotyperEngine.java index 2e8eea121..e2b3daae9 100755 --- a/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedGenotyperEngine.java +++ b/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedGenotyperEngine.java @@ -210,7 +210,7 @@ public class UnifiedGenotyperEngine { private VariantContext generateEmptyContext(RefMetaDataTracker tracker, ReferenceContext ref, Map stratifiedContexts, AlignmentContext rawContext) { VariantContext vc; if ( UAC.GenotypingMode == GenotypeLikelihoodsCalculationModel.GENOTYPING_MODE.GENOTYPE_GIVEN_ALLELES ) { - final VariantContext vcInput = tracker.getVariantContext(ref, "alleles", null, ref.getLocus(), true); + final VariantContext vcInput = tracker.getVariantContext(ref, "alleles", null, ref.getLocus(), false); if ( vcInput == null ) return null; vc = new VariantContext("UG_call", vcInput.getChr(), vcInput.getStart(), vcInput.getEnd(), vcInput.getAlleles()); diff --git a/java/src/org/broadinstitute/sting/oneoffprojects/walkers/GenotypeAndValidateWalker.java b/java/src/org/broadinstitute/sting/oneoffprojects/walkers/GenotypeAndValidateWalker.java index 3ff1378a7..125166e0d 100755 --- a/java/src/org/broadinstitute/sting/oneoffprojects/walkers/GenotypeAndValidateWalker.java +++ b/java/src/org/broadinstitute/sting/oneoffprojects/walkers/GenotypeAndValidateWalker.java @@ -51,9 +51,14 @@ import java.util.*; * @help.summary Validates the calls on a ROD track using a BAM dataset. */ -//@Requires(value={DataSource.READS, DataSource.REFERENCE, DataSource.REFERENCE_ORDERED_DATA}) +@Requires(value={DataSource.READS, DataSource.REFERENCE},referenceMetaData=@RMD(name="alleles",type=VariantContext.class)) @Allows(value={DataSource.READS, DataSource.REFERENCE}) +// Ugly fix because RodWalkers don't have access to reads +@By(DataSource.REFERENCE) +@Reference(window=@Window(start=-200,stop=200)) + + public class GenotypeAndValidateWalker extends RodWalker { @Argument(fullName="minimum_base_quality_score", shortName="mbq", doc="Minimum base quality score for calling a genotype", required=false) @@ -70,17 +75,12 @@ public class GenotypeAndValidateWalker extends RodWalker 0) uac.MIN_BASE_QUALTY_SCORE = mbq; - if (deletions > 0) uac.MAX_DELETION_FRACTION = deletions; + if (mbq >= 0) uac.MIN_BASE_QUALTY_SCORE = mbq; + if (deletions >= 0) uac.MAX_DELETION_FRACTION = deletions; snpEngine = new UnifiedGenotyperEngine(getToolkit(), uac); // Adding the INDEL calling arguments for UG @@ -142,38 +143,37 @@ public class GenotypeAndValidateWalker extends RodWalker