diff --git a/biopet.wdl b/biopet.wdl index 8aff11f03cccd16aa0189fc14aebb0edb9144735..286b2e0e9459c89c92259bd50b94aae973f0875a 100644 --- a/biopet.wdl +++ b/biopet.wdl @@ -3,7 +3,7 @@ task BaseCounter { String? preCommand - String? toolJar + File? toolJar File bam File bamIndex File refFlat @@ -72,7 +72,7 @@ task BaseCounter { } task ExtractAdaptersFastqc { - String? toolJar + File? toolJar File inputFile String outputDir String? adapterOutputFilePath = outputDir + "/adapter.list" @@ -122,7 +122,7 @@ task FastqSplitter { String? preCommand File inputFastq Array[String] outputPaths - String? toolJar + File? toolJar Float? memory Float? memoryMultiplier @@ -162,7 +162,7 @@ task FastqSync { File in2 String out1path String out2path - String? toolJar + File? toolJar Float? memory Float? memoryMultiplier @@ -196,7 +196,7 @@ task FastqSync { } task SampleConfig { - String? toolJar + File? toolJar String? preCommand Array[File]+ inputFiles String keyFilePath @@ -244,7 +244,7 @@ task ScatterRegions { File refFasta File refDict String outputDirPath - String? toolJar + File? toolJar Int? scatterSize File? regions @@ -276,3 +276,32 @@ task ScatterRegions { } } +task Seqstat { + String? preCommand + File? toolJar + File fastq + String outputFile + Float? memory + Float? memoryMultiplier + Int mem = ceil(select_first([memory, 4.0])) + + String toolCommand = if defined(toolJar) + then "java -Xmx" + mem + "G -jar " + toolJar + else "biopet-seqstat -Xmx" + mem + "G" + + command { + set -e -o pipefail + ${preCommand} + mkdir -p $(dirname ${outputFile}) + ${toolCommand} \ + --fastq ${fastq} \ + --output ${outputFile} + } + output { + File json = outputFile + } + runtime { + memory: ceil(mem * select_first([memoryMultiplier, 2.0])) + } +} + diff --git a/cutadapt.wdl b/cutadapt.wdl index 6e6cd56aa2b028c9c18f08b20c60d162d1cf71f6..d4255c695c51e5cd6947b7955f8b871746ad8524 100644 --- a/cutadapt.wdl +++ b/cutadapt.wdl @@ -33,7 +33,7 @@ task cutadapt { String? stripSuffix String? prefix String? suffix - Int? minimumLength + Int? minimumLength = 1 # Necessary to prevent creation of empty reads Int? maximumLength Int? maxN Boolean? discardTrimmed