diff --git a/src/main.nf b/src/main.nf index 563a087f6349e0ec67f21b77e947210529cd8298..5198b79552f83d58ef88a63c377d2bf6da01b6e9 100644 --- a/src/main.nf +++ b/src/main.nf @@ -3,7 +3,7 @@ nextflow.enable.dsl=2 /* Testing pipeline for marseq scRNASeq analysis */ -params.kmer_size = 31 +params.kmer_size = 12 include { SPLIT } from "./modules/split" include { FASTKMERS } from "./modules/fastkmers" @@ -24,5 +24,5 @@ workflow { SPLIT(fastq.r1.mix(fastq.r2)) FASTKMERS(SPLIT.out.fastq.transpose()) MERGEKMER(FASTKMERS.out.csv.groupTuple()) - COLLATEKMER(MERGEKMER.out.csv.map{it -> it[1]}.collect()) + COLLATEKMER(MERGEKMER.out.csv.map{it -> [it[0].specie, it[1]] }.groupTuple()) } diff --git a/src/modules/fastkmers.nf b/src/modules/fastkmers.nf index 5a6ea264cdc42a6470c1980e3c97f06b86973365..469883c2cf26078a616f3c0c194f71a6ee79d910 100644 --- a/src/modules/fastkmers.nf +++ b/src/modules/fastkmers.nf @@ -1,7 +1,6 @@ process FASTKMERS { tag "$meta.id" label 'big_mem_mono_cpus' - publishDir "results/${meta.specie}/${meta.sex}/${meta.read}/", mode: 'copy' container "lbmc/fastkmers:025efdf" diff --git a/src/modules/kmc.nf b/src/modules/kmc.nf index d89b1be7d24764ec0d5cad9bec66daf3ecad2b2b..61a555fc9e2090a119abe675cead96492b973ace 100644 --- a/src/modules/kmc.nf +++ b/src/modules/kmc.nf @@ -4,7 +4,6 @@ process KMC { tag "$meta.id" label 'process_single' - publishDir "results/${meta.specie}/${meta.sex}/${meta.read}/", mode: 'copy' container "lbmc/kmc:3.2.2" diff --git a/src/modules/mergekmer.nf b/src/modules/mergekmer.nf index 3885cc7417ed48c04ea23e8ef7e1a22728e31e56..1ecd27e1ffaa52a18ce3070f50cfc71d7a76e8d9 100644 --- a/src/modules/mergekmer.nf +++ b/src/modules/mergekmer.nf @@ -1,7 +1,6 @@ process MERGEKMER { tag "$meta.id" label 'big_mem_mono_cpus' - publishDir "results/${meta.specie}/${meta.sex}/${meta.read}/", mode: 'copy' container "lbmc/mergekmer:0.1.2" @@ -26,14 +25,14 @@ process MERGEKMER { } process COLLATEKMER { - tag "$csv" + tag "$specie" label 'big_mem_mono_cpus' - publishDir "results/", mode: 'copy' + publishDir "results/${specie}/", mode: 'copy' container "lbmc/mergekmer:0.1.2" input: - path(csv) + tuple val(specie), path(csv) output: path("*.csv"), emit: csv @@ -42,7 +41,7 @@ process COLLATEKMER { script: def args = task.ext.args ?: '' """ - mergekmer --csv ${csv} --output fusion.csv --collate + mergekmer --csv ${csv} --output ${specie}.csv --collate cat <<-END_VERSIONS > versions.yml