diff --git a/CHANGELOG.md b/CHANGELOG.md index a75dbb51..f366a0ee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### `Fixed` -- [###]() Added new parameter `annotation_prokka_renamecontigs` to allow prokka to retain the original contig headers/locus tag by default (fix by @darcy220606) +- [###]() Added new parameter `annotation_prokka_retaincontigheaders` to allow prokka to retain the original contig headers/locus tag. (by @darcy220606) ### `Dependencies` diff --git a/conf/modules.config b/conf/modules.config index 0a2fdbd5..c94e5324 100644 --- a/conf/modules.config +++ b/conf/modules.config @@ -65,7 +65,7 @@ process { "--mincontiglen ${params.annotation_prokka_mincontiglen}", "--evalue ${params.annotation_prokka_evalue}", "--coverage ${params.annotation_prokka_coverage}", - params.annotation_prokka_renamecontigs ? "--locustag PROKKA --centre CENTER" : "--force" , + params.annotation_prokka_retaincontigheaders ? "--force" : "--locustag PROKKA --centre CENTER" , params.annotation_prokka_singlemode ? '' : '--metagenome' , params.annotation_prokka_cdsrnaolap ? '--cdsrnaolap' : '', params.annotation_prokka_rawproduct ? '--rawproduct' : '', diff --git a/nextflow.config b/nextflow.config index a094f9ec..599de35c 100644 --- a/nextflow.config +++ b/nextflow.config @@ -62,9 +62,9 @@ params { annotation_prokka_mincontiglen = 1 annotation_prokka_evalue = 1E-06 annotation_prokka_coverage = 80 - annotation_prokka_compliant = false + annotation_prokka_compliant = true annotation_prokka_addgenes = false - annotation_prokka_renamecontigs = false + annotation_prokka_retaincontigheaders = false // Database downloading options save_databases = false diff --git a/nextflow_schema.json b/nextflow_schema.json index c7f5d1d6..56bef890 100644 --- a/nextflow_schema.json +++ b/nextflow_schema.json @@ -309,10 +309,10 @@ "description": "Add the gene features for each CDS hit.", "help_text": "For every CDS annotated, this flag adds the gene that encodes for that CDS region. For more information please check Prokka [documentation](https://github.com/tseemann/prokka). \n\n> Modifies tool parameter(s):\n> - Prokka: `--addgenes`" }, - "annotation_prokka_renamecontigs": { + "annotation_prokka_retaincontigheaders": { "type": "boolean", - "help_text": "This parameter retains the original contig names by activating `PROKKA`'s `--force` flag. If this parameter is set to `true` it activates `PROKKA`'s flags `--locus-tag PROKKA --centre CENTER` so the locus tags (contig names) will be PROKKA_# and the center tag will be CENTER. \n\n> Modifies tool parameter(s):\n> - Prokka: `--locus-tag PROKKA --centre CENTER`\n> - Prokka: `--force`", - "description": "Renames contig names." + "help_text": "This parameter allows prokka to retain the original contig names by activating `PROKKA`'s `--force` flag. If this parameter is set to `false` it activates `PROKKA`'s flags `--locus-tag PROKKA --centre CENTER` so the locus tags (contig names) will be PROKKA_# and the center tag will be CENTER. By default `PROKKA` changes contig headers to avoid errors that might rise due to long contig headers, so this must be turned on if the user has short contig names that should be retained by `PROKKA`. \n\n> Modifies tool parameter(s):\n> - Prokka: `--locus-tag PROKKA --centre CENTER`\n> - Prokka: `--force`", + "description": "Retains contig names." } }, "fa_icon": "fas fa-tools",