diff macros.xml @ 15:97a7f34fcb6a draft

"planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/maxquant commit 641b1d3af3b589a861cde2dc2f8803c9b79df7be"
author galaxyp
date Wed, 11 Aug 2021 09:24:23 +0000
parents e42225f8a659
children 74f5d355d156
line wrap: on
line diff
--- a/macros.xml	Thu Jul 08 22:45:35 2021 +0000
+++ b/macros.xml	Wed Aug 11 09:24:23 2021 +0000
@@ -1,7 +1,8 @@
 <?xml version="1.0" ?>
 <macros>
     <token name="@VERSION@">1.6.17.0</token>
-    <token name="@VERSION_SUFFIX@">2</token>
+    <token name="@VERSION_SUFFIX@">3</token>
+    <token name="@VERSION_SUFFIX_MQPAR@">0</token>
     <token name="@VERSION_PTXQC@">1.0.10</token>
     <token name="@SUBSTITUTION_RX@">[^\w\-\s\.]</token>
     <token name="@TMT2PLEX@">
@@ -60,6 +61,11 @@
                     - [TMTpro16plex-Lys134N,TMTpro16plex-Nter134N,0,0,0,0,True]
                     - [TMTpro16plex-Lys126C,TMTpro16plex-Nter126C,0,0,0,0,True]
     </token>
+    <token name="@TMTPRO18PLEX@">
+                    @TMTPRO16PLEX@
+                    - [TMTpro18plex-Lys134C,TMTpro18plex-Nter134C,0,0,0,0,True]
+                    - [TMTpro18plex-Lys135N,TMTpro18plex-Nter135N,0,0,0,0,True]
+    </token>
     <token name="@ITRAQ4PLEX@">
                     - [iTRAQ4plex-Lys114,iTRAQ4plex-Nter114,0,0,0,0,False]
                     - [iTRAQ4plex-Lys115,iTRAQ4plex-Nter115,0,0,0,0,False]
@@ -131,11 +137,18 @@
                   cont_MYCO:
                   - MYCOPLASMA
                   - '1'
+            #if $varExists("mqpar_input"):
+                #import re
+                #set $mqpar_xml = open(str($mqpar_input), "r").read()
+                #set $matchingTimeWindow = re.search("matchingTimeWindow>(.*)./matchingTimeWindow", $mqpar_xml).group(1)
+                MQpar_MatchingTimeWindow_num: ${matchingTimeWindow}
+            #else:
                 #if $search_opts.mbr.match_between_runs == 'True':
                 MQpar_MatchingTimeWindow_num: ${search_opts.mbr.matching_time_window}
                 #else:
                 MQpar_MatchingTimeWindow_num: 0.0
                 #end if
+            #end if
                 MatchBetweenRuns_wA: auto
                 MQpar_firstSearchTol_num: 20.0
                 firstSearch_outOfCalWarnSD_num: 2.0
@@ -829,6 +842,10 @@
         <expand macro="mod_option" value="TMTpro16plex-Lys133N"/>
         <expand macro="mod_option" value="TMTpro16plex-Lys133C"/>
         <expand macro="mod_option" value="TMTpro16plex-Lys134N"/>
+        <expand macro="mod_option" value="TMTpro18plex-Nter134C"/>
+        <expand macro="mod_option" value="TMTpro18plex-Nter135N"/>
+        <expand macro="mod_option" value="TMTpro18plex-Lys134C"/>
+        <expand macro="mod_option" value="TMTpro18plex-Lys135N"/>
     </xml>
     <xml name="citations">
         <citations>