# HG changeset patch
# User galaxyp
# Date 1500072624 14400
# Node ID bef5424453e466696b963ab5b3ffe645fad72a6b
# Parent  c3a2662b615933ea90a1512bc7a0c1336ec67da8
planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit daf6dfc513ede9b890125d9fff2c2657d834eea9

diff -r c3a2662b6159 -r bef5424453e4 IDMapper.xml
--- a/IDMapper.xml	Thu Apr 27 12:53:22 2017 -0400
+++ b/IDMapper.xml	Fri Jul 14 18:50:24 2017 -0400
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!--This is a configuration file for the integration of a tools into Galaxy (https://galaxyproject.org/). This file was automatically generated using CTD2Galaxy.-->
 <!--Proposed Tool Section: [ID Processing]-->
-<tool id="IDMapper" name="IDMapper" version="2.1.0">
+<tool id="IDMapper" name="IDMapper" version="2.2.0">
   <description>Assigns protein/peptide identifications to features or consensus features.</description>
   <macros>
     <token name="@EXECUTABLE@">IDMapper</token>
@@ -55,6 +55,9 @@
 #if $param_consensus_use_subelements:
   -consensus:use_subelements
 #end if
+#if $param_spectra_in:
+  -spectra:in $param_spectra_in
+#end if
 #if $adv_opts.adv_opts_selector=='advanced':
     #if $adv_opts.param_force:
   -force
@@ -81,6 +84,7 @@
     <param name="param_feature_use_centroid_rt" display="radio" type="boolean" truevalue="-feature:use_centroid_rt" falsevalue="" checked="false" optional="True" label="Use the RT coordinates of the feature centroids for matching, instead of the RT ranges of the features/mass traces" help="(-use_centroid_rt) "/>
     <param name="param_feature_use_centroid_mz" display="radio" type="boolean" truevalue="-feature:use_centroid_mz" falsevalue="" checked="false" optional="True" label="Use the m/z coordinates of the feature centroids for matching, instead of the m/z ranges of the features/mass traces" help="(-use_centroid_mz) &lt;br&gt;(If you choose 'peptide' as 'mz_reference', you should usually set this flag to avoid false-positive matches.)"/>
     <param name="param_consensus_use_subelements" display="radio" type="boolean" truevalue="-consensus:use_subelements" falsevalue="" checked="false" optional="True" label="Match using RT and m/z of sub-features instead of consensus RT and m/z" help="(-use_subelements) A consensus feature matches if any of its sub-features matches"/>
+    <param name="param_spectra_in" type="data" format="mzml" optional="True" label="MS run used to annotated unidentified spectra to features or consensus features" help="(-in) "/>
     <expand macro="advanced_options">
       <param name="param_force" display="radio" type="boolean" truevalue="-force" falsevalue="" checked="false" optional="True" label="Overwrite tool specific checks" help="(-force) "/>
       <param name="param_consensus_annotate_ids_with_subelements" display="radio" type="boolean" truevalue="-consensus:annotate_ids_with_subelements" falsevalue="" checked="false" optional="True" label="Store the map index of the sub-feature in the peptide ID" help="(-annotate_ids_with_subelements) "/>
diff -r c3a2662b6159 -r bef5424453e4 macros.xml
--- a/macros.xml	Thu Apr 27 12:53:22 2017 -0400
+++ b/macros.xml	Fri Jul 14 18:50:24 2017 -0400
@@ -2,7 +2,7 @@
 <macros>
   <xml name="requirements">
     <requirements>
-      <requirement type="package" version="2.1">openms</requirement>
+      <requirement type="package" version="2.2">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>
diff -r c3a2662b6159 -r bef5424453e4 readme.md
--- a/readme.md	Thu Apr 27 12:53:22 2017 -0400
+++ b/readme.md	Fri Jul 14 18:50:24 2017 -0400
@@ -14,15 +14,29 @@
 Generating OpenMS wrappers
 ==========================
 
- * install OpenMS (you can do this automatically through the Tool Shed)
+ * install OpenMS (you can do this automatically through Conda)
  * create a folder called CTD
- * inside of your new installed openms/bin folder, execute the following command:
+ * if you installed openms as a binary in a specific directory, execute the following command in the `openms/bin` directory:
     
     ```bash
     for binary in `ls`; do ./$binary -write_ctd /PATH/TO/YOUR/CTD; done;
     ```
     
- * `MetaProSIP.ctd` includes a not supported character: To use it, search for `²` and replace it (e.g. with `^2`).
+ * if there is no binary release (e.g. as with version 2.2), download and unpack the Conda package, find the `bin` folder and create a list of the tools as follow:
+ 
+    ```bash
+    ls >> tools.txt
+    ```
+    
+ * search for the `bin` folder of your conda environment containing OpenMS and do:
+ 
+    ```bash
+    while read p; do
+        ./PATH/TO/BIN/$p -write_ctd /PATH/TO/YOUR/CTD;
+    done <tools.txt
+    ```
+    
+ * You should have all CTD files now. `MetaProSIP.ctd` includes a not supported character: To use it, search for `²` and replace it (e.g. with `^2`).
 
  * clone or install CTDopts
 
@@ -42,7 +56,7 @@
     git clone https://github.com/WorkflowConversion/CTD2Galaxy.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.
+ * 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.
 
     ```bash
     python generator.py \ 
diff -r c3a2662b6159 -r bef5424453e4 tool.conf
--- a/tool.conf	Thu Apr 27 12:53:22 2017 -0400
+++ b/tool.conf	Fri Jul 14 18:50:24 2017 -0400
@@ -6,13 +6,7 @@
     <tool file="openms/RTModel.xml"/>
     <tool file="openms/RTPredict.xml"/>
   </section>
-  <section id="section-id-DEFAULT" name="DEFAULT">
-    <tool file="openms/OpenSwathFileSplitter.xml"/>
-    <tool file="openms/OpenSwathMzMLFileCacher.xml"/>
-  </section>
   <section id="section-id-TargetedExperiments" name="Targeted Experiments">
-    <tool file="openms/ConvertTraMLToTSV.xml"/>
-    <tool file="openms/ConvertTSVToTraML.xml"/>
     <tool file="openms/InclusionExclusionListCreator.xml"/>
     <tool file="openms/MRMMapper.xml"/>
     <tool file="openms/OpenSwathAnalyzer.xml"/>
@@ -22,13 +16,17 @@
     <tool file="openms/OpenSwathDecoyGenerator.xml"/>
     <tool file="openms/OpenSwathDIAPreScoring.xml"/>
     <tool file="openms/OpenSwathFeatureXMLToTSV.xml"/>
+    <tool file="openms/OpenSwathFileSplitter.xml"/>
+    <tool file="openms/OpenSwathMzMLFileCacher.xml"/>
     <tool file="openms/OpenSwathRewriteToFeatureXML.xml"/>
     <tool file="openms/OpenSwathRTNormalizer.xml"/>
     <tool file="openms/PrecursorIonSelector.xml"/>
+    <tool file="openms/TargetedFileConverter.xml"/>
   </section>
   <section id="section-id-Utilities" name="Utilities">
     <tool file="openms/AccurateMassSearch.xml"/>
     <tool file="openms/CVInspector.xml"/>
+    <tool file="openms/DatabaseFilter.xml"/>
     <tool file="openms/DecoyDatabase.xml"/>
     <tool file="openms/DeMeanderize.xml"/>
     <tool file="openms/Digestor.xml"/>
@@ -44,7 +42,6 @@
     <tool file="openms/LabeledEval.xml"/>
     <tool file="openms/LowMemPeakPickerHiRes.xml"/>
     <tool file="openms/LowMemPeakPickerHiRes_RandomAccess.xml"/>
-    <tool file="openms/MapAlignmentEvaluation.xml"/>
     <tool file="openms/MassCalculator.xml"/>
     <tool file="openms/MetaboliteSpectralMatcher.xml"/>
     <tool file="openms/MetaProSIP.xml"/>
@@ -62,12 +59,14 @@
     <tool file="openms/QCMerger.xml"/>
     <tool file="openms/QCShrinker.xml"/>
     <tool file="openms/RNPxl.xml"/>
+    <tool file="openms/RNPxlSearch.xml"/>
     <tool file="openms/RNPxlXICFilter.xml"/>
     <tool file="openms/RTEvaluation.xml"/>
     <tool file="openms/SemanticValidator.xml"/>
     <tool file="openms/SequenceCoverageCalculator.xml"/>
     <tool file="openms/SimpleSearchEngine.xml"/>
     <tool file="openms/SpecLibCreator.xml"/>
+    <tool file="openms/SpectraSTSearchAdapter.xml"/>
     <tool file="openms/SvmTheoreticalSpectrumGeneratorTrainer.xml"/>
     <tool file="openms/TICCalculator.xml"/>
     <tool file="openms/TopPerc.xml"/>
@@ -78,6 +77,7 @@
     <tool file="openms/ConsensusMapNormalizer.xml"/>
     <tool file="openms/FeatureLinkerLabeled.xml"/>
     <tool file="openms/FeatureLinkerUnlabeled.xml"/>
+    <tool file="openms/FeatureLinkerUnlabeledKD.xml"/>
     <tool file="openms/FeatureLinkerUnlabeledQT.xml"/>
     <tool file="openms/MapRTTransformer.xml"/>
   </section>
@@ -154,9 +154,7 @@
     <tool file="openms/FeatureFinderMultiplex.xml"/>
     <tool file="openms/FeatureFinderSuperHirn.xml"/>
     <tool file="openms/IsobaricAnalyzer.xml"/>
-    <tool file="openms/ITRAQAnalyzer.xml"/>
     <tool file="openms/ProteinQuantifier.xml"/>
     <tool file="openms/ProteinResolver.xml"/>
-    <tool file="openms/TMTAnalyzer.xml"/>
   </section>
 </toolbox>