diff --git a/conf/modules.config b/conf/modules.config index 031e7c6ee51d2834a9039fe09fce5bcee6dc1d3d..88d2ac50a94d48243e0488c22617c096d70f69f7 100644 --- a/conf/modules.config +++ b/conf/modules.config @@ -274,7 +274,7 @@ process { mode: 'copy' ] ext.args = '15 25 50 --window-pixels' - ext.prefix = { "${meta.id}.${resolution}" } + ext.prefix = { "${cool.baseName}" } } withName: 'HIC_FIND_TADS' { @@ -284,6 +284,6 @@ process { mode: 'copy' ] ext.args = '--correctForMultipleTesting fdr' - ext.prefix = { "${meta.id}.${resolution}" } + ext.prefix = { "${cool.baseName}" } } } diff --git a/nextflow.config b/nextflow.config index 32176ea645c502ff57421f79a1458c5d5c29f894..cfddfeb62fd15e6910a110934e86cf9fc1498bfb 100644 --- a/nextflow.config +++ b/nextflow.config @@ -50,8 +50,8 @@ params { ligation_site='GATCGATC' } 'arima' { - restriction_site='^GATC,G^ANT' - ligation_site='GATCGATC,GANTGATC,GANTANTC,GATCANTC' + restriction_site='^GATC,G^ANTC' + ligation_site='GATCGATC,GATCANTC,GANTGATC,GANTANTC' } } diff --git a/workflows/hic.nf b/workflows/hic.nf index 0f39687a16eadb0c00d359945c76a070fa8d4cab..362d51bd8a547c73d1ba7274e0ba5dc1c32c03ef 100644 --- a/workflows/hic.nf +++ b/workflows/hic.nf @@ -67,7 +67,7 @@ if (params.res_dist_decay && !params.skip_dist_decay){ .set {ch_ddecay_res} ch_map_res = ch_map_res.concat(ch_ddecay_res) }else{ - ch_ddecay_res = Channel.create() + ch_ddecay_res = Channel.empty() if (!params.skip_dist_decay){ log.warn "[nf-core/hic] Hi-C resolution for distance decay not specified. See --res_dist_decay" } @@ -81,7 +81,7 @@ if (params.res_compartments && !params.skip_compartments){ .set {ch_comp_res} ch_map_res = ch_map_res.concat(ch_comp_res) }else{ - ch_comp_res = Channel.create() + ch_comp_res = Channel.empty() if (!params.skip_compartments){ log.warn "[nf-core/hic] Hi-C resolution for compartment calling not specified. See --res_compartments" }