diff --git a/CHANGELOG.md b/CHANGELOG.md index 5b47ef9673ccdecefa03bb17e3d1a2850d83e55e..57b95447b438ca5d213c8ddc32d0917975aa618a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ * Make pull references from BioHPC default (including in biohpc.config) * Start using new gudmaprbk dockerhub (images autobuilt) * Moved consistency checks to be fully python +* Changed order of steps so that fastqc is done after the trim step *Known Bugs* * Datahub reference pull uses dev.gudmap.org as source until referencencs are placed on production diff --git a/docs/dag.png b/docs/dag.png index e29fa207116d63af5ed95931b7e45bd618260ff3..785a852de0310576415c2c99f80c3452f7ad176e 100644 Binary files a/docs/dag.png and b/docs/dag.png differ diff --git a/workflow/rna-seq.nf b/workflow/rna-seq.nf index 551f18d262dca6808ae3b514c0f4a6e36d23cfad..97c25de77f9b95592e46f3ed92d0af7f98238807 100644 --- a/workflow/rna-seq.nf +++ b/workflow/rna-seq.nf @@ -227,14 +227,12 @@ if (fastqsForce != "") { Channel .fromPath(fastqsForce) .ifEmpty { exit 1, "override inputBag file not found: ${fastqsForce}" } - .collect().into { + .collect().set { fastqs_trimData - fastqs_fastqc } } else { - fastqs.into { + fastqs.set { fastqs_trimData - fastqs_fastqc } } @@ -343,6 +341,7 @@ process trimData { output: path ("*.fq.gz") into fastqsTrim + path ("*.fastq.gz", includeInputs:true) into fastqs_fastqc path ("*_trimming_report.txt") into trimQC path ("readLength.csv") into inferMetadata_readLength