Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add skip_qualimap and skip_eklipse parameters #436

Merged
merged 4 commits into from
Oct 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- A new parameter to skip filtering based on vep results [#416](https://github.com/nf-core/raredisease/pull/416)
- A `metromap` representating the core parts of the pipeline [#428](https://github.com/nf-core/raredisease/pull/428)
- Metromap and logos for light and dark theme [#432](https://github.com/nf-core/raredisease/pull/432)
- New parameters to skip qualimap and eklipse (`--skip_qualimap` and `--skip_eklipse`) [#436](https://github.com/nf-core/raredisease/pull/436)

### `Changed`

Expand Down
14 changes: 8 additions & 6 deletions conf/modules/call_sv_MT.config
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,14 @@ process {
]
}

withName: '.*CALL_SV_MT:EKLIPSE' {
publishDir = [
path: { "${params.outdir}/call_sv/mitochondria" },
mode: params.publish_dir_mode,
saveAs: { filename -> filename.equals('versions.yml') ? null : filename }
]
if (!params.skip_eklipse){
withName: '.*CALL_SV_MT:EKLIPSE' {
publishDir = [
path: { "${params.outdir}/call_sv/mitochondria" },
mode: params.publish_dir_mode,
saveAs: { filename -> filename.equals('versions.yml') ? null : filename }
]
}
}
}

6 changes: 4 additions & 2 deletions conf/modules/qc_bam.config
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,10 @@ process {
ext.prefix = { "${meta.id}_hsmetrics" }
}

withName: '.*QC_BAM:QUALIMAP_BAMQC' {
ext.prefix = { "${meta.id}_qualimap" }
if (!params.skip_qualimap) {
withName: '.*QC_BAM:QUALIMAP_BAMQC' {
ext.prefix = { "${meta.id}_qualimap" }
}
}

withName: '.*QC_BAM:TIDDIT_COV' {
Expand Down
2 changes: 2 additions & 0 deletions conf/test.config
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ params {

// analysis params
skip_cnv_calling = true
skip_eklipse = true
skip_qualimap = true
skip_mt_annotation = System.getenv("GITHUB_ACTIONS").equals(null) ? false : true // skip annotation on Github CI

// Input data
Expand Down
2 changes: 2 additions & 0 deletions conf/test_one_sample.config
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ params {

// analysis params
skip_cnv_calling = true
skip_eklipse = true
skip_qualimap = true
skip_mt_annotation = System.getenv("GITHUB_ACTIONS").equals(null) ? false : true // skip annotation on Github CI

// Input data
Expand Down
2 changes: 2 additions & 0 deletions nextflow.config
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ params {
bait_padding = 100
save_mapped_as_cram = false
skip_cnv_calling = false
skip_eklipse = false
skip_qualimap = false
skip_snv_annotation = false
skip_sv_annotation = false
skip_mt_annotation = false
Expand Down
10 changes: 10 additions & 0 deletions nextflow_schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,16 @@
"description": "Specifies whether or not to skip CNV calling.",
"fa_icon": "fas fa-toggle-on"
},
"skip_eklipse": {
"type": "boolean",
"description": "Specifies whether or not to skip eKLIPse.",
"fa_icon": "fas fa-toggle-on"
},
"skip_qualimap": {
"type": "boolean",
"description": "Specifies whether or not to skip Qualimap.",
"fa_icon": "fas fa-toggle-on"
},
"skip_mt_annotation": {
"type": "boolean",
"description": "Specifies whether or not to skip annotation of mitochondrial variants.",
Expand Down
9 changes: 6 additions & 3 deletions subworkflows/local/qc_bam.nf
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ workflow QC_BAM {

main:
ch_versions = Channel.empty()
ch_qualimap = Channel.empty()

PICARD_COLLECTMULTIPLEMETRICS (ch_bam_bai, ch_genome_fasta, ch_genome_fai)

Expand All @@ -39,7 +40,10 @@ workflow QC_BAM {

PICARD_COLLECTHSMETRICS (ch_hsmetrics_in, ch_genome_fasta, ch_genome_fai, [[],[]])

QUALIMAP_BAMQC (ch_bam, [])
if (!params.skip_qualimap) {
ch_qualimap = QUALIMAP_BAMQC (ch_bam, []).results
ch_versions = ch_versions.mix(QUALIMAP_BAMQC.out.versions.first())
}

TIDDIT_COV (ch_bam, [[],[]]) // 2nd pos. arg is req. only for cram input

Expand All @@ -60,7 +64,6 @@ workflow QC_BAM {

ch_versions = ch_versions.mix(PICARD_COLLECTMULTIPLEMETRICS.out.versions.first())
ch_versions = ch_versions.mix(PICARD_COLLECTHSMETRICS.out.versions.first())
ch_versions = ch_versions.mix(QUALIMAP_BAMQC.out.versions.first())
ch_versions = ch_versions.mix(TIDDIT_COV.out.versions.first())
ch_versions = ch_versions.mix(UCSC_WIGTOBIGWIG.out.versions.first())
ch_versions = ch_versions.mix(MOSDEPTH.out.versions.first())
Expand All @@ -70,7 +73,7 @@ workflow QC_BAM {
emit:
multiple_metrics = PICARD_COLLECTMULTIPLEMETRICS.out.metrics // channel: [ val(meta), path(metrics) ]
hs_metrics = PICARD_COLLECTHSMETRICS.out.metrics // channel: [ val(meta), path(metrics) ]
qualimap_results = QUALIMAP_BAMQC.out.results // channel: [ val(meta), path(qualimap_dir) ]
qualimap_results = ch_qualimap // channel: [ val(meta), path(qualimap_dir) ]
tiddit_wig = TIDDIT_COV.out.wig // channel: [ val(meta), path(wig) ]
bigwig = UCSC_WIGTOBIGWIG.out.bw // channel: [ val(meta), path(bw) ]
d4 = MOSDEPTH.out.per_base_d4 // channel: [ val(meta), path(d4) ]
Expand Down
20 changes: 14 additions & 6 deletions subworkflows/local/variant_calling/call_sv_MT.nf
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,27 @@ workflow CALL_SV_MT {
ch_fasta // channel: [mandatory] [ val(meta), path(fasta) ]

main:
ch_versions = Channel.empty()
ch_versions = Channel.empty()
ch_eklipse_del = Channel.empty()
ch_eklipse_genes = Channel.empty()
ch_eklipse_circos = Channel.empty()

EKLIPSE(ch_bam_bai,[])
if (!params.skip_eklipse){
EKLIPSE(ch_bam_bai,[])
ch_eklipse_del = EKLIPSE.out.deletions
ch_eklipse_genes = EKLIPSE.out.genes
ch_eklipse_circos = EKLIPSE.out.circos
ch_versions = ch_versions.mix(EKLIPSE.out.versions.first())
}

MT_DELETION(ch_bam_bai, ch_fasta)

ch_versions = ch_versions.mix(EKLIPSE.out.versions.first())
ch_versions = ch_versions.mix(MT_DELETION.out.versions.first())

emit:
eklipse_del = EKLIPSE.out.deletions // channel: [ val(meta), path(csv) ]
eklipse_genes = EKLIPSE.out.genes // channel: [ val(meta), path(csv) ]
eklipse_circos = EKLIPSE.out.circos // channel: [ val(meta), path(png) ]
eklipse_del = ch_eklipse_del // channel: [ val(meta), path(csv) ]
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

will they always be empty or do I miss something here? Do you need to add the output from EKLIPSE in line 22 etc.?

eklipse_genes = ch_eklipse_genes // channel: [ val(meta), path(csv) ]
eklipse_circos = ch_eklipse_circos // channel: [ val(meta), path(png) ]
mt_del_result = MT_DELETION.out.mt_del_result // channel: [ val(meta), path(txt) ]
versions = ch_versions // channel: [ path(versions.yml) ]
}