Skip to content

Commit b036799

Browse files
authored
Merge pull request #29 from uclahs-cds/gk-add-validation
Adding validation
2 parents d9cd224 + 3d5ba99 commit b036799

1 file changed

Lines changed: 3 additions & 16 deletions

File tree

pipeline/align-DNA.nf

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
def docker_image_BWA_and_SAMTools = "blcdsdockerregistry/align-dna:bwa-mem2-2.1_samtools-1.10"
1010
def docker_image_PicardTools = "blcdsdockerregistry/align-dna:picardtools-2.23.3"
1111
def docker_image_sha512sum = "blcdsdockerregistry/align-dna:sha512sum-1.0"
12-
def docker_image_validate_params = "blcdsdockerregistry/align-dna:sha512sum-1.0"
12+
def docker_image_validate_params = "blcdsdockerregistry/validate:1.0.0"
1313

1414
// resource information
1515
def number_of_cpus = (int) (Runtime.getRuntime().availableProcessors() / params.max_number_of_parallel_jobs)
@@ -136,24 +136,14 @@ process validate_inputs {
136136
input_ch_reference_index_files_validate
137137
)
138138

139-
output:
140-
val(true) into output_ch_validate_inputs
141-
142139
script:
143140
"""
144141
set -euo pipefail
145142
146-
#python -m validate -t ${file_to_validate}
143+
python -m validate -t file-input ${file_to_validate}
147144
"""
148145
}
149146

150-
int number_of_invalid_inputs = output_ch_validate_inputs
151-
.filter { valid_result ->
152-
valid_result == false
153-
}
154-
.count()
155-
.get()
156-
157147
// align with bwa mem and convert with samtools
158148
process BWA_mem_SAMTools_Convert_Sam_to_Bam {
159149
container docker_image_BWA_and_SAMTools
@@ -162,9 +152,6 @@ process BWA_mem_SAMTools_Convert_Sam_to_Bam {
162152
memory amount_of_memory
163153
cpus params.bwa_mem_number_of_cpus
164154

165-
when:
166-
number_of_invalid_inputs == 0
167-
168155
// use "each" so the the reference files are passed through for each fastq pair alignment
169156
input:
170157
tuple(val(library),
@@ -353,6 +340,6 @@ process validate_outputs {
353340
"""
354341
set -euo pipefail
355342
356-
#python -m validate -t ${file_to_validate}
343+
python -m validate -t file-input ${file_to_validate}
357344
"""
358345
}

0 commit comments

Comments
 (0)