Skip to content
Snippets Groups Projects
Verified Commit 9489f360 authored by Laurent Modolo's avatar Laurent Modolo
Browse files

Merge branch 'crey02-master-patch-25149' into 'master'

Crey02 master patch 25149

See merge request !24
parent 8be11d56
No related branches found
No related tags found
No related merge requests found
...@@ -16,7 +16,6 @@ process index_fasta { ...@@ -16,7 +16,6 @@ process index_fasta {
output: output:
tuple val(file_id), path("${fasta}"), path("*.mmi*"), emit: index tuple val(file_id), path("${fasta}"), path("*.mmi*"), emit: index
path "*_report.txt", emit: report
script: script:
memory = "${task.memory}" - ~/\s*GB/ memory = "${task.memory}" - ~/\s*GB/
...@@ -41,7 +40,6 @@ process mapping_fastq { ...@@ -41,7 +40,6 @@ process mapping_fastq {
output: output:
tuple val(file_id), path("*.bam"), emit: bam tuple val(file_id), path("*.bam"), emit: bam
path "*_report.txt", emit: report
script: script:
if (file_id instanceof List){ if (file_id instanceof List){
...@@ -50,7 +48,7 @@ process mapping_fastq { ...@@ -50,7 +48,7 @@ process mapping_fastq {
file_prefix = file_id file_prefix = file_id
} }
memory = "${task.memory}" - ~/\s*GB/ memory = "${task.memory}" - ~/\s*GB/
memory = memory / (task.cpus + 1.0) memory = memory.toInteger() / (task.cpus + 1.0)
if (reads.size() == 2) if (reads.size() == 2)
""" """
minimap2 ${params.mapping_fastq} -t ${task.cpus} -K ${memory} ${fasta} ${reads[0]} ${reads[1]} | minimap2 ${params.mapping_fastq} -t ${task.cpus} -K ${memory} ${fasta} ${reads[0]} ${reads[1]} |
...@@ -61,4 +59,4 @@ process mapping_fastq { ...@@ -61,4 +59,4 @@ process mapping_fastq {
minimap2 ${params.mapping_fastq} -t ${task.cpus} -K ${memory} ${fasta} ${reads} | minimap2 ${params.mapping_fastq} -t ${task.cpus} -K ${memory} ${fasta} ${reads} |
samtools view -Sb - > ${pair_id}.bam samtools view -Sb - > ${pair_id}.bam
""" """
} }
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment