Merge branch 'template-updates' into 'dev'

Template updates See merge request epi2melabs/workflows/wf-amplicon!28
epi2me-labs · Sep 5, 2023 · 082c719 · 082c719
2 parents 29bedc8 + 2549616
commit 082c719
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/lib/fastqingress.nf b/lib/fastqingress.nf
@@ -311,7 +311,13 @@ def get_valid_inputs(Map margs){
                 [create_metamap([alias: margs["sample"] ?: input.baseName]), input])
         } else {
             // deal with the second case (sub-directories with fastq data) --> first
-            // check whether we actually found sub-directories
+            // check whether we actually found sub-directories (and remove
+            // sub-directories called 'unclassified' unless otherwise specified)
+            if (!margs.analyse_unclassified) {
+                sub_dirs_with_fastq_files = sub_dirs_with_fastq_files.findAll {
+                    it.baseName != "unclassified"
+                }
+            }
             if (!sub_dirs_with_fastq_files) {
                 error "Input directory '$input' must contain either FASTQ files " +
                     "or sub-directories containing FASTQ files."
@@ -325,12 +331,6 @@ def get_valid_inputs(Map margs){
                 error "Input directory '$input' cannot contain more " +
                     "than one level of sub-directories with FASTQ files."
             }
-            // remove directories called 'unclassified' unless otherwise specified
-            if (!margs.analyse_unclassified) {
-                sub_dirs_with_fastq_files = sub_dirs_with_fastq_files.findAll {
-                    it.baseName != "unclassified"
-                }
-            }
             // filter based on sample sheet in case one was provided
             if (margs.sample_sheet) {
                 // get channel of entries in the sample sheet

diff --git a/nextflow.config b/nextflow.config
@@ -23,7 +23,7 @@ params {
     // filtering + downsampling args
     min_read_length = 300
     max_read_length = null
-    min_read_qual = 10.0
+    min_read_qual = 10
     reads_downsampling_size = null
 
     // mapping + variant calling args
@@ -38,7 +38,7 @@ params {
     aws_image_prefix = null
     aws_queue = null
     disable_ping = false
-    threads = 1
+    threads = 4
 
     // schema etc.
     monochrome_logs = false

diff --git a/nextflow_schema.json b/nextflow_schema.json
@@ -77,7 +77,7 @@
                 },
                 "min_read_qual": {
                     "type": "number",
-                    "default": 10.0,
+                    "default": 10,
                     "title": "Minimum mean read quality",
                     "description": "Reads with a lower mean quality will be removed."
                 },
@@ -195,12 +195,14 @@
                 },
                 "help": {
                     "type": "boolean",
+                    "default": false,
                     "description": "Display help text.",
                     "fa_icon": "fas fa-question-circle",
                     "hidden": true
                 },
                 "version": {
                     "type": "boolean",
+                    "default": false,
                     "description": "Display version and exit.",
                     "fa_icon": "fas fa-question-circle",
                     "hidden": true