Skip to content

Commit 2c08e3a

Browse files
committed
fix bug in assembler argument resolution that may affect test
1 parent 59e6bb1 commit 2c08e3a

2 files changed

Lines changed: 10 additions & 7 deletions

File tree

nextflow.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ params {
8181
// -- Assembly: Flye --
8282
genome_size = null // genomesize, optional, can be estimated from ONT reads
8383
// DEPRECATED: flye_mode = '--nano-hq'
84-
flye_args = "" // extra flye args
84+
flye_args = '' // extra flye args
8585
// -- Assembly: hifiasm --
8686
hifiasm_args = '' // extra hifiasm args
8787
// QC Oriented extra options

subworkflows/local/utils_nfcore_genomeassembler_pipeline/main.nf

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,9 @@ workflow PIPELINE_INITIALISATION {
138138
def hic_trim = !scaffold_hic ? false :
139139
(it.hic_trim ?: params.hic_trim)
140140

141+
def assembler_ont_args = it.assembler_ont_args ?: params.assembler_ont_args ?: ''
142+
def assembler_hifi_args = it.assembler_hifi_args ?: params.assembler_hifi_args ?: ''
143+
141144

142145
// Check if strategy can be inferred
143146
strategy == "single" && ontreads && hifireads && !((!assembler_ont && assembler_hifi) || (assembler_ont && !assembler_hifi)) ?
@@ -166,13 +169,13 @@ workflow PIPELINE_INITIALISATION {
166169
assembler_ont: assembler_ont,
167170
assembler_hifi: assembler_hifi,
168171
assembly_scaffolding_order: it.assembly_scaffolding_order ?: params.assembly_scaffolding_order ?: "ont_on_hifi",
169-
assembler_ont_args: it.assembler_ont_args ?: params.assembler_ont_args ?:
170-
(assembler_ont == "hifiasm") ? (it.hifiasm_args ?: params.hifiasm_args) :
171-
(assembler_ont == "flye") ? (it.flye_args ?: params.flye_args) :
172+
assembler_ont_args: assembler_ont_args + " " +
173+
(assembler == "flye" && strategy == "single") || (assembler_ont == "flye") ? (it.flye_args ?: params.flye_args) :
174+
(assembler == "hifiasm" && strategy == "single") || (assembler_ont == "hifiasm") ? (it.hifiasm_args ?: params.hifiasm_args) :
172175
"",
173-
assembler_hifi_args: it.assembler_hifi_args ?: params.assembler_hifi_args ?:
174-
(assembler_hifi == "hifiasm") ? (it.hifiasm_args ?: params.hifiasm_args) :
175-
(assembler_hifi == "flye") ? (it.flye_args ?: params.flye_args) :
176+
assembler_hifi_args: assembler_hifi_args + " " +
177+
(assembler == "flye" && strategy == "single") || (assembler_hifi == "hifiasm") ? (it.hifiasm_args ?: params.hifiasm_args) :
178+
(assembler == "flye" && strategy == "single") || (assembler_hifi == "flye") ? (it.flye_args ?: params.flye_args) :
176179
"",
177180
polish: polish,
178181
ont_collect: it.ont_collect ?: params.ont_collect,

0 commit comments

Comments
 (0)