comparison abims_CAMERA_annotateDiffreport.xml @ 17:73d82de36369 draft

planemo upload commit 1a5357c0e28103a0325b2df858504721f6266049
author lecorguille
date Tue, 09 Oct 2018 06:03:01 -0400
parents a2c49996603e
children cb923396e70f
comparison
equal deleted inserted replaced
16:a2c49996603e 17:73d82de36369
1 <tool id="abims_CAMERA_annotateDiffreport" name="CAMERA.annotate" version="2.2.3"> 1 <tool id="abims_CAMERA_annotateDiffreport" name="CAMERA.annotate" version="2.2.4">
2 2
3 <description>CAMERA annotate function. Returns annotation results (isotope peaks, adducts and fragments) and a diffreport if more than one condition.</description> 3 <description>CAMERA annotate function. Returns annotation results (isotope peaks, adducts and fragments) and a diffreport if more than one condition.</description>
4 4
5 <macros> 5 <macros>
6 <import>macros.xml</import> 6 <import>macros.xml</import>
16 16
17 nSlaves \${GALAXY_SLOTS:-1} 17 nSlaves \${GALAXY_SLOTS:-1}
18 18
19 ## output 19 ## output
20 variableMetadataOutput '$variableMetadata' 20 variableMetadataOutput '$variableMetadata'
21 dataMatrixOutput '$datamatrix'
22 21
23 ## groupFWHM 22 ## groupFWHM
24 sigma $groupfwhm.sigma 23 sigma $groupfwhm.sigma
25 perfwhm $groupfwhm.perfwhm 24 perfwhm $groupfwhm.perfwhm
26 25
170 <expand macro="input_file_load"/> 169 <expand macro="input_file_load"/>
171 </inputs> 170 </inputs>
172 171
173 <outputs> 172 <outputs>
174 <data name="variableMetadata" format="tabular" label="${image.name[:-6]}.annotate.variableMetadata.tsv" /> 173 <data name="variableMetadata" format="tabular" label="${image.name[:-6]}.annotate.variableMetadata.tsv" />
175 <data name="datamatrix" format="tabular" label="${image.name[:-6]}.annotate.dataMatrix.tsv" />
176 <data name="rdata_quick_false" format="rdata.camera.quick" label="${image.name[:-6]}.annotate.${$quick_block.findadducts.polarity}.Rdata" > 174 <data name="rdata_quick_false" format="rdata.camera.quick" label="${image.name[:-6]}.annotate.${$quick_block.findadducts.polarity}.Rdata" >
177 <filter>quick_block['quick'] == 'FALSE'</filter> 175 <filter>quick_block['quick'] == 'FALSE'</filter>
178 <change_format> 176 <change_format>
179 <when input="quick_block.findadducts.polarity" value="positive" format="rdata.camera.positive" /> 177 <when input="quick_block.findadducts.polarity" value="positive" format="rdata.camera.positive" />
180 <when input="quick_block.findadducts.polarity" value="negative" format="rdata.camera.negative" /> 178 <when input="quick_block.findadducts.polarity" value="negative" format="rdata.camera.negative" />
195 <param name="image" value="faahKO.xset.group.retcor.group.fillpeaks.RData"/> 193 <param name="image" value="faahKO.xset.group.retcor.group.fillpeaks.RData"/>
196 <expand macro="test_annotate_diffreport"/> 194 <expand macro="test_annotate_diffreport"/>
197 <expand macro="test_annotate_quick_true"/> 195 <expand macro="test_annotate_quick_true"/>
198 <expand macro="test_file_load_zip"/> 196 <expand macro="test_file_load_zip"/>
199 <output name="variableMetadata" file="faahKO.xset.group.retcor.group.fillPeaks.annotate.variableMetadata.tsv" /> 197 <output name="variableMetadata" file="faahKO.xset.group.retcor.group.fillPeaks.annotate.variableMetadata.tsv" />
200 <output name="datamatrix" file="faahKO.xset.group.retcor.group.fillPeaks.annotate.dataMatrix.tsv" />
201 </test>--> 198 </test>-->
202 <test> 199 <test>
203 <param name="image" value="faahKO-single.xset.merged.group.retcor.group.fillpeaks.RData"/> 200 <param name="image" value="faahKO-single.xset.merged.group.retcor.group.fillpeaks.RData"/>
204 <expand macro="test_annotate_diffreport"/> 201 <expand macro="test_annotate_diffreport"/>
205 <expand macro="test_annotate_quick_true"/> 202 <expand macro="test_annotate_quick_true"/>
206 <expand macro="test_file_load_single"/> 203 <expand macro="test_file_load_single"/>
207 <output name="variableMetadata" file="faahKO.xset.group.retcor.group.fillPeaks.annotate.variableMetadata.tsv" /> 204 <output name="variableMetadata" file="faahKO.xset.group.retcor.group.fillPeaks.annotate.variableMetadata.tsv" lines_diff="2" />
208 <output name="datamatrix" file="faahKO.xset.group.retcor.group.fillPeaks.annotate.dataMatrix.tsv" />
209 </test> 205 </test>
210 <test> 206 <test>
211 <param name="image" value="faahKO-single.xset.merged.group.retcor.group.fillpeaks-xcms3.RData"/> 207 <param name="image" value="faahKO-single.xset.merged.group.retcor.group.fillpeaks-xcms3.RData"/>
212 <expand macro="test_annotate_diffreport"/> 208 <expand macro="test_annotate_diffreport"/>
213 <expand macro="test_annotate_quick_true"/> 209 <expand macro="test_annotate_quick_true"/>
214 <expand macro="test_file_load_single"/> 210 <expand macro="test_file_load_single"/>
215 <output name="variableMetadata" file="faahKO.xset.group.retcor.group.fillPeaks.annotate.variableMetadata-xcms3.tsv" /> 211 <output name="variableMetadata" file="faahKO.xset.group.retcor.group.fillPeaks.annotate.variableMetadata-xcms3.tsv" lines_diff="2" />
216 <output name="datamatrix" file="faahKO.xset.group.retcor.group.fillPeaks.annotate.dataMatrix-xcms3.tsv" />
217 </test> 212 </test>
218 <test> 213 <test>
219 <param name="image" value="faahKO-single.xset.merged.group.retcor.group.fillpeaks.RData"/> 214 <param name="image" value="faahKO-single.xset.merged.group.retcor.group.fillpeaks.RData"/>
220 <expand macro="test_annotate_diffreport"/> 215 <expand macro="test_annotate_diffreport"/>
221 <conditional name="quick_block"> 216 <conditional name="quick_block">
227 <param name="rules" value="CASMI_extended_NEG_rules.csv" ftype="csv"/> 222 <param name="rules" value="CASMI_extended_NEG_rules.csv" ftype="csv"/>
228 </conditional> 223 </conditional>
229 </section> 224 </section>
230 </conditional> 225 </conditional>
231 <expand macro="test_file_load_single"/> 226 <expand macro="test_file_load_single"/>
232 <output name="variableMetadata" file="faahKO.xset.group.retcor.group.fillPeaks.annotate.rules.variableMetadata.tsv" /> 227 <output name="variableMetadata" file="faahKO.xset.group.retcor.group.fillPeaks.annotate.rules.variableMetadata.tsv" lines_diff="2"/>
233 <output name="datamatrix" file="faahKO.xset.group.retcor.group.fillPeaks.annotate.rules.dataMatrix.tsv" />
234 </test> 228 </test>
235 </tests> 229 </tests>
236 230
237 231
238 232
285 +---------------------------+---------------------------------------+------------------------------------------------+ 279 +---------------------------+---------------------------------------+------------------------------------------------+
286 | Name | Output file | Format | 280 | Name | Output file | Format |
287 +===========================+=======================================+================================================+ 281 +===========================+=======================================+================================================+
288 |CAMERA_combinexsAnnot |xset.annotate.Rdata | rdata.camera.positive or rdata.camera.negative | 282 |CAMERA_combinexsAnnot |xset.annotate.Rdata | rdata.camera.positive or rdata.camera.negative |
289 +---------------------------+---------------------------------------+------------------------------------------------+ 283 +---------------------------+---------------------------------------+------------------------------------------------+
290 |Determine Vdk or Lowess |xset.annotate.dataMatrix.tsv | Tabular | 284 |Determine Vdk or Lowess |xset.annotate.variableMetadata.tsv | Tabular |
291 +---------------------------+---------------------------------------+------------------------------------------------+ 285 +---------------------------+---------------------------------------+------------------------------------------------+
292 |Normalization Vdk/Lowess |xset.annotate.dataMatrix.tsv | Tabular | 286 |Normalization Vdk/Lowess |xset.annotate.variableMetadata.tsv | Tabular |
293 +---------------------------+---------------------------------------+------------------------------------------------+ 287 +---------------------------+---------------------------------------+------------------------------------------------+
294 |Anova |xset.annotate.dataMatrix.tsv | Tabular | 288 |Anova |xset.annotate.variableMetadata.tsv | Tabular |
295 +---------------------------+---------------------------------------+------------------------------------------------+ 289 +---------------------------+---------------------------------------+------------------------------------------------+
296 |PCA |xset.annotate.dataMatrix.tsv | Tabular | 290 |PCA |xset.annotate.variableMetadata.tsv | Tabular |
297 +---------------------------+---------------------------------------+------------------------------------------------+ 291 +---------------------------+---------------------------------------+------------------------------------------------+
298 |Hierarchical Clustering |xset.annotate.dataMatrix.tsv | Tabular | 292 |Hierarchical Clustering |xset.annotate.variableMetadata.tsv | Tabular |
299 +---------------------------+---------------------------------------+------------------------------------------------+ 293 +---------------------------+---------------------------------------+------------------------------------------------+
300 294
301 295
302 The output file **xset.annotate.dataMatrix.tsv** is an tabular file. You can continue your analysis using it in the following tools: 296 The output file **xset.annotate.variableMetadata.tsv** is an tabular file. You can continue your analysis using it in the following tools:
303 297
304 | Determine Vdk or Lowess 298 | Determine Vdk or Lowess
305 | Normalization Vdk/Lowess 299 | Normalization Vdk/Lowess
306 | Anova 300 | Anova
307 | PCA 301 | PCA
359 xset.annotate.variableMetadata.tsv 353 xset.annotate.variableMetadata.tsv
360 354
361 | For each metabolite (row) : 355 | For each metabolite (row) :
362 | the value of the intensity in each sample, fold, anova, mzmed, mzmin, mzmax, rtmed, rtmin, rtmax, npeaks, isotopes, adduct and pcgroup 356 | the value of the intensity in each sample, fold, anova, mzmed, mzmin, mzmax, rtmed, rtmin, rtmax, npeaks, isotopes, adduct and pcgroup
363 357
364 xset.annotate.dataMatrix.tsv
365
366 | A tabular file which represents for each metabolite (row), the value of the intensity in each sample (column).
367
368 xset.annotate.zip 358 xset.annotate.zip
369 359
370 | It contains filebase_eic, filebase_box and filebase.tsv for one conditon vs another (Anova analysis). 360 | It contains filebase_eic, filebase_box and filebase.tsv for one conditon vs another (Anova analysis).
371 361
372 xset.annotate.Rdata rdata.camera.quick or rdata.camera.positive or rdata.camera.negative 362 xset.annotate.Rdata rdata.camera.quick or rdata.camera.positive or rdata.camera.negative
375 365
376 ------ 366 ------
377 367
378 .. class:: infomark 368 .. class:: infomark
379 369
380 The output **"xset.annotate.dataMatrix.tsv"** is a tabular file. You can continue your analysis using it in the following tools of the workflow: 370 The output **"xset.annotate.variableMetadata.tsv"** is a tabular file. You can continue your analysis using it in the following tools of the workflow:
381 371
382 | Determine Vdk or Lowess (Data correction) 372 | Determine Vdk or Lowess (Data correction)
383 | Normalization Vdk/Lowess (Data correction) 373 | Normalization Vdk/Lowess (Data correction)
384 | Anova (Statistical analysis) 374 | Anova (Statistical analysis)
385 | PCA (Statistical analysis) 375 | PCA (Statistical analysis)
416 406
417 407
418 Output files 408 Output files
419 ------------ 409 ------------
420 410
421 **Example of an xset.annotate.dataMatrix.tsv output**
422
423 .. image:: annotatediffreport_dataMatrix.png
424
425 **Example of a part of xset.annotate.variableMetadata.tsv output** 411 **Example of a part of xset.annotate.variableMetadata.tsv output**
426 412
427 .. image:: annotatediffreport_variableMetadata.png 413 .. image:: annotatediffreport_variableMetadata.png
428 414
429 415
430 --------------------------------------------------- 416 ---------------------------------------------------
431 417
432 Changelog/News 418 Changelog/News
433 -------------- 419 --------------
434 420
421 **Version 2.2.4 - 09/10/2018**
422
423 - NES: CAMERA.annotate no longer export a DataMatrix. fillChromPeaks does the job
424
435 **Version 2.2.3 - 30/04/2018** 425 **Version 2.2.3 - 30/04/2018**
436 426
437 - NEW: support the new xcms 3.0.0 wrapper 427 - NEW: support the new xcms 3.0.0 wrapper
438 428
439 **Version 2.2.2 - 01/03/2018** 429 **Version 2.2.2 - 01/03/2018**