From ae1cd9b992d657c9d52db8e26cab3c374294abc3 Mon Sep 17 00:00:00 2001 From: Laura Gauthier Date: Mon, 22 Jul 2019 16:11:48 -0400 Subject: [PATCH] Fixes for tests --- .../hellbender/engine/FeatureManager.java | 2 +- .../hellbender/engine/VariantWalker.java | 10 ---- .../tools/evoquer/GnarlyGenotyperEngine.java | 4 +- .../tools/genomicsdb/GenomicsDBOptions.java | 2 +- .../tools/genomicsdb/GenomicsDBUtils.java | 2 +- .../tools/walkers/GnarlyGenotyper.java | 41 +++++++------- .../walkers/annotator/AnnotationUtils.java | 13 ++--- .../walkers/annotator/RMSMappingQuality.java | 29 +++++----- .../allelespecific/AS_QualByDepth.java | 6 +-- .../allelespecific/AS_RMSMappingQuality.java | 4 +- .../allelespecific/AS_RankSumTest.java | 2 +- .../walkers/variantutils/ReblockGVCF.java | 4 +- .../hellbender/utils/GenotypeUtils.java | 30 +++++------ .../utils/variant/GATKVCFConstants.java | 2 +- .../utils/variant/GATKVCFHeaderLines.java | 2 +- .../annotator/RMSMappingQualityUnitTest.java | 4 +- ...S_Annotations.keepRawCombined.expected.vcf | 51 +++++++++--------- ...hailOutput.chr20snippet.sites_only.vcf.idx | Bin 0 -> 154586 bytes 18 files changed, 98 insertions(+), 110 deletions(-) create mode 100644 src/test/resources/org/broadinstitute/hellbender/tools/walkers/GnarlyGenotyper/hailOutput.chr20snippet.sites_only.vcf.idx diff --git a/src/main/java/org/broadinstitute/hellbender/engine/FeatureManager.java b/src/main/java/org/broadinstitute/hellbender/engine/FeatureManager.java index 4b21f4ba893..7aaa1e8507c 100644 --- a/src/main/java/org/broadinstitute/hellbender/engine/FeatureManager.java +++ b/src/main/java/org/broadinstitute/hellbender/engine/FeatureManager.java @@ -208,7 +208,7 @@ private void initializeFeatureSources( final int featureQueryLookahead, final Co if ( featureInput != null ) { final Class featureType = getFeatureTypeForFeatureInputField(featureArgument.getKey()); addToFeatureSources(featureQueryLookahead, featureInput, featureType, cloudPrefetchBuffer, cloudIndexPrefetchBuffer, - toolInstance instanceof GATKTool ? ((GATKTool) toolInstance).getGenomicsDBOptions() : null); + toolInstance instanceof VariantWalker ? ((VariantWalker) toolInstance).getGenomicsDBOptions() : null); } } } diff --git a/src/main/java/org/broadinstitute/hellbender/engine/VariantWalker.java b/src/main/java/org/broadinstitute/hellbender/engine/VariantWalker.java index 3d0e8b51cd6..3fb19ce414a 100644 --- a/src/main/java/org/broadinstitute/hellbender/engine/VariantWalker.java +++ b/src/main/java/org/broadinstitute/hellbender/engine/VariantWalker.java @@ -7,10 +7,8 @@ import org.broadinstitute.hellbender.cmdline.StandardArgumentDefinitions; import org.broadinstitute.hellbender.engine.filters.CountingReadFilter; import org.broadinstitute.hellbender.exceptions.GATKException; -import org.broadinstitute.hellbender.tools.genomicsdb.GenomicsDBOptions; import org.broadinstitute.hellbender.utils.SimpleInterval; -import java.nio.file.Path; import java.util.Spliterator; /** @@ -146,12 +144,4 @@ protected final void onShutdown() { if ( drivingVariants != null ) drivingVariants.close(); } - - /** - * Does this tool need sample genotypes to be called if reading from a GenomicsDB? - * @return if false, GTs remain no-calls, as in CombineGVCFs - */ - protected boolean doGenotypeCalling() { - return false; - } } diff --git a/src/main/java/org/broadinstitute/hellbender/tools/evoquer/GnarlyGenotyperEngine.java b/src/main/java/org/broadinstitute/hellbender/tools/evoquer/GnarlyGenotyperEngine.java index 6afd517644b..f304fd5d9bc 100644 --- a/src/main/java/org/broadinstitute/hellbender/tools/evoquer/GnarlyGenotyperEngine.java +++ b/src/main/java/org/broadinstitute/hellbender/tools/evoquer/GnarlyGenotyperEngine.java @@ -68,7 +68,7 @@ public GnarlyGenotyperEngine(final boolean keepAllSites, final int maxAltAlleles } @SuppressWarnings({"unchecked", "rawtypes"}) - public static VariantContext finalizeGenotype(final VariantContext variant, final VariantContextBuilder annotationDBBuilder) { + public VariantContext finalizeGenotype(final VariantContext variant, final VariantContextBuilder annotationDBBuilder) { //GenomicsDB or Evoquer merged all the annotations, but we still need to finalize MQ and QD annotations //return a VC with the finalized annotations and dbBuilder gets the raw annotations for the database @@ -245,7 +245,7 @@ public static VariantContext finalizeGenotype(final VariantContext variant, fina * @param vc the input variant with NON_REF * @return a GenotypesContext */ - private static GenotypesContext iterateOnGenotypes(final VariantContext vc, final List targetAlleles, + private GenotypesContext iterateOnGenotypes(final VariantContext vc, final List targetAlleles, final Map targetAlleleCounts, final int[] SBsum, final boolean nonRefReturned, final boolean summarizePLs, final int[] rawGenotypeCounts) { diff --git a/src/main/java/org/broadinstitute/hellbender/tools/genomicsdb/GenomicsDBOptions.java b/src/main/java/org/broadinstitute/hellbender/tools/genomicsdb/GenomicsDBOptions.java index db37250cdbf..32516b9b2fb 100644 --- a/src/main/java/org/broadinstitute/hellbender/tools/genomicsdb/GenomicsDBOptions.java +++ b/src/main/java/org/broadinstitute/hellbender/tools/genomicsdb/GenomicsDBOptions.java @@ -23,7 +23,7 @@ public GenomicsDBOptions(final Path reference) { /** * * @param reference Path to a reference. May be null. Needed only for reading from GenomicsDB. - * @param callGenotypes Indicated whether GenomicsDB should return called genotypes + * @param callGenotypes Indicates whether GenomicsDB should return called genotypes */ public GenomicsDBOptions(final Path reference, final boolean callGenotypes, final int maxAlternateAlleles) { this.reference = reference; diff --git a/src/main/java/org/broadinstitute/hellbender/tools/genomicsdb/GenomicsDBUtils.java b/src/main/java/org/broadinstitute/hellbender/tools/genomicsdb/GenomicsDBUtils.java index 3095874503a..cb1b41193e9 100644 --- a/src/main/java/org/broadinstitute/hellbender/tools/genomicsdb/GenomicsDBUtils.java +++ b/src/main/java/org/broadinstitute/hellbender/tools/genomicsdb/GenomicsDBUtils.java @@ -103,7 +103,7 @@ public static GenomicsDBExportConfiguration.ExportConfiguration createExportConf //Update combine operations for GnarlyGenotyper //Note that this MQ format is deprecated, but was used by the prototype version of ReblockGVCF vidMapPB = updateINFOFieldCombineOperation(vidMapPB, fieldNameToIndexInVidFieldsList, - GATKVCFConstants.MAPPING_QUALITY_DEPTH, "sum"); + GATKVCFConstants.MAPPING_QUALITY_DEPTH_DEPRECATED, "sum"); vidMapPB = updateINFOFieldCombineOperation(vidMapPB, fieldNameToIndexInVidFieldsList, GATKVCFConstants.RAW_QUAL_APPROX_KEY, "sum"); vidMapPB = updateINFOFieldCombineOperation(vidMapPB, fieldNameToIndexInVidFieldsList, diff --git a/src/main/java/org/broadinstitute/hellbender/tools/walkers/GnarlyGenotyper.java b/src/main/java/org/broadinstitute/hellbender/tools/walkers/GnarlyGenotyper.java index 39dbea2f2a9..88ae435e6c9 100644 --- a/src/main/java/org/broadinstitute/hellbender/tools/walkers/GnarlyGenotyper.java +++ b/src/main/java/org/broadinstitute/hellbender/tools/walkers/GnarlyGenotyper.java @@ -70,8 +70,10 @@ * * *

Caveats

- *