diff --git a/modules/samtools/merge/main.nf b/modules/samtools/merge/main.nf index bbf7e8fb..d01bbed8 100644 --- a/modules/samtools/merge/main.nf +++ b/modules/samtools/merge/main.nf @@ -8,8 +8,9 @@ process SAMTOOLS_MERGE { 'quay.io/biocontainers/samtools:1.15.1--h1170115_0' }" input: - tuple val(meta), path(input_files) + tuple val(meta), path(input_files, stageAs: "?/*") path fasta + path fai output: tuple val(meta), path("${prefix}.bam") , optional:true, emit: bam diff --git a/modules/samtools/merge/meta.yml b/modules/samtools/merge/meta.yml index fb78e55c..f6833d0c 100644 --- a/modules/samtools/merge/meta.yml +++ b/modules/samtools/merge/meta.yml @@ -29,6 +29,10 @@ input: type: optional file description: Reference file the CRAM was created with pattern: "*.{fasta,fa}" + - fai: + type: optional file + description: Index of the reference file the CRAM was created with + pattern: "*.fai" output: - meta: type: map diff --git a/tests/modules/samtools/merge/main.nf b/tests/modules/samtools/merge/main.nf index ad5c56e3..979fb73f 100644 --- a/tests/modules/samtools/merge/main.nf +++ b/tests/modules/samtools/merge/main.nf @@ -6,20 +6,24 @@ include { SAMTOOLS_MERGE } from '../../../../modules/samtools/merge/main.nf' workflow test_samtools_merge { input = [ [ id: 'test' ], // meta map - [ file(params.test_data['sarscov2']['illumina']['test_paired_end_methylated_sorted_bam'], checkIfExists: true), - file(params.test_data['sarscov2']['illumina']['test_paired_end_sorted_bam'], checkIfExists: true), - file(params.test_data['sarscov2']['illumina']['test_single_end_sorted_bam'], checkIfExists: true)] - ] + [ + file(params.test_data['sarscov2']['illumina']['test_paired_end_methylated_sorted_bam'], checkIfExists: true), + file(params.test_data['sarscov2']['illumina']['test_paired_end_sorted_bam'], checkIfExists: true), + file(params.test_data['sarscov2']['illumina']['test_single_end_sorted_bam'], checkIfExists: true) + ] + ] - SAMTOOLS_MERGE ( input, [] ) + SAMTOOLS_MERGE ( input, [], [] ) } workflow test_samtools_merge_cram { input = [ [ id: 'test' ], // meta map - [ file(params.test_data['homo_sapiens']['illumina']['test_paired_end_recalibrated_sorted_cram'], checkIfExists: true), - file(params.test_data['homo_sapiens']['illumina']['test2_paired_end_recalibrated_sorted_cram'], checkIfExists: true), - ] - ] - fasta = file(params.test_data['homo_sapiens']['genome']['genome_fasta'], checkIfExists: true) - SAMTOOLS_MERGE ( input, fasta ) + [ + file(params.test_data['homo_sapiens']['illumina']['test_paired_end_recalibrated_sorted_cram'], checkIfExists: true), + file(params.test_data['homo_sapiens']['illumina']['test2_paired_end_recalibrated_sorted_cram'], checkIfExists: true), + ] + ] + fasta = file(params.test_data['homo_sapiens']['genome']['genome_fasta'], checkIfExists: true) + fai = file(params.test_data['homo_sapiens']['genome']['genome_fasta_fai'], checkIfExists: true) + SAMTOOLS_MERGE ( input, fasta, fai ) } diff --git a/tests/modules/samtools/merge/nextflow.config b/tests/modules/samtools/merge/nextflow.config index 4ac70fa0..8730f1c4 100644 --- a/tests/modules/samtools/merge/nextflow.config +++ b/tests/modules/samtools/merge/nextflow.config @@ -2,8 +2,4 @@ process { publishDir = { "${params.outdir}/${task.process.tokenize(':')[-1].tokenize('_')[0].toLowerCase()}" } - withName: SAMTOOLS_MERGE { - ext.prefix = { "${meta.id}_merged" } - } - } diff --git a/tests/modules/samtools/merge/test.yml b/tests/modules/samtools/merge/test.yml index 948c6191..fb420a1c 100644 --- a/tests/modules/samtools/merge/test.yml +++ b/tests/modules/samtools/merge/test.yml @@ -4,7 +4,7 @@ - samtools - samtools/merge files: - - path: output/samtools/test_merged.bam + - path: output/samtools/test.bam - name: samtools merge test_samtools_merge_cram command: nextflow run ./tests/modules/samtools/merge -entry test_samtools_merge_cram -c ./tests/config/nextflow.config -c ./tests/modules/samtools/merge/nextflow.config @@ -12,4 +12,4 @@ - samtools - samtools/merge files: - - path: output/samtools/test_merged.cram + - path: output/samtools/test.cram