diff --git a/runs/kallisto/workflow.yml b/runs/kallisto/workflow.yml index db33ad666d253942c4ab8a07f96284b38839fcf4..44b12a52b580c347272b25df36394b2c8e005966 100644 --- a/runs/kallisto/workflow.yml +++ b/runs/kallisto/workflow.yml @@ -13,17 +13,20 @@ InputReadsMultipleSamples: - class: File path: ../../assays/Talinum_RNASeq_minimal/dataset/DB_097_CAMMD_CAGATC_L001_R1_001.fastq.gz format: edam:format_1930 # FASTQ - - - - class: File - path: ../../assays/Talinum_RNASeq_minimal/dataset/DB_099_CAMMD_CTTGTA_L001_R1_001.fastq.gz - format: edam:format_1930 # FASTQ + # - + # - class: File + # path: ../../assays/Talinum_RNASeq_minimal/dataset/DB_099_CAMMD_CTTGTA_L001_R1_001.fastq.gz + # format: edam:format_1930 # FASTQ numCharsFastqFileName: 6 + ### Kallisto quant Parameters isSingle: true FragmentLength: 200 StandardDeviation: 20 BootstrapSamples: 1 +resultsFolder: kallist_results + $namespaces: edam: https://edamontology.org/ \ No newline at end of file diff --git a/workflows/_aux-tools/collectFilesInDir.cwl b/workflows/_aux-tools/collectFilesInDir.cwl new file mode 100644 index 0000000000000000000000000000000000000000..f8d411fe571e1a22a08e23a6dc472cd5ac1c25d1 --- /dev/null +++ b/workflows/_aux-tools/collectFilesInDir.cwl @@ -0,0 +1,19 @@ +cwlVersion: v1.2 +class: ExpressionTool +doc: | + Takes Files (e.g. from a workflow step) and yields them in a desired directory. +requirements: + - class: InlineJavascriptRequirement +inputs: + files: File[] + destination: string +expression: | + ${ + return {"outDir": { + "class": "Directory", + "basename": inputs.destination, + "listing": inputs.files + } }; + } +outputs: + outDir: Directory \ No newline at end of file diff --git a/workflows/_aux-tools/yield-dirInDestination.cwl b/workflows/_aux-tools/yield-dirInDestination.cwl new file mode 100644 index 0000000000000000000000000000000000000000..c2a20eabcd7bfc412238d74a99aedb6eac468008 --- /dev/null +++ b/workflows/_aux-tools/yield-dirInDestination.cwl @@ -0,0 +1,19 @@ +cwlVersion: v1.2 +class: ExpressionTool +doc: | + Takes a directory (e.g. from a workflow step) and yield it in a desired directory. +requirements: + - class: InlineJavascriptRequirement +inputs: + inDir: Directory + destinationDir: string +expression: | + ${ + return {"outDir": { + "class": "Directory", + "basename": inputs.destinationDir, + "listing": [inputs.inDir] + } }; + } +outputs: + outDir: Directory \ No newline at end of file diff --git a/workflows/kallisto/kallisto-workflow.cwl b/workflows/kallisto/kallisto-workflow.cwl index 0cf46eb9a97c5cd0a9bc65e5f819ff55cd9bad2f..6bbeb9d70dcfe5f6d17a7317771126c11bce8e48 100644 --- a/workflows/kallisto/kallisto-workflow.cwl +++ b/workflows/kallisto/kallisto-workflow.cwl @@ -14,11 +14,11 @@ inputs: items: type: array items: File - numCharsFastqFileName: int? isSingle: boolean FragmentLength: double? StandardDeviation: double? - BootstrapSamples: int? + BootstrapSamples: int? + resultsFolder: string steps: index: @@ -46,8 +46,15 @@ steps: StandardDeviation: StandardDeviation BootstrapSamples: BootstrapSamples out: [outFolder] + collectResults: + run: ../_aux-tools/yield-dirInDestination.cwl + scatter: inDir + in: + inDir: quant/outFolder + destinationDir: resultsFolder + out: outDir outputs: finalOut: - type: Directory[] - outputSource: quant/outFolder + type: Directory + outputSource: collectResults/outDir