diff MSGFPlusAdapter.xml @ 16:810779f0cf49 draft default tip

planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit 5c080b1e2b99f1c88f4557e9fec8c45c9d23b906
author galaxyp
date Fri, 14 Jun 2024 21:31:39 +0000
parents f5ec766d80cf
children
line wrap: on
line diff
--- a/MSGFPlusAdapter.xml	Thu Dec 01 19:07:07 2022 +0000
+++ b/MSGFPlusAdapter.xml	Fri Jun 14 21:31:39 2024 +0000
@@ -1,8 +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 CTDConverter.-->
-<!--Proposed Tool Section: [Identification]-->
+<!--Proposed Tool Section: [Identification of Proteins/Peptides (SearchEngines)]-->
 <tool id="MSGFPlusAdapter" name="MSGFPlusAdapter" version="@TOOL_VERSION@+galaxy@VERSION_SUFFIX@" profile="21.05">
-  <description>MS/MS database search using MS-GF+.</description>
+  <description>MS/MS database search using MS-GF+</description>
   <macros>
     <token name="@EXECUTABLE@">MSGFPlusAdapter</token>
     <import>macros.xml</import>
@@ -15,7 +14,7 @@
 
 ## Preprocessing
 mkdir in &&
-ln -s '$in' 'in/${re.sub("[^\w\-_]", "_", $in.element_identifier)}.$gxy2omsext($in.ext)' &&
+cp '$in' 'in/${re.sub("[^\w\-_]", "_", $in.element_identifier)}.$gxy2omsext($in.ext)' &&
 #if "out_FLAG" in str($OPTIONAL_OUTPUTS).split(',')
   mkdir out &&
 #end if
@@ -23,10 +22,10 @@
   mkdir mzid_out &&
 #end if
 mkdir database &&
-ln -s '$database' 'database/${re.sub("[^\w\-_]", "_", $database.element_identifier)}.$gxy2omsext($database.ext)' &&
+cp '$database' 'database/${re.sub("[^\w\-_]", "_", $database.element_identifier)}.$gxy2omsext($database.ext)' &&
 #if $conf:
   mkdir conf &&
-  ln -s '$conf' 'conf/${re.sub("[^\w\-_]", "_", $conf.element_identifier)}.$gxy2omsext($conf.ext)' &&
+  cp '$conf' 'conf/${re.sub("[^\w\-_]", "_", $conf.element_identifier)}.$gxy2omsext($conf.ext)' &&
 #end if
 
 ## Main program call
@@ -70,32 +69,32 @@
     <configfile name="hardcoded_json"><![CDATA[{"executable": "\$(msgf_plus -get_jar_path)", "java_executable": "java", "log": "log.txt", "threads": "\${GALAXY_SLOTS:-1}", "no_progress": true}]]></configfile>
   </configfiles>
   <inputs>
-    <param argument="-in" type="data" format="mgf,ms2,mzml,mzxml" optional="false" label="Input file (MS-GF+ parameter '-s')" help=" select mgf,ms2,mzml,mzxml data sets(s)"/>
-    <param argument="-database" type="data" format="fasta" optional="false" label="Protein sequence database (FASTA file; MS-GF+ parameter '-d')" help="Non-existing relative filenames are looked up via 'OpenMS.ini:id_db_dir' select fasta data sets(s)"/>
-    <param argument="-precursor_mass_tolerance" type="float" optional="true" value="10.0" label="Precursor monoisotopic mass tolerance (MS-GF+ parameter '-t')" help=""/>
-    <param argument="-precursor_error_units" type="select" optional="true" label="Unit of precursor mass tolerance (MS-GF+ parameter '-t')" help="">
+    <param argument="-in" type="data" format="mgf,ms2,mzml,mzxml" label="Input file (MS-GF+ parameter '-s')" help=" select mgf,ms2,mzml,mzxml data sets(s)"/>
+    <param argument="-database" type="data" format="fasta" label="Protein sequence database (FASTA file; MS-GF+ parameter '-d')" help="Non-existing relative filenames are looked up via 'OpenMS.ini:id_db_dir' select fasta data sets(s)"/>
+    <param argument="-precursor_mass_tolerance" type="float" value="10.0" label="Precursor monoisotopic mass tolerance (MS-GF+ parameter '-t')" help=""/>
+    <param argument="-precursor_error_units" type="select" label="Unit of precursor mass tolerance (MS-GF+ parameter '-t')" help="">
       <option value="Da">Da</option>
       <option value="ppm" selected="true">ppm</option>
       <expand macro="list_string_san" name="precursor_error_units"/>
     </param>
-    <param argument="-isotope_error_range" type="text" optional="true" value="0,1" label="Range of allowed isotope peak errors (MS-GF+ parameter '-ti')" help="Takes into account the error introduced by choosing a non-monoisotopic peak for fragmentation. Combined with 'precursor_mass_tolerance'/'precursor_error_units', this determines the actual precursor mass tolerance. E.g. for experimental mass 'exp' and calculated mass 'calc', '-precursor_mass_tolerance 20 -precursor_error_units ppm -isotope_error_range -1,2' tests '|exp - calc - n * 1.00335 Da| &lt; 20 ppm' for n = -1, 0, 1, 2">
+    <param argument="-isotope_error_range" type="text" value="0,1" label="Range of allowed isotope peak errors (MS-GF+ parameter '-ti')" help="Takes into account the error introduced by choosing a non-monoisotopic peak for fragmentation. Combined with 'precursor_mass_tolerance'/'precursor_error_units', this determines the actual precursor mass tolerance. E.g. for experimental mass 'exp' and calculated mass 'calc', '-precursor_mass_tolerance 20 -precursor_error_units ppm -isotope_error_range -1,2' tests '|exp - calc - n * 1.00335 Da| &lt; 20 ppm' for n = -1, 0, 1, 2">
       <expand macro="list_string_san" name="isotope_error_range"/>
     </param>
-    <param argument="-fragment_method" type="select" optional="true" label="Fragmentation method ('from_spectrum' relies on spectrum meta data and uses CID as fallback option; MS-GF+ parameter '-m')" help="">
+    <param argument="-fragment_method" type="select" label="Fragmentation method ('from_spectrum' relies on spectrum meta data and uses CID as fallback option; MS-GF+ parameter '-m')" help="">
       <option value="from_spectrum" selected="true">from_spectrum</option>
       <option value="CID">CID</option>
       <option value="ETD">ETD</option>
       <option value="HCD">HCD</option>
       <expand macro="list_string_san" name="fragment_method"/>
     </param>
-    <param argument="-instrument" type="select" optional="true" label="Instrument that generated the data ('low_res'/'high_res' refer to LCQ and LTQ instruments; MS-GF+ parameter '-inst')" help="">
+    <param argument="-instrument" type="select" label="Instrument that generated the data ('low_res'/'high_res' refer to LCQ and LTQ instruments; MS-GF+ parameter '-inst')" help="">
       <option value="low_res" selected="true">low_res</option>
       <option value="high_res">high_res</option>
       <option value="TOF">TOF</option>
       <option value="Q_Exactive">Q_Exactive</option>
       <expand macro="list_string_san" name="instrument"/>
     </param>
-    <param argument="-enzyme" type="select" optional="true" label="Enzyme used for digestion, or type of cleavage" help="Note: MS-GF+ does not support blocking rules. (MS-GF+ parameter '-e')">
+    <param argument="-enzyme" type="select" label="Enzyme used for digestion, or type of cleavage" help="Note: MS-GF+ does not support blocking rules. (MS-GF+ parameter '-e')">
       <option value="Alpha-lytic protease">Alpha-lytic protease</option>
       <option value="Arg-C/P">Arg-C/P</option>
       <option value="Asp-N/B">Asp-N/B</option>
@@ -108,7 +107,7 @@
       <option value="unspecific cleavage">unspecific cleavage</option>
       <expand macro="list_string_san" name="enzyme"/>
     </param>
-    <param argument="-protocol" type="select" optional="true" label="Labeling or enrichment protocol used, if any (MS-GF+ parameter '-p')" help="">
+    <param argument="-protocol" type="select" label="Labeling or enrichment protocol used, if any (MS-GF+ parameter '-p')" help="">
       <option value="automatic" selected="true">automatic</option>
       <option value="phospho">phospho</option>
       <option value="iTRAQ">iTRAQ</option>
@@ -117,22 +116,22 @@
       <option value="none">none</option>
       <expand macro="list_string_san" name="protocol"/>
     </param>
-    <param argument="-tryptic" type="select" optional="true" label="Level of cleavage specificity required (MS-GF+ parameter '-ntt')" help="">
+    <param argument="-tryptic" type="select" label="Level of cleavage specificity required (MS-GF+ parameter '-ntt')" help="">
       <option value="non">non</option>
       <option value="semi">semi</option>
       <option value="fully" selected="true">fully</option>
       <expand macro="list_string_san" name="tryptic"/>
     </param>
-    <param argument="-min_precursor_charge" type="integer" optional="true" min="1" value="2" label="Minimum precursor ion charge (only used for spectra without charge information; MS-GF+ parameter '-minCharge')" help=""/>
-    <param argument="-max_precursor_charge" type="integer" optional="true" min="1" value="3" label="Maximum precursor ion charge (only used for spectra without charge information; MS-GF+ parameter '-maxCharge')" help=""/>
-    <param argument="-min_peptide_length" type="integer" optional="true" min="1" value="6" label="Minimum peptide length to consider (MS-GF+ parameter '-minLength')" help=""/>
-    <param argument="-max_peptide_length" type="integer" optional="true" min="1" value="40" label="Maximum peptide length to consider (MS-GF+ parameter '-maxLength')" help=""/>
-    <param argument="-matches_per_spec" type="integer" optional="true" min="1" value="1" label="Number of matches per spectrum to be reported (MS-GF+ parameter '-n')" help=""/>
+    <param argument="-min_precursor_charge" type="integer" min="1" value="2" label="Minimum precursor ion charge (only used for spectra without charge information; MS-GF+ parameter '-minCharge')" help=""/>
+    <param argument="-max_precursor_charge" type="integer" min="1" value="3" label="Maximum precursor ion charge (only used for spectra without charge information; MS-GF+ parameter '-maxCharge')" help=""/>
+    <param argument="-min_peptide_length" type="integer" min="1" value="6" label="Minimum peptide length to consider (MS-GF+ parameter '-minLength')" help=""/>
+    <param argument="-max_peptide_length" type="integer" min="1" value="40" label="Maximum peptide length to consider (MS-GF+ parameter '-maxLength')" help=""/>
+    <param argument="-matches_per_spec" type="integer" min="1" value="1" label="Number of matches per spectrum to be reported (MS-GF+ parameter '-n')" help=""/>
     <param argument="-add_features" type="boolean" truevalue="true" falsevalue="false" checked="true" label="Output additional features (MS-GF+ parameter '-addFeatures')" help="This is required by Percolator and hence by default enabled"/>
-    <param argument="-max_mods" type="integer" optional="true" min="0" value="2" label="Maximum number of modifications per peptide" help="If this value is large, the search may take very long"/>
-    <param argument="-max_missed_cleavages" type="integer" optional="true" min="-1" value="-1" label="Maximum number of missed cleavages allowed for a peptide to be considered for scoring" help="(default: -1 meaning unlimited)"/>
-    <param argument="-tasks" type="integer" optional="true" value="0" label="(Override the number of tasks to use on the threads; Default: (internally calculated based on inputs))" help="More tasks than threads will reduce the memory requirements of the search, but will be slower (how much depends on the inputs)..    1 &lt;= tasks &lt;= numThreads: will create one task per thread, which is the original behavior..    tasks = 0: use default calculation - minimum of: (threads*3) and (numSpectra/250)..    tasks &lt; 0: multiply number of threads by abs(tasks) to determine number of tasks (i.e., -2 means &quot;2 * numThreads&quot; tasks)..    One task per thread will use the most memory, but will usually finish the fastest..    2-3 tasks per thread will use comparably less memory, but may cause the search to take 1.5 to 2 times as long"/>
-    <param argument="-fixed_modifications" multiple="true" type="select" optional="true" label="Fixed modifications, specified using Unimod (www.unimod.org) terms" help="e.g. 'Carbamidomethyl (C)' or 'Oxidation (M)'">
+    <param argument="-max_mods" type="integer" min="0" value="2" label="Maximum number of modifications per peptide" help="If this value is large, the search may take very long"/>
+    <param argument="-max_missed_cleavages" type="integer" min="-1" value="-1" label="Maximum number of missed cleavages allowed for a peptide to be considered for scoring" help="(default: -1 meaning unlimited)"/>
+    <param argument="-tasks" type="integer" value="0" label="(Override the number of tasks to use on the threads; Default: (internally calculated based on inputs))" help="More tasks than threads will reduce the memory requirements of the search, but will be slower (how much depends on the inputs)..    1 &lt;= tasks &lt;= numThreads: will create one task per thread, which is the original behavior..    tasks = 0: use default calculation - minimum of: (threads*3) and (numSpectra/250)..    tasks &lt; 0: multiply number of threads by abs(tasks) to determine number of tasks (i.e., -2 means &quot;2 * numThreads&quot; tasks)..    One task per thread will use the most memory, but will usually finish the fastest..    2-3 tasks per thread will use comparably less memory, but may cause the search to take 1.5 to 2 times as long"/>
+    <param argument="-fixed_modifications" type="select" multiple="true" optional="false" label="Fixed modifications, specified using Unimod (www.unimod.org) terms" help="e.g. 'Carbamidomethyl (C)' or 'Oxidation (M)'">
       <option value="15N-oxobutanoic (N-term C)">15N-oxobutanoic (N-term C)</option>
       <option value="15N-oxobutanoic (Protein N-term S)">15N-oxobutanoic (Protein N-term S)</option>
       <option value="15N-oxobutanoic (Protein N-term T)">15N-oxobutanoic (Protein N-term T)</option>
@@ -142,6 +141,10 @@
       <option value="2-succinyl (C)">2-succinyl (C)</option>
       <option value="2HPG (R)">2HPG (R)</option>
       <option value="3-deoxyglucosone (R)">3-deoxyglucosone (R)</option>
+      <option value="3-hydroxybenzyl-phosphate (K)">3-hydroxybenzyl-phosphate (K)</option>
+      <option value="3-hydroxybenzyl-phosphate (S)">3-hydroxybenzyl-phosphate (S)</option>
+      <option value="3-hydroxybenzyl-phosphate (T)">3-hydroxybenzyl-phosphate (T)</option>
+      <option value="3-hydroxybenzyl-phosphate (Y)">3-hydroxybenzyl-phosphate (Y)</option>
       <option value="3-phosphoglyceryl (K)">3-phosphoglyceryl (K)</option>
       <option value="3sulfo (N-term)">3sulfo (N-term)</option>
       <option value="4-ONE (C)">4-ONE (C)</option>
@@ -231,6 +234,7 @@
       <option value="AMTzHexNAc2 (N)">AMTzHexNAc2 (N)</option>
       <option value="AMTzHexNAc2 (S)">AMTzHexNAc2 (S)</option>
       <option value="AMTzHexNAc2 (T)">AMTzHexNAc2 (T)</option>
+      <option value="Andro-H2O (C)">Andro-H2O (C)</option>
       <option value="Archaeol (C)">Archaeol (C)</option>
       <option value="Arg (N-term)">Arg (N-term)</option>
       <option value="Arg-&gt;Ala (R)">Arg-&gt;Ala (R)</option>
@@ -334,6 +338,7 @@
       <option value="Biotin-phenacyl (H)">Biotin-phenacyl (H)</option>
       <option value="Biotin-phenacyl (S)">Biotin-phenacyl (S)</option>
       <option value="Biotin-tyramide (Y)">Biotin-tyramide (Y)</option>
+      <option value="Biotin:Aha-DADPS (M)">Biotin:Aha-DADPS (M)</option>
       <option value="Biotin:Cayman-10013 (C)">Biotin:Cayman-10013 (C)</option>
       <option value="Biotin:Cayman-10141 (C)">Biotin:Cayman-10141 (C)</option>
       <option value="Biotin:Invitrogen-M1602 (C)">Biotin:Invitrogen-M1602 (C)</option>
@@ -366,7 +371,6 @@
       <option value="BITC (N-term)">BITC (N-term)</option>
       <option value="BMP-piperidinol (C)">BMP-piperidinol (C)</option>
       <option value="BMP-piperidinol (M)">BMP-piperidinol (M)</option>
-      <option value="Bodipy (C)">Bodipy (C)</option>
       <option value="Brij35 (N-term)">Brij35 (N-term)</option>
       <option value="Brij58 (N-term)">Brij58 (N-term)</option>
       <option value="Bromo (F)">Bromo (F)</option>
@@ -798,9 +802,9 @@
       <option value="Dehydrated (T)">Dehydrated (T)</option>
       <option value="Dehydrated (Y)">Dehydrated (Y)</option>
       <option value="Dehydro (C)">Dehydro (C)</option>
+      <option value="Delta:H(-1)N(-1)18O(1) (N)">Delta:H(-1)N(-1)18O(1) (N)</option>
       <option value="Delta:H(-4)O(2) (W)">Delta:H(-4)O(2) (W)</option>
       <option value="Delta:H(-4)O(3) (W)">Delta:H(-4)O(3) (W)</option>
-      <option value="Delta:H(1)N(-1)18O(1) (N)">Delta:H(1)N(-1)18O(1) (N)</option>
       <option value="Delta:H(10)C(8)O(1) (K)">Delta:H(10)C(8)O(1) (K)</option>
       <option value="Delta:H(2)C(2) (H)">Delta:H(2)C(2) (H)</option>
       <option value="Delta:H(2)C(2) (K)">Delta:H(2)C(2) (K)</option>
@@ -810,7 +814,6 @@
       <option value="Delta:H(2)C(3)O(1) (K)">Delta:H(2)C(3)O(1) (K)</option>
       <option value="Delta:H(2)C(3)O(1) (R)">Delta:H(2)C(3)O(1) (R)</option>
       <option value="Delta:H(2)C(5) (K)">Delta:H(2)C(5) (K)</option>
-      <option value="Delta:H(3)C(3)O(2) (K)">Delta:H(3)C(3)O(2) (K)</option>
       <option value="Delta:H(4)C(2) (H)">Delta:H(4)C(2) (H)</option>
       <option value="Delta:H(4)C(2) (K)">Delta:H(4)C(2) (K)</option>
       <option value="Delta:H(4)C(2) (N-term)">Delta:H(4)C(2) (N-term)</option>
@@ -822,6 +825,7 @@
       <option value="Delta:H(4)C(3)O(1) (H)">Delta:H(4)C(3)O(1) (H)</option>
       <option value="Delta:H(4)C(3)O(1) (K)">Delta:H(4)C(3)O(1) (K)</option>
       <option value="Delta:H(4)C(3)O(1) (R)">Delta:H(4)C(3)O(1) (R)</option>
+      <option value="Delta:H(4)C(3)O(2) (K)">Delta:H(4)C(3)O(2) (K)</option>
       <option value="Delta:H(4)C(5)O(1) (R)">Delta:H(4)C(5)O(1) (R)</option>
       <option value="Delta:H(4)C(6) (K)">Delta:H(4)C(6) (K)</option>
       <option value="Delta:H(5)C(2) (P)">Delta:H(5)C(2) (P)</option>
@@ -1394,7 +1398,6 @@
       <option value="Ethanolyl (C)">Ethanolyl (C)</option>
       <option value="Ethanolyl (K)">Ethanolyl (K)</option>
       <option value="Ethanolyl (R)">Ethanolyl (R)</option>
-      <option value="Ethoxyformyl (H)">Ethoxyformyl (H)</option>
       <option value="Ethyl (C-term)">Ethyl (C-term)</option>
       <option value="Ethyl (D)">Ethyl (D)</option>
       <option value="Ethyl (E)">Ethyl (E)</option>
@@ -1488,6 +1491,7 @@
       <option value="Gln-&gt;Xle (Q)">Gln-&gt;Xle (Q)</option>
       <option value="Glu (E)">Glu (E)</option>
       <option value="Glu (Protein C-term)">Glu (Protein C-term)</option>
+      <option value="Glu+O(2) (H)">Glu+O(2) (H)</option>
       <option value="Glu-&gt;Ala (E)">Glu-&gt;Ala (E)</option>
       <option value="Glu-&gt;Arg (E)">Glu-&gt;Arg (E)</option>
       <option value="Glu-&gt;Asn (E)">Glu-&gt;Asn (E)</option>
@@ -1502,7 +1506,6 @@
       <option value="Glu-&gt;Pro (E)">Glu-&gt;Pro (E)</option>
       <option value="Glu-&gt;pyro-Glu (N-term E)">Glu-&gt;pyro-Glu (N-term E)</option>
       <option value="Glu-&gt;pyro-Glu+Methyl (N-term E)">Glu-&gt;pyro-Glu+Methyl (N-term E)</option>
-      <option value="Glu-&gt;pyro-Glu+Methyl:2H(2)13C (N-term E)">Glu-&gt;pyro-Glu+Methyl:2H(2)13C (N-term E)</option>
       <option value="Glu-&gt;pyro-Glu+Methyl:2H(2)13C(1) (N-term E)">Glu-&gt;pyro-Glu+Methyl:2H(2)13C(1) (N-term E)</option>
       <option value="Glu-&gt;Ser (E)">Glu-&gt;Ser (E)</option>
       <option value="Glu-&gt;Thr (E)">Glu-&gt;Thr (E)</option>
@@ -1526,6 +1529,7 @@
       <option value="Gly (K)">Gly (K)</option>
       <option value="Gly (S)">Gly (S)</option>
       <option value="Gly (T)">Gly (T)</option>
+      <option value="Gly+O(2) (H)">Gly+O(2) (H)</option>
       <option value="Gly-&gt;Ala (G)">Gly-&gt;Ala (G)</option>
       <option value="Gly-&gt;Arg (G)">Gly-&gt;Arg (G)</option>
       <option value="Gly-&gt;Asn (G)">Gly-&gt;Asn (G)</option>
@@ -1916,6 +1920,7 @@
       <option value="Hex(6)HexNAc(4)Me(3) (N)">Hex(6)HexNAc(4)Me(3) (N)</option>
       <option value="Hex(6)HexNAc(4)Me(3)Pent(1) (N)">Hex(6)HexNAc(4)Me(3)Pent(1) (N)</option>
       <option value="Hex(6)HexNAc(5) (N)">Hex(6)HexNAc(5) (N)</option>
+      <option value="Hex(6)HexNAc(5)NeuAc(3) (N)">Hex(6)HexNAc(5)NeuAc(3) (N)</option>
       <option value="Hex(6)Phos(1) (S)">Hex(6)Phos(1) (S)</option>
       <option value="Hex(6)Phos(1) (T)">Hex(6)Phos(1) (T)</option>
       <option value="Hex(6)Phos(3) (S)">Hex(6)Phos(3) (S)</option>
@@ -1927,6 +1932,9 @@
       <option value="Hex(7)HexNAc(3) (N)">Hex(7)HexNAc(3) (N)</option>
       <option value="Hex(7)HexNAc(3)Phos(1) (N)">Hex(7)HexNAc(3)Phos(1) (N)</option>
       <option value="Hex(7)HexNAc(4) (N)">Hex(7)HexNAc(4) (N)</option>
+      <option value="Hex(7)HexNAc(6) (N)">Hex(7)HexNAc(6) (N)</option>
+      <option value="Hex(7)HexNAc(6) (S)">Hex(7)HexNAc(6) (S)</option>
+      <option value="Hex(7)HexNAc(6) (T)">Hex(7)HexNAc(6) (T)</option>
       <option value="Hex(7)Phos(3) (S)">Hex(7)Phos(3) (S)</option>
       <option value="Hex(7)Phos(3) (T)">Hex(7)Phos(3) (T)</option>
       <option value="Hex(8)HexNAc(1) (N)">Hex(8)HexNAc(1) (N)</option>
@@ -1982,6 +1990,7 @@
       <option value="HexNAc(4) (T)">HexNAc(4) (T)</option>
       <option value="HexNAc(5) (S)">HexNAc(5) (S)</option>
       <option value="HexNAc(5) (T)">HexNAc(5) (T)</option>
+      <option value="His+O(2) (H)">His+O(2) (H)</option>
       <option value="His-&gt;Ala (H)">His-&gt;Ala (H)</option>
       <option value="His-&gt;Arg (H)">His-&gt;Arg (H)</option>
       <option value="His-&gt;Asn (H)">His-&gt;Asn (H)</option>
@@ -2119,11 +2128,14 @@
       <option value="iTRAQ8plex:13C(6)15N(2) (K)">iTRAQ8plex:13C(6)15N(2) (K)</option>
       <option value="iTRAQ8plex:13C(6)15N(2) (N-term)">iTRAQ8plex:13C(6)15N(2) (N-term)</option>
       <option value="iTRAQ8plex:13C(6)15N(2) (Y)">iTRAQ8plex:13C(6)15N(2) (Y)</option>
+      <option value="Kdo (S)">Kdo (S)</option>
+      <option value="Kdo (T)">Kdo (T)</option>
       <option value="Label:13C(1)2H(3) (M)">Label:13C(1)2H(3) (M)</option>
       <option value="Label:13C(1)2H(3)+Oxidation (M)">Label:13C(1)2H(3)+Oxidation (M)</option>
       <option value="Label:13C(2)15N(2) (K)">Label:13C(2)15N(2) (K)</option>
       <option value="Label:13C(3) (A)">Label:13C(3) (A)</option>
       <option value="Label:13C(3)15N(1) (A)">Label:13C(3)15N(1) (A)</option>
+      <option value="Label:13C(3)15N(1) (S)">Label:13C(3)15N(1) (S)</option>
       <option value="Label:13C(4) (M)">Label:13C(4) (M)</option>
       <option value="Label:13C(4)+Oxidation (M)">Label:13C(4)+Oxidation (M)</option>
       <option value="Label:13C(4)15N(1) (D)">Label:13C(4)15N(1) (D)</option>
@@ -2208,13 +2220,16 @@
       <option value="LG-lactam-K (K)">LG-lactam-K (K)</option>
       <option value="LG-lactam-K (Protein N-term)">LG-lactam-K (Protein N-term)</option>
       <option value="LG-lactam-R (R)">LG-lactam-R (R)</option>
+      <option value="LG-pyrrole (C)">LG-pyrrole (C)</option>
       <option value="LG-pyrrole (K)">LG-pyrrole (K)</option>
       <option value="LG-pyrrole (N-term)">LG-pyrrole (N-term)</option>
       <option value="Lipoyl (K)">Lipoyl (K)</option>
       <option value="LRGG (K)">LRGG (K)</option>
       <option value="LRGG+dimethyl (K)">LRGG+dimethyl (K)</option>
       <option value="LRGG+methyl (K)">LRGG+methyl (K)</option>
+      <option value="LTX+Lophotoxin (Y)">LTX+Lophotoxin (Y)</option>
       <option value="Lys (N-term)">Lys (N-term)</option>
+      <option value="Lys+O(2) (H)">Lys+O(2) (H)</option>
       <option value="Lys-&gt;Ala (K)">Lys-&gt;Ala (K)</option>
       <option value="Lys-&gt;Allysine (K)">Lys-&gt;Allysine (K)</option>
       <option value="Lys-&gt;AminoadipicAcid (K)">Lys-&gt;AminoadipicAcid (K)</option>
@@ -2249,6 +2264,7 @@
       <option value="Malonyl (C)">Malonyl (C)</option>
       <option value="Malonyl (K)">Malonyl (K)</option>
       <option value="Malonyl (S)">Malonyl (S)</option>
+      <option value="MBS+peptide (C)">MBS+peptide (C)</option>
       <option value="MDCC (C)">MDCC (C)</option>
       <option value="MeMePhosphorothioate (S)">MeMePhosphorothioate (S)</option>
       <option value="Menadione (C)">Menadione (C)</option>
@@ -2260,6 +2276,7 @@
       <option value="MesitylOxide (H)">MesitylOxide (H)</option>
       <option value="MesitylOxide (K)">MesitylOxide (K)</option>
       <option value="MesitylOxide (Protein N-term)">MesitylOxide (Protein N-term)</option>
+      <option value="Met+O(2) (H)">Met+O(2) (H)</option>
       <option value="Met-&gt;Aha (M)">Met-&gt;Aha (M)</option>
       <option value="Met-&gt;Ala (M)">Met-&gt;Ala (M)</option>
       <option value="Met-&gt;Arg (M)">Met-&gt;Arg (M)</option>
@@ -2443,7 +2460,6 @@
       <option value="Nmethylmaleimide+water (C)">Nmethylmaleimide+water (C)</option>
       <option value="NO_SMX_SEMD (C)">NO_SMX_SEMD (C)</option>
       <option value="NO_SMX_SIMD (C)">NO_SMX_SIMD (C)</option>
-      <option value="NO_SMX_SMCT (C)">NO_SMX_SMCT (C)</option>
       <option value="NP40 (N-term)">NP40 (N-term)</option>
       <option value="NQIGG (K)">NQIGG (K)</option>
       <option value="O-Dimethylphosphate (S)">O-Dimethylphosphate (S)</option>
@@ -2531,6 +2547,10 @@
       <option value="Phe-&gt;Tyr (F)">Phe-&gt;Tyr (F)</option>
       <option value="Phe-&gt;Val (F)">Phe-&gt;Val (F)</option>
       <option value="Phe-&gt;Xle (F)">Phe-&gt;Xle (F)</option>
+      <option value="phenyl-phosphate (K)">phenyl-phosphate (K)</option>
+      <option value="phenyl-phosphate (S)">phenyl-phosphate (S)</option>
+      <option value="phenyl-phosphate (T)">phenyl-phosphate (T)</option>
+      <option value="phenyl-phosphate (Y)">phenyl-phosphate (Y)</option>
       <option value="Phenylisocyanate (N-term)">Phenylisocyanate (N-term)</option>
       <option value="Phenylisocyanate:2H(5) (N-term)">Phenylisocyanate:2H(5) (N-term)</option>
       <option value="phenylsulfonylethyl (C)">phenylsulfonylethyl (C)</option>
@@ -2545,6 +2565,7 @@
       <option value="Phospho (Y)">Phospho (Y)</option>
       <option value="Phosphoadenosine (H)">Phosphoadenosine (H)</option>
       <option value="Phosphoadenosine (K)">Phosphoadenosine (K)</option>
+      <option value="Phosphoadenosine (S)">Phosphoadenosine (S)</option>
       <option value="Phosphoadenosine (T)">Phosphoadenosine (T)</option>
       <option value="Phosphoadenosine (Y)">Phosphoadenosine (Y)</option>
       <option value="PhosphoCytidine (S)">PhosphoCytidine (S)</option>
@@ -2576,6 +2597,7 @@
       <option value="Phytochromobilin (C)">Phytochromobilin (C)</option>
       <option value="Piperidine (K)">Piperidine (K)</option>
       <option value="Piperidine (N-term)">Piperidine (N-term)</option>
+      <option value="Pro+O(2) (H)">Pro+O(2) (H)</option>
       <option value="Pro-&gt;Ala (P)">Pro-&gt;Ala (P)</option>
       <option value="Pro-&gt;Arg (P)">Pro-&gt;Arg (P)</option>
       <option value="Pro-&gt;Asn (P)">Pro-&gt;Asn (P)</option>
@@ -2653,18 +2675,30 @@
       <option value="QTGG (K)">QTGG (K)</option>
       <option value="Quinone (W)">Quinone (W)</option>
       <option value="Quinone (Y)">Quinone (Y)</option>
+      <option value="RBS-ID_Uridine (A)">RBS-ID_Uridine (A)</option>
+      <option value="RBS-ID_Uridine (C)">RBS-ID_Uridine (C)</option>
+      <option value="RBS-ID_Uridine (D)">RBS-ID_Uridine (D)</option>
+      <option value="RBS-ID_Uridine (E)">RBS-ID_Uridine (E)</option>
+      <option value="RBS-ID_Uridine (F)">RBS-ID_Uridine (F)</option>
+      <option value="RBS-ID_Uridine (G)">RBS-ID_Uridine (G)</option>
+      <option value="RBS-ID_Uridine (H)">RBS-ID_Uridine (H)</option>
+      <option value="RBS-ID_Uridine (I)">RBS-ID_Uridine (I)</option>
+      <option value="RBS-ID_Uridine (K)">RBS-ID_Uridine (K)</option>
+      <option value="RBS-ID_Uridine (L)">RBS-ID_Uridine (L)</option>
+      <option value="RBS-ID_Uridine (M)">RBS-ID_Uridine (M)</option>
+      <option value="RBS-ID_Uridine (N)">RBS-ID_Uridine (N)</option>
+      <option value="RBS-ID_Uridine (P)">RBS-ID_Uridine (P)</option>
+      <option value="RBS-ID_Uridine (Q)">RBS-ID_Uridine (Q)</option>
+      <option value="RBS-ID_Uridine (R)">RBS-ID_Uridine (R)</option>
+      <option value="RBS-ID_Uridine (S)">RBS-ID_Uridine (S)</option>
+      <option value="RBS-ID_Uridine (T)">RBS-ID_Uridine (T)</option>
+      <option value="RBS-ID_Uridine (V)">RBS-ID_Uridine (V)</option>
+      <option value="RBS-ID_Uridine (W)">RBS-ID_Uridine (W)</option>
+      <option value="RBS-ID_Uridine (Y)">RBS-ID_Uridine (Y)</option>
       <option value="Retinylidene (K)">Retinylidene (K)</option>
       <option value="RNPXL (N-term K)">RNPXL (N-term K)</option>
       <option value="RNPXL (N-term R)">RNPXL (N-term R)</option>
       <option value="RNPXlink1 (C)">RNPXlink1 (C)</option>
-      <option value="RNPXlink2 (F)">RNPXlink2 (F)</option>
-      <option value="RNPXlink2 (K)">RNPXlink2 (K)</option>
-      <option value="RNPXlink2 (L)">RNPXlink2 (L)</option>
-      <option value="RNPXlink3 (C)">RNPXlink3 (C)</option>
-      <option value="RNPXlink3 (F)">RNPXlink3 (F)</option>
-      <option value="RNPXlink4 (C)">RNPXlink4 (C)</option>
-      <option value="RNPXlink5 (F)">RNPXlink5 (F)</option>
-      <option value="RNPXlink5 (Y)">RNPXlink5 (Y)</option>
       <option value="s-GlcNAc (S)">s-GlcNAc (S)</option>
       <option value="s-GlcNAc (T)">s-GlcNAc (T)</option>
       <option value="Saligenin (H)">Saligenin (H)</option>
@@ -2692,6 +2726,9 @@
       <option value="shTMT (K)">shTMT (K)</option>
       <option value="shTMT (N-term)">shTMT (N-term)</option>
       <option value="shTMT (Protein N-term)">shTMT (Protein N-term)</option>
+      <option value="shTMTpro (K)">shTMTpro (K)</option>
+      <option value="shTMTpro (N-term)">shTMTpro (N-term)</option>
+      <option value="shTMTpro (Protein N-term)">shTMTpro (Protein N-term)</option>
       <option value="SMA (K)">SMA (K)</option>
       <option value="SMA (N-term)">SMA (N-term)</option>
       <option value="spermidine (Q)">spermidine (Q)</option>
@@ -2867,7 +2904,6 @@
       <option value="Tyr-&gt;Trp (Y)">Tyr-&gt;Trp (Y)</option>
       <option value="Tyr-&gt;Val (Y)">Tyr-&gt;Val (Y)</option>
       <option value="Tyr-&gt;Xle (Y)">Tyr-&gt;Xle (Y)</option>
-      <option value="Ub-amide (C)">Ub-amide (C)</option>
       <option value="Ub-Br2 (C)">Ub-Br2 (C)</option>
       <option value="Ub-fluorescein (C)">Ub-fluorescein (C)</option>
       <option value="Ub-VME (C)">Ub-VME (C)</option>
@@ -3062,7 +3098,7 @@
       <option value="ZQG (K)">ZQG (K)</option>
       <expand macro="list_string_san" name="fixed_modifications"/>
     </param>
-    <param argument="-variable_modifications" multiple="true" type="select" optional="true" label="Variable modifications, specified using Unimod (www.unimod.org) terms" help="e.g. 'Carbamidomethyl (C)' or 'Oxidation (M)'">
+    <param argument="-variable_modifications" type="select" multiple="true" optional="false" label="Variable modifications, specified using Unimod (www.unimod.org) terms" help="e.g. 'Carbamidomethyl (C)' or 'Oxidation (M)'">
       <option value="15N-oxobutanoic (N-term C)">15N-oxobutanoic (N-term C)</option>
       <option value="15N-oxobutanoic (Protein N-term S)">15N-oxobutanoic (Protein N-term S)</option>
       <option value="15N-oxobutanoic (Protein N-term T)">15N-oxobutanoic (Protein N-term T)</option>
@@ -3072,6 +3108,10 @@
       <option value="2-succinyl (C)">2-succinyl (C)</option>
       <option value="2HPG (R)">2HPG (R)</option>
       <option value="3-deoxyglucosone (R)">3-deoxyglucosone (R)</option>
+      <option value="3-hydroxybenzyl-phosphate (K)">3-hydroxybenzyl-phosphate (K)</option>
+      <option value="3-hydroxybenzyl-phosphate (S)">3-hydroxybenzyl-phosphate (S)</option>
+      <option value="3-hydroxybenzyl-phosphate (T)">3-hydroxybenzyl-phosphate (T)</option>
+      <option value="3-hydroxybenzyl-phosphate (Y)">3-hydroxybenzyl-phosphate (Y)</option>
       <option value="3-phosphoglyceryl (K)">3-phosphoglyceryl (K)</option>
       <option value="3sulfo (N-term)">3sulfo (N-term)</option>
       <option value="4-ONE (C)">4-ONE (C)</option>
@@ -3161,6 +3201,7 @@
       <option value="AMTzHexNAc2 (N)">AMTzHexNAc2 (N)</option>
       <option value="AMTzHexNAc2 (S)">AMTzHexNAc2 (S)</option>
       <option value="AMTzHexNAc2 (T)">AMTzHexNAc2 (T)</option>
+      <option value="Andro-H2O (C)">Andro-H2O (C)</option>
       <option value="Archaeol (C)">Archaeol (C)</option>
       <option value="Arg (N-term)">Arg (N-term)</option>
       <option value="Arg-&gt;Ala (R)">Arg-&gt;Ala (R)</option>
@@ -3264,6 +3305,7 @@
       <option value="Biotin-phenacyl (H)">Biotin-phenacyl (H)</option>
       <option value="Biotin-phenacyl (S)">Biotin-phenacyl (S)</option>
       <option value="Biotin-tyramide (Y)">Biotin-tyramide (Y)</option>
+      <option value="Biotin:Aha-DADPS (M)">Biotin:Aha-DADPS (M)</option>
       <option value="Biotin:Cayman-10013 (C)">Biotin:Cayman-10013 (C)</option>
       <option value="Biotin:Cayman-10141 (C)">Biotin:Cayman-10141 (C)</option>
       <option value="Biotin:Invitrogen-M1602 (C)">Biotin:Invitrogen-M1602 (C)</option>
@@ -3296,7 +3338,6 @@
       <option value="BITC (N-term)">BITC (N-term)</option>
       <option value="BMP-piperidinol (C)">BMP-piperidinol (C)</option>
       <option value="BMP-piperidinol (M)">BMP-piperidinol (M)</option>
-      <option value="Bodipy (C)">Bodipy (C)</option>
       <option value="Brij35 (N-term)">Brij35 (N-term)</option>
       <option value="Brij58 (N-term)">Brij58 (N-term)</option>
       <option value="Bromo (F)">Bromo (F)</option>
@@ -3728,9 +3769,9 @@
       <option value="Dehydrated (T)">Dehydrated (T)</option>
       <option value="Dehydrated (Y)">Dehydrated (Y)</option>
       <option value="Dehydro (C)">Dehydro (C)</option>
+      <option value="Delta:H(-1)N(-1)18O(1) (N)">Delta:H(-1)N(-1)18O(1) (N)</option>
       <option value="Delta:H(-4)O(2) (W)">Delta:H(-4)O(2) (W)</option>
       <option value="Delta:H(-4)O(3) (W)">Delta:H(-4)O(3) (W)</option>
-      <option value="Delta:H(1)N(-1)18O(1) (N)">Delta:H(1)N(-1)18O(1) (N)</option>
       <option value="Delta:H(10)C(8)O(1) (K)">Delta:H(10)C(8)O(1) (K)</option>
       <option value="Delta:H(2)C(2) (H)">Delta:H(2)C(2) (H)</option>
       <option value="Delta:H(2)C(2) (K)">Delta:H(2)C(2) (K)</option>
@@ -3740,7 +3781,6 @@
       <option value="Delta:H(2)C(3)O(1) (K)">Delta:H(2)C(3)O(1) (K)</option>
       <option value="Delta:H(2)C(3)O(1) (R)">Delta:H(2)C(3)O(1) (R)</option>
       <option value="Delta:H(2)C(5) (K)">Delta:H(2)C(5) (K)</option>
-      <option value="Delta:H(3)C(3)O(2) (K)">Delta:H(3)C(3)O(2) (K)</option>
       <option value="Delta:H(4)C(2) (H)">Delta:H(4)C(2) (H)</option>
       <option value="Delta:H(4)C(2) (K)">Delta:H(4)C(2) (K)</option>
       <option value="Delta:H(4)C(2) (N-term)">Delta:H(4)C(2) (N-term)</option>
@@ -3752,6 +3792,7 @@
       <option value="Delta:H(4)C(3)O(1) (H)">Delta:H(4)C(3)O(1) (H)</option>
       <option value="Delta:H(4)C(3)O(1) (K)">Delta:H(4)C(3)O(1) (K)</option>
       <option value="Delta:H(4)C(3)O(1) (R)">Delta:H(4)C(3)O(1) (R)</option>
+      <option value="Delta:H(4)C(3)O(2) (K)">Delta:H(4)C(3)O(2) (K)</option>
       <option value="Delta:H(4)C(5)O(1) (R)">Delta:H(4)C(5)O(1) (R)</option>
       <option value="Delta:H(4)C(6) (K)">Delta:H(4)C(6) (K)</option>
       <option value="Delta:H(5)C(2) (P)">Delta:H(5)C(2) (P)</option>
@@ -4324,7 +4365,6 @@
       <option value="Ethanolyl (C)">Ethanolyl (C)</option>
       <option value="Ethanolyl (K)">Ethanolyl (K)</option>
       <option value="Ethanolyl (R)">Ethanolyl (R)</option>
-      <option value="Ethoxyformyl (H)">Ethoxyformyl (H)</option>
       <option value="Ethyl (C-term)">Ethyl (C-term)</option>
       <option value="Ethyl (D)">Ethyl (D)</option>
       <option value="Ethyl (E)">Ethyl (E)</option>
@@ -4418,6 +4458,7 @@
       <option value="Gln-&gt;Xle (Q)">Gln-&gt;Xle (Q)</option>
       <option value="Glu (E)">Glu (E)</option>
       <option value="Glu (Protein C-term)">Glu (Protein C-term)</option>
+      <option value="Glu+O(2) (H)">Glu+O(2) (H)</option>
       <option value="Glu-&gt;Ala (E)">Glu-&gt;Ala (E)</option>
       <option value="Glu-&gt;Arg (E)">Glu-&gt;Arg (E)</option>
       <option value="Glu-&gt;Asn (E)">Glu-&gt;Asn (E)</option>
@@ -4432,7 +4473,6 @@
       <option value="Glu-&gt;Pro (E)">Glu-&gt;Pro (E)</option>
       <option value="Glu-&gt;pyro-Glu (N-term E)">Glu-&gt;pyro-Glu (N-term E)</option>
       <option value="Glu-&gt;pyro-Glu+Methyl (N-term E)">Glu-&gt;pyro-Glu+Methyl (N-term E)</option>
-      <option value="Glu-&gt;pyro-Glu+Methyl:2H(2)13C (N-term E)">Glu-&gt;pyro-Glu+Methyl:2H(2)13C (N-term E)</option>
       <option value="Glu-&gt;pyro-Glu+Methyl:2H(2)13C(1) (N-term E)">Glu-&gt;pyro-Glu+Methyl:2H(2)13C(1) (N-term E)</option>
       <option value="Glu-&gt;Ser (E)">Glu-&gt;Ser (E)</option>
       <option value="Glu-&gt;Thr (E)">Glu-&gt;Thr (E)</option>
@@ -4456,6 +4496,7 @@
       <option value="Gly (K)">Gly (K)</option>
       <option value="Gly (S)">Gly (S)</option>
       <option value="Gly (T)">Gly (T)</option>
+      <option value="Gly+O(2) (H)">Gly+O(2) (H)</option>
       <option value="Gly-&gt;Ala (G)">Gly-&gt;Ala (G)</option>
       <option value="Gly-&gt;Arg (G)">Gly-&gt;Arg (G)</option>
       <option value="Gly-&gt;Asn (G)">Gly-&gt;Asn (G)</option>
@@ -4846,6 +4887,7 @@
       <option value="Hex(6)HexNAc(4)Me(3) (N)">Hex(6)HexNAc(4)Me(3) (N)</option>
       <option value="Hex(6)HexNAc(4)Me(3)Pent(1) (N)">Hex(6)HexNAc(4)Me(3)Pent(1) (N)</option>
       <option value="Hex(6)HexNAc(5) (N)">Hex(6)HexNAc(5) (N)</option>
+      <option value="Hex(6)HexNAc(5)NeuAc(3) (N)">Hex(6)HexNAc(5)NeuAc(3) (N)</option>
       <option value="Hex(6)Phos(1) (S)">Hex(6)Phos(1) (S)</option>
       <option value="Hex(6)Phos(1) (T)">Hex(6)Phos(1) (T)</option>
       <option value="Hex(6)Phos(3) (S)">Hex(6)Phos(3) (S)</option>
@@ -4857,6 +4899,9 @@
       <option value="Hex(7)HexNAc(3) (N)">Hex(7)HexNAc(3) (N)</option>
       <option value="Hex(7)HexNAc(3)Phos(1) (N)">Hex(7)HexNAc(3)Phos(1) (N)</option>
       <option value="Hex(7)HexNAc(4) (N)">Hex(7)HexNAc(4) (N)</option>
+      <option value="Hex(7)HexNAc(6) (N)">Hex(7)HexNAc(6) (N)</option>
+      <option value="Hex(7)HexNAc(6) (S)">Hex(7)HexNAc(6) (S)</option>
+      <option value="Hex(7)HexNAc(6) (T)">Hex(7)HexNAc(6) (T)</option>
       <option value="Hex(7)Phos(3) (S)">Hex(7)Phos(3) (S)</option>
       <option value="Hex(7)Phos(3) (T)">Hex(7)Phos(3) (T)</option>
       <option value="Hex(8)HexNAc(1) (N)">Hex(8)HexNAc(1) (N)</option>
@@ -4912,6 +4957,7 @@
       <option value="HexNAc(4) (T)">HexNAc(4) (T)</option>
       <option value="HexNAc(5) (S)">HexNAc(5) (S)</option>
       <option value="HexNAc(5) (T)">HexNAc(5) (T)</option>
+      <option value="His+O(2) (H)">His+O(2) (H)</option>
       <option value="His-&gt;Ala (H)">His-&gt;Ala (H)</option>
       <option value="His-&gt;Arg (H)">His-&gt;Arg (H)</option>
       <option value="His-&gt;Asn (H)">His-&gt;Asn (H)</option>
@@ -5049,11 +5095,14 @@
       <option value="iTRAQ8plex:13C(6)15N(2) (K)">iTRAQ8plex:13C(6)15N(2) (K)</option>
       <option value="iTRAQ8plex:13C(6)15N(2) (N-term)">iTRAQ8plex:13C(6)15N(2) (N-term)</option>
       <option value="iTRAQ8plex:13C(6)15N(2) (Y)">iTRAQ8plex:13C(6)15N(2) (Y)</option>
+      <option value="Kdo (S)">Kdo (S)</option>
+      <option value="Kdo (T)">Kdo (T)</option>
       <option value="Label:13C(1)2H(3) (M)">Label:13C(1)2H(3) (M)</option>
       <option value="Label:13C(1)2H(3)+Oxidation (M)">Label:13C(1)2H(3)+Oxidation (M)</option>
       <option value="Label:13C(2)15N(2) (K)">Label:13C(2)15N(2) (K)</option>
       <option value="Label:13C(3) (A)">Label:13C(3) (A)</option>
       <option value="Label:13C(3)15N(1) (A)">Label:13C(3)15N(1) (A)</option>
+      <option value="Label:13C(3)15N(1) (S)">Label:13C(3)15N(1) (S)</option>
       <option value="Label:13C(4) (M)">Label:13C(4) (M)</option>
       <option value="Label:13C(4)+Oxidation (M)">Label:13C(4)+Oxidation (M)</option>
       <option value="Label:13C(4)15N(1) (D)">Label:13C(4)15N(1) (D)</option>
@@ -5138,13 +5187,16 @@
       <option value="LG-lactam-K (K)">LG-lactam-K (K)</option>
       <option value="LG-lactam-K (Protein N-term)">LG-lactam-K (Protein N-term)</option>
       <option value="LG-lactam-R (R)">LG-lactam-R (R)</option>
+      <option value="LG-pyrrole (C)">LG-pyrrole (C)</option>
       <option value="LG-pyrrole (K)">LG-pyrrole (K)</option>
       <option value="LG-pyrrole (N-term)">LG-pyrrole (N-term)</option>
       <option value="Lipoyl (K)">Lipoyl (K)</option>
       <option value="LRGG (K)">LRGG (K)</option>
       <option value="LRGG+dimethyl (K)">LRGG+dimethyl (K)</option>
       <option value="LRGG+methyl (K)">LRGG+methyl (K)</option>
+      <option value="LTX+Lophotoxin (Y)">LTX+Lophotoxin (Y)</option>
       <option value="Lys (N-term)">Lys (N-term)</option>
+      <option value="Lys+O(2) (H)">Lys+O(2) (H)</option>
       <option value="Lys-&gt;Ala (K)">Lys-&gt;Ala (K)</option>
       <option value="Lys-&gt;Allysine (K)">Lys-&gt;Allysine (K)</option>
       <option value="Lys-&gt;AminoadipicAcid (K)">Lys-&gt;AminoadipicAcid (K)</option>
@@ -5179,6 +5231,7 @@
       <option value="Malonyl (C)">Malonyl (C)</option>
       <option value="Malonyl (K)">Malonyl (K)</option>
       <option value="Malonyl (S)">Malonyl (S)</option>
+      <option value="MBS+peptide (C)">MBS+peptide (C)</option>
       <option value="MDCC (C)">MDCC (C)</option>
       <option value="MeMePhosphorothioate (S)">MeMePhosphorothioate (S)</option>
       <option value="Menadione (C)">Menadione (C)</option>
@@ -5190,6 +5243,7 @@
       <option value="MesitylOxide (H)">MesitylOxide (H)</option>
       <option value="MesitylOxide (K)">MesitylOxide (K)</option>
       <option value="MesitylOxide (Protein N-term)">MesitylOxide (Protein N-term)</option>
+      <option value="Met+O(2) (H)">Met+O(2) (H)</option>
       <option value="Met-&gt;Aha (M)">Met-&gt;Aha (M)</option>
       <option value="Met-&gt;Ala (M)">Met-&gt;Ala (M)</option>
       <option value="Met-&gt;Arg (M)">Met-&gt;Arg (M)</option>
@@ -5373,7 +5427,6 @@
       <option value="Nmethylmaleimide+water (C)">Nmethylmaleimide+water (C)</option>
       <option value="NO_SMX_SEMD (C)">NO_SMX_SEMD (C)</option>
       <option value="NO_SMX_SIMD (C)">NO_SMX_SIMD (C)</option>
-      <option value="NO_SMX_SMCT (C)">NO_SMX_SMCT (C)</option>
       <option value="NP40 (N-term)">NP40 (N-term)</option>
       <option value="NQIGG (K)">NQIGG (K)</option>
       <option value="O-Dimethylphosphate (S)">O-Dimethylphosphate (S)</option>
@@ -5461,6 +5514,10 @@
       <option value="Phe-&gt;Tyr (F)">Phe-&gt;Tyr (F)</option>
       <option value="Phe-&gt;Val (F)">Phe-&gt;Val (F)</option>
       <option value="Phe-&gt;Xle (F)">Phe-&gt;Xle (F)</option>
+      <option value="phenyl-phosphate (K)">phenyl-phosphate (K)</option>
+      <option value="phenyl-phosphate (S)">phenyl-phosphate (S)</option>
+      <option value="phenyl-phosphate (T)">phenyl-phosphate (T)</option>
+      <option value="phenyl-phosphate (Y)">phenyl-phosphate (Y)</option>
       <option value="Phenylisocyanate (N-term)">Phenylisocyanate (N-term)</option>
       <option value="Phenylisocyanate:2H(5) (N-term)">Phenylisocyanate:2H(5) (N-term)</option>
       <option value="phenylsulfonylethyl (C)">phenylsulfonylethyl (C)</option>
@@ -5475,6 +5532,7 @@
       <option value="Phospho (Y)">Phospho (Y)</option>
       <option value="Phosphoadenosine (H)">Phosphoadenosine (H)</option>
       <option value="Phosphoadenosine (K)">Phosphoadenosine (K)</option>
+      <option value="Phosphoadenosine (S)">Phosphoadenosine (S)</option>
       <option value="Phosphoadenosine (T)">Phosphoadenosine (T)</option>
       <option value="Phosphoadenosine (Y)">Phosphoadenosine (Y)</option>
       <option value="PhosphoCytidine (S)">PhosphoCytidine (S)</option>
@@ -5506,6 +5564,7 @@
       <option value="Phytochromobilin (C)">Phytochromobilin (C)</option>
       <option value="Piperidine (K)">Piperidine (K)</option>
       <option value="Piperidine (N-term)">Piperidine (N-term)</option>
+      <option value="Pro+O(2) (H)">Pro+O(2) (H)</option>
       <option value="Pro-&gt;Ala (P)">Pro-&gt;Ala (P)</option>
       <option value="Pro-&gt;Arg (P)">Pro-&gt;Arg (P)</option>
       <option value="Pro-&gt;Asn (P)">Pro-&gt;Asn (P)</option>
@@ -5583,18 +5642,30 @@
       <option value="QTGG (K)">QTGG (K)</option>
       <option value="Quinone (W)">Quinone (W)</option>
       <option value="Quinone (Y)">Quinone (Y)</option>
+      <option value="RBS-ID_Uridine (A)">RBS-ID_Uridine (A)</option>
+      <option value="RBS-ID_Uridine (C)">RBS-ID_Uridine (C)</option>
+      <option value="RBS-ID_Uridine (D)">RBS-ID_Uridine (D)</option>
+      <option value="RBS-ID_Uridine (E)">RBS-ID_Uridine (E)</option>
+      <option value="RBS-ID_Uridine (F)">RBS-ID_Uridine (F)</option>
+      <option value="RBS-ID_Uridine (G)">RBS-ID_Uridine (G)</option>
+      <option value="RBS-ID_Uridine (H)">RBS-ID_Uridine (H)</option>
+      <option value="RBS-ID_Uridine (I)">RBS-ID_Uridine (I)</option>
+      <option value="RBS-ID_Uridine (K)">RBS-ID_Uridine (K)</option>
+      <option value="RBS-ID_Uridine (L)">RBS-ID_Uridine (L)</option>
+      <option value="RBS-ID_Uridine (M)">RBS-ID_Uridine (M)</option>
+      <option value="RBS-ID_Uridine (N)">RBS-ID_Uridine (N)</option>
+      <option value="RBS-ID_Uridine (P)">RBS-ID_Uridine (P)</option>
+      <option value="RBS-ID_Uridine (Q)">RBS-ID_Uridine (Q)</option>
+      <option value="RBS-ID_Uridine (R)">RBS-ID_Uridine (R)</option>
+      <option value="RBS-ID_Uridine (S)">RBS-ID_Uridine (S)</option>
+      <option value="RBS-ID_Uridine (T)">RBS-ID_Uridine (T)</option>
+      <option value="RBS-ID_Uridine (V)">RBS-ID_Uridine (V)</option>
+      <option value="RBS-ID_Uridine (W)">RBS-ID_Uridine (W)</option>
+      <option value="RBS-ID_Uridine (Y)">RBS-ID_Uridine (Y)</option>
       <option value="Retinylidene (K)">Retinylidene (K)</option>
       <option value="RNPXL (N-term K)">RNPXL (N-term K)</option>
       <option value="RNPXL (N-term R)">RNPXL (N-term R)</option>
       <option value="RNPXlink1 (C)">RNPXlink1 (C)</option>
-      <option value="RNPXlink2 (F)">RNPXlink2 (F)</option>
-      <option value="RNPXlink2 (K)">RNPXlink2 (K)</option>
-      <option value="RNPXlink2 (L)">RNPXlink2 (L)</option>
-      <option value="RNPXlink3 (C)">RNPXlink3 (C)</option>
-      <option value="RNPXlink3 (F)">RNPXlink3 (F)</option>
-      <option value="RNPXlink4 (C)">RNPXlink4 (C)</option>
-      <option value="RNPXlink5 (F)">RNPXlink5 (F)</option>
-      <option value="RNPXlink5 (Y)">RNPXlink5 (Y)</option>
       <option value="s-GlcNAc (S)">s-GlcNAc (S)</option>
       <option value="s-GlcNAc (T)">s-GlcNAc (T)</option>
       <option value="Saligenin (H)">Saligenin (H)</option>
@@ -5622,6 +5693,9 @@
       <option value="shTMT (K)">shTMT (K)</option>
       <option value="shTMT (N-term)">shTMT (N-term)</option>
       <option value="shTMT (Protein N-term)">shTMT (Protein N-term)</option>
+      <option value="shTMTpro (K)">shTMTpro (K)</option>
+      <option value="shTMTpro (N-term)">shTMTpro (N-term)</option>
+      <option value="shTMTpro (Protein N-term)">shTMTpro (Protein N-term)</option>
       <option value="SMA (K)">SMA (K)</option>
       <option value="SMA (N-term)">SMA (N-term)</option>
       <option value="spermidine (Q)">spermidine (Q)</option>
@@ -5797,7 +5871,6 @@
       <option value="Tyr-&gt;Trp (Y)">Tyr-&gt;Trp (Y)</option>
       <option value="Tyr-&gt;Val (Y)">Tyr-&gt;Val (Y)</option>
       <option value="Tyr-&gt;Xle (Y)">Tyr-&gt;Xle (Y)</option>
-      <option value="Ub-amide (C)">Ub-amide (C)</option>
       <option value="Ub-Br2 (C)">Ub-Br2 (C)</option>
       <option value="Ub-fluorescein (C)">Ub-fluorescein (C)</option>
       <option value="Ub-VME (C)">Ub-VME (C)</option>
@@ -5998,12 +6071,12 @@
       <param name="decoy_string" argument="-PeptideIndexing:decoy_string" type="text" optional="true" value="" label="String that was appended (or prefixed - see 'decoy_string_position' flag below) to the accessions in the protein database to indicate decoy proteins" help="If empty (default), it's determined automatically (checking for common terms, both as prefix and suffix)">
         <expand macro="list_string_san" name="decoy_string"/>
       </param>
-      <param name="decoy_string_position" argument="-PeptideIndexing:decoy_string_position" type="select" optional="true" label="Is the 'decoy_string' prepended (prefix) or appended (suffix) to the protein accession" help="(ignored if decoy_string is empty)">
+      <param name="decoy_string_position" argument="-PeptideIndexing:decoy_string_position" type="select" label="Is the 'decoy_string' prepended (prefix) or appended (suffix) to the protein accession" help="(ignored if decoy_string is empty)">
         <option value="prefix" selected="true">prefix</option>
         <option value="suffix">suffix</option>
         <expand macro="list_string_san" name="decoy_string_position"/>
       </param>
-      <param name="missing_decoy_action" argument="-PeptideIndexing:missing_decoy_action" type="select" optional="true" label="Action to take if NO peptide was assigned to a decoy protein (which indicates wrong database or decoy string): 'error' (exit with error, no output), 'warn' (exit with success, warning message), 'silent' (no action is taken, not even a warning)" help="">
+      <param name="missing_decoy_action" argument="-PeptideIndexing:missing_decoy_action" type="select" label="Action to take if NO peptide was assigned to a decoy protein (which indicates wrong database or decoy string): 'error' (exit with error, no output), 'warn' (exit with success, warning message), 'silent' (no action is taken, not even a warning)" help="">
         <option value="error">error</option>
         <option value="warn" selected="true">warn</option>
         <option value="silent">silent</option>
@@ -6012,54 +6085,55 @@
       <param name="write_protein_sequence" argument="-PeptideIndexing:write_protein_sequence" type="boolean" truevalue="true" falsevalue="false" checked="false" label="If set, the protein sequences are stored as well" help=""/>
       <param name="write_protein_description" argument="-PeptideIndexing:write_protein_description" type="boolean" truevalue="true" falsevalue="false" checked="false" label="If set, the protein description is stored as well" help=""/>
       <param name="keep_unreferenced_proteins" argument="-PeptideIndexing:keep_unreferenced_proteins" type="boolean" truevalue="true" falsevalue="false" checked="false" label="If set, protein hits which are not referenced by any peptide are kept" help=""/>
-      <param name="unmatched_action" argument="-PeptideIndexing:unmatched_action" type="select" optional="true" label="If peptide sequences cannot be matched to any protein: 1) raise an error; 2) warn (unmatched PepHits will miss target/decoy annotation with downstream problems); 3) remove the hit" help="">
+      <param name="unmatched_action" argument="-PeptideIndexing:unmatched_action" type="select" label="If peptide sequences cannot be matched to any protein: 1) raise an error; 2) warn (unmatched PepHits will miss target/decoy annotation with downstream problems); 3) remove the hit" help="">
         <option value="error" selected="true">error</option>
         <option value="warn">warn</option>
         <option value="remove">remove</option>
         <expand macro="list_string_san" name="unmatched_action"/>
       </param>
-      <param name="aaa_max" argument="-PeptideIndexing:aaa_max" type="integer" optional="true" min="0" max="10" value="3" label="Maximal number of ambiguous amino acids (AAAs) allowed when matching to a protein database with AAAs" help="AAAs are 'B', 'J', 'Z' and 'X'"/>
-      <param name="mismatches_max" argument="-PeptideIndexing:mismatches_max" type="integer" optional="true" min="0" max="10" value="0" label="Maximal number of mismatched (mm) amino acids allowed when matching to a protein database" help="The required runtime is exponential in the number of mm's; apply with care. MM's are allowed in addition to AAA's"/>
+      <param name="aaa_max" argument="-PeptideIndexing:aaa_max" type="integer" min="0" max="10" value="3" label="Maximal number of ambiguous amino acids (AAAs) allowed when matching to a protein database with AAAs" help="AAAs are 'B', 'J', 'Z' and 'X'"/>
+      <param name="mismatches_max" argument="-PeptideIndexing:mismatches_max" type="integer" min="0" max="10" value="0" label="Maximal number of mismatched (mm) amino acids allowed when matching to a protein database" help="The required runtime is exponential in the number of mm's; apply with care. MM's are allowed in addition to AAA's"/>
       <param name="IL_equivalent" argument="-PeptideIndexing:IL_equivalent" type="boolean" truevalue="true" falsevalue="false" checked="false" label="Treat the isobaric amino acids isoleucine ('I') and leucine ('L') as equivalent (indistinguishable)" help="Also occurrences of 'J' will be treated as 'I' thus avoiding ambiguous matching"/>
+      <param name="allow_nterm_protein_cleavage" argument="-PeptideIndexing:allow_nterm_protein_cleavage" type="boolean" truevalue="true" falsevalue="false" checked="true" label="Allow the protein N-terminus amino acid to clip" help=""/>
       <section name="enzyme" title="" help="" expanded="false">
-        <param name="name" argument="-PeptideIndexing:enzyme:name" type="select" optional="true" label="Enzyme which determines valid cleavage sites -" help="e.g. trypsin cleaves after lysine (K) or arginine (R), but not before proline (P). Default: deduce from input">
+        <param name="name" argument="-PeptideIndexing:enzyme:name" type="select" label="Enzyme which determines valid cleavage sites -" help="e.g. trypsin cleaves after lysine (K) or arginine (R), but not before proline (P). Default: deduce from input">
           <option value="auto" selected="true">auto</option>
           <option value="Trypsin">Trypsin</option>
-          <option value="CNBr">CNBr</option>
           <option value="Formic_acid">Formic_acid</option>
-          <option value="PepsinA">PepsinA</option>
-          <option value="TrypChymo">TrypChymo</option>
-          <option value="Trypsin/P">Trypsin/P</option>
-          <option value="V8-DE">V8-DE</option>
-          <option value="V8-E">V8-E</option>
-          <option value="leukocyte elastase">leukocyte elastase</option>
-          <option value="proline endopeptidase">proline endopeptidase</option>
-          <option value="glutamyl endopeptidase">glutamyl endopeptidase</option>
+          <option value="Lys-C">Lys-C</option>
+          <option value="Lys-N">Lys-N</option>
+          <option value="Glu-C+P">Glu-C+P</option>
+          <option value="PepsinA + P">PepsinA + P</option>
           <option value="cyanogen-bromide">cyanogen-bromide</option>
           <option value="Clostripain/P">Clostripain/P</option>
           <option value="elastase-trypsin-chymotrypsin">elastase-trypsin-chymotrypsin</option>
           <option value="no cleavage">no cleavage</option>
           <option value="unspecific cleavage">unspecific cleavage</option>
+          <option value="Lys-C/P">Lys-C/P</option>
+          <option value="PepsinA">PepsinA</option>
+          <option value="TrypChymo">TrypChymo</option>
+          <option value="Trypsin/P">Trypsin/P</option>
+          <option value="Chymotrypsin">Chymotrypsin</option>
+          <option value="Chymotrypsin/P">Chymotrypsin/P</option>
+          <option value="CNBr">CNBr</option>
+          <option value="Arg-C">Arg-C</option>
+          <option value="Arg-C/P">Arg-C/P</option>
+          <option value="Asp-N">Asp-N</option>
+          <option value="Asp-N/B">Asp-N/B</option>
+          <option value="Asp-N_ambic">Asp-N_ambic</option>
+          <option value="glutamyl endopeptidase">glutamyl endopeptidase</option>
           <option value="Alpha-lytic protease">Alpha-lytic protease</option>
           <option value="2-iodobenzoate">2-iodobenzoate</option>
           <option value="iodosobenzoate">iodosobenzoate</option>
           <option value="staphylococcal protease/D">staphylococcal protease/D</option>
           <option value="proline-endopeptidase/HKR">proline-endopeptidase/HKR</option>
-          <option value="Glu-C+P">Glu-C+P</option>
-          <option value="PepsinA + P">PepsinA + P</option>
-          <option value="Lys-C">Lys-C</option>
-          <option value="Lys-N">Lys-N</option>
-          <option value="Lys-C/P">Lys-C/P</option>
-          <option value="Arg-C/P">Arg-C/P</option>
-          <option value="Arg-C">Arg-C</option>
-          <option value="Asp-N">Asp-N</option>
-          <option value="Asp-N/B">Asp-N/B</option>
-          <option value="Asp-N_ambic">Asp-N_ambic</option>
-          <option value="Chymotrypsin">Chymotrypsin</option>
-          <option value="Chymotrypsin/P">Chymotrypsin/P</option>
+          <option value="V8-DE">V8-DE</option>
+          <option value="V8-E">V8-E</option>
+          <option value="leukocyte elastase">leukocyte elastase</option>
+          <option value="proline endopeptidase">proline endopeptidase</option>
           <expand macro="list_string_san" name="name"/>
         </param>
-        <param name="specificity" argument="-PeptideIndexing:enzyme:specificity" type="select" optional="true" label="Specificity of the enzyme" help="Default: deduce from input..   'full': both internal cleavage sites must match..   'semi': one of two internal cleavage sites must match..   'none': allow all peptide hits no matter their context (enzyme is irrelevant)">
+        <param name="specificity" argument="-PeptideIndexing:enzyme:specificity" type="select" label="Specificity of the enzyme" help="Default: deduce from input..   'full': both internal cleavage sites must match..   'semi': one of two internal cleavage sites must match..   'none': allow all peptide hits no matter their context (enzyme is irrelevant)">
           <option value="auto" selected="true">auto</option>
           <option value="full">full</option>
           <option value="semi">semi</option>
@@ -6069,10 +6143,9 @@
       </section>
     </section>
     <expand macro="adv_opts_macro">
-      <param argument="-add_decoys" type="boolean" truevalue="true" falsevalue="false" checked="false" label="Create decoy proteins (reversed sequences) and append them to the database for the search (MS-GF+ parameter '-tda')" help="This allows the calculation of FDRs, but should only be used if the database does not already contain decoys"/>
       <param argument="-legacy_conversion" type="boolean" truevalue="true" falsevalue="false" checked="false" label="Use the indirect conversion of MS-GF+ results to idXML via export to TSV" help="Try this only if the default conversion takes too long or uses too much memory"/>
       <param argument="-force" type="boolean" truevalue="true" falsevalue="false" checked="false" label="Overrides tool-specific checks" help=""/>
-      <param argument="-test" type="hidden" optional="true" value="False" label="Enables the test mode (needed for internal use only)" help="">
+      <param argument="-test" type="hidden" value="False" label="Enables the test mode (needed for internal use only)" help="" optional="true">
         <expand macro="list_string_san" name="test"/>
       </param>
     </expand>
@@ -6096,17 +6169,17 @@
       <filter>OPTIONAL_OUTPUTS is not None and "ctd_out_FLAG" in OPTIONAL_OUTPUTS</filter>
     </data>
   </outputs>
-  <tests><!-- TOPP_MSGFPlusAdapter_1 -->
+  <tests>
+    <!-- TOPP_MSGFPlusAdapter_1 -->
     <test expect_num_outputs="3">
       <section name="adv_opts">
-        <param name="add_decoys" value="false"/>
         <param name="legacy_conversion" value="false"/>
         <param name="force" value="false"/>
         <param name="test" value="true"/>
       </section>
       <param name="in" value="spectra.mzML"/>
-      <output name="out" file="MSGFPlusAdapter_1_out.idXML" compare="sim_size" delta_frac="0.7" ftype="idxml"/>
-      <output name="mzid_out" file="MSGFPlusAdapter_1_out2.tmp.mzid" compare="sim_size" delta_frac="0.7" ftype="mzid"/>
+      <output name="out" value="MSGFPlusAdapter_1_out.idXML" compare="sim_size" delta_frac="0.7" ftype="idxml"/>
+      <output name="mzid_out" value="MSGFPlusAdapter_1_out.mzid" compare="sim_size" delta_frac="0.7" ftype="mzid"/>
       <param name="database" value="proteins.fasta"/>
       <param name="precursor_mass_tolerance" value="10.0"/>
       <param name="precursor_error_units" value="ppm"/>
@@ -6125,7 +6198,6 @@
       <param name="max_mods" value="2"/>
       <param name="max_missed_cleavages" value="-1"/>
       <param name="tasks" value="0"/>
-      <param name="fixed_modifications"/>
       <param name="variable_modifications" value="Oxidation (M)"/>
       <param name="reindex" value="true"/>
       <section name="PeptideIndexing">
@@ -6139,6 +6211,7 @@
         <param name="aaa_max" value="3"/>
         <param name="mismatches_max" value="0"/>
         <param name="IL_equivalent" value="false"/>
+        <param name="allow_nterm_protein_cleavage" value="true"/>
         <section name="enzyme">
           <param name="name" value="auto"/>
           <param name="specificity" value="auto"/>
@@ -6150,11 +6223,14 @@
           <is_valid_xml/>
         </assert_contents>
       </output>
+      <assert_stdout>
+        <has_text_matching expression="@EXECUTABLE@ took .* \(wall\), .* \(CPU\), .* \(system\), .* \(user\)(; Peak Memory Usage: 32 MB)?."/>
+      </assert_stdout>
     </test>
   </tests>
   <help><![CDATA[MS/MS database search using MS-GF+.
 
 
-For more information, visit http://www.openms.de/doxygen/release/2.8.0/html/TOPP_MSGFPlusAdapter.html]]></help>
+For more information, visit https://openms.de/doxygen/release/3.1.0/html/TOPP_MSGFPlusAdapter.html]]></help>
   <expand macro="references"/>
 </tool>