Skip to content

Commit e12489d

Browse files
committed
Adapted SplitNCigarReads command to also split multimappers
* added ci nextflow profile
1 parent a9c44b2 commit e12489d

File tree

13 files changed

+21
-18
lines changed

13 files changed

+21
-18
lines changed

modules/02_mark_duplicates.nf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ process SPLIT_CIGAR_N_READS {
7676
--input ${bam} \
7777
--output ${name}.split_cigarn.bam \
7878
--create-output-bam-index true \
79+
--process-secondary-alignments true \
7980
--reference ${reference}
8081
8182
cp ${name}.split_cigarn.bai ${name}.split_cigarn.bam.bai

nextflow.config

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@
88
profiles {
99
conda { params.enable_conda = true }
1010
debug { process.beforeScript = 'echo $HOSTNAME' }
11-
test {
12-
params.input_files = "test_data/test_input.txt"
13-
params.reference = "$baseDir/test_data/ucsc.hg19.minimal.fasta"
11+
ci {
1412
params.prepare_bam_cpus = 1
1513
params.prepare_bam_memory = "3g"
1614
params.mark_duplicates_cpus = 1
@@ -23,15 +21,19 @@ profiles {
2321
params.metrics_memory = "3g"
2422
params.index_cpus = 1
2523
params.index_memory = "3g"
26-
params.known_indels1 = "$baseDir/test_data/1000G_phase1.indels.hg19.sites.minimal.vcf"
27-
params.known_indels2 = "$baseDir/test_data/Mills_and_1000G_gold_standard.indels.hg19.sites.sorted.minimal.vcf"
28-
params.intervals = "$baseDir/test_data/minimal_intervals.bed"
29-
params.dbsnp = "$baseDir/test_data/dbsnp_138.hg19.minimal.vcf"
3024
timeline.enabled = false
3125
report.enabled = false
3226
trace.enabled = false
3327
dag.enabled = false
3428
}
29+
test {
30+
params.input_files = "test_data/test_input.txt"
31+
params.reference = "$baseDir/test_data/ucsc.hg19.minimal.fasta"
32+
params.known_indels1 = "$baseDir/test_data/1000G_phase1.indels.hg19.sites.minimal.vcf"
33+
params.known_indels2 = "$baseDir/test_data/Mills_and_1000G_gold_standard.indels.hg19.sites.sorted.minimal.vcf"
34+
params.intervals = "$baseDir/test_data/minimal_intervals.bed"
35+
params.dbsnp = "$baseDir/test_data/dbsnp_138.hg19.minimal.vcf"
36+
}
3537
}
3638

3739
// Export this variable to prevent local Python libraries from conflicting with those in the container

tests/test_01.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
source tests/assert.sh
55
output=output/test1
6-
nextflow main.nf -profile test,conda --output $output
6+
nextflow main.nf -profile test,conda,ci --output $output
77

88
test -s $output/sample1/sample1.preprocessed.bam || { echo "Missing output BAM file!"; exit 1; }
99
test -s $output/sample1/sample1.preprocessed.bai || { echo "Missing output BAI file!"; exit 1; }

tests/test_02.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
source tests/assert.sh
55
output=output/test2
6-
nextflow main.nf -profile test,conda --output $output --skip_bqsr
6+
nextflow main.nf -profile test,conda,ci --output $output --skip_bqsr
77

88
test -s $output/sample1/sample1.preprocessed.bam || { echo "Missing output BAM file!"; exit 1; }
99
test -s $output/sample1/sample1.preprocessed.bai || { echo "Missing output BAI file!"; exit 1; }

tests/test_03.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
source tests/assert.sh
55
output=output/test3
6-
nextflow main.nf -profile test,conda --output $output --skip_realignment
6+
nextflow main.nf -profile test,conda,ci --output $output --skip_realignment
77

88
test -s $output/sample1/sample1.preprocessed.bam || { echo "Missing output BAM file!"; exit 1; }
99
test -s $output/sample1/sample1.preprocessed.bai || { echo "Missing output BAI file!"; exit 1; }

tests/test_04.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
source tests/assert.sh
55
output=output/test4
6-
nextflow main.nf -profile test,conda --output $output --skip_deduplication
6+
nextflow main.nf -profile test,conda,ci --output $output --skip_deduplication
77

88
test -s $output/sample1/sample1.preprocessed.bam || { echo "Missing output BAM file!"; exit 1; }
99
test -s $output/sample1/sample1.preprocessed.bai || { echo "Missing output BAI file!"; exit 1; }

tests/test_05.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
source tests/assert.sh
55
output=output/test5
6-
nextflow main.nf -profile test,conda --output $output --skip_deduplication --skip_bqsr --skip_metrics --known_indels1 false --known_indels2 false
6+
nextflow main.nf -profile test,conda,ci --output $output --skip_deduplication --skip_bqsr --skip_metrics --known_indels1 false --known_indels2 false
77

88
test -s $output/sample1/sample1.preprocessed.bam || { echo "Missing output BAM file!"; exit 1; }
99
test -s $output/sample1/sample1.preprocessed.bai || { echo "Missing output BAI file!"; exit 1; }

tests/test_06.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
source tests/assert.sh
55
output=output/test6
6-
nextflow main.nf -profile test,conda --output $output --intervals false --skip_deduplication --skip_bqsr --skip_realignment
6+
nextflow main.nf -profile test,conda,ci --output $output --intervals false --skip_deduplication --skip_bqsr --skip_realignment
77

88
test -s $output/sample1/sample1.preprocessed.bam || { echo "Missing output BAM file!"; exit 1; }
99
test -s $output/sample1/sample1.preprocessed.bai || { echo "Missing output BAI file!"; exit 1; }

tests/test_07.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
source tests/assert.sh
55
output=output/test7
6-
nextflow main.nf -profile test,conda --output $output --skip_bqsr --skip_realignment
6+
nextflow main.nf -profile test,conda,ci --output $output --skip_bqsr --skip_realignment
77

88
test -s $output/sample1/sample1.preprocessed.bam || { echo "Missing output BAM file!"; exit 1; }
99
test -s $output/sample1/sample1.preprocessed.bai || { echo "Missing output BAI file!"; exit 1; }

tests/test_08.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
source tests/assert.sh
55
output=output/test8
6-
nextflow main.nf -profile test,conda --output $output --collect_hs_metrics_min_base_quality 10 \
6+
nextflow main.nf -profile test,conda,ci --output $output --collect_hs_metrics_min_base_quality 10 \
77
--collect_hs_metrics_min_mapping_quality 10 --remove_duplicates false --skip_bqsr --skip_realignment
88

99
test -s $output/sample1/sample1.preprocessed.bam || { echo "Missing BAM file!"; exit 1; }

tests/test_09.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
source tests/assert.sh
55
output=output/test9
6-
nextflow main.nf -profile test,conda --output $output --skip_deduplication --skip_bqsr --skip_realignment \
6+
nextflow main.nf -profile test,conda,ci --output $output --skip_deduplication --skip_bqsr --skip_realignment \
77
--input_files false --input_bam test_data/TESTX_S1_L001.bam
88

99
test -s $output/TESTX_S1_L001/TESTX_S1_L001.preprocessed.bam || { echo "Missing test 9 output file!"; exit 1; }

tests/test_10.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
source tests/assert.sh
55
output=output/test10
6-
nextflow main.nf -profile test,conda --output $output --skip_realignment --split_cigarn
6+
nextflow main.nf -profile test,conda,ci --output $output --skip_realignment --split_cigarn
77

88
test -s $output/sample1/sample1.preprocessed.bam || { echo "Missing output BAM file!"; exit 1; }
99
test -s $output/sample1/sample1.preprocessed.bai || { echo "Missing output BAI file!"; exit 1; }

tests/test_11.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
source tests/assert.sh
55
output=output/test11
6-
nextflow main.nf -profile test,conda --output $output --reference `pwd`/test_data/ucsc.hg19.minimal.without_indices.fasta
6+
nextflow main.nf -profile test,conda,ci --output $output --reference `pwd`/test_data/ucsc.hg19.minimal.without_indices.fasta
77

88
test -s `pwd`/test_data/ucsc.hg19.minimal.without_indices.fasta.fai || { echo "Missing output FAI index!"; exit 1; }
99
test -s `pwd`/test_data/ucsc.hg19.minimal.without_indices.dict || { echo "Missing output dict index!"; exit 1; }

0 commit comments

Comments
 (0)