diff --git a/tools/msconvert/msconvert.xml b/tools/msconvert/msconvert.xml index 17f7f8b5a..0a5d2028a 100644 --- a/tools/msconvert/msconvert.xml +++ b/tools/msconvert/msconvert.xml @@ -1,4 +1,4 @@ - + Convert and/or filter mass spectrometry files msconvert_macros.xml diff --git a/tools/msconvert/msconvert_macros.xml b/tools/msconvert/msconvert_macros.xml index d48494c90..cf78a68b6 100644 --- 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 @@ - data_processing['precursor_refinement']['use_mzrefinement'] == True + data_processing['precursor_refinement']['use_mzrefinement'] == "true" - general_options['multi_run_output']['do_multi_run_output'] == True + general_options['multi_run_output']['do_multi_run_output'] == "true"