# HG changeset patch # User devteam # Date 1447261463 18000 # Node ID 4f92dccc808a49e13a85247ee63cd4786903a19d # Parent e23b0cdeeba61432b0bf1f580ece5000b8d57362 planemo upload for repository https://github.com/galaxyproject/tools-devteam/tree/master/tools/bowtie2 commit a1517c9d22029095120643bbe2c8fa53754dd2b7 diff -r e23b0cdeeba6 -r 4f92dccc808a bowtie2_wrapper.xml --- a/bowtie2_wrapper.xml Wed Aug 26 12:46:11 2015 -0400 +++ b/bowtie2_wrapper.xml Wed Nov 11 12:04:23 2015 -0500 @@ -10,7 +10,7 @@ samtools - + ## prepare bowtie2 index #set index_path = '' #if str($reference_genome.source) == "history": @@ -20,18 +20,17 @@ #else: #set index_path = $reference_genome.index.fields.path #end if - + ## execute bowtie2 - + bowtie2 - + ## number of threads -p \${GALAXY_SLOTS:-4} ## index file path -x $index_path - - + ## Fastq inputs #if str( $library.type ) == "single": -U "${library.input_1}" @@ -72,7 +71,7 @@ --un-conc $output_unaligned_reads_l #end if #end if - + ## Read group information. @define_read_group_helpers@ #if str( $library.type ) == "single": @@ -98,7 +97,7 @@ $format_read_group("PI:", $rg_pi, '"', arg='--rg ') $format_read_group("PU:", $rg_pu, '"', arg='--rg ') #end if - + ## Analysis type #if ( str( $analysis_type.analysis_type_selector ) == "simple" and str( $analysis_type.presets ) != "no_presets" ): $analysis_type.presets @@ -112,7 +111,7 @@ ${analysis_type.input_options.solexa_quals} ${analysis_type.input_options.int_quals} #end if - + #if str( $analysis_type.alignment_options.alignment_options_selector ) == "yes": -N "${analysis_type.alignment_options.N}" -L "${analysis_type.alignment_options.L}" @@ -132,7 +131,7 @@ --score-min "${analysis_type.alignment_options.align_mode.score_min_loc}" #end if #end if - + #if str( $analysis_type.scoring_options.scoring_options_selector ) == "yes": #if ( str( $analysis_type.alignment_options.alignment_options_selector ) == "yes" and str( $analysis_type.alignment_options.align_mode.align_mode_selector ) == "local" ): --ma "${analysis_type.scoring_options.ma}" @@ -142,36 +141,39 @@ --rdg "${analysis_type.scoring_options.rdg_read_open},${analysis_type.scoring_options.rdg_read_extend}" --rfg "${analysis_type.scoring_options.rfg_ref_open},${analysis_type.scoring_options.rfg_ref_extend}" #end if - + #if str( $analysis_type.reporting_options.reporting_options_selector ) == "k": -k "${analysis_type.reporting_options.k}" #elif str( $analysis_type.reporting_options.reporting_options_selector ) == "a": -a #end if - + #if str( $analysis_type.effort_options.effort_options_selector ) == "yes": -D "${analysis_type.effort_options.D}" -R "${analysis_type.effort_options.R}" #end if - + #if str( $analysis_type.sam_options.sam_options_selector ) == "yes": ${analysis_type.sam_options.no_unal} ${analysis_type.sam_options.omit_sec_seq} #end if - + #if str( $analysis_type.other_options.other_options_selector ) == "yes": + ${analysis_type.other_options.reorder} ${analysis_type.other_options.non_deterministic} --seed "${analysis_type.other_options.seed}" #end if - + #elif str( $analysis_type.analysis_type_selector ) == "cline": ${analysis_type.cline} #end if - - -S "galaxy_bowtie_2_output.sam" && - ## view/sort and output BAM file - ( samtools view -Su "galaxy_bowtie_2_output.sam" | samtools sort -o - - > $output ) + ## output file + #if ( str( $analysis_type.analysis_type_selector ) != "full" or str( $analysis_type.sam_opt ) != "true" ): + | samtools view -Su - | samtools sort -o - - > $output + #else + > $output_sam + #end if ## rename unaligned sequence files #if $library.type == "paired" and $output_unaligned_reads_l and $output_unaligned_reads_r: @@ -180,14 +182,13 @@ && mv "${ _unaligned_root }.1${_unaligned_ext}" "${ output_unaligned_reads_l }" && mv "${ _unaligned_root }.2${_unaligned_ext}" "${ output_unaligned_reads_r }" #end if - + - - + @@ -198,12 +199,12 @@ - + - - + + @@ -221,8 +222,8 @@ - - + + @@ -230,7 +231,7 @@ - + @@ -248,8 +249,8 @@ - - + + @@ -327,7 +328,7 @@ - + @@ -359,7 +360,7 @@ - + @@ -419,6 +420,7 @@ + @@ -426,6 +428,7 @@ + @@ -437,21 +440,66 @@ library['unaligned_file'] is True - - + + + + + + + + + + + + + + ( library['type'] == "paired" or library['type'] == "paired_collection" ) and library['unaligned_file'] is True - - + + + + + + + + + + + analysis_type['analysis_type_selector'] == "simple" or analysis_type['sam_opt'] is False + + + + + + + + + + + + + + + + + analysis_type['analysis_type_selector'] == "full" and analysis_type['sam_opt'] is True diff -r e23b0cdeeba6 -r 4f92dccc808a read_group_macros.xml --- a/read_group_macros.xml Wed Aug 26 12:46:11 2015 -0400 +++ b/read_group_macros.xml Wed Nov 11 12:04:23 2015 -0500 @@ -121,7 +121,7 @@ #set $rg_pg = '' #end if - #if str($rg_param("PI")) + #if $rg_param("PI") != None #set $rg_pi = str($rg_param("PI")) #else #set $rg_pi = '' @@ -146,7 +146,7 @@ - + @@ -158,7 +158,7 @@ - + @@ -171,7 +171,7 @@ as per Picard. --> - + @@ -194,7 +194,7 @@ - + @@ -204,7 +204,7 @@ - + @@ -216,33 +216,33 @@ - + - + - + - + \*|[ACMGRSVTWYHKDBN]+$ - + - + - + - +