diff --git a/CHANGELOG.md b/CHANGELOG.md index 27e923e77708041b8c90762caa7eff858ec47c78..1733c93fd5f515b08a82a9295091fa9645a8b0bc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,8 @@ that users understand how the changes affect the new version. version 5.0.0-dev --------------------------- - ++ Bam2fastx: Input bam and index are now arrays. ++ Lima: Remove globs from outputs. + Updated task gridss.wdl: add --jvmheap parameter + A bwa-mem2 task was created with the same interface (including usePostalt) as the bwa mem task. diff --git a/bam2fastx.wdl b/bam2fastx.wdl index 5e5fb50afe854af5ea404f977f835da00f4e1c1f..42240cd4da789985ca1d84ec86973f833f15672b 100644 --- a/bam2fastx.wdl +++ b/bam2fastx.wdl @@ -22,8 +22,8 @@ version 1.0 task Bam2Fasta { input { - File inputFile - File bamIndex + Array[File]+ bam + Array[File]+ bamIndex String outputPrefix Int compressionLevel = 1 Boolean splitByBarcode = false @@ -43,7 +43,7 @@ task Bam2Fasta { -c ~{compressionLevel} \ ~{true="--split-barcodes" false="" splitByBarcode} \ ~{"--seqid-prefix " + seqIdPrefix} \ - ~{inputFile} + ~{sep=" " bam} } output { @@ -58,8 +58,8 @@ task Bam2Fasta { parameter_meta { # inputs - inputFile: {description: "The input pacbio bam file.", category: "required"} - bamIndex: {description: "The .pbi index for the input file.", category: "required"} + bam: {description: "The input pacbio bam file(s).", category: "required"} + bamIndex: {description: "The .pbi index for the input file(s).", category: "required"} outputPrefix: {description: "Output directory path + output file prefix.", category: "required"} compressionLevel: {description: "Gzip compression level [1-9]", category: "advanced"} splitByBarcode: {description: "Split output into multiple fasta files, by barcode pairs.", category: "advanced"} @@ -75,8 +75,8 @@ task Bam2Fasta { task Bam2Fastq { input { - File inputFile - File bamIndex + Array[File]+ bam + Array[File]+ bamIndex String outputPrefix Int compressionLevel = 1 Boolean splitByBarcode = false @@ -96,7 +96,7 @@ task Bam2Fastq { -c ~{compressionLevel} \ ~{true="--split-barcodes" false="" splitByBarcode} \ ~{"--seqid-prefix " + seqIdPrefix} \ - ~{inputFile} + ~{sep=" " bam} } output { @@ -111,8 +111,8 @@ task Bam2Fastq { parameter_meta { # inputs - inputFile: {description: "The input pacbio bam file.", category: "required"} - bamIndex: {description: "The .pbi index for the input file.", category: "required"} + bam: {description: "The input pacbio bam file(s).", category: "required"} + bamIndex: {description: "The .pbi index for the input file(s).", category: "required"} outputPrefix: {description: "Output directory path + output file prefix.", category: "required"} compressionLevel: {description: "Gzip compression level [1-9]", category: "advanced"} splitByBarcode: {description: "Split output into multiple fastq files, by barcode pairs.", category: "advanced"} diff --git a/lima.wdl b/lima.wdl index 2e8a708502598bba6e7839e21fd0dc557ce6e56e..1a40b1c8174c8df6aefa360fe199e2a1d8ccea8d 100644 --- a/lima.wdl +++ b/lima.wdl @@ -95,12 +95,15 @@ task Lima { cp "~{basename(outputPrefix)}.fl.lima.counts" "~{outputPrefix}.fl.lima.counts" cp "~{basename(outputPrefix)}.fl.lima.report" "~{outputPrefix}.fl.lima.report" cp "~{basename(outputPrefix)}.fl.lima.summary" "~{outputPrefix}.fl.lima.summary" + find . -path "*.bam" > bamFiles.txt + find . -path "*.bam.pbi" > bamIndexes.txt + find . -path "*.subreadset.xml" > subreadsets.txt } output { - Array[File] limaBam = glob("*.bam") - Array[File] limaBamIndex = glob("*.bam.pbi") - Array[File] limaXml = glob("*.subreadset.xml") + Array[File] limaBam = read_lines("bamFiles.txt") + Array[File] limaBamIndex = read_lines("bamIndexes.txt") + Array[File] limaXml = read_lines("subreadsets.txt") File limaStderr = outputPrefix + ".fl.stderr.log" File limaJson = outputPrefix + ".fl.json" File limaCounts = outputPrefix + ".fl.lima.counts"