diff --git a/tools/bowtie2/bowtie2_wrapper.xml b/tools/bowtie2/bowtie2_wrapper.xml index 99209676..7d67aeed 100644 --- a/tools/bowtie2/bowtie2_wrapper.xml +++ b/tools/bowtie2/bowtie2_wrapper.xml @@ -1,4 +1,4 @@ - + - map reads against reference genome read_group_macros.xml @@ -35,6 +35,9 @@ #if str( $library.unaligned_file ) == "true": --un $output_unaligned_reads_l #end if + #if str( $library.aligned_file ) == "true": + --al $output_aligned_reads_l + #end if #elif str( $library.type ) == "paired": -1 "${library.input_1}" -2 "${library.input_2}" @@ -51,6 +54,9 @@ #if str( $library.unaligned_file ) == "true": --un-conc $output_unaligned_reads_l #end if + #if str( $library.aligned_file ) == "true": + --al-conc $output_aligned_reads_l + #end if #else ## prepare collection -1 $library.input_1.forward @@ -185,6 +191,12 @@ && mv "${ _unaligned_root }.1${_unaligned_ext}" "${ output_unaligned_reads_l }" && mv "${ _unaligned_root }.2${_unaligned_ext}" "${ output_unaligned_reads_r }" #end if + #if $library.type == "paired" and $output_aligned_reads_l and $output_aligned_reads_r: + #from os.path import splitext + #set _aligned_root, _aligned_ext = splitext( str( $output_aligned_reads_l ) ) + && mv "${ _aligned_root }.1${_aligned_ext}" "${ output_aligned_reads_l }" + && mv "${ _aligned_root }.2${_aligned_ext}" "${ output_aligned_reads_r }" + #end if @@ -204,11 +216,13 @@ + + @@ -236,6 +250,7 @@ + @@ -463,6 +478,45 @@ + + library['aligned_file'] is True + + + + + + + + + + + + + + + + + + + ( library['type'] == "paired" or library['type'] == "paired_collection" ) and library['aligned_file'] is True + + + + + + + + + + + + + ( library['type'] == "paired" or library['type'] == "paired_collection" ) and library['unaligned_file'] is True