Updating cwl and yml for intervals and other changes

[arvados-tutorial.git] / WGS-processing / cwl / helper / bwamem-gatk-report-wf.cwl

diff --git a/WGS-processing/cwl/helper/bwamem-gatk-report-wf.cwl b/WGS-processing/cwl/helper/bwamem-gatk-report-wf.cwl
index ee8ae4fdce5682340403ba4070a10fc52e1cb1f6..dbb1d5024731aa1923fa539217264e6a7070600c 100644 (file)
--- a/WGS-processing/cwl/helper/bwamem-gatk-report-wf.cwl
+++ b/WGS-processing/cwl/helper/bwamem-gatk-report-wf.cwl
@@ -3,7 +3,7 @@ class: Workflow
 label: WGS processing workflow for single sample
 
 requirements:
-  - class: SubworkflowFeatureRequirement
+  SubworkflowFeatureRequirement: {}
 
 inputs:
   fastq1:
@@ -26,6 +26,9 @@ inputs:
       - .sa
       - .fai
       - ^.dict
+  fullintervallist:
+    type: File
+    label: Full list of intervals to operate over
   sample: 
     type: string
     label: Sample Name
@@ -47,18 +50,18 @@ inputs:
     label: Function used to create HTML report
   headhtml:
     type: File
-    format: edam:format_1964 # HTML
+    format: edam:format_2331 # HTML
     label: Header for HTML report
   tailhtml:
     type: File
-    format: edam:format_1964 # HTML
+    format: edam:format_2331 # HTML
     label: Footer for HTML report
 
 outputs:
   qc-html:
     type: File[]
     label: FASTQ QC reports
-    format: edam:format_1964 # HTML
+    format: edam:format_2331 # HTML
     outputSource: fastqc/out-html
   qc-zip:
     type: File[]
@@ -72,7 +75,7 @@ outputs:
   report:
     type: File  
     outputSource: generate-report/report
-    format: edam:format_1964 # HTML
+    format: edam:format_2331 # HTML
     label: ClinVar variant report
 
 steps:
@@ -110,6 +113,7 @@ steps:
     run: scatter-gatk-wf-with-interval.cwl 
     in:
       reference: reference
+      fullintervallist: fullintervallist
       bam: samtools-index/indexedbam
       sample: sample
       scattercount: scattercount
@@ -119,7 +123,7 @@ steps:
     run: report-wf.cwl
     in:
       gvcf: haplotypecaller/gatheredgvcf
-      samplename: sample
+      sample: sample
       clinvarvcf: clinvarvcf
       reportfunc: reportfunc
       headhtml: headhtml
@@ -133,6 +137,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