Merge pull request #755 from mvdbeek/fix_boolean_to_select_transition

Fix boolean to select bugs in msconvert
galaxyproteomics · Jul 26, 2024 · 6832144 · 6832144
2 parents 918ae25 + e980a63
commit 6832144
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/tools/msconvert/msconvert.xml b/tools/msconvert/msconvert.xml
@@ -1,4 +1,4 @@
-<tool id="msconvert" name="msconvert" version="@VERSION@.3">
+<tool id="msconvert" name="msconvert" version="@VERSION@.4">
     <description>Convert and/or filter mass spectrometry files</description>
     <macros>
         <import>msconvert_macros.xml</import>

diff --git a/tools/msconvert/msconvert_macros.xml b/tools/msconvert/msconvert_macros.xml
@@ -32,7 +32,7 @@
       #set inputmask = "'"+$basename+"'"
     #end if
 
-    #if $data_processing.precursor_refinement.use_mzrefinement
+    #if $data_processing.precursor_refinement.use_mzrefinement == "true"
       #set input_ident_name = ".".join((os.path.splitext($basename)[0], $data_processing.precursor_refinement.input_ident.ext))
       #set output_refinement_name = os.path.splitext($basename)[0] + '.mzRefinement.tsv'
       ln -s '$data_processing.precursor_refinement.input_ident' '$input_ident_name' &&
@@ -65,7 +65,7 @@
       --filter "scanSumming precursorTol=$general_options.scan_summing.precursorTol scanTimeTol=$general_options.scan_summing.scanTimeTol ionMobilityTol=$general_options.scan_summing.ionMobilityTol"
     #end if
 
-    #if $general_options.multi_run_output.do_multi_run_output:
+    #if $general_options.multi_run_output.do_multi_run_output == "true":
       #if len($general_options.multi_run_output.run_index_set) > 0
         --runIndexSet "
         #for $index in $general_options.multi_run_output.run_index_set
@@ -85,7 +85,7 @@
         --filter "peakPicking $data_processing.peak_picking.pick_peaks_algorithm msLevel=$data_processing.peak_picking.pick_peaks_ms_levels"
       #end if
 
-      #if $data_processing.precursor_refinement.use_mzrefinement
+      #if $data_processing.precursor_refinement.use_mzrefinement == "true"
       --filter "mzRefiner $input_ident_name
         msLevels=$data_processing.precursor_refinement.precursor_refinement_ms_levels
         thresholdScore=$data_processing.precursor_refinement.thresholdScore
@@ -229,7 +229,7 @@
         #end if
       #end if
 
-      #if $data_processing.precursor_refinement.use_mzrefinement
+      #if $data_processing.precursor_refinement.use_mzrefinement == "true"
         && mv '$output_refinement_name' '$output_refinement';
       #end if
 ]]>
@@ -560,10 +560,10 @@
         </change_format>
       </data>
       <data format="tsv" name="output_refinement" label="${($input.name[:-4] if $input.name.endswith('.tar') else $input.name).rsplit('.',1)[0]}.mzRefinement.tsv">
-        <filter>data_processing['precursor_refinement']['use_mzrefinement'] == True</filter>
+        <filter>data_processing['precursor_refinement']['use_mzrefinement'] == "true"</filter>
       </data>
       <collection name="multi_run_output_list" type="list" label="${($input.name[:-4] if $input.name.endswith('.tar') else $input.name).rsplit('.',1)[0]}.${output_type} collection">
-        <filter>general_options['multi_run_output']['do_multi_run_output'] == True</filter>
+        <filter>general_options['multi_run_output']['do_multi_run_output'] == "true"</filter>
         <discover_datasets pattern="__name_and_ext__" directory="outputs" />
       </collection>
     </outputs>