Skip to content

Commit 9481c84

Browse files
committed
Re-add piping, and hope ARFP2 doesn't pipe errors into files anymore (only reported at one cluster)
1 parent 1b6dff8 commit 9481c84

2 files changed

Lines changed: 10 additions & 12 deletions

File tree

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
99

1010
### `Fixed`
1111

12+
- [#843](https://github.com/nf-core/eager/issues/843) Re-add direct piping of AdapterRemovalFixPrefix to pigz
13+
1214
### `Dependencies`
1315

1416
### `Deprecated`

main.nf

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -811,8 +811,8 @@ process adapter_removal {
811811
mv *.settings output/
812812
813813
## Add R_ and L_ for unmerged reads for DeDup compatibility
814-
AdapterRemovalFixPrefix -Xmx${task.memory.toGiga()}g output/${base}.pe.combined.tmp.fq.gz > output/${base}.pe.combined.fq
815-
pigz -p ${task.cpus - 1} output/${base}.pe.combined.fq
814+
AdapterRemovalFixPrefix -Xmx${task.memory.toGiga()}g output/${base}.pe.combined.tmp.fq.gz | pigz -p ${task.cpus - 1} > output/${base}.pe.combined.fq.gz
815+
816816
"""
817817
//PE mode, collapse and trim, outputting all reads, preserving 5p
818818
} else if (seqtype == 'PE' && !params.skip_collapse && !params.skip_trim && !params.mergedonly && params.preserve5p) {
@@ -826,8 +826,8 @@ process adapter_removal {
826826
mv *.settings output/
827827
828828
## Add R_ and L_ for unmerged reads for DeDup compatibility
829-
AdapterRemovalFixPrefix -Xmx${task.memory.toGiga()}g output/${base}.pe.combined.tmp.fq.gz > output/${base}.pe.combined.fq
830-
pigz -p ${task.cpus - 1} output/${base}.pe.combined.fq
829+
AdapterRemovalFixPrefix -Xmx${task.memory.toGiga()}g output/${base}.pe.combined.tmp.fq.gz | pigz -p ${task.cpus - 1} > output/${base}.pe.combined.fq.gz
830+
831831
"""
832832
// PE mode, collapse and trim but only output collapsed reads
833833
} else if ( seqtype == 'PE' && !params.skip_collapse && !params.skip_trim && params.mergedonly && !params.preserve5p ) {
@@ -838,8 +838,7 @@ process adapter_removal {
838838
cat *.collapsed.gz *.collapsed.truncated.gz > output/${base}.pe.combined.tmp.fq.gz
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
843842
844843
mv *.settings output/
845844
"""
@@ -852,8 +851,7 @@ process adapter_removal {
852851
cat *.collapsed.gz > output/${base}.pe.combined.tmp.fq.gz
853852
854853
## Add R_ and L_ for unmerged reads for DeDup compatibility
855-
AdapterRemovalFixPrefix -Xmx${task.memory.toGiga()}g output/${base}.pe.combined.tmp.fq.gz > output/${base}.pe.combined.fq
856-
pigz -p ${task.cpus - 1} output/${base}.pe.combined.fq
854+
AdapterRemovalFixPrefix -Xmx${task.memory.toGiga()}g output/${base}.pe.combined.tmp.fq.gz | pigz -p ${task.cpus - 1} > output/${base}.pe.combined.fq.gz
857855
858856
mv *.settings output/
859857
"""
@@ -867,8 +865,7 @@ process adapter_removal {
867865
cat *.collapsed.gz *.pair1.truncated.gz *.pair2.truncated.gz > output/${base}.pe.combined.tmp.fq.gz
868866
869867
## Add R_ and L_ for unmerged reads for DeDup compatibility
870-
AdapterRemovalFixPrefix -Xmx${task.memory.toGiga()}g output/${base}.pe.combined.tmp.fq.gz > output/${base}.pe.combined.fq
871-
pigz -p ${task.cpus - 1} output/${base}.pe.combined.fq
868+
AdapterRemovalFixPrefix -Xmx${task.memory.toGiga()}g output/${base}.pe.combined.tmp.fq.gz | pigz -p ${task.cpus - 1} > output/${base}.pe.combined.fq.gz
872869
873870
mv *.settings output/
874871
"""
@@ -882,8 +879,7 @@ process adapter_removal {
882879
cat *.collapsed.gz > output/${base}.pe.combined.tmp.fq.gz
883880
884881
## Add R_ and L_ for unmerged reads for DeDup compatibility
885-
AdapterRemovalFixPrefix -Xmx${task.memory.toGiga()}g output/${base}.pe.combined.tmp.fq.gz > output/${base}.pe.combined.fq
886-
pigz -p ${task.cpus - 1} output/${base}.pe.combined.fq
882+
AdapterRemovalFixPrefix -Xmx${task.memory.toGiga()}g output/${base}.pe.combined.tmp.fq.gz | pigz -p ${task.cpus - 1} > output/${base}.pe.combined.fq.gz
887883
888884
mv *.settings output/
889885
"""

0 commit comments

Comments
 (0)