Commit Graph

12316 Commits (13bfa963da1a207c64f7b8a95e7ba552feaf9bb9)

Author SHA1 Message Date
David Roazen 13bfa963da Revert changes to exampleFASTA.fasta.fai for now to get tests passing again 2013-05-02 12:59:20 -04:00
Mark DePristo dfdc0df4f1 Merge pull request #207 from broadinstitute/eb_fixing_bundle_script
Fixing the bundle script
2013-05-02 08:18:19 -07:00
Eric Banks f88a964e2c Adding .fai file to example fasta since we don't generate it anymore 2013-05-02 10:54:32 -04:00
Eric Banks 6d0e383a60 Fixing the bundle script
1. someone out there busted it when adding high confidence 1000G calls
2. new path to NA12878 bam
3. updated clashing version argument
2013-05-02 09:40:36 -04:00
Mark DePristo 803f666fd5 Merge pull request #204 from broadinstitute/rp_cgl_force_sample_name
Adding argument to CGL to not stratify by sample name. This is useful wh...
2013-05-01 13:59:20 -07:00
Ryan Poplin ad84f15572 Adding argument to CGL to not stratify by sample name. This is useful when running with 1000G so that you don't get 1000s of lines on the plots. 2013-05-01 16:25:11 -04:00
droazen 19b59f0fb9 Merge pull request #206 from broadinstitute/dr_update_tests_for_java7
Update expected test output for Java 7
2013-05-01 13:23:25 -07:00
David Roazen f3c94a3c87 Update expected test output for Java 7
-Changes in Java 7 related to comparators / sorting produce a large number
 of innocuous differences in our test output. Updating expectations now
 that we've moved to using Java 7 internally.

-Also incorporate Eric's fix to the GATKSAMRecordUnitTest to prevent
 intermittent failures.
2013-05-01 16:18:01 -04:00
David Roazen d0980e236a Merged bug fix from Stable into Unstable 2013-05-01 01:08:29 -04:00
David Roazen f57256b6c2 Delete unused FastaSequenceIndexBuilder class and accompanying test
This class, being unused, was no longer getting packaged into the
GATK release jar by bcel, and so attempting to run its unit test
on the release jar was producing an error.
2013-05-01 01:02:01 -04:00
David Roazen 2edb286d1c Merged bug fix from Stable into Unstable 2013-04-30 22:33:36 -04:00
David Roazen 3390fc7d67 Include cofoja jar in classpath when testing release jars
-Even though we're no longer compiling/using contracts in tests,
 we still need the cofoja jar in the classpath when testing the
 release jars due to some bad behavior on the part of TestNG in
 not being able to handle missing annotation classes.

-We don't need to package the cofoja classes in the actual GATK
 jar, however (and we never have).
2013-04-30 22:16:58 -04:00
Eric Banks e29b52b9a5 Merge remote-tracking branch 'unstable/master' 2013-04-30 15:31:33 -04:00
Mark DePristo a0a1a366e3 Merge pull request #201 from broadinstitute/eb_fix_reduced_count_tagging
Setting the reduce reads count tag was all wrong in a previous commit; fixing
2013-04-30 12:14:40 -07:00
Eric Banks 58424e56be Setting the reduce reads count tag was all wrong in a previous commit; fixing.
RR counts are represented as offsets from the first count, but that wasn't being done
correctly when counts are adjusted on the fly.  Also, we were triggering the expensive
conversion and writing to binary tags even when we weren't going to write the read
to disk.

The code has been updated so that unconverted counts are passed to the GATKSAMRecord
and it knows how to encode the tag correctly.  Also, there are now methods to write
to the reduced counts array without forcing the conversion (and methods that do force
the conversion).

Also:
1. counts are now maintained as ints whenever possible.  Only the GATKSAMRecord knows
about the internal encoding.
2. as discussed in meetings today, we updated the encoding so that it can now handle
a range of values that extends to 255 instead of 127 (and is backwards compatible).
3. tests have been moved from SyntheticReadUnitTest to GATKSAMRecordUnitTest accordingly.
2013-04-30 13:45:42 -04:00
delangel 15266da51c Merge pull request #203 from broadinstitute/gda_poolcaller_paper
Updates to pool caller scala script due to new paths and cleanup, hopefu...
2013-04-30 07:12:02 -07:00
Guillermo del Angel 95637e03a0 Updates to pool caller scala script due to new paths and cleanup, hopefully with final changes for paper.
Added also R script used to process everything into a couple of ggplot-friendly data frames.
Functionality is basically the same. Enhancements:
-- Add annotation to log axiom and Exome Chip AC along with LOF results for concordance comparisons.
-- General Cleanup.
-- Used base path for files as a variable in case directory structure in gsa-hpprojects changes again.
-- Output also per-pool data by subsetting genotypes per pool and comparing with corresponding genotypes from Axiom, exome chip and omni.
-- Commit R scripts that load all tables and crunch them to analyze them.
2013-04-30 10:05:35 -04:00
Mark DePristo 6ea2bceb55 Merge pull request #202 from broadinstitute/yf_remove_getlength_from_every_GATKBAMIndex_read
GATKBAMIndex calls buffer.length() on every read.
2013-04-30 06:24:34 -07:00
Mark DePristo 73fcacbf1b Change Long to long 2013-04-30 09:21:10 -04:00
Eric Banks a3a2ec5a1c Merge pull request #200 from broadinstitute/gda_ug_rr_bug_48742591
Fix for indel calling with UG in presence of reduced reads: When a read ...
2013-04-29 17:54:43 -07:00
Guillermo del Angel 20d3137928 Fix for indel calling with UG in presence of reduced reads: When a read is long enough so that there's no reference context available, the reads gets clipped so that it falls again within the reference context range. However, the clipping is incorrect, as it makes the read end precisely at the end of the reference context coordinates. This might lead to a case where a read might span beyond the haplotype if one of the candidate haplotypes is shorter than the reference context (As in the case e.g. with deletions). In this case, the HMM will not work properly and the likelihood will be bad, since "insertions" at end of reads when haplotype is done will be penalized and likelihood will be much lower than it should.
-- Added check to see if read spans beyond reference window MINUS padding and event length. This guarantees that read will always be contained in haplotype.
-- Changed md5's that happen when long reads from old 454 data have their likelihoods changed because of the extra base clipping.
2013-04-29 19:33:02 -04:00
Yossi Farjoun 0e7e6d35d8 GATKBAMIndex calls buffer.length() on every read. This is causing much pain.
Optimized by getting the read of the file upon opening the index-file and using that instead.
2013-04-29 12:49:02 -04:00
Eric Banks c5701a9ade Merge pull request #199 from broadinstitute/md_clipped_reduced_reads
Bugfix for ReadClipper with ReducedReads
2013-04-29 09:14:43 -07:00
Mark DePristo 0387ea8df9 Bugfix for ReadClipper with ReducedReads
-- The previous version of the read clipping operations wouldn't modify the reduced reads counts, so hardClipToRegion would result in a read with, say, 50 bp of sequence and base qualities but 250 bp of reduced read counts.  Updated the hardClip operation to handle reduce reads, and added a unit test to make sure this works properly.  Also had to update GATKSAMRecord.emptyRead() to set the reduced count to new byte[0] if the template read is a reduced read
-- Update md5s, where the new code recovers a TP variant with count 2 that was missed previously
2013-04-29 11:12:09 -04:00
Mark DePristo 5dd73ba2d1 Merge pull request #198 from broadinstitute/mc_reduce_reads_ds_doc
Updates GATKDocs for ReduceReads downsampling
2013-04-27 05:49:47 -07:00
delangel 651e1f23b1 Merge pull request #194 from broadinstitute/gda_ancient_dna_newPipeline
Add feature to specify Allele frequency priors by command line when call...
2013-04-27 04:59:09 -07:00
Mauricio Carneiro 76e997895e Updates GATKDocs for ReduceReads downsampling
[fixes #48258295]
2013-04-26 23:33:44 -04:00
Guillermo del Angel 4168aaf280 Add feature to specify Allele frequency priors by command line when calling variants.
Use case:
The default AF priors used (infinite sites model, neutral variation) is appropriate in the case where the reference allele is ancestral, and the called allele is a derived allele.
Most of the times this is true but in several population studies and in ancient DNA analyses this might introduce reference biases, and in some other cases it's hard to ascertain what the ancestral allele is (normally requiring to look up homologous chimp sequence).
Specifying no prior is one solution, but this may introduce a lot of artifactual het calls in shallower coverage regions.
With this option, users can specify what the prior for each AC should be according to their needs, subject to the restrictions documented in the code and in GATK docs.
-- Updated ancient DNA single sample calling script with filtering options and other cleanups.
-- Added integration test. Removed old -noPrior syntax.
2013-04-26 19:06:39 -04:00
Mark DePristo 759c531d1b Merge pull request #197 from broadinstitute/dr_disable_snpeff_version_check
Add support for snpEff "GATK compatibility mode" (-o gatk)
2013-04-26 13:55:14 -07:00
David Roazen 7d90bbab08 Add support for snpEff "GATK compatibility mode" (-o gatk)
-Do not throw an exception when parsing snpEff output files
 generated by not-officially-supported versions of snpEff,
 PROVIDED that snpEff was run with -o gatk

-Requested by the snpEff author

-Relevant integration tests updated/expanded
2013-04-26 15:47:15 -04:00
Mark DePristo ec8fb9860a Merge pull request #196 from broadinstitute/rp_cgl_allele_matching
In CGL ensure that the alleles match exactly between the comp track and ...
2013-04-26 12:38:59 -07:00
Ryan Poplin 93fc48739a In CGL ensure that the alleles match exactly between the comp track and the external likelihoods track.
-- Mostly important for indels.
-- Added integration tests to cover this and the new skipFiltered argument.
2013-04-26 15:01:04 -04:00
Mark DePristo 071fd67d55 Merge pull request #193 from broadinstitute/eb_contamination_fixing_for_reduced_reads
Eb contamination fixing for reduced reads
2013-04-26 09:48:45 -07:00
Mark DePristo 92a6c7b561 Merge pull request #195 from broadinstitute/eb_exclude_sample_file_bug_in_select_variants
Fixed bug reported on the forum where using the --exclude_sample_file ar...
2013-04-26 09:47:38 -07:00
Eric Banks 360e2ba87e Fixed bug reported on the forum where using the --exclude_sample_file argument in SV was giving bad results.
Added integration test.
https://www.pivotaltracker.com/s/projects/793457/stories/47399245
2013-04-26 12:23:11 -04:00
Eric Banks 021adf4220 WTF - I thought we had disabled the randomized dithering of rank sum tests for integration tests?!
Well, it wasn't done so I went ahead and did so.  Lots of MD5 changes accordingly.
2013-04-26 11:24:05 -04:00
Eric Banks ba2c3b57ed Extended the allele-biased down-sampling functionality to handle reduced reads.
Note that this works only in the case of pileups (i.e. coming from UG);
allele-biased down-sampling for RR just cannot work for haplotypes.

Added lots of unit tests for new functionality.
2013-04-26 11:23:17 -04:00
droazen b749f06ba6 Merge pull request #192 from broadinstitute/dr_rev_picard_for_2.5_release
Rev picard, sam-jdk, tribble, and variant jars to version 1.90.1442
2013-04-25 17:59:27 -07:00
David Roazen 7cb1247164 Rev picard, sam-jdk, tribble, and variant jars to version 1.90.1442
-This is mainly to get the new "0-length cigar element" check in the
 sam-jdk
2013-04-25 14:05:24 -04:00
Mark DePristo 528c3d083a Merge pull request #191 from broadinstitute/dr_fix_rod_system_locking
Detect stuck lock-acquisition calls, and disable file locking for tests
2013-04-25 09:32:54 -07:00
Ryan Poplin 3c7db87527 Merge pull request #189 from broadinstitute/md_hc_clip_before_merging
Bugfix for FragmentUtils.mergeOverlappingPairedFragments
2013-04-25 08:42:03 -07:00
Mark DePristo d20be41fee Bugfix for FragmentUtils.mergeOverlappingPairedFragments
-- The previous version was unclipping soft clipped bases, and these were sometimes adaptor sequences.  If the two reads successfully merged, we'd lose all of the information necessary to remove the adaptor, producing a very high quality read that matched reference.  Updated the code to first clip the adapter sequences from the incoming fragments
-- Update MD5s
2013-04-25 11:11:15 -04:00
David Roazen 4d56142163 Detect stuck lock-acquisition calls, and disable file locking for tests
-Acquire file locks in a background thread with a timeout of 30 seconds,
 and throw a UserException if a lock acquisition call times out

    * should solve the locking issue for most people provided they
      RETRY failed farm jobs

    * since we use NON-BLOCKING lock acquisition calls, any call that
      takes longer than a second or two indicates a problem with the
      underlying OS file lock support

    * use daemon threads so that stuck lock acquisition tasks don't
      prevent the JVM from exiting

-Disable both auto-index creation and file locking for integration tests
 via a hidden GATK argument --disable_auto_index_creation_and_locking_when_reading_rods

    * argument not safe for general use, since it allows reading from
      an index file without first acquiring a lock

    * this is fine for the test suite, since all index files already
      exist for test files (or if they don't, they should!)

-Added missing indices for files in private/testdata

-Had to delete most of RMDTrackBuilderUnitTest, since it mostly tested auto-index
 creation, which we can't test with locking disabled, but I replaced the deleted
 tests with some tests of my own.

-Unit test for FSLockWithShared to test the timeout feature
2013-04-24 22:49:02 -04:00
Mark DePristo 43f1746eb9 Merge pull request #190 from broadinstitute/mc_processing_pipeline
TechDev version of the Data Processing Pipeline
2013-04-24 17:04:46 -07:00
Mauricio Carneiro 95ac9b6a33 TechDev version of the Data Processing Pipeline
For those times when you need to re-process using the latest and greatest aligners out there...
2013-04-24 19:51:34 -04:00
Mark DePristo 55ead98d3d Merge pull request #188 from broadinstitute/gda_cgl_fix
Small fixes for CalibrateGenotypeLikelihoods.
2013-04-24 16:17:29 -07:00
Guillermo del Angel 3d49f524ee Small fixes for CalibrateGenotypeLikelihoods.
-- If we are using an external vcf, do not consider filtered out records when argument -ignoreFiltered is set.
-- Fix for R script: it uses ddply but some default R installations don't include plyr library by default.
2013-04-24 19:10:59 -04:00
MauricioCarneiro 27bb699e8b Merge pull request #181 from broadinstitute/eb_yet_more_rr_improvements_GSA-930
Various bug fixes for recent Reduce Reads additions plus solution implemented for low MQ reads.
2013-04-24 15:40:03 -07:00
Eric Banks 379a9841ce Various bug fixes for recent Reduce Reads additions plus solution implemented for low MQ reads.
1. Using cumulative binomial probability was not working at high coverage sites (because p-values quickly
got out of hand) so instead we use a hybrid system for determining significance: at low coverage sites
use binomial prob and at high coverage sites revert to using the old base proportions.  Then we get the
best of both worlds.  As a note, coverage refers to just the individual base counts and not the entire pileup.

2. Reads were getting lost because of the comparator being used in the SlidingWindow. When read pairs had
the same alignment end position the 2nd one encountered would get dropped (but added to the header!). We
now use a PriorityQueue instead of a TreeSet to allow for such cases.

3. Each consensus keeps track of its own number of softclipped bases.  There was no reason that that number
should be shared between them.

4. We output consensus filtered (i.e. low MQ) reads whenever they are present for now.  Don't lose that
information.  Maybe we'll decide to change this in the future, but for now we are conservative.

5. Also implemented various small performance optimizations based on profiling.

Added unit tests to cover these changes; systematic assessment now tests against low MQ reads too.
2013-04-24 18:18:50 -04:00
MauricioCarneiro 45fec382e7 Merge pull request #180 from broadinstitute/mc_diagnosetargets_missing_targets
DiagnoseTargets Global Refactor
2013-04-24 14:54:55 -07:00