Updating annotation and gatk code

Arvados-DCO-1.1-Signed-off-by: Sarah Wait Zaranek <swz@curii.com>
no issue #

diff --git a/cwl/annotate-vcf.cwl b/cwl/annotate-vcf.cwl
index fc20bfc1af01a4ffb0db038b87ff7c8c739b3cd7..019fa1ab5d53f65982928ec7a74197e76340a321 100644 (file)
--- a/cwl/annotate-vcf.cwl
+++ b/cwl/annotate-vcf.cwl
@@ -18,7 +18,6 @@ inputs:
     type: File
   clinvarvcf:
     type: File
-
 outputs:
   reporttxt: stdout
 

diff --git a/cwl/gatk-haplotypecaller.cwl b/cwl/gatk-haplotypecaller.cwl
index ae34a00133dd7993ac201b6344c224c175181e4a..f10178301ae677c272e949e81bae0ff1dfd41689 100644 (file)
--- a/cwl/gatk-haplotypecaller.cwl
+++ b/cwl/gatk-haplotypecaller.cwl
@@ -11,7 +11,7 @@ requirements:
 
 hints:
   ResourceRequirement:
-    ramMin: 10000
+    ramMin: 20000
     coresMin: 4    
 
 inputs:
@@ -37,16 +37,23 @@ outputs:
     outputBinding:
       glob: "*vcf.gz"
 
+baseCommand: /gatk/gatk
+
 arguments:
-  - java
-  - -jar
-  - /gatk/gatk.jar
+  - "--java-options"
+  - "-Xmx8G" 
   - HaplotypeCaller
-  - -R
-  - $(inputs.reference)
-  - -I
-  - $(inputs.bam)
-  - -O
-  - $(runtime.outdir)/$(inputs.sample).gatk.g.vcf.gz
-  - -ERC
-  - "GVCF"
+  - prefix: "-R"
+    valueFrom: $(inputs.reference)
+  - prefix: "-I"
+    valueFrom: $(inputs.bam)
+  - prefix: "-O"
+    valueFrom: $(runtime.outdir)/$(inputs.sample).gatk.g.vcf.gz
+  - prefix: "-ERC"
+    valueFrom: "GVCF"
+  - prefix: "-GQB"
+    valueFrom: "5"
+  - prefix: "-GQB"
+    valueFrom: "20"
+  - prefix: "-GQB"
+    valueFrom: "60"

diff --git a/cwl/gvcf-to-vcf.cwl b/cwl/gvcf-to-vcf.cwl
index ecba357fcdd09e4e406c4b3ac7771f53868381f8..dfa3e248da1c19dcd5426cdee894dcd0e8d81f96 100644 (file)
--- a/cwl/gvcf-to-vcf.cwl
+++ b/cwl/gvcf-to-vcf.cwl
@@ -31,6 +31,8 @@ arguments:
   - prefix: "--min-ac"
     valueFrom: "1"
   - $(inputs.gvcf.path)
+  - prefix: "-i"
+    valueFrom: "AVG(GQ)>20"
   - valueFrom: "-Ov"
   - prefix: "-o"
     valueFrom: $(inputs.samplename).vcf