diff --git a/bin/lp_phased_balance.R b/bin/lp_phased_balance.R index 145635a..0d8afd6 100644 --- a/bin/lp_phased_balance.R +++ b/bin/lp_phased_balance.R @@ -783,6 +783,7 @@ } if(!opt$from_maf) { + gg$meta$ploidy = ifelse(is.null(gg$meta$ploidy), NA, gg$meta$ploidy) jab = zitools:::gg2jab(gg, purity = gg$meta$purity, ploidy = gg$meta$ploidy) jab = jabba.alleles2(jab, hets.gr, verbose = TRUE, uncoupled = TRUE, marginal = opt$marginal) diff --git a/conf/modules/alleic_cn.config b/conf/modules/alleic_cn.config deleted file mode 100644 index 0fe7d71..0000000 --- a/conf/modules/alleic_cn.config +++ /dev/null @@ -1,34 +0,0 @@ -/* -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - Config file for defining DSL2 per module options and publishing paths -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - Available keys to override module options: - ext.args = Additional arguments appended to command in module. - ext.args2 = Second set of arguments appended to command in module (multi-tool modules). - ext.args3 = Third set of arguments appended to command in module (multi-tool modules). - ext.prefix = File name prefix for output files. - ext.when = When to run the module. ----------------------------------------------------------------------------------------- -*/ -// ALLEIC_CN configs - -process { - - withName: 'MSKILABORG_NFJABBA:NFJABBA:ALLEIC_CN:NON_INTEGER_BALANCE' { - ext.when = { params.tools && params.tools.split(',').contains('alleic_cn') } - publishDir = [ - mode: params.publish_dir_mode, - path: { "${params.outdir}/alleic_cn/non_integer_balance/${meta.id}/" }, - pattern: "*{.rds*,.command.*}" - ] - } - - withName: 'MSKILABORG_NFJABBA:NFJABBA:ALLEIC_CN:LP_PHASED_BALANCE' { - ext.when = { params.tools && params.tools.split(',').contains('alleic_cn') } - publishDir = [ - mode: params.publish_dir_mode, - path: { "${params.outdir}/alleic_cn/lp_phased_balance/${meta.id}/" }, - pattern: "*{.rds*,.command.*}" - ] - } -} diff --git a/conf/modules/allelic_cn.config b/conf/modules/allelic_cn.config index a5e459b..0fe7d71 100644 --- a/conf/modules/allelic_cn.config +++ b/conf/modules/allelic_cn.config @@ -23,24 +23,6 @@ process { ] } - withName: 'MSKILABORG_NFJABBA:NFJABBA:ALLEIC_CN:NON_INTEGER_BALANCE_WITH_GRIDSS' { - ext.when = { params.tools && params.tools.split(',').contains('alleic_cn') } - publishDir = [ - mode: params.publish_dir_mode, - path: { "${params.outdir}/alleic_cn/non_integer_balance_with_gridss/${meta.id}/" }, - pattern: "*{.rds*,.command.*}" - ] - } - - withName: 'MSKILABORG_NFJABBA:NFJABBA:ALLEIC_CN:NON_INTEGER_BALANCE_WITH_SVABA' { - ext.when = { params.tools && params.tools.split(',').contains('alleic_cn') } - publishDir = [ - mode: params.publish_dir_mode, - path: { "${params.outdir}/alleic_cn/non_integer_balance_with_svaba/${meta.id}/" }, - pattern: "*{.rds*,.command.*}" - ] - } - withName: 'MSKILABORG_NFJABBA:NFJABBA:ALLEIC_CN:LP_PHASED_BALANCE' { ext.when = { params.tools && params.tools.split(',').contains('alleic_cn') } publishDir = [ @@ -49,22 +31,4 @@ process { pattern: "*{.rds*,.command.*}" ] } - - withName: 'MSKILABORG_NFJABBA:NFJABBA:ALLEIC_CN:LP_PHASED_BALANCE_WITH_GRIDSS' { - ext.when = { params.tools && params.tools.split(',').contains('alleic_cn') } - publishDir = [ - mode: params.publish_dir_mode, - path: { "${params.outdir}/alleic_cn/lp_phased_balance_with_gridss/${meta.id}/" }, - pattern: "*{.rds*,.command.*}" - ] - } - - withName: 'MSKILABORG_NFJABBA:NFJABBA:ALLEIC_CN:LP_PHASED_BALANCE_WITH_SVABA' { - ext.when = { params.tools && params.tools.split(',').contains('alleic_cn') } - publishDir = [ - mode: params.publish_dir_mode, - path: { "${params.outdir}/alleic_cn/lp_phased_balance_with_svaba/${meta.id}/" }, - pattern: "*{.rds*,.command.*}" - ] - } } diff --git a/conf/modules/events.config b/conf/modules/events.config index 46d6899..15e58dd 100644 --- a/conf/modules/events.config +++ b/conf/modules/events.config @@ -18,7 +18,7 @@ process { ext.when = { params.tools && params.tools.split(',').contains('events') } publishDir = [ mode: params.publish_dir_mode, - path: { "${params.outdir}/events/${meta.id}/" }, + path: { "${params.outdir}/Events/${meta.id}/" }, pattern: "*{.rds*,.command.*}" ] }