Skip to content

Commit 5063eb0

Browse files
authored
Merge pull request #453 from JoseEspinosa/fixes
Fixes parametrization of SUBREAD_FEATURECOUNTS depending on meta.single_read
2 parents 16a7d15 + 5483399 commit 5063eb0

File tree

3 files changed

+12
-7
lines changed

3 files changed

+12
-7
lines changed

CHANGELOG.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
### Enhancements & fixes
99

10-
- [[#428](https://github.com/nf-core/chipseq/issues/428)] - Bump MultiQC version to 1.25.1
10+
- [[#428](https://github.com/nf-core/chipseq/issues/428)] - Bump MultiQC version to `1.25.1`.
1111
- [[PR #434](https://github.com/nf-core/chipseq/pull/434)] - Prevent pipeline fails from erroneous param validation when igenomes is used.
1212
- [[#432](https://github.com/nf-core/chipseq/issues/432)] - Fix `GFFREAD` call to have the two expected input channels.
1313
- [[PR #444](https://github.com/nf-core/chipseq/pull/444)] - Add empty map to ch_gff so that when provided by the user `GFFREAD` works.
14-
- Updated pipeline template to [nf-core/tools 3.2.0](https://github.com/nf-core/tools/releases/tag/3.2.0)
14+
- Updated pipeline template to [nf-core/tools 3.2.0](https://github.com/nf-core/tools/releases/tag/3.2.0).
15+
- [[#451](https://github.com/nf-core/chipseq/issues/451)] - Pass `map.single_read` to `SUBREAD_FEATURECOUNTS` as to correctly set parameter `-p`.
1516

1617
### Parameters
1718

subworkflows/local/bed_consensus_quantify_qc_bedtools_featurecounts_deseq2.nf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ workflow BED_CONSENSUS_QUANTIFY_QC_BEDTOOLS_FEATURECOUNTS_DESEQ2 {
9090
}
9191
.join(ch_bams)
9292
.map {
93-
antibody, meta, saf, bams ->
94-
[ meta, bams.flatten().sort(), saf ]
93+
antibody, meta, saf, bams, meta_single_end ->
94+
[ meta + meta_single_end, bams.flatten().sort(), saf ]
9595
}
9696
.set { ch_bam_saf }
9797

workflows/chipseq.nf

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,6 @@ workflow CHIPSEQ {
130130
)
131131
ch_versions = ch_versions.mix(FASTQ_FASTQC_UMITOOLS_TRIMGALORE.out.versions)
132132

133-
134133
//
135134
// SUBWORKFLOW: Alignment with BWA & BAM QC
136135
//
@@ -470,13 +469,18 @@ workflow CHIPSEQ {
470469
ch_deseq2_pca_multiqc = Channel.empty()
471470
ch_deseq2_clustering_multiqc = Channel.empty()
472471
if (!params.skip_consensus_peaks) {
473-
// Create channels: [ antibody, [ ip_bams ] ]
472+
// Create channels: [ antibody, [ ip_bams ], single_end_map ]
474473
ch_ip_control_bam
475474
.map {
476475
meta, ip_bam, control_bam ->
477-
[ meta.antibody, ip_bam ]
476+
[ meta.antibody, meta.single_end, ip_bam ]
478477
}
479478
.groupTuple()
479+
.map {
480+
antibody, single_end, ip_bams ->
481+
def single_end_map = single_end.unique().size() == 1 ? [single_end: single_end[0]] : false
482+
[ antibody, ip_bams, single_end_map ]
483+
}
480484
.set { ch_antibody_bams }
481485

482486
BED_CONSENSUS_QUANTIFY_QC_BEDTOOLS_FEATURECOUNTS_DESEQ2 (

0 commit comments

Comments
 (0)