Skip to content

Commit f4f8b68

Browse files
author
bjlang
committed
suggestions from code review
1 parent 132892e commit f4f8b68

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

conf/modules.config

+9-9
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,7 @@ if (!params.skip_plot_fingerprint) {
540540
}
541541

542542
process {
543-
withName: '.*:BAM_PEAKS_CALL_QC_ANNOTATE_MACS2_HOMER:MACS2_CALLPEAK' {
543+
withName: 'MACS2_CALLPEAK' {
544544
ext.args = [
545545
'--keep-dup all',
546546
params.narrow_peak ? '' : "--broad --broad-cutoff ${params.broad_cutoff}",
@@ -559,15 +559,15 @@ process {
559559
]
560560
}
561561

562-
withName: '.*:BAM_PEAKS_CALL_QC_ANNOTATE_MACS2_HOMER:FRIP_SCORE' {
562+
withName: 'FRIP_SCORE' {
563563
ext.args = '-bed -c -f 0.20'
564564
publishDir = [
565565
path: { "${params.outdir}/${params.aligner}/merged_library/macs2/${params.narrow_peak ? '/narrow_peak' : '/broad_peak'}/qc" },
566566
enabled: false
567567
]
568568
}
569569

570-
withName: '.*:BAM_PEAKS_CALL_QC_ANNOTATE_MACS2_HOMER:MULTIQC_CUSTOM_PEAKS' {
570+
withName: 'MULTIQC_CUSTOM_PEAKS' {
571571
publishDir = [
572572
path: { "${params.outdir}/${params.aligner}/merged_library/macs2/${params.narrow_peak ? '/narrow_peak' : '/broad_peak'}/qc" },
573573
mode: params.publish_dir_mode,
@@ -591,7 +591,7 @@ if (!params.skip_peak_annotation) {
591591

592592
if (!params.skip_peak_qc) {
593593
process {
594-
withName: '.*:BAM_PEAKS_CALL_QC_ANNOTATE_MACS2_HOMER:PLOT_MACS2_QC' {
594+
withName: 'PLOT_MACS2_QC' {
595595
ext.args = '-o ./ -p macs2_peak'
596596
publishDir = [
597597
path: { "${params.outdir}/${params.aligner}/merged_library/macs2/${params.narrow_peak ? '/narrow_peak' : '/broad_peak'}/qc" },
@@ -600,7 +600,7 @@ if (!params.skip_peak_annotation) {
600600
]
601601
}
602602

603-
withName: '.*:BAM_PEAKS_CALL_QC_ANNOTATE_MACS2_HOMER:PLOT_HOMER_ANNOTATEPEAKS' {
603+
withName: 'PLOT_HOMER_ANNOTATEPEAKS' {
604604
ext.args = '-o ./'
605605
ext.prefix = 'macs2_annotatePeaks'
606606
publishDir = [
@@ -615,7 +615,7 @@ if (!params.skip_peak_annotation) {
615615

616616
if (!params.skip_consensus_peaks) {
617617
process {
618-
withName: '.*:BED_CONSENSUS_QUANTIFY_QC_BEDTOOLS_FEATURECOUNTS_DESEQ2:MACS2_CONSENSUS' {
618+
withName: 'MACS2_CONSENSUS' {
619619
ext.when = { meta.multiple_groups || meta.replicates_exist }
620620
ext.prefix = { "${meta.id}.consensus_peaks" }
621621
publishDir = [
@@ -625,7 +625,7 @@ if (!params.skip_consensus_peaks) {
625625
]
626626
}
627627

628-
withName: '.*:BED_CONSENSUS_QUANTIFY_QC_BEDTOOLS_FEATURECOUNTS_DESEQ2:SUBREAD_FEATURECOUNTS' {
628+
withName: 'SUBREAD_FEATURECOUNTS' {
629629
ext.args = '-F SAF -O --fracOverlap 0.2'
630630
ext.prefix = { "${meta.id}.consensus_peaks" }
631631
publishDir = [
@@ -648,7 +648,7 @@ if (!params.skip_consensus_peaks) {
648648
]
649649
}
650650

651-
withName: '.*:BED_CONSENSUS_QUANTIFY_QC_BEDTOOLS_FEATURECOUNTS_DESEQ2:ANNOTATE_BOOLEAN_PEAKS' {
651+
withName: 'ANNOTATE_BOOLEAN_PEAKS' {
652652
ext.prefix = { "${meta.id}.consensus_peaks" }
653653
publishDir = [
654654
path: { "${params.outdir}/${params.aligner}/merged_library/macs2/${params.narrow_peak ? '/narrow_peak' : '/broad_peak'}/consensus/${meta.id}" },
@@ -661,7 +661,7 @@ if (!params.skip_consensus_peaks) {
661661

662662
if (!params.skip_deseq2_qc) {
663663
process {
664-
withName: '.*:BED_CONSENSUS_QUANTIFY_QC_BEDTOOLS_FEATURECOUNTS_DESEQ2:DESEQ2_QC' {
664+
withName: 'DESEQ2_QC' {
665665
ext.when = { meta.multiple_groups && meta.replicates_exist }
666666
ext.args = [
667667
'--id_col 1',

subworkflows/local/bed_consensus_quantify_qc_bedtools_featurecounts_deseq2.nf

+2-1
Original file line numberDiff line numberDiff line change
@@ -69,14 +69,15 @@ workflow BED_CONSENSUS_QUANTIFY_QC_BEDTOOLS_FEATURECOUNTS_DESEQ2 {
6969
ch_fasta,
7070
ch_gtf
7171
)
72+
ch_versions = ch_versions.mix(HOMER_ANNOTATEPEAKS.out.versions)
7273

7374
//
7475
// MODULE: Add boolean fields to annotated consensus peaks to aid filtering
7576
//
7677
ANNOTATE_BOOLEAN_PEAKS (
7778
MACS2_CONSENSUS.out.boolean_txt.join(HOMER_ANNOTATEPEAKS.out.txt, by: [0]),
7879
)
79-
ch_versions = ch_versions.mix(HOMER_ANNOTATEPEAKS.out.versions)
80+
ch_versions = ch_versions.mix(ANNOTATE_BOOLEAN_PEAKS.out.versions)
8081
}
8182

8283
// Create channels: [ meta, [ ip_bams ], saf ]

0 commit comments

Comments
 (0)