Merge pull request #1320 from broadinstitute/ldg_AS_QD_fix

To address weird case with all hom-refs, but alt allele is present, s…

protected/gatk-tools-protected/src/main/java/org/broadinstitute/gatk/tools/walkers/annotator/AS_QualByDepth.java

@@ -172,6 +172,8 @@ public class AS_QualByDepth extends InfoFieldAnnotation implements ReducibleAnno
             return null;
 
         final List<Integer> standardDepth = getAlleleDepths(genotypes);
+        if (standardDepth == null) //all no-calls and homRefs
+            return null;
 
         //Parse the VC's allele-specific qual values
         List<Object> alleleQualObjList = vc.getAttributeAsList(GATKVCFConstants.AS_QUAL_KEY);

protected/gatk-tools-protected/src/main/java/org/broadinstitute/gatk/tools/walkers/genotyper/GenotypingEngine.java

@@ -210,7 +210,7 @@ public abstract class GenotypingEngine<Config extends StandardCallerArgumentColl
      * @param vc                                 Input VC
      * @param model                              GL calculation model
      * @param inheritAttributesFromInputVC       Output VC will contain attributes inherited from input vc
-     * @return                                   VC with assigned genotypes
+     * @return                                   VC with assigned genotypes (may be null if QUAL<emit threshold or MLEAF==0)
      */
     protected VariantCallContext calculateGenotypes(final RefMetaDataTracker tracker, final ReferenceContext refContext,
                                                  final AlignmentContext rawContext, Map<String, AlignmentContext> stratifiedContexts,

protected/gatk-tools-protected/src/test/java/org/broadinstitute/gatk/tools/walkers/variantutils/GenotypeGVCFsIntegrationTest.java

@@ -612,6 +612,15 @@ public class GenotypeGVCFsIntegrationTest extends WalkerTest {
         executeTest("testAlleleSpecificAnnotations_elevenSamples", spec);
     }
 
+    @Test
+    public void testMonomorphicVCwithAlt() {
+        final String cmd = "-T GenotypeGVCFs -R " + b37KGReference + " -G AS_Standard -o %s --no_cmdline_in_header --disableDithering -V "
+                + privateTestDir + "monomorphicGVCwithAlt.vcf";
+        final WalkerTestSpec spec = new WalkerTestSpec(cmd, 1, Collections.singletonList("080951cdb5d4903dd58b1e753b9378d5"));
+        spec.disableShadowBCF();
+        executeTest("testAlleleSpecificAnnotations", spec);
+    }
+
     @Test
     public void testFractionInformativeReads() {
         final String cmd = "-T GenotypeGVCFs -R " + b37KGReference + " -G AS_Standard -o %s --no_cmdline_in_header -A FractionInformativeReads --disableDithering -V "

public/gatk-tools-public/src/main/java/org/broadinstitute/gatk/tools/walkers/annotator/VariantAnnotatorEngine.java

@@ -357,9 +357,9 @@ public class VariantAnnotatorEngine {
             final Map<String, Object> annotationsFromCurrentType = currentASannotation.finalizeRawData(vc, originalVC);
             if ( annotationsFromCurrentType != null ) {
                 infoAnnotations.putAll(annotationsFromCurrentType);
-                //clean up raw annotation data after annotations are finalized
-                infoAnnotations.remove(currentASannotation.getRawKeyName());
             }
+            //clean up raw annotation data after annotations are finalized
+            infoAnnotations.remove(currentASannotation.getRawKeyName());
         }
 
         // generate a new annotated VC