diff XTandemAdapter.xml @ 15:567de7cb1766 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:35:51 +0000
parents 5c2a97a234d6
children
line wrap: on
line diff
--- a/XTandemAdapter.xml	Thu Dec 01 19:15:43 2022 +0000
+++ b/XTandemAdapter.xml	Fri Jun 14 21:35:51 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="XTandemAdapter" name="XTandemAdapter" version="@TOOL_VERSION@+galaxy@VERSION_SUFFIX@" profile="21.05">
-  <description>Annotates MS/MS spectra using X! Tandem.</description>
+  <description>Annotates MS/MS spectra using X! Tandem</description>
   <macros>
     <token name="@EXECUTABLE@">XTandemAdapter</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 xml_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 $default_config_file:
   mkdir default_config_file &&
-  ln -s '$default_config_file' 'default_config_file/${re.sub("[^\w\-_]", "_", $default_config_file.element_identifier)}.$gxy2omsext($default_config_file.ext)' &&
+  cp '$default_config_file' 'default_config_file/${re.sub("[^\w\-_]", "_", $default_config_file.element_identifier)}.$gxy2omsext($default_config_file.ext)' &&
 #end if
 
 ## Main program call
@@ -70,25 +69,25 @@
     <configfile name="hardcoded_json"><![CDATA[{"xtandem_executable": "xtandem", "log": "log.txt", "threads": "\${GALAXY_SLOTS:-1}", "no_progress": true}]]></configfile>
   </configfiles>
   <inputs>
-    <param argument="-in" type="data" format="mzml" optional="false" label="Input file containing MS2 spectra" help=" select mzml data sets(s)"/>
-    <param argument="-database" type="data" format="fasta" optional="false" label="FASTA file or pro file" help="Non-existing relative file-names are looked up via'OpenMS.ini:id_db_dir' select fasta data sets(s)"/>
+    <param argument="-in" type="data" format="mzml" label="Input file containing MS2 spectra" help=" select mzml data sets(s)"/>
+    <param argument="-database" type="data" format="fasta" label="FASTA file or pro file" help="Non-existing relative file-names are looked up via'OpenMS.ini:id_db_dir' select fasta data sets(s)"/>
     <param argument="-default_config_file" type="data" format="xml" optional="true" label="Default X" help="Tandem configuration file. All parameters of this adapter take precedence over the file - use it for parameters not available here. A template file can be found at 'OpenMS/share/CHEMISTRY/XTandem_default_config.xml' select xml data sets(s)"/>
     <param argument="-ignore_adapter_param" type="boolean" truevalue="true" falsevalue="false" checked="false" label="Set this to use the configuration given in 'default_config_file' exclusively, ignoring other parameters (apart from 'in', 'out', 'database', 'xtandem_executable') set via this adapte" help=""/>
-    <param argument="-precursor_mass_tolerance" type="float" optional="true" value="10.0" label="Precursor mass tolerance" help=""/>
-    <param argument="-fragment_mass_tolerance" type="float" optional="true" value="0.3" label="Fragment mass erro" help=""/>
-    <param argument="-precursor_error_units" type="select" optional="true" label="Parent monoisotopic mass error units" help="">
+    <param argument="-precursor_mass_tolerance" type="float" value="10.0" label="Precursor mass tolerance" help=""/>
+    <param argument="-fragment_mass_tolerance" type="float" value="0.3" label="Fragment mass erro" help=""/>
+    <param argument="-precursor_error_units" type="select" label="Parent monoisotopic mass error units" help="">
       <option value="ppm" selected="true">ppm</option>
       <option value="Da">Da</option>
       <expand macro="list_string_san" name="precursor_error_units"/>
     </param>
-    <param argument="-fragment_error_units" type="select" optional="true" label="Fragment monoisotopic mass error units" help="">
+    <param argument="-fragment_error_units" type="select" label="Fragment monoisotopic mass error units" help="">
       <option value="ppm">ppm</option>
       <option value="Da" selected="true">Da</option>
       <expand macro="list_string_san" name="fragment_error_units"/>
     </param>
-    <param argument="-max_precursor_charge" type="integer" optional="true" min="0" value="4" label="Maximum precursor charge ('0' to use X" help="Tandem default)"/>
+    <param argument="-max_precursor_charge" type="integer" min="0" value="4" label="Maximum precursor charge ('0' to use X" help="Tandem default)"/>
     <param argument="-no_isotope_error" type="boolean" truevalue="true" falsevalue="false" checked="false" label="By default, misassignment to the first and second isotopic 13C peak are also considered" help="Set this flag to disable"/>
-    <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="-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>
@@ -98,6 +97,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>
@@ -187,6 +190,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>
@@ -290,6 +294,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>
@@ -322,7 +327,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>
@@ -754,9 +758,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>
@@ -766,7 +770,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>
@@ -778,6 +781,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>
@@ -1350,7 +1354,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>
@@ -1444,6 +1447,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>
@@ -1458,7 +1462,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>
@@ -1482,6 +1485,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>
@@ -1872,6 +1876,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>
@@ -1883,6 +1888,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>
@@ -1938,6 +1946,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>
@@ -2075,11 +2084,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>
@@ -2164,13 +2176,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>
@@ -2205,6 +2220,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>
@@ -2216,6 +2232,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>
@@ -2399,7 +2416,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>
@@ -2487,6 +2503,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>
@@ -2501,6 +2521,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>
@@ -2532,6 +2553,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>
@@ -2609,18 +2631,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>
@@ -2648,6 +2682,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>
@@ -2823,7 +2860,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>
@@ -3018,7 +3054,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>
@@ -3028,6 +3064,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>
@@ -3117,6 +3157,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>
@@ -3220,6 +3261,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>
@@ -3252,7 +3294,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>
@@ -3684,9 +3725,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>
@@ -3696,7 +3737,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>
@@ -3708,6 +3748,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>
@@ -4280,7 +4321,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>
@@ -4374,6 +4414,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>
@@ -4388,7 +4429,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>
@@ -4412,6 +4452,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>
@@ -4802,6 +4843,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>
@@ -4813,6 +4855,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>
@@ -4868,6 +4913,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>
@@ -5005,11 +5051,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>
@@ -5094,13 +5143,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>
@@ -5135,6 +5187,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>
@@ -5146,6 +5199,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>
@@ -5329,7 +5383,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>
@@ -5417,6 +5470,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>
@@ -5431,6 +5488,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>
@@ -5462,6 +5520,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>
@@ -5539,18 +5598,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>
@@ -5578,6 +5649,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>
@@ -5753,7 +5827,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>
@@ -5948,53 +6021,54 @@
       <option value="ZQG (K)">ZQG (K)</option>
       <expand macro="list_string_san" name="variable_modifications"/>
     </param>
-    <param argument="-minimum_fragment_mz" type="float" optional="true" value="150.0" label="Minimum fragment m/z" help=""/>
-    <param argument="-enzyme" type="select" optional="true" label="The enzyme used for peptide digestion" help="">
-      <option value="Chymotrypsin/P">Chymotrypsin/P</option>
-      <option value="CNBr">CNBr</option>
-      <option value="Formic_acid">Formic_acid</option>
-      <option value="Trypsin" selected="true">Trypsin</option>
-      <option value="unspecific cleavage">unspecific cleavage</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="PepsinA">PepsinA</option>
+    <param argument="-minimum_fragment_mz" type="float" value="150.0" label="Minimum fragment m/z" help=""/>
+    <param argument="-enzyme" type="select" label="The enzyme used for peptide digestion" help="">
       <option value="TrypChymo">TrypChymo</option>
       <option value="Trypsin/P">Trypsin/P</option>
       <option value="V8-DE">V8-DE</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="Arg-C/P">Arg-C/P</option>
-      <option value="Arg-C">Arg-C</option>
       <option value="V8-E">V8-E</option>
+      <option value="Trypsin" selected="true">Trypsin</option>
       <option value="leukocyte elastase">leukocyte elastase</option>
       <option value="glutamyl endopeptidase">glutamyl endopeptidase</option>
+      <option value="Arg-C">Arg-C</option>
+      <option value="Arg-C/P">Arg-C/P</option>
+      <option value="no cleavage">no cleavage</option>
+      <option value="unspecific cleavage">unspecific cleavage</option>
       <option value="Alpha-lytic protease">Alpha-lytic protease</option>
       <option value="2-iodobenzoate">2-iodobenzoate</option>
+      <option value="Lys-C">Lys-C</option>
+      <option value="Lys-N">Lys-N</option>
+      <option value="Chymotrypsin">Chymotrypsin</option>
+      <option value="Chymotrypsin/P">Chymotrypsin/P</option>
+      <option value="CNBr">CNBr</option>
+      <option value="Formic_acid">Formic_acid</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="Lys-C/P">Lys-C/P</option>
+      <option value="PepsinA">PepsinA</option>
       <expand macro="list_string_san" name="enzyme"/>
     </param>
-    <param argument="-missed_cleavages" type="integer" optional="true" value="1" label="Number of possible cleavage sites missed by the enzyme" help=""/>
+    <param argument="-missed_cleavages" type="integer" value="1" label="Number of possible cleavage sites missed by the enzyme" help=""/>
     <param argument="-semi_cleavage" type="boolean" truevalue="true" falsevalue="false" checked="false" label="Require only peptide end to have a valid cleavage site, not both" help=""/>
-    <param argument="-output_results" type="select" optional="true" label="Which hits should be reported" help="All, valid ones (passing the E-Value threshold), or stochastic (failing the threshold)">
+    <param argument="-output_results" type="select" label="Which hits should be reported" help="All, valid ones (passing the E-Value threshold), or stochastic (failing the threshold)">
       <option value="all" selected="true">all</option>
       <option value="valid">valid</option>
       <option value="stochastic">stochastic</option>
       <expand macro="list_string_san" name="output_results"/>
     </param>
-    <param argument="-max_valid_expect" type="float" optional="true" value="0.1" label="Maximal E-Value of a hit to be reported (only evaluated if 'output_result' is 'valid' or 'stochastic')" help=""/>
+    <param argument="-max_valid_expect" type="float" value="0.1" label="Maximal E-Value of a hit to be reported (only evaluated if 'output_result' is 'valid' or 'stochastic')" help=""/>
     <param argument="-reindex" type="boolean" truevalue="true" falsevalue="false" checked="true" label="Recalculate peptide to protein association using OpenMS" help="Annotates target-decoy information"/>
     <section name="PeptideIndexing" title="" help="" expanded="false">
       <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>
@@ -6003,54 +6077,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="Chymotrypsin/P">Chymotrypsin/P</option>
-          <option value="CNBr">CNBr</option>
-          <option value="Formic_acid">Formic_acid</option>
-          <option value="Trypsin">Trypsin</option>
-          <option value="Lys-C/P">Lys-C/P</option>
-          <option value="PepsinA">PepsinA</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="Lys-C">Lys-C</option>
-          <option value="Lys-N">Lys-N</option>
-          <option value="Arg-C">Arg-C</option>
-          <option value="leukocyte elastase">leukocyte elastase</option>
+          <option value="Glu-C+P">Glu-C+P</option>
+          <option value="Chymotrypsin">Chymotrypsin</option>
+          <option value="Chymotrypsin/P">Chymotrypsin/P</option>
+          <option value="CNBr">CNBr</option>
+          <option value="Trypsin">Trypsin</option>
+          <option value="unspecific cleavage">unspecific cleavage</option>
           <option value="proline endopeptidase">proline endopeptidase</option>
           <option value="glutamyl endopeptidase">glutamyl endopeptidase</option>
-          <option value="V8-DE">V8-DE</option>
-          <option value="V8-E">V8-E</option>
-          <option value="Arg-C/P">Arg-C/P</option>
-          <option value="Asp-N">Asp-N</option>
+          <option value="Alpha-lytic protease">Alpha-lytic protease</option>
           <option value="TrypChymo">TrypChymo</option>
           <option value="Trypsin/P">Trypsin/P</option>
-          <option value="Glu-C+P">Glu-C+P</option>
+          <option value="Lys-C/P">Lys-C/P</option>
+          <option value="PepsinA">PepsinA</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="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="Arg-C">Arg-C</option>
+          <option value="Arg-C/P">Arg-C/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="Formic_acid">Formic_acid</option>
+          <option value="Lys-C">Lys-C</option>
+          <option value="Lys-N">Lys-N</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>
@@ -6061,7 +6136,7 @@
     </section>
     <expand macro="adv_opts_macro">
       <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>
@@ -6085,14 +6160,15 @@
       <filter>OPTIONAL_OUTPUTS is not None and "ctd_out_FLAG" in OPTIONAL_OUTPUTS</filter>
     </data>
   </outputs>
-  <tests><!-- TOPP_XTandemAdapter_1 -->
+  <tests>
+    <!-- TOPP_XTandemAdapter_1 -->
     <test expect_num_outputs="2">
       <section name="adv_opts">
         <param name="force" value="false"/>
         <param name="test" value="true"/>
       </section>
       <param name="in" value="spectra.mzML"/>
-      <output name="out" file="XTandemAdapter_1_out.idXML" compare="sim_size" delta_frac="0.7" ftype="idxml"/>
+      <output name="out" value="XTandemAdapter_1_out.idXML" compare="sim_size" delta_frac="0.7" ftype="idxml"/>
       <param name="database" value="proteins.fasta"/>
       <param name="default_config_file" value="CHEMISTRY/XTandem_default_config.xml"/>
       <param name="ignore_adapter_param" value="false"/>
@@ -6102,7 +6178,6 @@
       <param name="fragment_error_units" value="Da"/>
       <param name="max_precursor_charge" value="0"/>
       <param name="no_isotope_error" value="false"/>
-      <param name="fixed_modifications"/>
       <param name="variable_modifications" value="Oxidation (M)"/>
       <param name="minimum_fragment_mz" value="150.0"/>
       <param name="enzyme" value="Trypsin"/>
@@ -6122,6 +6197,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"/>
@@ -6133,6 +6209,9 @@
           <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>
     <!-- TOPP_XTandemAdapter_2 -->
     <test expect_num_outputs="2">
@@ -6141,7 +6220,7 @@
         <param name="test" value="true"/>
       </section>
       <param name="in" value="spectra.mzML"/>
-      <output name="out" file="XTandemAdapter_2_out.idXML" compare="sim_size" delta_frac="0.7" ftype="idxml"/>
+      <output name="out" value="XTandemAdapter_2_out.idXML" compare="sim_size" delta_frac="0.7" ftype="idxml"/>
       <param name="database" value="proteins.fasta"/>
       <param name="default_config_file" value="CHEMISTRY/XTandem_default_config.xml"/>
       <param name="ignore_adapter_param" value="false"/>
@@ -6151,7 +6230,6 @@
       <param name="fragment_error_units" value="Da"/>
       <param name="max_precursor_charge" value="0"/>
       <param name="no_isotope_error" value="false"/>
-      <param name="fixed_modifications"/>
       <param name="variable_modifications" value="Oxidation (M)"/>
       <param name="minimum_fragment_mz" value="150.0"/>
       <param name="enzyme" value="Trypsin"/>
@@ -6171,6 +6249,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"/>
@@ -6182,6 +6261,9 @@
           <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>
     <!-- TOPP_XTandemAdapter_3 -->
     <test expect_num_outputs="2">
@@ -6190,7 +6272,7 @@
         <param name="test" value="true"/>
       </section>
       <param name="in" value="spectra.mzML"/>
-      <output name="out" file="XTandemAdapter_3_out.idXML" compare="sim_size" delta_frac="0.7" ftype="idxml"/>
+      <output name="out" value="XTandemAdapter_3_out.idXML" compare="sim_size" delta_frac="0.7" ftype="idxml"/>
       <param name="database" value="proteinslong.fasta"/>
       <param name="default_config_file" value="CHEMISTRY/XTandem_default_config.xml"/>
       <param name="ignore_adapter_param" value="false"/>
@@ -6200,7 +6282,6 @@
       <param name="fragment_error_units" value="Da"/>
       <param name="max_precursor_charge" value="0"/>
       <param name="no_isotope_error" value="false"/>
-      <param name="fixed_modifications"/>
       <param name="variable_modifications" value="Oxidation (M)"/>
       <param name="minimum_fragment_mz" value="150.0"/>
       <param name="enzyme" value="Trypsin"/>
@@ -6220,6 +6301,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"/>
@@ -6231,11 +6313,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[Annotates MS/MS spectra using X! Tandem.
 
 
-For more information, visit http://www.openms.de/doxygen/release/2.8.0/html/TOPP_XTandemAdapter.html]]></help>
+For more information, visit https://openms.de/doxygen/release/3.1.0/html/TOPP_XTandemAdapter.html]]></help>
   <expand macro="references"/>
 </tool>