diff --git a/java/src/org/broadinstitute/sting/gatk/walkers/beagle/ProduceBeagleInputWalker.java b/java/src/org/broadinstitute/sting/gatk/walkers/beagle/ProduceBeagleInputWalker.java index 202227249..8edd31eb5 100755 --- a/java/src/org/broadinstitute/sting/gatk/walkers/beagle/ProduceBeagleInputWalker.java +++ b/java/src/org/broadinstitute/sting/gatk/walkers/beagle/ProduceBeagleInputWalker.java @@ -73,11 +73,6 @@ public class ProduceBeagleInputWalker extends RodWalker { @Argument(doc="VQSqual key", shortName = "vqskey", required=false) protected String VQSLOD_KEY = "VQSqual"; - @Hidden - @Argument(doc="REMOVE ME", shortName = "rcwpio", required=false) - private static final boolean REMAIN_COMPATIBLE_WITH_PREVIOUS_IO = false; - - // @Hidden // @Argument(doc="Include filtered records", shortName = "ifr", fullName = "IncludeFilteredRecords", required=false) // protected boolean includeFilteredRecords = false; @@ -275,14 +270,9 @@ public class ProduceBeagleInputWalker extends RodWalker { double[] normalizedLikelihoods = MathUtils.normalizeFromLog10(log10Likelihoods); // see if we need to randomly mask out genotype in this position. - // todo -- remove me after testing - if ( REMAIN_COMPATIBLE_WITH_PREVIOUS_IO && (log10Likelihoods == HAPLOID_FLAT_LOG10_LIKELIHOODS || log10Likelihoods == DIPLOID_FLAT_LOG10_LIKELIHOODS) ) - for (double likeVal: normalizedLikelihoods) - out.append(String.format("%.2f ",likeVal)); - else - for (double likeVal: normalizedLikelihoods) { - out.append(String.format("%5.4f ",likeVal)); - } + for (double likeVal: normalizedLikelihoods) { + out.append(String.format("%5.4f ",likeVal)); + } } diff --git a/java/test/org/broadinstitute/sting/gatk/walkers/beagle/BeagleIntegrationTest.java b/java/test/org/broadinstitute/sting/gatk/walkers/beagle/BeagleIntegrationTest.java index 08ccbb324..ed29865c8 100755 --- a/java/test/org/broadinstitute/sting/gatk/walkers/beagle/BeagleIntegrationTest.java +++ b/java/test/org/broadinstitute/sting/gatk/walkers/beagle/BeagleIntegrationTest.java @@ -60,7 +60,7 @@ public class BeagleIntegrationTest extends WalkerTest { "-T ProduceBeagleInput -B:variant,VCF /humgen/gsa-hpprojects/GATK/data/Validation_Data/NA12878_HSQ_chr22_14-16m.vcf "+ "-B:validation,VCF /humgen/gsa-hpprojects/GATK/data/Validation_Data/NA12878_OMNI_chr22_14-16m.vcf "+ "-L 22:14000000-16000000 -o %s -bvcf %s -bs 0.8 -valp 0.98 -R /humgen/1kg/reference/human_g1k_v37.fasta -NO_HEADER ",2, - Arrays.asList("44d28b6b092d5f4c0ae59af442612ea3","223fb977e8db567dcaf632c6ee51f294")); + Arrays.asList("660986891b30cdc937e0f2a3a5743faa","223fb977e8db567dcaf632c6ee51f294")); executeTest("test BeagleInputWithBootstrap",spec); }