diff --git a/.cwl/cwl-plots/runs/kallisto.svg b/.cwl/cwl-plots/runs/kallisto.svg
index 45f69bc844193654382928997d43f78b3e2171f4..241535b57ea69b5af61d7e5f40ede4a8366fdb7f 100644
--- a/.cwl/cwl-plots/runs/kallisto.svg
+++ b/.cwl/cwl-plots/runs/kallisto.svg
@@ -109,15 +109,15 @@
<path fill="none" stroke="black" d="M79.18,-185.43C89.76,-174.74 104.84,-161.76 121,-155 157.69,-139.66 267.22,-133.56 330.49,-131.27"/>
<polygon fill="black" stroke="black" points="330.73,-134.77 340.61,-130.93 330.49,-127.77 330.73,-134.77"/>
</g>
-<!-- finalOut -->
+<!-- kallistoOutDir -->
<g id="node9" class="node">
-<title>finalOut</title>
+<title>kallistoOutDir</title>
<polygon fill="#94ddf4" stroke="black" points="346.06,-38.5 346.06,-74.5 407.94,-74.5 407.94,-38.5 346.06,-38.5"/>
-<text text-anchor="middle" x="377" y="-52.3" font-family="Times,serif" font-size="14.00">finalOut</text>
+<text text-anchor="middle" x="377" y="-52.3" font-family="Times,serif" font-size="14.00">kallistoOutDir</text>
</g>
-<!-- kallisto->finalOut -->
+<!-- kallisto->kallistoOutDir -->
<g id="edge8" class="edge">
-<title>kallisto->finalOut</title>
+<title>kallisto->kallistoOutDir</title>
<path fill="none" stroke="black" d="M377,-110.93C377,-103.17 377,-93.78 377,-85.06"/>
<polygon fill="black" stroke="black" points="380.5,-84.9 377,-74.9 373.5,-84.9 380.5,-84.9"/>
</g>
diff --git a/.cwl/cwl-plots/workflows/kallisto.svg b/.cwl/cwl-plots/workflows/kallisto.svg
index 9e81b888aae33970cf281e5cb9f209c6c363d61a..930b4cad82f95e6624a32284127342621d8e2618 100644
--- a/.cwl/cwl-plots/workflows/kallisto.svg
+++ b/.cwl/cwl-plots/workflows/kallisto.svg
@@ -37,15 +37,15 @@
<path fill="none" stroke="black" d="M491.95,-193.08C456.78,-182.13 394.44,-162.71 348.49,-148.4"/>
<polygon fill="black" stroke="black" points="349.25,-144.97 338.66,-145.34 347.16,-151.66 349.25,-144.97"/>
</g>
-<!-- finalOut -->
+<!-- kallistoOutDir -->
<g id="node11" class="node">
-<title>finalOut</title>
+<title>kallistoOutDir</title>
<polygon fill="#94ddf4" stroke="black" points="260.06,-38.5 260.06,-74.5 321.94,-74.5 321.94,-38.5 260.06,-38.5"/>
-<text text-anchor="middle" x="291" y="-52.3" font-family="Times,serif" font-size="14.00">finalOut</text>
+<text text-anchor="middle" x="291" y="-52.3" font-family="Times,serif" font-size="14.00">kallistoOutDir</text>
</g>
-<!-- collectResults->finalOut -->
+<!-- collectResults->kallistoOutDir -->
<g id="edge12" class="edge">
-<title>collectResults->finalOut</title>
+<title>collectResults->kallistoOutDir</title>
<path fill="none" stroke="black" d="M291,-111.31C291,-103.29 291,-93.55 291,-84.57"/>
<polygon fill="black" stroke="black" points="294.5,-84.53 291,-74.53 287.5,-84.53 294.5,-84.53"/>
</g>
diff --git a/arc.cwl b/arc.cwl
index 0043dcfb4d5fb1298df82835b838907d71349774..e42113e4885aa5aae903714b01c970a16dd04f25 100644
--- a/arc.cwl
+++ b/arc.cwl
@@ -50,7 +50,7 @@ steps:
StandardDeviation: kallisto_StandardDeviation
BootstrapSamples: kallisto_BootstrapSamples
resultsFolder: kallisto_resultsFolder
- out: [finalOut]
+ out: [kallistoOutDir]
isaSampleToRawDataSeq:
@@ -65,7 +65,7 @@ steps:
sleuth:
run: runs/sleuth/run.cwl
in:
- inKallistoResults: kallisto/finalOut
+ inKallistoResults: kallisto/kallistoOutDir
inMetadataFile: isaSampleToRawDataSeq/output
inMetadataSample: sleuth_inMetadataSample
inMetadataFactorList: sleuth_inMetadataFactorList
diff --git a/runs/isaSampleToRawDataSeq/rnaseq-samples.xlsx b/runs/isaSampleToRawDataSeq/rnaseq-samples.xlsx
index 1c05d363efc105474dc4887ac57f94beba0ac181..e73d722501815a8b129f9f7a95b3b0af60c45ab0 100644
Binary files a/runs/isaSampleToRawDataSeq/rnaseq-samples.xlsx and b/runs/isaSampleToRawDataSeq/rnaseq-samples.xlsx differ
diff --git a/runs/isaSampleToRawDataSeq/run.cwl b/runs/isaSampleToRawDataSeq/run.cwl
index 8f00f6abfd1d3f757b20fdf253fbbcd0b0003aa5..3df9da4b2ea089ed1ce9a18f5b48cf3c5dd32bfa 100644
--- a/runs/isaSampleToRawDataSeq/run.cwl
+++ b/runs/isaSampleToRawDataSeq/run.cwl
@@ -1,6 +1,9 @@
cwlVersion: v1.2
class: Workflow
+requirements:
+ MultipleInputFeatureRequirement: {}
+
inputs:
arcPath: Directory
assayName: string
@@ -15,10 +18,14 @@ steps:
assayName: assayName
startingNodeNum: startingNodeNum
outName: outName
- out: [output]
+ out:
+ - sampleseqCsv
+ - sampleseqXlsx
outputs:
- output:
+ sampleseqs:
type: File[]
- outputSource: isaSampleToRawDataSeq/output
+ outputSource:
+ - isaSampleToRawDataSeq/sampleseqCsv
+ - isaSampleToRawDataSeq/sampleseqXlsx
diff --git a/runs/kallisto/run.cwl b/runs/kallisto/run.cwl
index 3ec2a22fd3d933361182dff470de94caf611a092..d702ed4426bff5a1890b4f9f0ce0de6acb1743c8 100644
--- a/runs/kallisto/run.cwl
+++ b/runs/kallisto/run.cwl
@@ -35,9 +35,9 @@ steps:
StandardDeviation: StandardDeviation
BootstrapSamples: BootstrapSamples
resultsFolder: resultsFolder
- out: [finalOut]
+ out: [kallistoOutDir]
outputs:
- finalOut:
- type: Directory[]
- outputSource: kallisto/finalOut
+ kallistoOutDir:
+ type: Directory
+ outputSource: kallisto/kallistoOutDir
diff --git a/workflows/isaSampleToRawDataSeq/workflow.cwl b/workflows/isaSampleToRawDataSeq/workflow.cwl
index 9cace450b08381d8a8dc408daf6fab25489e8881..f9db3ee3cc8a9dcd6cb12b963d0728cdbb247c70 100644
--- a/workflows/isaSampleToRawDataSeq/workflow.cwl
+++ b/workflows/isaSampleToRawDataSeq/workflow.cwl
@@ -39,9 +39,13 @@ inputs:
position: 4
outputs:
- output:
- type: File[]
+ sampleseqCsv:
+ type: File
outputBinding:
glob:
- "*.csv"
+ sampleseqXlsx:
+ type: File
+ outputBinding:
+ glob:
- "*.xlsx"
diff --git a/workflows/kallisto/yield-dirInDestination.cwl b/workflows/kallisto/gather-dirs.cwl
similarity index 64%
rename from workflows/kallisto/yield-dirInDestination.cwl
rename to workflows/kallisto/gather-dirs.cwl
index bc90cb81f1a907735bd433d6117c55872c213f92..c7a13f50c1bd08836574a800142fdf549f4c8628 100644
--- a/workflows/kallisto/yield-dirInDestination.cwl
+++ b/workflows/kallisto/gather-dirs.cwl
@@ -1,18 +1,18 @@
cwlVersion: v1.2
class: ExpressionTool
doc: |
- Takes a directory (e.g. from a workflow step) and yields it in a desired directory.
+ Takes an array of directories (e.g. from a workflow step) and yields them in a destination directory.
requirements:
- class: InlineJavascriptRequirement
inputs:
- inDir: Directory
+ inDirs: Directory[]
destinationDir: string
expression: |
${
return {"outDir": {
"class": "Directory",
"basename": inputs.destinationDir,
- "listing": [inputs.inDir]
+ "listing": inputs.inDirs
} };
}
outputs:
diff --git a/workflows/kallisto/kallisto-quant.cwl b/workflows/kallisto/kallisto-quant.cwl
index 026f7e1bc37dba078b750b3f7ecb70019c4bc753..692be5854e29bca5ef9abdfdec35164339183a3d 100755
--- a/workflows/kallisto/kallisto-quant.cwl
+++ b/workflows/kallisto/kallisto-quant.cwl
@@ -126,7 +126,7 @@ arguments: [ "--output-dir", $(inputs.QuantOutfolder) ]
outputs:
- outFolder:
+ kallistoQuantOutDir:
type: Directory
outputBinding:
glob: $(runtime.outdir)/$(inputs.QuantOutfolder)
diff --git a/workflows/kallisto/workflow.cwl b/workflows/kallisto/workflow.cwl
index 4ce56173769787379dddf9cd977d60b18e6ff9c1..56e140016e2e12e2da4f02aa5d49d0a1efc7366d 100644
--- a/workflows/kallisto/workflow.cwl
+++ b/workflows/kallisto/workflow.cwl
@@ -51,17 +51,16 @@ steps:
FragmentLength: FragmentLength
StandardDeviation: StandardDeviation
BootstrapSamples: BootstrapSamples
- out: [outFolder]
-
+ out: [kallistoQuantOutDir]
collectResults:
- run: ./yield-dirInDestination.cwl
- scatter: inDir
+ run: ./gather-dirs.cwl
in:
- inDir: quant/outFolder
+ inDirs: quant/kallistoQuantOutDir
destinationDir: resultsFolder
out: [outDir]
outputs:
- finalOut:
- type: Directory[]
+ kallistoOutDir:
+ type: Directory
outputSource: collectResults/outDir
+