Updating to allow for two vcfs of known sites

[arvados-tutorial.git] / WGS-processing / cwl / helper / gatk-wf-with-interval.cwl

diff --git a/WGS-processing/cwl/helper/gatk-wf-with-interval.cwl b/WGS-processing/cwl/helper/gatk-wf-with-interval.cwl
index e1e54eeef1d39b613f235b7fc4410a9c6414f205..d9023c92186ca6fda034cbf4552accdb5c069364 100644 (file)
--- a/WGS-processing/cwl/helper/gatk-wf-with-interval.cwl
+++ b/WGS-processing/cwl/helper/gatk-wf-with-interval.cwl
@@ -1,17 +1,21 @@
 cwlVersion: v1.1
 class: Workflow
-label: Variant calling workflow for single interval 
+label: Variant calling workflow for given interval
 
 requirements:
-  - class: SubworkflowFeatureRequirement
+  SubworkflowFeatureRequirement: {}
 
 inputs:
   bam:
     type: File
+    format: edam:format_2572 # BAM
+    label: Indexed sorted BAM with labeled duplicates
     secondaryFiles:
       - .bai
   reference:
     type: File
+    format: edam:format_1929 # FASTA
+    label: Reference genome
     secondaryFiles:
       - .amb
       - .ann
@@ -20,17 +24,30 @@ inputs:
       - .sa
       - .fai
       - ^.dict
-  sample: string
+  sample:
+    type: string
+    label: Sample Name
   knownsites1:
     type: File
+    format: edam:format_3016 # VCF
+    label: VCF of known polymorphic sites for BQSR
+    secondaryFiles:
+      - .idx
+  knownsites2:
+    type: File
+    format: edam:format_3016 # VCF
+    label: VCF of known polymorphic sites for BQSR
     secondaryFiles:
       - .tbi
   intervallist:
     type: File
+    label: Scatter intervals file
 
 outputs:
   gvcf:
     type: File
+    format: edam:format_3016 # GVCF
+    label: Given interval filtered GVCF
     outputSource: selectvariants/filteredgvcf
 
 steps:
@@ -41,11 +58,12 @@ steps:
       reference: reference
       sample: sample
       knownsites1: knownsites1
+      knownsites2: knownsites2
       intervallist: intervallist
     out: [recaltable]
   applyBQSR:
     run: gatk-applyBSQR-with-interval.cwl
-    in: 
+    in:
       reference: reference
       bam: bam
       sample: sample
@@ -62,7 +80,7 @@ steps:
     out: [gvcf]
   selectvariants:
     run: gatk-selectvariants.cwl
-    in: 
+    in:
       gvcf: haplotypecaller/gvcf
       reference: reference
       sample: sample
@@ -75,6 +93,6 @@ $namespaces:
  s: https://schema.org/
  edam: http://edamontology.org/
 
-$schemas:
- - https://schema.org/version/latest/schema.rdf
- - http://edamontology.org/EDAM_1.18.owl
+#$schemas:
+# - https://schema.org/version/latest/schema.rdf
+# - http://edamontology.org/EDAM_1.18.owl