Updating links to "helper" cwl

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

diff --git a/WGS-processing/cwl/helper/.scatter-gatk-wf-with-interval.cwl.swp b/WGS-processing/cwl/helper/.scatter-gatk-wf-with-interval.cwl.swp
deleted file mode 100644 (file)
index 6973e8c..0000000
Binary files a/WGS-processing/cwl/helper/.scatter-gatk-wf-with-interval.cwl.swp and /dev/null differ

diff --git a/WGS-processing/cwl/helper/bwa-gatk-wf.cwl b/WGS-processing/cwl/helper/bwa-gatk-wf.cwl
deleted file mode 100644 (file)
index 56c1758..0000000
--- a/WGS-processing/cwl/helper/bwa-gatk-wf.cwl
+++ /dev/null
@@ -1,65 +0,0 @@
-cwlVersion: v1.1
-class: Workflow
-
-requirements:
-  - class: SubworkflowFeatureRequirement
-
-inputs:
-  fastq1: File
-  fastq2: File
-  reference:
-    type: File
-    secondaryFiles:
-      - .amb
-      - .ann
-      - .bwt
-      - .pac
-      - .sa
-      - .fai
-      - ^.dict
-  sample: string
-
-outputs:
-  qc-html:
-    type: File[]
-    outputSource: fastqc/out-html
-  qc-zip:
-    type: File[]
-    outputSource: fastqc/out-zip 
-  vcf:
-    type: File
-    outputSource: haplotypecaller/vcf
-
-steps:
-  fastqc:
-    run: fastqc.cwl
-    in:
-      fastq1: fastq1
-      fastq2: fastq2
-    out: [out-html, out-zip]
-  bwamem-samtools-view:
-    run: bwamem-samtools-view.cwl
-    in:
-      fastq1: fastq1
-      fastq2: fastq2
-      reference: reference
-      sample: sample
-    out: [bam]
-  samtools-sort:
-    run: samtools-sort.cwl
-    in:
-      bam: bwamem-samtools-view/bam
-      sample: sample
-    out: [out]
-  samtools-index:
-    run: samtools-index.cwl
-    in:
-      bam: samtools-sort/out
-    out: [out]
-  haplotypecaller:
-    run: gatk-haplotypecaller.cwl
-    in:
-      reference: reference
-      bam: samtools-index/out
-      sample: sample
-    out: [vcf]

diff --git a/WGS-processing/cwl/helper/bwamem-gatk-report-wf.cwl b/WGS-processing/cwl/helper/bwamem-gatk-report-wf.cwl
index 0a4b9d274d40a8b9ffe854b8d79f924671ac6953..f601e9549eec665e8ed113103394f1bc57fd52b8 100644 (file)
--- a/WGS-processing/cwl/helper/bwamem-gatk-report-wf.cwl
+++ b/WGS-processing/cwl/helper/bwamem-gatk-report-wf.cwl
@@ -43,7 +43,7 @@ outputs:
     outputSource: generate-report/report
 steps:
   fastqc:
     outputSource: generate-report/report
 steps:
   fastqc:

-    run: fastqc.cwl
+    run: ./helper/fastqc.cwl

     in:
       fastq1: fastq1
       fastq2: fastq2
     in:
       fastq1: fastq1
       fastq2: fastq2


@@ -57,13 +57,13 @@ steps:
       sample: sample
     out: [bam]
   samtools-sort:
       sample: sample
     out: [bam]
   samtools-sort:

-    run: samtools-sort.cwl 
+    run: ./helper/samtools-sort.cwl 

     in:
       bam: bwamem-samtools-view/bam
       sample: sample
     out: [sortedbam]
   mark-duplicates:
     in:
       bam: bwamem-samtools-view/bam
       sample: sample
     out: [sortedbam]
   mark-duplicates:

-    run: mark-duplicates.cwl
+    run: ./helper/mark-duplicates.cwl

     in:
       bam: samtools-sort/sortedbam
     out: [dupbam,dupmetrics]
     in:
       bam: samtools-sort/sortedbam
     out: [dupbam,dupmetrics]


@@ -73,7 +73,7 @@ steps:
       bam: mark-duplicates/dupbam
     out: [indexedbam]
   haplotypecaller:
       bam: mark-duplicates/dupbam
     out: [indexedbam]
   haplotypecaller:

-    run: scatter-gatk-wf-with-interval.cwl 
+    run: ./helper/scatter-gatk-wf-with-interval.cwl 

     in:
       reference: reference
       bam: samtools-index/indexedbam
     in:
       reference: reference
       bam: samtools-index/indexedbam


@@ -82,7 +82,7 @@ steps:
       knownsites1: knownsites
     out: [gatheredgvcf]
   generate-report:
       knownsites1: knownsites
     out: [gatheredgvcf]
   generate-report:

-    run: report-wf.cwl
+    run: ./helper/report-wf.cwl

     in:
       gvcf: haplotypecaller/gatheredgvcf
       samplename: sample
     in:
       gvcf: haplotypecaller/gatheredgvcf
       samplename: sample


@@ -90,4 +90,4 @@ steps:
       reportfunc: reportfunc
       headhtml: headhtml
       tailhtml: tailhtml
       reportfunc: reportfunc
       headhtml: headhtml
       tailhtml: tailhtml

-    out: [report]  
+    out: [report] 

diff --git a/WGS-processing/cwl/helper/gatk-wf-with-interval.cwl b/WGS-processing/cwl/helper/gatk-wf-with-interval.cwl
index 4e9f456b24fec167cc3098a71560395254dd74da..c7bd8021f8ed0ad9d9018201e281c2b04dd3c37e 100644 (file)
--- a/WGS-processing/cwl/helper/gatk-wf-with-interval.cwl
+++ b/WGS-processing/cwl/helper/gatk-wf-with-interval.cwl
@@ -34,7 +34,7 @@ outputs:
 
 steps:
   basecalibrator:
 
 steps:
   basecalibrator:

-    run: gatk-baserecalibrator-with-interval.cwl
+    run: ./helper/gatk-baserecalibrator-with-interval.cwl

     in:
       bam: bam
       reference: reference
     in:
       bam: bam
       reference: reference


@@ -43,7 +43,7 @@ steps:
       intervallist: intervallist
     out: [recaltable]
   applyBQSR:
       intervallist: intervallist
     out: [recaltable]
   applyBQSR:

-    run: gatk-applyBSQR-with-interval.cwl
+    run: ./helper/gatk-applyBSQR-with-interval.cwl

     in: 
       reference: reference
       bam: bam
     in: 
       reference: reference
       bam: bam


@@ -52,7 +52,7 @@ steps:
       recaltable: basecalibrator/recaltable
     out: [recalbam]
   haplotypecaller:
       recaltable: basecalibrator/recaltable
     out: [recalbam]
   haplotypecaller:

-    run: gatk-haplotypecaller-with-interval.cwl
+    run: ./helper/gatk-haplotypecaller-with-interval.cwl

     in:
       reference: reference
       bam: applyBQSR/recalbam
     in:
       reference: reference
       bam: applyBQSR/recalbam


@@ -60,7 +60,7 @@ steps:
       intervallist: intervallist
     out: [gvcf]
   selectvariants:
       intervallist: intervallist
     out: [gvcf]
   selectvariants:

-    run: gatk-selectvariants.cwl
+    run: ./helper/gatk-selectvariants.cwl

     in: 
       gvcf: haplotypecaller/gvcf
       reference: reference
     in: 
       gvcf: haplotypecaller/gvcf
       reference: reference

diff --git a/WGS-processing/cwl/helper/report-wf.cwl b/WGS-processing/cwl/helper/report-wf.cwl
index de8ab3f67ce9b20bfd392a1ce31c2300926a00a6..3403ebbe7dfb880d5a5d44b8c7a05c5c1c6a6d36 100644 (file)
--- a/WGS-processing/cwl/helper/report-wf.cwl
+++ b/WGS-processing/cwl/helper/report-wf.cwl
@@ -22,21 +22,21 @@ outputs:
 
 steps:
   gvcf-to-vcf:
 
 steps:
   gvcf-to-vcf:

-    run: gvcf-to-vcf.cwl
+    run: ./helper/gvcf-to-vcf.cwl

     in:
       gvcf: gvcf
       samplename: samplename
     out: [vcf]
 
   annotate:
     in:
       gvcf: gvcf
       samplename: samplename
     out: [vcf]
 
   annotate:

-    run: annotate-vcf.cwl
+    run: ./helper/annotate-vcf.cwl

     in:
       vcf: gvcf-to-vcf/vcf
       clinvarvcf: clinvarvcf
     out: [reporttxt]
 
   generate-report:
     in:
       vcf: gvcf-to-vcf/vcf
       clinvarvcf: clinvarvcf
     out: [reporttxt]
 
   generate-report:

-    run: generate-report.cwl
+    run: ./helper/generate-report.cwl

     in:
       reportfunc: reportfunc
       sampletxt: annotate/reporttxt
     in:
       reportfunc: reportfunc
       sampletxt: annotate/reporttxt

diff --git a/WGS-processing/cwl/wgs-processing-wf.cwl b/WGS-processing/cwl/wgs-processing-wf.cwl
index f7d2d00d36d80c043515eb53f467dcb278c3b9fd..e43bfe5e95a08d89e2f8a033505abe3ead69366d 100644 (file)
--- a/WGS-processing/cwl/wgs-processing-wf.cwl
+++ b/WGS-processing/cwl/wgs-processing-wf.cwl
@@ -1,4 +1,4 @@
-cwlVersion: v1.1
+Version: v1.1

 class: Workflow
 
 requirements:
 class: Workflow
 
 requirements: