Skip to content

Commit 51588ca

Browse files
authored
Merge pull request #793 from nf-core/adapterremovalfixprefix-sep
Adapterremovalfixprefix sep
2 parents bc2a625 + 50e209b commit 51588ca

2 files changed

Lines changed: 13 additions & 6 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
2424
- [#787](https://github.com/nf-core/eager/issues/787) Adds memory specification flags for the GATK UnifiedGenotyper and HaplotyperCaller steps (thanks to @nylander)
2525
- Fixed issue where MultiVCFAnalyzer would not pick up newly generated VCF files, when specifying additional VCF files.
2626
- [#790](https://github.com/nf-core/eager/issues/790) Fixed kraken2 report file-name collision when sample names have `.` in them
27+
- [#792](https://github.com/nf-core/eager/issues/792) Fixed java error messages for AdapterRemovalFixPrefix being hidden in output
2728

2829
### `Dependencies`
2930

main.nf

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -811,7 +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 | pigz -p ${task.cpus - 1} > output/${base}.pe.combined.fq.gz
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
815816
"""
816817
//PE mode, collapse and trim, outputting all reads, preserving 5p
817818
} else if (seqtype == 'PE' && !params.skip_collapse && !params.skip_trim && !params.mergedonly && params.preserve5p) {
@@ -825,7 +826,8 @@ process adapter_removal {
825826
mv *.settings output/
826827
827828
## Add R_ and L_ for unmerged reads for DeDup compatibility
828-
AdapterRemovalFixPrefix -Xmx${task.memory.toGiga()}g output/${base}.pe.combined.tmp.fq.gz | pigz -p ${task.cpus - 1} > output/${base}.pe.combined.fq.gz
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
829831
"""
830832
// PE mode, collapse and trim but only output collapsed reads
831833
} else if ( seqtype == 'PE' && !params.skip_collapse && !params.skip_trim && params.mergedonly && !params.preserve5p ) {
@@ -836,7 +838,8 @@ process adapter_removal {
836838
cat *.collapsed.gz *.collapsed.truncated.gz > output/${base}.pe.combined.tmp.fq.gz
837839
838840
## Add R_ and L_ for unmerged reads for DeDup compatibility
839-
AdapterRemovalFixPrefix -Xmx${task.memory.toGiga()}g output/${base}.pe.combined.tmp.fq.gz | pigz -p ${task.cpus - 1} > output/${base}.pe.combined.fq.gz
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
840843
841844
mv *.settings output/
842845
"""
@@ -849,7 +852,8 @@ process adapter_removal {
849852
cat *.collapsed.gz > output/${base}.pe.combined.tmp.fq.gz
850853
851854
## Add R_ and L_ for unmerged reads for DeDup compatibility
852-
AdapterRemovalFixPrefix -Xmx${task.memory.toGiga()}g output/${base}.pe.combined.tmp.fq.gz | pigz -p ${task.cpus - 1} > output/${base}.pe.combined.fq.gz
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
853857
854858
mv *.settings output/
855859
"""
@@ -863,7 +867,8 @@ process adapter_removal {
863867
cat *.collapsed.gz *.pair1.truncated.gz *.pair2.truncated.gz > output/${base}.pe.combined.tmp.fq.gz
864868
865869
## Add R_ and L_ for unmerged reads for DeDup compatibility
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
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
867872
868873
mv *.settings output/
869874
"""
@@ -877,7 +882,8 @@ process adapter_removal {
877882
cat *.collapsed.gz > output/${base}.pe.combined.tmp.fq.gz
878883
879884
## Add R_ and L_ for unmerged reads for DeDup compatibility
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
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
881887
882888
mv *.settings output/
883889
"""

0 commit comments

Comments
 (0)