diff --git a/biopet.wdl b/biopet.wdl index 7d0d0a5fcfe5f1cb9711a3da6b3665f34546e3a8..8d91955779a87b4791815b8971e251a1d0e15aef 100644 --- a/biopet.wdl +++ b/biopet.wdl @@ -65,6 +65,49 @@ task BaseCounter { } } +task extractAdapters { + File extractAdaptersFastqcJar + File inputFile + String outputDir + String? adapterOutputFilePath = outputDir + "/adapter.list" + String? contamsOutputFilePath = outputDir + "/contaminations.list" + Boolean? skipContams + File? knownContamFile + File? knownAdapterFile + Float? adapterCutoff + Boolean? outputAsFasta + + Float? memory + Float? memoryMultiplier + + Int mem = ceil(select_first([memory, 4.0])) + command { + set -e + mkdir -p ${outputDir} + java -Xmx${mem}G -jar ${extractAdaptersFastqcJar} \ + --inputFile ${inputFile} \ + ${"--adapterOutputFile " + adapterOutputFilePath } \ + ${"--contamsOutputFile " + contamsOutputFilePath } \ + ${"--knownContamFile " + knownContamFile} \ + ${"--knownAdapterFile " + knownAdapterFile} \ + ${"--adapterCutoff " + adapterCutoff} \ + ${true="--skipContams" false="" skipContams} \ + ${true="--outputAsFasta" false="" outputAsFasta} + } + + output { + File adapterOutputFile = select_first([adapterOutputFilePath]) + File contamsOutputFile = select_first([contamsOutputFilePath]) + Array[String] adapterList = read_lines(select_first([adapterOutputFilePath])) + Array[String] contamsList = read_lines(select_first([contamsOutputFilePath])) + } + + runtime { + memory: ceil(mem * select_first([memoryMultiplier, 2.5])) + } +} + + task FastqSplitter { String? preCommand File inputFastq diff --git a/fastqc.wdl b/fastqc.wdl index f0fd2fec0371432f054aecd9624dc9bda628f292..d9135f73197bf1e985f5a096c45f449f37e42d94 100644 --- a/fastqc.wdl +++ b/fastqc.wdl @@ -55,48 +55,6 @@ task fastqc { } } -task extractAdapters { - File extractAdaptersFastqcJar - File inputFile - String outputDir - String? adapterOutputFilePath = outputDir + "/adapter.list" - String? contamsOutputFilePath = outputDir + "/contaminations.list" - Boolean? skipContams - File? knownContamFile - File? knownAdapterFile - Float? adapterCutoff - Boolean? outputAsFasta - - Float? memory - Float? memoryMultiplier - - Int mem = ceil(select_first([memory, 4.0])) - command { - set -e - mkdir -p ${outputDir} - java -Xmx${mem}G -jar ${extractAdaptersFastqcJar} \ - --inputFile ${inputFile} \ - ${"--adapterOutputFile " + adapterOutputFilePath } \ - ${"--contamsOutputFile " + contamsOutputFilePath } \ - ${"--knownContamFile " + knownContamFile} \ - ${"--knownAdapterFile " + knownAdapterFile} \ - ${"--adapterCutoff " + adapterCutoff} \ - ${true="--skipContams" false="" skipContams} \ - ${true="--outputAsFasta" false="" outputAsFasta} - } - - output { - File adapterOutputFile = select_first([adapterOutputFilePath]) - File contamsOutputFile = select_first([contamsOutputFilePath]) - Array[String] adapterList = read_lines(select_first([adapterOutputFilePath])) - Array[String] contamsList = read_lines(select_first([contamsOutputFilePath])) - } - - runtime { - memory: ceil(mem * select_first([memoryMultiplier, 2.5])) - } -} - task getConfiguration { String? preCommand String? fastqcDirFile = "fastqcDir.txt"