| Previous changeset 0:539a3a4dcc9e (2017-03-01) Next changeset 2:561b83804e7f (2017-10-18) |
|
Commit message:
planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit 9a14ed1f2d3c9abdfb080251b3419dd9e0c52a14 |
|
modified:
PeptideIndexer.xml filetypes.txt macros.xml readme.md tool.conf |
|
removed:
datatypes_conf.xml |
| b |
| diff -r 539a3a4dcc9e -r 6b0add7e424d PeptideIndexer.xml --- a/PeptideIndexer.xml Wed Mar 01 12:48:36 2017 -0500 +++ b/PeptideIndexer.xml Wed Aug 09 09:44:22 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="PeptideIndexer" name="PeptideIndexer" version="2.1.0"> +<tool id="PeptideIndexer" name="PeptideIndexer" version="2.2.0"> <description>Refreshes the protein references for all peptide hits.</description> <macros> <token name="@EXECUTABLE@">PeptideIndexer</token> @@ -25,10 +25,20 @@ -decoy_string "$param_decoy_string" #end if #if $param_decoy_string_position: - -decoy_string_position $param_decoy_string_position + -decoy_string_position + #if " " in str($param_decoy_string_position): + "$param_decoy_string_position" + #else + $param_decoy_string_position + #end if #end if #if $param_missing_decoy_action: - -missing_decoy_action $param_missing_decoy_action + -missing_decoy_action + #if " " in str($param_missing_decoy_action): + "$param_missing_decoy_action" + #else + $param_missing_decoy_action + #end if #end if #if $param_write_protein_sequence: -write_protein_sequence @@ -58,10 +68,20 @@ -filter_aaa_proteins #end if #if $param_enzyme_name: - -enzyme:name $param_enzyme_name + -enzyme:name + #if " " in str($param_enzyme_name): + "$param_enzyme_name" + #else + $param_enzyme_name + #end if #end if #if $param_enzyme_specificity: - -enzyme:specificity $param_enzyme_specificity + -enzyme:specificity + #if " " in str($param_enzyme_specificity): + "$param_enzyme_specificity" + #else + $param_enzyme_specificity + #end if #end if #if $adv_opts.adv_opts_selector=='advanced': #if $adv_opts.param_force: @@ -98,26 +118,26 @@ <param name="param_IL_equivalent" display="radio" type="boolean" truevalue="-IL_equivalent" falsevalue="" checked="false" optional="True" label="Treat the isobaric amino acids isoleucine ('I') and leucine ('L') as equivalent (indistinguishable)" help="(-IL_equivalent) "/> <param name="param_filter_aaa_proteins" display="radio" type="boolean" truevalue="-filter_aaa_proteins" falsevalue="" checked="false" optional="True" label="In the tolerant search for matches to proteins with ambiguous amino acids (AAAs), rebuild the search database to only consider proteins with AAAs" help="(-filter_aaa_proteins) This may save time if most proteins don't contain AAAs and if there is a significant number of peptides that enter the tolerant search"/> <param name="param_enzyme_name" type="select" optional="False" value="Trypsin" label="Enzyme which determines valid cleavage sites -" help="(-name) e.g. trypsin cleaves after lysine (K) or arginine (R), but not before proline (P)"> - <option value="Lys-C/P">Lys-C/P</option> - <option value="unspecific cleavage">unspecific cleavage</option> - <option value="Lys-C">Lys-C</option> - <option value="Formic_acid">Formic_acid</option> + <option value="glutamyl endopeptidase">glutamyl endopeptidase</option> + <option value="CNBr">CNBr</option> + <option value="Asp-N_ambic">Asp-N_ambic</option> <option value="Trypsin" selected="true">Trypsin</option> - <option value="V8-DE">V8-DE</option> + <option value="Formic_acid">Formic_acid</option> + <option value="TrypChymo">TrypChymo</option> + <option value="proline endopeptidase">proline endopeptidase</option> + <option value="Lys-C/P">Lys-C/P</option> + <option value="Chymotrypsin">Chymotrypsin</option> + <option value="Arg-C">Arg-C</option> + <option value="PepsinA">PepsinA</option> + <option value="Asp-N">Asp-N</option> + <option value="Trypsin/P">Trypsin/P</option> + <option value="Lys-C">Lys-C</option> + <option value="no cleavage">no cleavage</option> + <option value="unspecific cleavage">unspecific cleavage</option> <option value="2-iodobenzoate">2-iodobenzoate</option> - <option value="Asp-N_ambic">Asp-N_ambic</option> - <option value="no cleavage">no cleavage</option> <option value="V8-E">V8-E</option> <option value="leukocyte elastase">leukocyte elastase</option> - <option value="CNBr">CNBr</option> - <option value="glutamyl endopeptidase">glutamyl endopeptidase</option> - <option value="TrypChymo">TrypChymo</option> - <option value="PepsinA">PepsinA</option> - <option value="Asp-N">Asp-N</option> - <option value="Arg-C">Arg-C</option> - <option value="proline endopeptidase">proline endopeptidase</option> - <option value="Chymotrypsin">Chymotrypsin</option> - <option value="Trypsin/P">Trypsin/P</option> + <option value="V8-DE">V8-DE</option> </param> <param name="param_enzyme_specificity" display="radio" type="select" optional="False" value="full" label="Specificity of the enzyme" help="(-specificity) <br> 'full': both internal cleavage sites must match. <br> 'semi': one of two internal cleavage sites must match. <br> 'none': allow all peptide hits no matter their context. Therefore, the enzyme chosen does not play a role here"> <option value="full" selected="true">full</option> |
| b |
| diff -r 539a3a4dcc9e -r 6b0add7e424d datatypes_conf.xml --- a/datatypes_conf.xml Wed Mar 01 12:48:36 2017 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
| b |
| @@ -1,33 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<datatypes> - <registration converters_path="lib/galaxy/datatypes/converters" display_path="display_applications"> - <datatype extension="mzxml" type="galaxy.datatypes.proteomics:MzXML" mimetype="application/xml"/> - <datatype extension="traml" type="galaxy.datatypes.proteomics:TraML" mimetype="application/xml"/> - <datatype extension="idxml" type="galaxy.datatypes.proteomics:IdXM" mimetype="application/xml"/> - <datatype extension="txt" type="galaxy.datatypes.data:Text"/> - <datatype extension="tabular" type="galaxy.datatypes.tabular:Tabular"/> - <datatype extension="txt" type="galaxy.datatypes.data:Text"/> - <datatype extension="fasta" type="galaxy.datatypes.sequence:Fasta"/> - <datatype extension="mgf" type="galaxy.datatypes.proteomics:Mgf"/> - <datatype extension="mzml" type="galaxy.datatypes.proteomics:MzML" mimetype="application/xml"/> - <datatype extension="trafoxml" type="galaxy.datatypes.xml:GenericXml" mimetype="application/xml"/> - <datatype extension="traml" type="galaxy.datatypes.proteomics:TraML" mimetype="application/xml"/> - <datatype extension="msp" type="galaxy.datatypes.proteomics:Msp"/> - <datatype extension="html" type="galaxy.datatypes.text:Html" mimetype="text/html"/> - <datatype extension="tabular" type="galaxy.datatypes.tabular:Tabular"/> - <datatype extension="fasta" type="galaxy.datatypes.sequence:Fasta"/> - <datatype extension="tabular" type="galaxy.datatypes.tabular:Tabular"/> - <datatype extension="consensusxml" type="galaxy.datatypes.proteomics:ConsensusXML" mimetype="application/xml"/> - <datatype extension="xml" type="galaxy.datatypes.xml:GenericXml" mimetype="application/xml"/> - <datatype extension="mzq" type="galaxy.datatypes.proteomics:MzQuantML" mimetype="application/xml"/> - <datatype extension="grid" type="galaxy.datatypes.data:Grid"/> - <datatype extension="pepxml" type="galaxy.datatypes.proteomics:PepXml" mimetype="application/xml"/> - <datatype extension="png" type="galaxy.datatypes.images:Png" mimetype="image/png"/> - <datatype extension="qcml" type="galaxy.datatypes.xml:GenericXml" mimetype="application/xml"/> - <datatype extension="featurexml" type="galaxy.datatypes.proteomics:FeatureXML" mimetype="application/xml"/> - <datatype extension="html" type="galaxy.datatypes.text:Html" mimetype="text/html"/> - <datatype extension="txt" type="galaxy.datatypes.data:Text"/> - <datatype extension="mzid" type="galaxy.datatypes.proteomics:MzIdentML" mimetype="application/xml"/> - <datatype extension="txt" type="galaxy.datatypes.data:Text"/> - </registration> -</datatypes> |
| b |
| diff -r 539a3a4dcc9e -r 6b0add7e424d filetypes.txt --- a/filetypes.txt Wed Mar 01 12:48:36 2017 -0500 +++ b/filetypes.txt Wed Aug 09 09:44:22 2017 -0400 |
| b |
| @@ -14,7 +14,7 @@ consensusXML consensusxml galaxy.datatypes.proteomics:ConsensusXML application/xml edta tabular galaxy.datatypes.tabular:Tabular featureXML featurexml galaxy.datatypes.proteomics:FeatureXML application/xml -idXML idxml galaxy.datatypes.proteomics:IdXM application/xml +idXML idxml galaxy.datatypes.proteomics:IdXML application/xml mzML mzml galaxy.datatypes.proteomics:MzML application/xml mzXML mzxml galaxy.datatypes.proteomics:MzXML application/xml pepXML pepxml galaxy.datatypes.proteomics:PepXml application/xml @@ -26,4 +26,4 @@ msp msp galaxy.datatypes.proteomics:Msp mzid mzid galaxy.datatypes.proteomics:MzIdentML application/xml png png galaxy.datatypes.images:Png image/png -mgf mgf galaxy.datatypes.proteomics:Mgf \ No newline at end of file +mgf mgf galaxy.datatypes.proteomics:Mgf |
| b |
| diff -r 539a3a4dcc9e -r 6b0add7e424d macros.xml --- a/macros.xml Wed Mar 01 12:48:36 2017 -0500 +++ b/macros.xml Wed Aug 09 09:44:22 2017 -0400 |
| b |
| @@ -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> |
| b |
| diff -r 539a3a4dcc9e -r 6b0add7e424d readme.md --- a/readme.md Wed Mar 01 12:48:36 2017 -0500 +++ b/readme.md Wed Aug 09 09:44:22 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 @@ -39,10 +53,10 @@ * clone or install CTD2Galaxy ```bash - git clone https://github.com/blankclemens/CTD2Galaxy.git + 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. + * 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 \ @@ -102,17 +116,32 @@ [...] ]]> ``` - * In `PeakPickerHiRes.xml`, the parameter `report_FWHM_unit` has to be put in quotation marks. Look for the following line + + * In `IDFileConverter.xml` the following is needed in the command section at the beginning (check your file to know what to copy where): - -algorithm:report_FWHM_unit $param_algorithm_report_FWHM_unit - - and change it to + ``` + <command><![CDATA[ - -algorithm:report_FWHM_unit "$param_algorithm_report_FWHM_unit" + ## check input file type + #set $in_type = $param_in.ext + + ## create the symlinks to set the proper file extension, since IDFileConverter uses them to choose how to handle the input files + ln -s '$param_in' 'param_in.${in_type}' && + + IDFileConverter - * In `FileConverter.xml` add `auto_format="true"` to the output, e.g.: + #if $param_in: + -in 'param_in.${in_type}' + #end if + + [...] + ]]> + ``` + + * In `IDFileConverter.xml` and `FileConverter.xml` add `auto_format="true"` to the output, e.g.: - <data name="param_out" metadata_source="param_in" auto_format="true"/> + - `<data name="param_out" auto_format="true"/>` + - `<data name="param_out" metadata_source="param_in" auto_format="true"/>` * To add an example test case to `DecoyDatabase.xml` add the following after the output section. If standard settings change you might have to adjust the options and/or the test files. |
| b |
| diff -r 539a3a4dcc9e -r 6b0add7e424d tool.conf --- a/tool.conf Wed Mar 01 12:48:36 2017 -0500 +++ b/tool.conf Wed Aug 09 09:44:22 2017 -0400 |
| b |
| @@ -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> |