Skip to content

Commit 9d611b9

Browse files
committed
[Luna] Address PR review comments
- Remove configParams usage, use params directly (contains config defaults) - Revert getDefaultConfigurations() to original implementation - Keep only cliParams in getParamsheetConfigurations() for CLI override - Merge order: params + row + cliParams = config defaults + paramsheet + CLI params
1 parent 86d00c4 commit 9d611b9

1 file changed

Lines changed: 2 additions & 6 deletions

File tree

  • subworkflows/local/utils_nfcore_differentialabundance_pipeline

subworkflows/local/utils_nfcore_differentialabundance_pipeline/main.nf

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -402,19 +402,15 @@ def getParamsheetConfigurations() {
402402
// Priority: CLI params (+ params-file) > paramsheet > config defaults
403403
// Use nextflow session to distinguish CLI params from config defaults
404404
def cliParams = nextflow.Global.session.cliParams ?: [:]
405-
def configParams = nextflow.Global.session.configParams ?: [:]
406-
def fullparamset = configParams + row + cliParams
405+
def fullparamset = params + row + cliParams
407406
return fullparamset
408407
}
409408
}
410409

411410
// Get default configurations from pipeline parameters
412411
def getDefaultConfigurations() {
413412
// replace null by string 'contrasts' for paramset_name to avoid certain problems with null object
414-
// Priority: CLI params > defaults
415-
def cliParams = nextflow.Global.session.cliParams ?: [:]
416-
def configParams = nextflow.Global.session.configParams ?: [:]
417-
return [configParams + cliParams + [paramset_name: 'contrasts']]
413+
return [params + [paramset_name: 'contrasts']]
418414
}
419415

420416
// Load configurations from yaml file

0 commit comments

Comments
 (0)