Skip to content

Commit 07bd918

Browse files
committed
trying to pass kraken2 report to multiqc
1 parent a9aba3e commit 07bd918

File tree

3 files changed

+38
-13
lines changed

3 files changed

+38
-13
lines changed

modules.json

Lines changed: 28 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,32 +8,44 @@
88
"fastqc": {
99
"branch": "master",
1010
"git_sha": "285a50500f9e02578d90b3ce6382ea3c30216acd",
11-
"installed_by": ["modules"]
11+
"installed_by": [
12+
"modules"
13+
]
1214
},
1315
"kraken2/kraken2": {
1416
"branch": "master",
1517
"git_sha": "666652151335353eef2fcd58880bcef5bc2928e1",
16-
"installed_by": ["modules"]
18+
"installed_by": [
19+
"modules"
20+
]
1721
},
1822
"krona/ktimporttaxonomy": {
1923
"branch": "master",
2024
"git_sha": "666652151335353eef2fcd58880bcef5bc2928e1",
21-
"installed_by": ["modules"]
25+
"installed_by": [
26+
"modules"
27+
]
2228
},
2329
"krona/ktupdatetaxonomy": {
2430
"branch": "master",
2531
"git_sha": "666652151335353eef2fcd58880bcef5bc2928e1",
26-
"installed_by": ["modules"]
32+
"installed_by": [
33+
"modules"
34+
]
2735
},
2836
"multiqc": {
2937
"branch": "master",
3038
"git_sha": "19ca321db5d8bd48923262c2eca6422359633491",
31-
"installed_by": ["modules"]
39+
"installed_by": [
40+
"modules"
41+
]
3242
},
3343
"untar": {
3444
"branch": "master",
3545
"git_sha": "666652151335353eef2fcd58880bcef5bc2928e1",
36-
"installed_by": ["modules"]
46+
"installed_by": [
47+
"modules"
48+
]
3749
}
3850
}
3951
},
@@ -42,20 +54,26 @@
4254
"utils_nextflow_pipeline": {
4355
"branch": "master",
4456
"git_sha": "5caf7640a9ef1d18d765d55339be751bb0969dfa",
45-
"installed_by": ["subworkflows"]
57+
"installed_by": [
58+
"subworkflows"
59+
]
4660
},
4761
"utils_nfcore_pipeline": {
4862
"branch": "master",
4963
"git_sha": "92de218a329bfc9a9033116eb5f65fd270e72ba3",
50-
"installed_by": ["subworkflows"]
64+
"installed_by": [
65+
"subworkflows"
66+
]
5167
},
5268
"utils_nfvalidation_plugin": {
5369
"branch": "master",
5470
"git_sha": "5caf7640a9ef1d18d765d55339be751bb0969dfa",
55-
"installed_by": ["subworkflows"]
71+
"installed_by": [
72+
"subworkflows"
73+
]
5674
}
5775
}
5876
}
5977
}
6078
}
61-
}
79+
}

subworkflows/local/phylogenetic_qc.nf

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ workflow PHYLOGENETIC_QC{
1313

1414
main:
1515
ch_reads = reads
16+
ch_multiqc_files = Channel.empty()
17+
ch_versions = Channel.empty()
1618
//
1719
// MODULE: Untar kraken2_db
1820
//
@@ -28,6 +30,8 @@ workflow PHYLOGENETIC_QC{
2830
params.kraken2_save_reads,
2931
params.kraken2_save_readclassifications
3032
)
33+
ch_multiqc_files = ch_multiqc_files.mix( KRAKEN2_KRAKEN2.out.report )
34+
ch_versions = ch_versions.mix( KRAKEN2_KRAKEN2.out.versions.first() )
3135
//KRAKEN2_KRAKEN2.out.report.map { meta, report -> [ report ] }.collect()
3236

3337
//
@@ -40,5 +44,6 @@ workflow PHYLOGENETIC_QC{
4044
)
4145

4246
emit:
43-
kraken2_report = KRAKEN2_KRAKEN2.out.report.map { meta, report -> [ report ] }.collect()
47+
versions = ch_versions
48+
mqc = ch_multiqc_files
4449
}

workflows/seqinspector.nf

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ workflow SEQINSPECTOR {
4040
ch_samplesheet
4141
)
4242
ch_multiqc_files = ch_multiqc_files.mix(FASTQC.out.zip)
43+
ch_versions = ch_versions.mix(FASTQC.out.versions.first())
4344

4445
//
4546
// SUBWORKFLOW: Run kraken2 and produce krona plots
@@ -48,8 +49,9 @@ workflow SEQINSPECTOR {
4849
ch_samplesheet
4950
)
5051

51-
ch_multiqc_files = ch_multiqc_files.mix(PHYLOGENETIC_QC.out.kraken2_report)
52-
ch_versions = ch_versions.mix(FASTQC.out.versions.first())
52+
ch_multiqc_files = ch_multiqc_files.mix(PHYLOGENETIC_QC.out.mqc.collect{it[1]}.ifEmpty([]))
53+
ch_versions = ch_versions.mix(PHYLOGENETIC_QC.out.versions)
54+
5355

5456
//
5557
// Collate and save software versions

0 commit comments

Comments
 (0)