From cb099242df2d6d469f59c422ff21ee92f8724cf4 Mon Sep 17 00:00:00 2001 From: Orli Cohen Date: Wed, 29 Jun 2022 21:31:09 -0400 Subject: [PATCH] responding to review --- .../walkers/variantutils/VariantsToTable.java | 2 +- .../VariantsToTableIntegrationTest.java | 4 +- .../VariantsToTable/1000G.phase3.snippet.vcf | 48 ------- .../expected.noFieldsSpecified.table | 4 - ...raheaderlinesdeleted_dbsnp_138.snippet.vcf | 117 ------------------ 5 files changed, 3 insertions(+), 172 deletions(-) delete mode 100644 src/test/resources/org/broadinstitute/hellbender/tools/walkers/variantutils/VariantsToTable/1000G.phase3.snippet.vcf delete mode 100644 src/test/resources/org/broadinstitute/hellbender/tools/walkers/variantutils/VariantsToTable/expected.noFieldsSpecified.table delete mode 100644 src/test/resources/org/broadinstitute/hellbender/tools/walkers/variantutils/VariantsToTable/extraheaderlinesdeleted_dbsnp_138.snippet.vcf diff --git a/src/main/java/org/broadinstitute/hellbender/tools/walkers/variantutils/VariantsToTable.java b/src/main/java/org/broadinstitute/hellbender/tools/walkers/variantutils/VariantsToTable.java index 83fe33d671d..db5d4e2e63c 100644 --- a/src/main/java/org/broadinstitute/hellbender/tools/walkers/variantutils/VariantsToTable.java +++ b/src/main/java/org/broadinstitute/hellbender/tools/walkers/variantutils/VariantsToTable.java @@ -246,7 +246,7 @@ public void onTraversalStart() { // if fields specified, but none are genotype fields, set samples to empty if (genotypeFieldsToTake.isEmpty() && asGenotypeFieldsToTake.isEmpty()) { - samples = Collections.emptySortedSet(); + samples = Collections.emptySortedSet(); } else { final Map vcfHeaders = Collections.singletonMap(getDrivingVariantsFeatureInput().getName(), getHeaderForVariants()); diff --git a/src/test/java/org/broadinstitute/hellbender/tools/walkers/variantutils/VariantsToTableIntegrationTest.java b/src/test/java/org/broadinstitute/hellbender/tools/walkers/variantutils/VariantsToTableIntegrationTest.java index f7426201709..10c922a267a 100644 --- a/src/test/java/org/broadinstitute/hellbender/tools/walkers/variantutils/VariantsToTableIntegrationTest.java +++ b/src/test/java/org/broadinstitute/hellbender/tools/walkers/variantutils/VariantsToTableIntegrationTest.java @@ -239,10 +239,10 @@ public void testMoltenOutputWithMultipleAlleles() throws IOException { } @Test - public void testNoFieldsSpecified() throws IOException { + public void testNoFieldsSpecifiedNoSamples() throws IOException { final File inputFile = new File(getToolTestDataDir(), "VCFWithoutGenotypes_dbsnp_138.snippet.vcf"); final File outputFile = createTempFile("noFieldsSpecifiedOutput", ".table"); - final File expectedFile = new File(getToolTestDataDir(), "expected.noFieldsSpecified.table"); + final File expectedFile = new File(getToolTestDataDir(), "expected.noFieldsSpecifiedNoSamples.table"); final String[] args = new String[] {"--variant", inputFile.getAbsolutePath(), "-O", outputFile.getAbsolutePath()}; diff --git a/src/test/resources/org/broadinstitute/hellbender/tools/walkers/variantutils/VariantsToTable/1000G.phase3.snippet.vcf b/src/test/resources/org/broadinstitute/hellbender/tools/walkers/variantutils/VariantsToTable/1000G.phase3.snippet.vcf deleted file mode 100644 index eaf1060e2e7..00000000000 --- a/src/test/resources/org/broadinstitute/hellbender/tools/walkers/variantutils/VariantsToTable/1000G.phase3.snippet.vcf +++ /dev/null @@ -1,48 +0,0 @@ -##fileformat=VCFv4.2 -##FILTER= -##FILTER= -##FILTER= -##FILTER= -##FILTER= -##FILTER= -##FILTER= -##FILTER= -##FILTER= -##FORMAT= -##FORMAT= -##FORMAT= -##FORMAT= -##FORMAT= -##GATKCommandLine= -##GATKCommandLine= -##GATKVersion=2.5-191-g02f8427 -##HaplotypeCaller="analysis_type=HaplotypeCaller input_file=[/humgen/1kg/processing/production_wgs_final/chr20/ALL.chr20.bam.list] read_buffer_size=null phone_home=AWS gatk_key=null tag=NA read_filter=[] intervals=[/humgen/1kg/processing/production_wgs_final/chr20/.queue/scatterGather/call.for.1000G-1-sg/temp_0001_of_1000/scatter.intervals] excludeIntervals=null interval_set_rule=UNION interval_merging=ALL interval_padding=0 reference_sequence=/humgen/1kg/reference/human_g1k_v37_decoy.fasta nonDeterministicRandomSeed=false disableDithering=false maxRuntime=-1 maxRuntimeUnits=MINUTES downsampling_type=BY_SAMPLE downsample_to_fraction=null downsample_to_coverage=200 baq=OFF baqGapOpenPenalty=40.0 fix_misencoded_quality_scores=false allow_potentially_misencoded_quality_scores=false performanceLog=null useOriginalQualities=false BQSR=null quantize_quals=0 disable_indel_quals=false emit_original_quals=false preserve_qscores_less_than=6 globalQScorePrior=-1.0 allow_bqsr_on_reduced_bams_despite_repeated_warnings=false defaultBaseQualities=-1 validation_strictness=SILENT remove_program_records=false keep_program_records=false unsafe=null disable_auto_index_creation_and_locking_when_reading_rods=false num_threads=1 num_cpu_threads_per_data_thread=1 num_io_threads=0 monitorThreadEfficiency=false num_bam_file_handles=null read_group_black_list=null pedigree=[] pedigreeString=[] pedigreeValidationType=STRICT allow_intervals_with_unindexed_bam=false generateShadowBCF=false logging_level=INFO log_to_file=null help=false version=false out=org.broadinstitute.sting.gatk.io.stubs.VariantContextWriterStub no_cmdline_in_header=org.broadinstitute.sting.gatk.io.stubs.VariantContextWriterStub sites_only=org.broadinstitute.sting.gatk.io.stubs.VariantContextWriterStub bcf=org.broadinstitute.sting.gatk.io.stubs.VariantContextWriterStub graphOutput=null bamOutput=null bam_compression=null disable_bam_indexing=null generate_md5=null simplifyBAM=null bamWriterType=CALLED_HAPLOTYPES dbsnp=(RodBinding name= source=UNBOUND) comp=[] annotation=[ClippingRankSumTest, DepthPerSampleHC] excludeAnnotation=[SpanningDeletions, TandemRepeatAnnotator] heterozygosity=0.001 indel_heterozygosity=1.25E-4 genotyping_mode=DISCOVERY output_mode=EMIT_VARIANTS_ONLY standard_min_confidence_threshold_for_calling=10.0 standard_min_confidence_threshold_for_emitting=10.0 alleles=(RodBinding name= source=UNBOUND) max_alternate_alleles=6 input_prior=[] contamination_fraction_to_filter=0.05 contamination_fraction_per_sample_file=null p_nonref_model=EXACT_INDEPENDENT exactcallslog=null useDebruijnAssembler=false minKmerForDebruijnAssembler=11 onlyUseKmerSizeForDebruijnAssembler=-1 kmerSize=[10, 25] dontIncreaseKmerSizesForCycles=false numPruningSamples=3 maxPathsPerSample=8 dontRecoverDanglingTails=false minPruning=2 gcpHMM=10 includeUmappedReads=false useAllelesTrigger=false useFilteredReadsForAnnotations=false phredScaledGlobalReadMismappingRate=45 maxNumHaplotypesInPopulation=25 mergeVariantsViaLD=false pair_hmm_implementation=LOGLESS_CACHING keepRG=null justDetermineActiveRegions=false dontGenotype=false errorCorrectKmers=false debug=false debugGraphTransformations=false useLowQualityBasesForAssembly=false dontTrimActiveRegions=false dontUseSoftClippedBases=false captureAssemblyFailureBAM=false allowCyclesInKmerGraphToGeneratePaths=false errorCorrectReads=false kmerLengthForReadErrorCorrection=25 minObservationsForKmerToBeSolid=20 activityProfileOut=null activeRegionOut=null activeRegionIn=null activeRegionExtension=null forceActive=false activeRegionMaxSize=null bandPassSigma=null min_mapping_quality_score=20 filter_reads_with_N_cigar=false filter_mismatching_base_and_quals=false filter_bases_not_stored=false" -##INFO= -##INFO= -##INFO= -##INFO= -##INFO= -##INFO= -##INFO= -##INFO= -##INFO= -##INFO= -##INFO= -##INFO= -##INFO= -##INFO= -##INFO= -##INFO= -##INFO= -##INFO= -##INFO= -##INFO= -##INFO= -##INFO= -##contig= -##contig= -##source=SelectVariants -#CHROM POS ID REF ALT QUAL FILTER INFO FORMAT HG00096 HG00097 HG00099 -20 10000054 . CTTTG C 504.42 PASS AC=0;AF=0.00;AN=6;BaseQRankSum=-0.975;ClippingRankSum=-2.925;DP=22;FS=1.899;InbreedingCoeff=0.0592;MQ=59.27;MQ0=0;MQRankSum=-3.212;QD=2.43;ReadPosRankSum=-0.264;VQSLOD=5.10;culprit=FS GT:AD:DP:GQ:PL 0/0:2,0:2:6:0,6,119 0/0:10,0:10:29:0,29,592 0/0:10,0:10:30:0,30,598 -20 10000107 . T C 263.95 PASS AC=0;AF=0.00;AN=6;BaseQRankSum=-0.444;ClippingRankSum=-3.132;DP=25;FS=0.948;InbreedingCoeff=-0.0102;MQ=59.19;MQ0=0;MQRankSum=2.292;POSITIVE_TRAIN_SITE;QD=10.56;ReadPosRankSum=0.055;VQSLOD=7.76;culprit=FS GT:AD:DP:GQ:PL 0/0:5,0:5:15:0,15,387 0/0:13,0:13:42:0,42,786 0/0:7,0:7:24:0,24,548 -20 10000117 . C T 329458.17 PASS AC=1;AF=0.167;AN=6;BaseQRankSum=10.505;ClippingRankSum=-20.658;DP=28;FS=8.305;InbreedingCoeff=0.1727;MQ=59.17;MQ0=0;MQRankSum=2.689;POSITIVE_TRAIN_SITE;QD=25.46;ReadPosRankSum=-4.688;VQSLOD=3.19;culprit=ReadPosRankSum GT:AD:DP:GQ:PL 0/0:5,0:5:15:0,15,189 0/1:8,8:16:99:254,0,231 0/0:7,0:7:21:0,21,271 diff --git a/src/test/resources/org/broadinstitute/hellbender/tools/walkers/variantutils/VariantsToTable/expected.noFieldsSpecified.table b/src/test/resources/org/broadinstitute/hellbender/tools/walkers/variantutils/VariantsToTable/expected.noFieldsSpecified.table deleted file mode 100644 index 6a6253c3ca6..00000000000 --- a/src/test/resources/org/broadinstitute/hellbender/tools/walkers/variantutils/VariantsToTable/expected.noFieldsSpecified.table +++ /dev/null @@ -1,4 +0,0 @@ -CHROM POS ID REF ALT QUAL FILTER AC CAF CLNDSDB COMMON DP DSS HD KGPROD KGPhase1 LSD REF RS RSPOS SAO SSR VC VP WGT dbSNPBuildID -20 10000092 rs183046704 T G -10.0 PASS NA [0.9991,0.0009183] NA 0 NA NA NA true true NA T 183046704 10000092 0 0 SNV 0x050000000001000014000100 1 135 -20 10000107 rs188245245 T C -10.0 PASS NA [0.9982,0.001837] NA 0 NA NA NA true true NA T 188245245 10000107 0 0 SNV 0x050000000001000014000100 1 135 -20 10000117 rs4816203 C T -10.0 PASS NA [0.3682,0.6318] NA 1 NA NA NA true true NA C 4816203 10000117 0 0 SNV 0x05010000000117011e000100 1 111 diff --git a/src/test/resources/org/broadinstitute/hellbender/tools/walkers/variantutils/VariantsToTable/extraheaderlinesdeleted_dbsnp_138.snippet.vcf b/src/test/resources/org/broadinstitute/hellbender/tools/walkers/variantutils/VariantsToTable/extraheaderlinesdeleted_dbsnp_138.snippet.vcf deleted file mode 100644 index 628a1d05d1e..00000000000 --- a/src/test/resources/org/broadinstitute/hellbender/tools/walkers/variantutils/VariantsToTable/extraheaderlinesdeleted_dbsnp_138.snippet.vcf +++ /dev/null @@ -1,117 +0,0 @@ -##fileformat=VCFv4.2 -##FILTER= -##GATKCommandLine.SelectVariants= -##GATKCommandLine= -##GATKCommandLine= -##INFO= -##INFO= -##INFO= -##INFO== 1% and for which 2 or more founders contribute to that minor allele frequency."> -##INFO= -##INFO= -##INFO= -##INFO= -##INFO= -##INFO= -##INFO= -##INFO= -##INFO= -##INFO= -##INFO= -##INFO= -##INFO= -##INFO= -##INFO= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##contig= -##dbSNP_BUILD_ID=138 -##fileDate=20130806 -##phasing=partial -##source=SelectVariants -##variationPropertyDocumentationUrl=ftp://ftp.ncbi.nlm.nih.gov/snp/specs/dbSNP_BitField_latest.pdf -#CHROM POS ID REF ALT QUAL FILTER INFO -20 10000092 rs183046704 T G . . CAF=[0.9991,0.0009183];COMMON=0;KGPROD;KGPhase1;RS=183046704;RSPOS=10000092;SAO=0;SSR=0;VC=SNV;VP=0x050000000001000014000100;WGT=1;dbSNPBuildID=135 -20 10000107 rs188245245 T C . . CAF=[0.9982,0.001837];COMMON=0;KGPROD;KGPhase1;RS=188245245;RSPOS=10000107;SAO=0;SSR=0;VC=SNV;VP=0x050000000001000014000100;WGT=1;dbSNPBuildID=135 -20 10000117 rs4816203 C T . . CAF=[0.3682,0.6318];COMMON=1;G5;G5A;GNO;KGPROD;KGPhase1;KGPilot123;OTHERKG;RS=4816203;RSPOS=10000117;SAO=0;SLO;SSR=0;VC=SNV;VLD;VP=0x05010000000117011e000100;WGT=1;dbSNPBuildID=111