# HG changeset patch
# User lecorguille
# Date 1491220317 14400
# Node ID 9456529152449a423470395e8dce77f42dbf801d
# Parent  62b66b39a2689bc759cef7d4e4ed59528497d7d0
planemo upload for repository https://github.com/workflow4metabolomics/xcms commit 392e432529877680e80a7b338e20d69a42e53767

diff -r 62b66b39a268 -r 945652915244 macros.xml
--- a/macros.xml	Thu Mar 02 08:21:35 2017 -0500
+++ b/macros.xml	Mon Apr 03 07:51:57 2017 -0400
@@ -107,11 +107,11 @@
         </conditional>
     </xml>
 
-    <xml name="output_peaklist">
-        <data name="variableMetadata" format="tabular" label="${image.name[:-6]}.fillPeaks.variableMetadata.tsv">
+    <xml name="output_peaklist"  token_function="">
+        <data name="variableMetadata" format="tabular" label="${image.name[:-6]}.@FUNCTION@.variableMetadata.tsv">
             <filter>(peaklist['peaklistBool'])</filter>
         </data>
-        <data name="dataMatrix" format="tabular" label="${image.name[:-6]}.fillPeaks.dataMatrix.tsv" >
+        <data name="dataMatrix" format="tabular" label="${image.name[:-6]}.@FUNCTION@.dataMatrix.tsv" >
             <filter>(peaklist['peaklistBool'])</filter>
         </data>
     </xml>
diff -r 62b66b39a268 -r 945652915244 static/images/xcms_merge_workflow.png
Binary file static/images/xcms_merge_workflow.png has changed
diff -r 62b66b39a268 -r 945652915244 xcms_merge.xml
--- a/xcms_merge.xml	Thu Mar 02 08:21:35 2017 -0500
+++ b/xcms_merge.xml	Mon Apr 03 07:51:57 2017 -0400
@@ -170,6 +170,7 @@
 |xcms.group                 | xset.RData         | rdata.xcms.raw  |
 +---------------------------+--------------------+-----------------+
 
+.. image:: xcms_merge_workflow.png
 
 -----------
 Input files