# HG changeset patch
# User lecorguille
# Date 1490959494 14400
# Node ID 1a7d1f9e891286e1c30bb197419eeec1d849d492
# Parent  dcff3c4a8c80886db3203991da6d5d6604ef4148
planemo upload for repository https://github.com/workflow4metabolomics/xcms commit b8ea02b3d37550c33dcf8e099fe8c636287b0865

diff -r dcff3c4a8c80 -r 1a7d1f9e8912 abims_xcms_group.xml
--- a/abims_xcms_group.xml	Thu Mar 30 08:34:09 2017 -0400
+++ b/abims_xcms_group.xml	Fri Mar 31 07:24:54 2017 -0400
@@ -98,7 +98,7 @@
     <outputs>
         <data name="xsetRData" format="rdata.xcms.group" label="${image.name[:-6]}.group.RData"/>
         <data name="rplotsPdf" format="pdf" label="${image.name[:-6]}.group.Rplots.pdf"/>
-        <expand macro="output_peaklist"/>
+        <expand macro="output_peaklist" function="group"/>
         <data name="log" format="txt" label="xset.log.txt"  hidden="true" />
     </outputs>
 
diff -r dcff3c4a8c80 -r 1a7d1f9e8912 macros.xml
--- a/macros.xml	Thu Mar 30 08:34:09 2017 -0400
+++ b/macros.xml	Fri Mar 31 07:24:54 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>