Skip to content
Snippets Groups Projects
Commit a334fd88 authored by António Paulo's avatar António Paulo
Browse files

Merge branch 'm2-gatk4.1.2.0-updates' of https://github.com/Amfgcp/tasks into...

Merge branch 'm2-gatk4.1.2.0-updates' of https://github.com/Amfgcp/tasks into m2-gatk4.1.2.0-updates
parents 6221290f ed801654
No related branches found
No related tags found
No related merge requests found
...@@ -15,6 +15,8 @@ version 1.0.0-dev ...@@ -15,6 +15,8 @@ version 1.0.0-dev
+ Mutect2: Add GATK tasks related to variant filtering (LearnReadOrientationModel, MergeStats, GetPileupSummaries, CalculateContamination and FilterMutectCalls). + Mutect2: Add GATK tasks related to variant filtering (LearnReadOrientationModel, MergeStats, GetPileupSummaries, CalculateContamination and FilterMutectCalls).
+ Mutect2: Add "--germline-resource" and "--f1r2-tar-gz" inputs, requiring an update to GATK 4.1.2.0. + Mutect2: Add "--germline-resource" and "--f1r2-tar-gz" inputs, requiring an update to GATK 4.1.2.0.
+ Mutect2: Add necessary missing index attribute for panel of normals. + Mutect2: Add necessary missing index attribute for panel of normals.
+ MultiQC: Add memory variable to multiqc task.
+ GATK: SplitNCigarReads, BaseRecalibration and ApplyBQSR do no longer need regions files as required inputs.
+ VarDict: Add user definable flags (-M, -A, -Q, -d, -v, -f) to the paired VCF filtering script. + VarDict: Add user definable flags (-M, -A, -Q, -d, -v, -f) to the paired VCF filtering script.
+ Cutadapt: If the output is a gzipped file, compress with level 1 (instead of default 6). + Cutadapt: If the output is a gzipped file, compress with level 1 (instead of default 6).
+ Cutadapt: Fix issues with read2output when using single-end reads. + Cutadapt: Fix issues with read2output when using single-end reads.
......
...@@ -7,7 +7,7 @@ task ApplyBQSR { ...@@ -7,7 +7,7 @@ task ApplyBQSR {
File inputBamIndex File inputBamIndex
String outputBamPath String outputBamPath
File recalibrationReport File recalibrationReport
Array[File]+ sequenceGroupInterval Array[File] sequenceGroupInterval = []
File referenceFasta File referenceFasta
File referenceFastaDict File referenceFastaDict
File referenceFastaFai File referenceFastaFai
...@@ -32,7 +32,7 @@ task ApplyBQSR { ...@@ -32,7 +32,7 @@ task ApplyBQSR {
--static-quantized-quals 10 \ --static-quantized-quals 10 \
--static-quantized-quals 20 \ --static-quantized-quals 20 \
--static-quantized-quals 30 \ --static-quantized-quals 30 \
-L ~{sep=" -L " sequenceGroupInterval} ~{true="-L" false="" length(sequenceGroupInterval) > 0} ~{sep=' -L ' sequenceGroupInterval}
} }
output { output {
...@@ -53,7 +53,7 @@ task BaseRecalibrator { ...@@ -53,7 +53,7 @@ task BaseRecalibrator {
File inputBam File inputBam
File inputBamIndex File inputBamIndex
String recalibrationReportPath String recalibrationReportPath
Array[File]+ sequenceGroupInterval Array[File] sequenceGroupInterval = []
Array[File]? knownIndelsSitesVCFs Array[File]? knownIndelsSitesVCFs
Array[File]? knownIndelsSitesVCFIndexes Array[File]? knownIndelsSitesVCFIndexes
File? dbsnpVCF File? dbsnpVCF
...@@ -82,7 +82,7 @@ task BaseRecalibrator { ...@@ -82,7 +82,7 @@ task BaseRecalibrator {
--use-original-qualities \ --use-original-qualities \
-O ~{recalibrationReportPath} \ -O ~{recalibrationReportPath} \
--known-sites ~{sep=" --known-sites " knownIndelsSitesVCFsArg} \ --known-sites ~{sep=" --known-sites " knownIndelsSitesVCFsArg} \
-L ~{sep=" -L " sequenceGroupInterval} ~{true="-L" false="" length(sequenceGroupInterval) > 0} ~{sep=' -L ' sequenceGroupInterval}
} }
output { output {
...@@ -478,7 +478,7 @@ task SplitNCigarReads { ...@@ -478,7 +478,7 @@ task SplitNCigarReads {
File referenceFastaDict File referenceFastaDict
File referenceFastaFai File referenceFastaFai
String outputBam String outputBam
Array[File]+ intervals Array[File] intervals = []
Int memory = 4 Int memory = 4
Float memoryMultiplier = 4 Float memoryMultiplier = 4
...@@ -493,7 +493,7 @@ task SplitNCigarReads { ...@@ -493,7 +493,7 @@ task SplitNCigarReads {
-I ~{inputBam} \ -I ~{inputBam} \
-R ~{referenceFasta} \ -R ~{referenceFasta} \
-O ~{outputBam} \ -O ~{outputBam} \
-L ~{sep=' -L ' intervals} ~{true="-L" false="" length(intervals) > 0} ~{sep=' -L ' intervals}
} }
output { output {
......
...@@ -38,6 +38,7 @@ task MultiQC { ...@@ -38,6 +38,7 @@ task MultiQC {
Boolean verbose = false Boolean verbose = false
Boolean quiet = false Boolean quiet = false
Array[Boolean] finished = [] # An array of booleans that can be used to let multiqc wait on stuff. Array[Boolean] finished = [] # An array of booleans that can be used to let multiqc wait on stuff.
Int memory = 4
} }
command { command {
...@@ -86,6 +87,7 @@ task MultiQC { ...@@ -86,6 +87,7 @@ task MultiQC {
} }
runtime { runtime {
memory: memory
docker: dockerImage docker: dockerImage
} }
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment