| Previous changeset 4:25e388f2b21e (2018-01-11) Next changeset 6:5ef9c166272d (2018-03-20) |
|
Commit message:
planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit 58476cadaaf10b494317a604ad81d41c2d15f29b |
|
modified:
macros.xml readme.md |
|
added:
LowMemPeakPickerHiResRandomAccess.xml tools_blacklist.txt |
|
removed:
LowMemPeakPickerHiRes_RandomAccess.xml SKIP_TOOLS_FILE.txt |
| b |
| diff -r 25e388f2b21e -r 9050f8fbee85 LowMemPeakPickerHiResRandomAccess.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/LowMemPeakPickerHiResRandomAccess.xml Mon Feb 12 13:12:32 2018 -0500 |
| [ |
| b'@@ -0,0 +1,137 @@\n+<?xml version=\'1.0\' encoding=\'UTF-8\'?>\n+<!--This is a configuration file for the integration of a tools into Galaxy (https://galaxyproject.org/). This file was automatically generated using CTDConverter.-->\n+<!--Proposed Tool Section: [Utilities]-->\n+<tool id="LowMemPeakPickerHiRes_RandomAccess" name="LowMemPeakPickerHiResRandomAccess" version="2.3.0">\n+ <description>Finds mass spectrometric peaks in profile mass spectra.</description>\n+ <macros>\n+ <token name="@EXECUTABLE@">LowMemPeakPickerHiResRandomAccess</token>\n+ <import>macros.xml</import>\n+ </macros>\n+ <expand macro="references"/>\n+ <expand macro="stdio"/>\n+ <expand macro="requirements"/>\n+ <command>LowMemPeakPickerHiResRandomAccess\n+\n+#if $param_in:\n+ -in $param_in\n+#end if\n+#if $param_out:\n+ -out $param_out\n+#end if\n+#if $param_algorithm_signal_to_noise:\n+ -algorithm:signal_to_noise $param_algorithm_signal_to_noise\n+#end if\n+\n+#if $rep_param_algorithm_ms_levels:\n+-algorithm:ms_levels\n+ #for token in $rep_param_algorithm_ms_levels:\n+ #if " " in str(token):\n+ "$token.param_algorithm_ms_levels"\n+ #else\n+ $token.param_algorithm_ms_levels\n+ #end if\n+ #end for\n+#end if\n+#if $param_algorithm_report_FWHM:\n+ -algorithm:report_FWHM\n+#end if\n+#if $param_algorithm_report_FWHM_unit:\n+ -algorithm:report_FWHM_unit\n+ #if " " in str($param_algorithm_report_FWHM_unit):\n+ "$param_algorithm_report_FWHM_unit"\n+ #else\n+ $param_algorithm_report_FWHM_unit\n+ #end if\n+#end if\n+#if $param_algorithm_SignalToNoise_win_len:\n+ -algorithm:SignalToNoise:win_len $param_algorithm_SignalToNoise_win_len\n+#end if\n+#if $param_algorithm_SignalToNoise_bin_count:\n+ -algorithm:SignalToNoise:bin_count $param_algorithm_SignalToNoise_bin_count\n+#end if\n+#if $param_algorithm_SignalToNoise_min_required_elements:\n+ -algorithm:SignalToNoise:min_required_elements $param_algorithm_SignalToNoise_min_required_elements\n+#end if\n+#if $param_algorithm_SignalToNoise_write_log_messages:\n+ -algorithm:SignalToNoise:write_log_messages\n+ #if " " in str($param_algorithm_SignalToNoise_write_log_messages):\n+ "$param_algorithm_SignalToNoise_write_log_messages"\n+ #else\n+ $param_algorithm_SignalToNoise_write_log_messages\n+ #end if\n+#end if\n+#if $adv_opts.adv_opts_selector==\'advanced\':\n+ #if $adv_opts.param_force:\n+ -force\n+#end if\n+ #if $adv_opts.param_algorithm_spacing_difference_gap:\n+ -algorithm:spacing_difference_gap $adv_opts.param_algorithm_spacing_difference_gap\n+#end if\n+ #if $adv_opts.param_algorithm_spacing_difference:\n+ -algorithm:spacing_difference $adv_opts.param_algorithm_spacing_difference\n+#end if\n+ #if $adv_opts.param_algorithm_missing:\n+ -algorithm:missing $adv_opts.param_algorithm_missing\n+#end if\n+ #if $adv_opts.param_algorithm_SignalToNoise_max_intensity:\n+ -algorithm:SignalToNoise:max_intensity $adv_opts.param_algorithm_SignalToNoise_max_intensity\n+#end if\n+ #if $adv_opts.param_algorithm_SignalToNoise_auto_max_stdev_factor:\n+ -algorithm:SignalToNoise:auto_max_stdev_factor $adv_opts.param_algorithm_SignalToNoise_auto_max_stdev_factor\n+#end if\n+ #if $adv_opts.param_algorithm_SignalToNoise_auto_max_percentile:\n+ -algorithm:SignalToNoise:auto_max_percentile $adv_opts.param_algorithm_SignalToNoise_auto_max_percentile\n+#end if\n+ #if $adv_opts.param_algorithm_SignalToNoise_auto_mode:\n+ -algorithm:SignalToNoise:auto_mode $adv_opts.param_algorithm_SignalToNoise_auto_mode\n+#end if\n+ #if $adv_opts.param_algorithm_SignalToNoise_noise_for_empty_window:\n+ -algorithm:SignalToNoise:noise_for_empty_window $adv_opts.param_algorithm_SignalToNoise_noise_for_empty_window\n+#end if\n+#end if\n+</command>\n+ <inputs>\n+ <param name="param_in" type="data" format="mzml" optional="False" label="input profile data file" help="(-in) "/>\n+ <param name="param_algorithm_signal_to_noise" type="float" min="0.0" optional="True" value="0.0" label="Minimal signal-to-noise ratio for a peak to be picked (0.0 disables SNT estimation!)"'..b'(-write_log_messages) ">\n+ <option value="true" selected="true">true</option>\n+ <option value="false">false</option>\n+ </param>\n+ <expand macro="advanced_options">\n+ <param name="param_force" display="radio" type="boolean" truevalue="-force" falsevalue="" checked="false" optional="True" label="Overwrite tool specific checks" help="(-force) "/>\n+ <param name="param_algorithm_spacing_difference_gap" type="float" min="0.0" optional="True" value="4.0" label="The extension of a peak is stopped if the spacing between two subsequent data points exceeds \'spacing_difference_gap * min_spacing\'" help="(-spacing_difference_gap) \'min_spacing\' is the smaller of the two spacings from the peak apex to its two neighboring points. \'0\' to disable the constraint. Not applicable to chromatograms"/>\n+ <param name="param_algorithm_spacing_difference" type="float" min="0.0" optional="True" value="1.5" label="Maximum allowed difference between points during peak extension, in multiples of the minimal difference between the peak apex and its two neighboring points" help="(-spacing_difference) If this difference is exceeded a missing point is assumed (see parameter \'missing\'). A higher value implies a less stringent peak definition, since individual signals within the peak are allowed to be further apart. \'0\' to disable the constraint. Not applicable to chromatograms"/>\n+ <param name="param_algorithm_missing" type="integer" min="0" optional="True" value="1" label="Maximum number of missing points allowed when extending a peak to the left or to the right" help="(-missing) A missing data point occurs if the spacing between two subsequent data points exceeds \'spacing_difference * min_spacing\'. \'min_spacing\' is the smaller of the two spacings from the peak apex to its two neighboring points. Not applicable to chromatograms"/>\n+ <param name="param_algorithm_SignalToNoise_max_intensity" type="integer" min="-1" optional="True" value="-1" label="maximal intensity considered for histogram construction" help="(-max_intensity) By default, it will be calculated automatically (see auto_mode). Only provide this parameter if you know what you are doing (and change \'auto_mode\' to \'-1\')! All intensities EQUAL/ABOVE \'max_intensity\' will be added to the LAST histogram bin. If you choose \'max_intensity\' too small, the noise estimate might be too small as well. If chosen too big, the bins become quite large (which you could counter by increasing \'bin_count\', which increases runtime). In general, the Median-S/N estimator is more robust to a manual max_intensity than the MeanIterative-S/N"/>\n+ <param name="param_algorithm_SignalToNoise_auto_max_stdev_factor" type="float" min="0.0" max="999.0" optional="True" value="3.0" label="parameter for \'max_intensity\' estimation (if \'auto_mode\' == 0): mean + \'auto_max_stdev_factor\' * stdev" help="(-auto_max_stdev_factor) "/>\n+ <param name="param_algorithm_SignalToNoise_auto_max_percentile" type="integer" min="0" max="100" optional="True" value="95" label="parameter for \'max_intensity\' estimation (if \'auto_mode\' == 1): auto_max_percentile th percentile" help="(-auto_max_percentile) "/>\n+ <param name="param_algorithm_SignalToNoise_auto_mode" type="integer" min="-1" max="1" optional="True" value="0" label="method to use to determine maximal intensity: -1 --> use \'max_intensity\'; 0 --> \'auto_max_stdev_factor\' method (default); 1 --> \'auto_max_percentile\' method" help="(-auto_mode) "/>\n+ <param name="param_algorithm_SignalToNoise_noise_for_empty_window" type="float" value="1e+20" label="noise value used for sparse windows" help="(-noise_for_empty_window) "/>\n+ </expand>\n+ </inputs>\n+ <outputs>\n+ <data name="param_out" format="mzml"/>\n+ </outputs>\n+ <help>Finds mass spectrometric peaks in profile mass spectra.\n+\n+\n+For more information, visit http://ftp.mi.fu-berlin.de/OpenMS/release-documentation/html/UTILS_LowMemPeakPickerHiResRandomAccess.html</help>\n+</tool>\n' |
| b |
| diff -r 25e388f2b21e -r 9050f8fbee85 LowMemPeakPickerHiRes_RandomAccess.xml --- a/LowMemPeakPickerHiRes_RandomAccess.xml Thu Jan 11 18:01:21 2018 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
| [ |
| b'@@ -1,137 +0,0 @@\n-<?xml version=\'1.0\' encoding=\'UTF-8\'?>\n-<!--This is a configuration file for the integration of a tools into Galaxy (https://galaxyproject.org/). This file was automatically generated using CTD2Galaxy.-->\n-<!--Proposed Tool Section: [Utilities]-->\n-<tool id="LowMemPeakPickerHiRes_RandomAccess" name="LowMemPeakPickerHiRes_RandomAccess" version="2.2.0">\n- <description>Finds mass spectrometric peaks in profile mass spectra.</description>\n- <macros>\n- <token name="@EXECUTABLE@">LowMemPeakPickerHiRes_RandomAccess</token>\n- <import>macros.xml</import>\n- </macros>\n- <expand macro="references"/>\n- <expand macro="stdio"/>\n- <expand macro="requirements"/>\n- <command>LowMemPeakPickerHiRes_RandomAccess\n-\n-#if $param_in:\n- -in $param_in\n-#end if\n-#if $param_out:\n- -out $param_out\n-#end if\n-#if $param_algorithm_signal_to_noise:\n- -algorithm:signal_to_noise $param_algorithm_signal_to_noise\n-#end if\n-\n-#if $rep_param_algorithm_ms_levels:\n--algorithm:ms_levels\n- #for token in $rep_param_algorithm_ms_levels:\n- #if " " in str(token):\n- "$token.param_algorithm_ms_levels"\n- #else\n- $token.param_algorithm_ms_levels\n- #end if\n- #end for\n-#end if\n-#if $param_algorithm_report_FWHM:\n- -algorithm:report_FWHM\n-#end if\n-#if $param_algorithm_report_FWHM_unit:\n- -algorithm:report_FWHM_unit\n- #if " " in str($param_algorithm_report_FWHM_unit):\n- "$param_algorithm_report_FWHM_unit"\n- #else\n- $param_algorithm_report_FWHM_unit\n- #end if\n-#end if\n-#if $param_algorithm_SignalToNoise_win_len:\n- -algorithm:SignalToNoise:win_len $param_algorithm_SignalToNoise_win_len\n-#end if\n-#if $param_algorithm_SignalToNoise_bin_count:\n- -algorithm:SignalToNoise:bin_count $param_algorithm_SignalToNoise_bin_count\n-#end if\n-#if $param_algorithm_SignalToNoise_min_required_elements:\n- -algorithm:SignalToNoise:min_required_elements $param_algorithm_SignalToNoise_min_required_elements\n-#end if\n-#if $param_algorithm_SignalToNoise_write_log_messages:\n- -algorithm:SignalToNoise:write_log_messages\n- #if " " in str($param_algorithm_SignalToNoise_write_log_messages):\n- "$param_algorithm_SignalToNoise_write_log_messages"\n- #else\n- $param_algorithm_SignalToNoise_write_log_messages\n- #end if\n-#end if\n-#if $adv_opts.adv_opts_selector==\'advanced\':\n- #if $adv_opts.param_force:\n- -force\n-#end if\n- #if $adv_opts.param_algorithm_spacing_difference_gap:\n- -algorithm:spacing_difference_gap $adv_opts.param_algorithm_spacing_difference_gap\n-#end if\n- #if $adv_opts.param_algorithm_spacing_difference:\n- -algorithm:spacing_difference $adv_opts.param_algorithm_spacing_difference\n-#end if\n- #if $adv_opts.param_algorithm_missing:\n- -algorithm:missing $adv_opts.param_algorithm_missing\n-#end if\n- #if $adv_opts.param_algorithm_SignalToNoise_max_intensity:\n- -algorithm:SignalToNoise:max_intensity $adv_opts.param_algorithm_SignalToNoise_max_intensity\n-#end if\n- #if $adv_opts.param_algorithm_SignalToNoise_auto_max_stdev_factor:\n- -algorithm:SignalToNoise:auto_max_stdev_factor $adv_opts.param_algorithm_SignalToNoise_auto_max_stdev_factor\n-#end if\n- #if $adv_opts.param_algorithm_SignalToNoise_auto_max_percentile:\n- -algorithm:SignalToNoise:auto_max_percentile $adv_opts.param_algorithm_SignalToNoise_auto_max_percentile\n-#end if\n- #if $adv_opts.param_algorithm_SignalToNoise_auto_mode:\n- -algorithm:SignalToNoise:auto_mode $adv_opts.param_algorithm_SignalToNoise_auto_mode\n-#end if\n- #if $adv_opts.param_algorithm_SignalToNoise_noise_for_empty_window:\n- -algorithm:SignalToNoise:noise_for_empty_window $adv_opts.param_algorithm_SignalToNoise_noise_for_empty_window\n-#end if\n-#end if\n-</command>\n- <inputs>\n- <param name="param_in" type="data" format="mzml" optional="False" label="input profile data file" help="(-in) "/>\n- <param name="param_algorithm_signal_to_noise" type="float" min="0.0" optional="True" value="0.0" label="Minimal signal-to-noise ratio for a peak to be picked (0.0 disables SNT estimation!)'..b'-write_log_messages) ">\n- <option value="true" selected="true">true</option>\n- <option value="false">false</option>\n- </param>\n- <expand macro="advanced_options">\n- <param name="param_force" display="radio" type="boolean" truevalue="-force" falsevalue="" checked="false" optional="True" label="Overwrite tool specific checks" help="(-force) "/>\n- <param name="param_algorithm_spacing_difference_gap" type="float" min="0.0" optional="True" value="4.0" label="The extension of a peak is stopped if the spacing between two subsequent data points exceeds \'spacing_difference_gap * min_spacing\'" help="(-spacing_difference_gap) \'min_spacing\' is the smaller of the two spacings from the peak apex to its two neighboring points. \'0\' to disable the constraint. Not applicable to chromatograms"/>\n- <param name="param_algorithm_spacing_difference" type="float" min="0.0" optional="True" value="1.5" label="Maximum allowed difference between points during peak extension, in multiples of the minimal difference between the peak apex and its two neighboring points" help="(-spacing_difference) If this difference is exceeded a missing point is assumed (see parameter \'missing\'). A higher value implies a less stringent peak definition, since individual signals within the peak are allowed to be further apart. \'0\' to disable the constraint. Not applicable to chromatograms"/>\n- <param name="param_algorithm_missing" type="integer" min="0" optional="True" value="1" label="Maximum number of missing points allowed when extending a peak to the left or to the right" help="(-missing) A missing data point occurs if the spacing between two subsequent data points exceeds \'spacing_difference * min_spacing\'. \'min_spacing\' is the smaller of the two spacings from the peak apex to its two neighboring points. Not applicable to chromatograms"/>\n- <param name="param_algorithm_SignalToNoise_max_intensity" type="integer" min="-1" optional="True" value="-1" label="maximal intensity considered for histogram construction" help="(-max_intensity) By default, it will be calculated automatically (see auto_mode). Only provide this parameter if you know what you are doing (and change \'auto_mode\' to \'-1\')! All intensities EQUAL/ABOVE \'max_intensity\' will be added to the LAST histogram bin. If you choose \'max_intensity\' too small, the noise estimate might be too small as well. If chosen too big, the bins become quite large (which you could counter by increasing \'bin_count\', which increases runtime). In general, the Median-S/N estimator is more robust to a manual max_intensity than the MeanIterative-S/N"/>\n- <param name="param_algorithm_SignalToNoise_auto_max_stdev_factor" type="float" min="0.0" max="999.0" optional="True" value="3.0" label="parameter for \'max_intensity\' estimation (if \'auto_mode\' == 0): mean + \'auto_max_stdev_factor\' * stdev" help="(-auto_max_stdev_factor) "/>\n- <param name="param_algorithm_SignalToNoise_auto_max_percentile" type="integer" min="0" max="100" optional="True" value="95" label="parameter for \'max_intensity\' estimation (if \'auto_mode\' == 1): auto_max_percentile th percentile" help="(-auto_max_percentile) "/>\n- <param name="param_algorithm_SignalToNoise_auto_mode" type="integer" min="-1" max="1" optional="True" value="0" label="method to use to determine maximal intensity: -1 --> use \'max_intensity\'; 0 --> \'auto_max_stdev_factor\' method (default); 1 --> \'auto_max_percentile\' method" help="(-auto_mode) "/>\n- <param name="param_algorithm_SignalToNoise_noise_for_empty_window" type="float" value="1e+20" label="noise value used for sparse windows" help="(-noise_for_empty_window) "/>\n- </expand>\n- </inputs>\n- <outputs>\n- <data name="param_out" format="mzml"/>\n- </outputs>\n- <help>Finds mass spectrometric peaks in profile mass spectra.\n-\n-\n-For more information, visit http://ftp.mi.fu-berlin.de/OpenMS/release-documentation/html/UTILS_LowMemPeakPickerHiRes_RandomAccess.html</help>\n-</tool>\n' |
| b |
| diff -r 25e388f2b21e -r 9050f8fbee85 SKIP_TOOLS_FILE.txt --- a/SKIP_TOOLS_FILE.txt Thu Jan 11 18:01:21 2018 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
| b |
| @@ -1,9 +0,0 @@ -OMSSAAdapter -MyriMatchAdapter -PepNovoAdapter -SeedListGenerator -SpecLibSearcher -MapAlignerIdentification -MapAlignerPoseClustering -MapAlignerSpectrum -MapAlignerRTTransformer |
| b |
| diff -r 25e388f2b21e -r 9050f8fbee85 macros.xml --- a/macros.xml Thu Jan 11 18:01:21 2018 -0500 +++ b/macros.xml Mon Feb 12 13:12:32 2018 -0500 |
| b |
| @@ -2,10 +2,10 @@ <macros> <xml name="requirements"> <requirements> - <requirement type="package" version="2.2">openms</requirement> + <requirement type="package" version="2.3">openms</requirement> <requirement type="package" version="15.12.15.2">xtandem</requirement> <requirement type="package" version="1.0">fido</requirement> - <requirement type="package" version="2016.10.26">msgf_plus</requirement> + <requirement type="package" version="2017.07.21">msgf_plus</requirement> <yield/> </requirements> </xml> |
| b |
| diff -r 25e388f2b21e -r 9050f8fbee85 readme.md --- a/readme.md Thu Jan 11 18:01:21 2018 -0500 +++ b/readme.md Mon Feb 12 13:12:32 2018 -0500 |
| b |
| @@ -53,29 +53,29 @@ * clone or install CTD2Galaxy ```bash - git clone https://github.com/WorkflowConversion/CTD2Galaxy.git + git clone https://github.com/WorkflowConversion/CTDConverter.git ``` - * If you have CTDopts and CTD2Galaxy installed you are ready to generate Galaxy Tools from CTD definitions. Change the following command according to your needs, especially the `/PATH/TO` parts. The default files are provided in this repository. You might have to install `libxslt` and `lxml` to run it. + * If you have CTDopts and CTDConverter installed you are ready to generate Galaxy Tools from CTD definitions. Change the following command according to your needs, especially the `/PATH/TO` parts. The default files are provided in this repository. You might have to install `libxslt` and `lxml` to run it. Further information can be found on the CTDConverter page. ```bash - python generator.py \ + python convert.py galaxy \ -i /PATH/TO/YOUR/CTD/*.ctd \ -o ./PATH/TO/YOUR/WRAPPERS/ -t tool.conf \ -d datatypes_conf.xml -g openms \ -b version log debug test no_progress threads \ in_type executable myrimatch_executable \ fido_executable fidocp_executable \ - omssa_executable pepnovo_executable \ + omssa_executable pepnovo_e xecutable \ xtandem_executable param_model_directory \ java_executable java_memory java_permgen \ r_executable rt_concat_trafo_out param_id_pool \ -f /PATH/TO/filetypes.txt -m /PATH/TO/macros.xml \ - -s PATH/TO/SKIP_TOOLS_FILES.txt + -s PATH/TO/tools_blacklist.txt ``` - * As last step you need to change manually the binary names of all external binaries you want to use in OpenMS. For example: + * As last step you need to change manually the binary names of all external binaries you want to use in OpenMS. Some of these tools might already be deprecated and the files might not exist: ``` sed -i '13 a\-fido_executable Fido' wrappers/FidoAdapter.xml @@ -171,8 +171,8 @@ ``` - * These tools have multiple outputs (number of inputs = number of outputs) which is not yet supported in - by the automatic conversion step and are therefore in `SKIP_TOOLS_FILES.txt`: + * `This section might not be up to date. It might be worth trying if these tools will run now.` These tools have multiple outputs (number of inputs = number of outputs) which is not yet supported in + by the automatic conversion step and are therefore in `tools_blacklist.txt`: * SeedListGenerator * SpecLibSearcher * MapAlignerIdentification |
| b |
| diff -r 25e388f2b21e -r 9050f8fbee85 tools_blacklist.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools_blacklist.txt Mon Feb 12 13:12:32 2018 -0500 |
| b |
| @@ -0,0 +1,9 @@ +OMSSAAdapter +MyriMatchAdapter +PepNovoAdapter +SeedListGenerator +SpecLibSearcher +MapAlignerIdentification +MapAlignerPoseClustering +MapAlignerSpectrum +MapAlignerRTTransformer |