Commit Graph

14064 Commits (ed7ff65b2ecbc1ccd7f02cf066ea3caa00cc6775)

Author SHA1 Message Date
Geraldine Van der Auwera 6c195ffcb1 Merge remote-tracking branch 'unstable/master' 2015-05-15 00:38:39 -04:00
Geraldine Van der Auwera 8b20523f5e Merge pull request #979 from broadinstitute/ami-fixASE-bug
solve bug - now work also when the reads does not have mate
2015-05-14 21:09:52 -04:00
Geraldine Van der Auwera dee66b06fa Merge pull request #978 from broadinstitute/dr_rev_htsjdk_and_picard
Rev htsjdk to version 1.132 and picard to version 1.131, and switch to using the versions in maven central
2015-05-14 21:08:19 -04:00
David Roazen caafe84e74 Rev htsjdk to version 1.132 and picard to version 1.131, and switch to using the versions in maven central
-We now pull htsjdk and picard from maven central.

-Updated the GATK codebase as necessary to adapt to changes in the Feature
 interface.

-Since VCFHeader now requires that all header lines have unique keys, uniquified
 the keys of GVCFBlock header lines by including the min/max GQ in the key.
 Updated MD5s accordingly.

-Other MD5s changed as a result of an htsjdk fix to eliminate "-0" in VCF output.
2015-05-14 15:26:23 -04:00
Geraldine Van der Auwera f6b3d8e862 Merge pull request #947 from broadinstitute/rhl_invert_selection
Added --invert_selection flag for variant selection queries
2015-05-13 13:40:32 -04:00
Eric Banks 5652cc6b5a Merge pull request #981 from broadinstitute/eb_no_lone_dels
Fixed a small feature/bug that I introduced with the spanning deletions genotyping
2015-05-13 13:27:16 -04:00
Eric Banks c752b9bca6 Fixed a small feature/bug that I introduced with the spanning deletions genotyping.
In the case where there's a low quality SNP under a spanning deletion in the gvcfs:
if the SNP is not genotyped by GenotypeGVCFs (because it's just noise) we were still
emitting a record with just the symbolic DEL allele (because that allele is high quality).

We no longer do that.
2015-05-13 11:19:40 -04:00
Ami Levy-Moonshine 536d550794 solve bug - now work also when the reads does not have mate
reads with no mate will be counted as valid reads
2015-05-12 17:51:01 -04:00
Ron Levine 4a75d54e65 Added invert and exclude flags for variant selection queries 2015-05-12 15:08:28 -04:00
Geraldine Van der Auwera 7a75f4ae79 Merge pull request #974 from broadinstitute/jw_Var2BinPEDSwap
Correct errant array element swap in FAM file output.
2015-05-12 08:49:16 -04:00
Eric Banks 53a34cea4a Merge pull request #938 from broadinstitute/eb_fix_spanning_deletions_in_genotyping
Added a fix for genotyping positions over spanning deletions.
2015-05-11 23:11:47 -04:00
Joseph White abb6bc6f57 Correct errant array element swap in FAM file output.
dad and mom are swapped; paternal first, then maternal

updated MD5 chksums for test files

remove commented lines
2015-05-11 20:45:50 -04:00
Eric Banks 530e0e5ea6 Added a fix for combining/genotyping positions over spanning deletions.
Previously, if a SNP occurred in sample A at a position that was in the middle of a deletion for sample B,
sample B would be genotyped as homozygous reference there (but it's NOT reference - there's a deletion).
Now, sample B is genotyped as having a symbolic DEL allele.

Minor cleanup added.  Note that I also removed Laura's previous fix for this problem.

Existing integration tests change because I've added a new header line to the VCF being output.
I also added several tests for the new functionality showing:
1. genotyping from separate and already combined gvcfs give the same output
2. genotyping over multiple spanning deletions works
3. combining works too

Existing unit tests also cover this case.
2015-05-11 15:11:16 -04:00
Geraldine Van der Auwera f77cee5171 Merge pull request #948 from broadinstitute/jw_deprecate_merge_var
Jw deprecate mergeVariantsViaLD argument
2015-05-11 09:30:23 -04:00
Joseph White 5be8bc5dfc Deprecate --mergeVariantsViaLD in HC
New unit test for deprecated mergeVariantsViaLD
Update HaplotypeCallerIntegrationTest.java
Delete duplicate testHaplotypeCallerMergeVariantsViaLDException test.
2015-05-08 17:50:25 -04:00
Geraldine Van der Auwera 8a4a4f3fcf Merge pull request #968 from broadinstitute/gg_unexclude_annotations_#966
Un-exclude SD and TRA from HC annotators
2015-05-03 21:25:55 +02:00
Geraldine Van der Auwera 5d8b9a7c20 Moved MQ0 out of HC exclusion and into StandardUGAnnotation 2015-05-03 01:04:49 +02:00
Geraldine Van der Auwera 071d82d1bf Un-exclude SD and TRA from HC annotators; resolves #966
Exclude MQ0BySample
Move SD and TRA to new StandardUGAnnotation interface
There is now annotation interface (StandardUGAnnotation) holding annots that are standard in UG but should't be used as they are now with HC. This allows us to not have to exclude these annotations explicitly in HC, but still be able to use them for development purposes.
2015-05-03 00:45:53 +02:00
Geraldine Van der Auwera e49f6dfd0f Merge pull request #970 from broadinstitute/gg_minor_docfixes
Fairly minor if plentiful fixes to various gatkdocs. Merging this without formal review since all tests pass, the gatkdocs build, and no one really wants to review corrections to grammar, typos and layout for 120+ documents. Review will be done by users in production ;-)
2015-05-03 00:36:12 +02:00
Geraldine Van der Auwera 919c3eaa2e Numerous doc fixes; mostly formatting and clarifications 2015-05-03 00:28:46 +02:00
Geraldine Van der Auwera fddc5331e1 Merge pull request #965 from broadinstitute/gg_nsubtil_clamp_hmm_fix
Clamp the HMM window starting coordinate to 1 instead of 0
2015-05-01 22:18:20 +02:00
ldgauthier 4b55118822 Merge pull request #967 from broadinstitute/rhl_va_allele_trim
More allele trimming for VariantAnnotator
2015-04-30 09:48:32 -04:00
Ron Levine 9ff827c83a More allele trimming for VariantAnnotator 2015-04-29 21:11:49 -04:00
Geraldine Van der Auwera f2b34d0823 Clamp the HMM window starting coordinate to 1 instead of 0 2015-04-30 01:37:20 +02:00
droazen 9c2dd29bd0 Merge pull request #952 from broadinstitute/dr_queue_qsub_broad
Queue: add -qsub-broad argument
2015-04-27 20:24:50 -04:00
David Roazen 19ceca5e86 Queue: add -qsub-broad argument
When -qsub-broad is specified instead of -qsub, use the "h_vmem" parameter
instead of "h_rss" to specify memory limit requests.

Also cause the GridEngine native arguments to be output by default to the logger,
instead of only when in debug mode.
2015-04-27 17:43:25 -04:00
Geraldine Van der Auwera cb4c3ea09e Merge pull request #943 from broadinstitute/ldg_fixAllowNonUniqueKmers
Fix implementation of allowNonUniqueKmersInRef so that it applies to all...
2015-04-27 04:08:50 +02:00
Laura Gauthier 97caf94807 Fix implementation of allowNonUniqueKmersInRef so that it applies to all kmer sizes 2015-04-23 13:01:47 -04:00
Eric Banks d4753f189f Merge pull request #930 from broadinstitute/rhl_bad_edge_pileup
Bypass edge alignment reads while making pileup
2015-04-21 19:02:14 -04:00
Ron Levine d5f98e99f0 Bypass reads with a bad CIGAR length 2015-04-21 11:55:56 -04:00
Geraldine Van der Auwera bfcac455c9 Merge pull request #932 from broadinstitute/yf_fix_picard_md
Fix the scala wrapper for Picard MarkDuplicates
2015-04-16 12:08:39 -04:00
kshakir 8329fe46d1 Merge pull request #934 from broadinstitute/ks_cat_variants_extensions
CatVariants now allows different input / output file types.
2015-04-15 11:44:56 -03:00
Khalid Shakir 90b579c78e CatVariants now allows different input / output file types.
Escaping the CatVariantsIntegrationTest classpaths for possible spaces in the directory names.
2015-04-13 14:39:46 -03:00
Yossi Farjoun a7487e282a since Picard mark duplicates moved to a different package, this class was broken. here's the fix. it would be good to have tests for all the scala picard-wrappers, but that is out of scope for this commit. 2015-04-13 08:44:30 -04:00
kcibul 6adf91d49f Merge pull request #922 from broadinstitute/kc_refactor_acs
Refactoring of HC & M2 Argument Collections
2015-04-08 09:52:11 -04:00
Kristian Cibulskis 45610a142c initial refactoring of arguments into individual argument collections
fix blasted license blurbs

updates based on PR comments (abstractify HaplotypeCallerArgumentCollection into AssemblyBasedCallerArgumentCollection)

comments on comments from PR review
2015-04-07 16:55:32 -04:00
Geraldine Van der Auwera 2053afe52a Merge pull request #914 from broadinstitute/ldg_fixDitheringRandomness
Initialize annotations so that --disableDithering actually works
2015-04-06 15:40:30 -04:00
Geraldine Van der Auwera 7cc802f3d0 Merge pull request #915 from broadinstitute/yf_fix_missing_filename_in_error
added the missing file to the error message
2015-04-06 15:33:22 -04:00
Yossi Farjoun d30a6258bc added the missing file to the error message 2015-04-06 08:21:55 -04:00
Laura Gauthier 9c842df3a3 Initialize annotations so that --disableDithering actually works 2015-04-02 17:34:46 -04:00
droazen 761e456d07 Merge pull request #911 from broadinstitute/ab_vcf_cmd_line_header_909
Modify GATK command line header for unique keys
2015-04-02 16:52:42 -04:00
Alex Baumann 024ec69e97 Modify GATK command line header for unique keys
The GATK command line header keys were being repeated in the VCF and
subsequently lost to a single key value by HTSJDK.  This resolves
the issue by appending the name of the walker after the text
"GATKCommandLine" and a number after that if the same walker was
used more than once in the form: GATKCommandLine.(walker name) for
the first occurrence of the walker, and GATKCommandLine.(walker name).#
where # is the number of the occurrence of the walker (e.g.
GATKCommandLine.SomeWalker.2 for the second occurrence of SomeWalker).
Integration test added to EngineFeaturesIntegrationTest to verify
two runs of same walker follow expected form.

Resolves #909
See also: HTSJDK #43
2015-04-02 13:56:11 -04:00
Geraldine Van der Auwera c2c0037969 Merge pull request #910 from broadinstitute/rhl_mv_example_doc
Update -mv example documentation
2015-04-01 14:12:47 -04:00
Ron Levine fe87484074 Update -mv example documentation
Made general doc fixes
2015-04-01 02:37:42 -04:00
Geraldine Van der Auwera d7f7022dce Merge pull request #904 from broadinstitute/pd_orig_dp
Added keepOriginalDP argument to SelectVariants
2015-03-30 09:01:33 -04:00
ldgauthier 0101003138 Merge pull request #899 from broadinstitute/ldg_M2_tandemRepeatsAndContamination
Lots of changes to M2:
2015-03-30 07:58:35 -04:00
Geraldine Van der Auwera 87b3dddb39 Merge pull request #894 from broadinstitute/gg_ami_docs_license
Edited ASEReadCounter documentation
2015-03-28 13:15:24 -04:00
Laura Gauthier 9a73196813 Fix license 2015-03-27 18:26:20 -04:00
Laura Gauthier 5a10758e2e Annotation changes for M2:
Build a ReferenceContext in ActiveRegionWalkers to pass in to annotation engine so we can call the TandemRepeatAnnotator from M2
Make TandemRepeatAnnotator default annotation for M2.
Setup (but don't use yet) HC-style contamination downsampling.
New HC integration test with TandemRepeatAnnotator
2015-03-27 18:25:23 -04:00
droazen 1f81c033f5 Merge pull request #890 from broadinstitute/rhl_writers_use_index_args
Automatically choose indexing strategy by file extension
2015-03-27 15:00:58 -04:00