Skip to content

Commit 9a66d39

Browse files
authored
Merge pull request #845 from nf-core/arfp-pigz-fix
Re-add piping, and hope ARFP2 doesn't pipe errors into files anymore …
2 parents 000807a + 01a89a0 commit 9a66d39

2 files changed

Lines changed: 9 additions & 12 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
1212
- [#828](https://github.com/nf-core/eager/issues/828) Improved error message if required metagenomic screening parameters not set correctly
1313
- [#836](https://github.com/nf-core/eager/issues/836) Remove deprecated parameters from test profiles
1414
- [#838](https://github.com/nf-core/eager/issues/836) Fix --snpcapture_bed files not being picked up by Nextflow
15+
- [#843](https://github.com/nf-core/eager/issues/843) Re-add direct piping of AdapterRemovalFixPrefix to pigz
1516
- [#845](https://github.com/nf-core/eager/issues/845) Updates parameter documention to specify `-s` preseq parameter also applies to lc_extrap
1617
- [#851](https://github.com/nf-core/eager/issues/851) Fixes a file-name clash during additional_library_merge, post-BAM trimming of different UDG treated libraries of a sample
1718
- Fix PMDtools reference mask not being picked up by Nextflow, and it's use being evaluated against --snpcapture_bed rather than --pmdtools_reference_mask

main.nf

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -823,8 +823,8 @@ process adapter_removal {
823823
mv *.settings output/
824824
825825
## Add R_ and L_ for unmerged reads for DeDup compatibility
826-
AdapterRemovalFixPrefix -Xmx${task.memory.toGiga()}g output/${base}.pe.combined.tmp.fq.gz > output/${base}.pe.combined.fq
827-
pigz -p ${task.cpus - 1} output/${base}.pe.combined.fq
826+
AdapterRemovalFixPrefix -Xmx${task.memory.toGiga()}g output/${base}.pe.combined.tmp.fq.gz | pigz -p ${task.cpus - 1} > output/${base}.pe.combined.fq.gz
827+
828828
"""
829829
//PE mode, collapse and trim, outputting all reads, preserving 5p
830830
} else if (seqtype == 'PE' && !params.skip_collapse && !params.skip_trim && !params.mergedonly && params.preserve5p) {
@@ -838,8 +838,8 @@ process adapter_removal {
838838
mv *.settings output/
839839
840840
## Add R_ and L_ for unmerged reads for DeDup compatibility
841-
AdapterRemovalFixPrefix -Xmx${task.memory.toGiga()}g output/${base}.pe.combined.tmp.fq.gz > output/${base}.pe.combined.fq
842-
pigz -p ${task.cpus - 1} output/${base}.pe.combined.fq
841+
AdapterRemovalFixPrefix -Xmx${task.memory.toGiga()}g output/${base}.pe.combined.tmp.fq.gz | pigz -p ${task.cpus - 1} > output/${base}.pe.combined.fq.gz
842+
843843
"""
844844
// PE mode, collapse and trim but only output collapsed reads
845845
} else if ( seqtype == 'PE' && !params.skip_collapse && !params.skip_trim && params.mergedonly && !params.preserve5p ) {
@@ -850,8 +850,7 @@ process adapter_removal {
850850
cat *.collapsed.gz *.collapsed.truncated.gz > output/${base}.pe.combined.tmp.fq.gz
851851
852852
## Add R_ and L_ for unmerged reads for DeDup compatibility
853-
AdapterRemovalFixPrefix -Xmx${task.memory.toGiga()}g output/${base}.pe.combined.tmp.fq.gz > output/${base}.pe.combined.fq
854-
pigz -p ${task.cpus - 1} output/${base}.pe.combined.fq
853+
AdapterRemovalFixPrefix -Xmx${task.memory.toGiga()}g output/${base}.pe.combined.tmp.fq.gz | pigz -p ${task.cpus - 1} > output/${base}.pe.combined.fq.gz
855854
856855
mv *.settings output/
857856
"""
@@ -864,8 +863,7 @@ process adapter_removal {
864863
cat *.collapsed.gz > output/${base}.pe.combined.tmp.fq.gz
865864
866865
## Add R_ and L_ for unmerged reads for DeDup compatibility
867-
AdapterRemovalFixPrefix -Xmx${task.memory.toGiga()}g output/${base}.pe.combined.tmp.fq.gz > output/${base}.pe.combined.fq
868-
pigz -p ${task.cpus - 1} output/${base}.pe.combined.fq
866+
AdapterRemovalFixPrefix -Xmx${task.memory.toGiga()}g output/${base}.pe.combined.tmp.fq.gz | pigz -p ${task.cpus - 1} > output/${base}.pe.combined.fq.gz
869867
870868
mv *.settings output/
871869
"""
@@ -879,8 +877,7 @@ process adapter_removal {
879877
cat *.collapsed.gz *.pair1.truncated.gz *.pair2.truncated.gz > output/${base}.pe.combined.tmp.fq.gz
880878
881879
## Add R_ and L_ for unmerged reads for DeDup compatibility
882-
AdapterRemovalFixPrefix -Xmx${task.memory.toGiga()}g output/${base}.pe.combined.tmp.fq.gz > output/${base}.pe.combined.fq
883-
pigz -p ${task.cpus - 1} output/${base}.pe.combined.fq
880+
AdapterRemovalFixPrefix -Xmx${task.memory.toGiga()}g output/${base}.pe.combined.tmp.fq.gz | pigz -p ${task.cpus - 1} > output/${base}.pe.combined.fq.gz
884881
885882
mv *.settings output/
886883
"""
@@ -894,8 +891,7 @@ process adapter_removal {
894891
cat *.collapsed.gz > output/${base}.pe.combined.tmp.fq.gz
895892
896893
## Add R_ and L_ for unmerged reads for DeDup compatibility
897-
AdapterRemovalFixPrefix -Xmx${task.memory.toGiga()}g output/${base}.pe.combined.tmp.fq.gz > output/${base}.pe.combined.fq
898-
pigz -p ${task.cpus - 1} output/${base}.pe.combined.fq
894+
AdapterRemovalFixPrefix -Xmx${task.memory.toGiga()}g output/${base}.pe.combined.tmp.fq.gz | pigz -p ${task.cpus - 1} > output/${base}.pe.combined.fq.gz
899895
900896
mv *.settings output/
901897
"""

0 commit comments

Comments
 (0)