Mercurial > repos > lecorguille > camera_annotate

annotate abims_CAMERA_annotateDiffreport.xml @ 37:636e36a64d31 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
planemo upload commit a5f400649acb64e1c66a92379027ac5abdb4f546
author lecorguille
date Tue, 09 Apr 2019 11:36:39 -0400
parents b6a8143c397c
children 2184c0435edf
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
36
b6a8143c397c planemo upload commit aa538ae477bc2f901c95d916e11d70eab75b5e00
lecorguille
parents: 35
diff changeset
1 <tool id="abims_CAMERA_annotateDiffreport" name="CAMERA.annotate" version="2.2.5">
0
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
2
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
3 <description>CAMERA annotate function. Returns annotation results (isotope peaks, adducts and fragments) and a diffreport if more than one condition.</description>
25
230f0bc9e792 planemo upload commit a634879c0e651eb0eb7b435a107ee40cf30524fa
lecorguille
parents: 23
diff changeset
4
9
c02d80efba80 planemo upload commit d8cc436fd91f5748dc396d0527a0a303d3221835
lecorguille
parents: 6
diff changeset
5 <macros>
c02d80efba80 planemo upload commit d8cc436fd91f5748dc396d0527a0a303d3221835
lecorguille
parents: 6
diff changeset
6 <import>macros.xml</import>
c02d80efba80 planemo upload commit d8cc436fd91f5748dc396d0527a0a303d3221835
lecorguille
parents: 6
diff changeset
7 </macros>
c02d80efba80 planemo upload commit d8cc436fd91f5748dc396d0527a0a303d3221835
lecorguille
parents: 6
diff changeset
8
c02d80efba80 planemo upload commit d8cc436fd91f5748dc396d0527a0a303d3221835
lecorguille
parents: 6
diff changeset
9 <expand macro="requirements"/>
c02d80efba80 planemo upload commit d8cc436fd91f5748dc396d0527a0a303d3221835
lecorguille
parents: 6
diff changeset
10 <expand macro="stdio"/>
0
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
11
1
a887bff50e45 Uploaded
lecorguille
parents: 0
diff changeset
12 <command><![CDATA[
9
c02d80efba80 planemo upload commit d8cc436fd91f5748dc396d0527a0a303d3221835
lecorguille
parents: 6
diff changeset
13 @COMMAND_CAMERA_SCRIPT@
25
230f0bc9e792 planemo upload commit a634879c0e651eb0eb7b435a107ee40cf30524fa
lecorguille
parents: 23
diff changeset
14 xfunction annotatediff
230f0bc9e792 planemo upload commit a634879c0e651eb0eb7b435a107ee40cf30524fa
lecorguille
parents: 23
diff changeset
15 image '$image'
1
a887bff50e45 Uploaded
lecorguille
parents: 0
diff changeset
16
28
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
17 nSlaves \${GALAXY_SLOTS:-1}
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
18
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
19 ## output
25
230f0bc9e792 planemo upload commit a634879c0e651eb0eb7b435a107ee40cf30524fa
lecorguille
parents: 23
diff changeset
20 variableMetadataOutput '$variableMetadata'
1
a887bff50e45 Uploaded
lecorguille
parents: 0
diff changeset
21
28
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
22 ## groupFWHM
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
23 sigma $groupfwhm.sigma
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
24 perfwhm $groupfwhm.perfwhm
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
25
30
fce12d692a41 planemo upload commit 2e3fcb07e9ff59974eaec8f868a9e78a63a89219
lecorguille
parents: 28
diff changeset
26 ## findGeneral
fce12d692a41 planemo upload commit 2e3fcb07e9ff59974eaec8f868a9e78a63a89219
lecorguille
parents: 28
diff changeset
27 ppm $findgeneral.ppm
fce12d692a41 planemo upload commit 2e3fcb07e9ff59974eaec8f868a9e78a63a89219
lecorguille
parents: 28
diff changeset
28 mzabs $findgeneral.mzabs
fce12d692a41 planemo upload commit 2e3fcb07e9ff59974eaec8f868a9e78a63a89219
lecorguille
parents: 28
diff changeset
29
28
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
30 ## findIsotopes
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
31 maxcharge $findisotopes.maxcharge
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
32 maxiso $findisotopes.maxiso
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
33 minfrac $findisotopes.minfrac
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
34
0
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
35 quick $quick_block.quick
30
fce12d692a41 planemo upload commit 2e3fcb07e9ff59974eaec8f868a9e78a63a89219
lecorguille
parents: 28
diff changeset
36 #if $quick_block.quick == "FALSE":
32
23e33e354bb7 planemo upload commit 964980509aaa30c196b7ff20dbb78293f8286f06
lecorguille
parents: 30
diff changeset
37 xsetRdataOutput '$rdata_quick_false'
28
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
38
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
39 ## groupcorr
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
40 cor_eic_th $quick_block.groupcorr.cor_eic_th
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
41 graphMethod $quick_block.groupcorr.graphMethod
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
42 pval $quick_block.groupcorr.pval
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
43 calcCiS $quick_block.groupcorr.calcCiS
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
44 calcIso $quick_block.groupcorr.calcIso
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
45 calcCaS $quick_block.groupcorr.calcCaS
30
fce12d692a41 planemo upload commit 2e3fcb07e9ff59974eaec8f868a9e78a63a89219
lecorguille
parents: 28
diff changeset
46
fce12d692a41 planemo upload commit 2e3fcb07e9ff59974eaec8f868a9e78a63a89219
lecorguille
parents: 28
diff changeset
47 ## findadducts
fce12d692a41 planemo upload commit 2e3fcb07e9ff59974eaec8f868a9e78a63a89219
lecorguille
parents: 28
diff changeset
48 polarity $quick_block.findadducts.polarity
fce12d692a41 planemo upload commit 2e3fcb07e9ff59974eaec8f868a9e78a63a89219
lecorguille
parents: 28
diff changeset
49 max_peaks $quick_block.findadducts.max_peaks
fce12d692a41 planemo upload commit 2e3fcb07e9ff59974eaec8f868a9e78a63a89219
lecorguille
parents: 28
diff changeset
50 #if $quick_block.findadducts.rules_block.rules_select == "FALSE":
fce12d692a41 planemo upload commit 2e3fcb07e9ff59974eaec8f868a9e78a63a89219
lecorguille
parents: 28
diff changeset
51 multiplier $quick_block.findadducts.rules_block.multiplier
fce12d692a41 planemo upload commit 2e3fcb07e9ff59974eaec8f868a9e78a63a89219
lecorguille
parents: 28
diff changeset
52 #else
fce12d692a41 planemo upload commit 2e3fcb07e9ff59974eaec8f868a9e78a63a89219
lecorguille
parents: 28
diff changeset
53 rules $quick_block.findadducts.rules_block.rules
fce12d692a41 planemo upload commit 2e3fcb07e9ff59974eaec8f868a9e78a63a89219
lecorguille
parents: 28
diff changeset
54 #end if
32
23e33e354bb7 planemo upload commit 964980509aaa30c196b7ff20dbb78293f8286f06
lecorguille
parents: 30
diff changeset
55 #else
23e33e354bb7 planemo upload commit 964980509aaa30c196b7ff20dbb78293f8286f06
lecorguille
parents: 30
diff changeset
56 xsetRdataOutput '$rdata_quick_true'
28
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
57 #end if
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
58
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
59 #if $diffreport.options.option == "show":
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
60 ## diffreport
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
61 runDiffreport TRUE
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
62 eicmax $diffreport.options.eicmax
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
63 eicwidth $diffreport.options.eicwidth
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
64 value $diffreport.options.value
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
65 sortpval $diffreport.options.sortpval
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
66 h $diffreport.options.h
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
67 w $diffreport.options.w
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
68 mzdec $diffreport.options.mzdec
36
b6a8143c397c planemo upload commit aa538ae477bc2f901c95d916e11d70eab75b5e00
lecorguille
parents: 35
diff changeset
69 tabular2 $diffreport.options.tabular2
b6a8143c397c planemo upload commit aa538ae477bc2f901c95d916e11d70eab75b5e00
lecorguille
parents: 35
diff changeset
70 png2 $diffreport.options.png2
0
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
71 #end if
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
72
25
230f0bc9e792 planemo upload commit a634879c0e651eb0eb7b435a107ee40cf30524fa
lecorguille
parents: 23
diff changeset
73 @COMMAND_PEAKLIST@
230f0bc9e792 planemo upload commit a634879c0e651eb0eb7b435a107ee40cf30524fa
lecorguille
parents: 23
diff changeset
74
230f0bc9e792 planemo upload commit a634879c0e651eb0eb7b435a107ee40cf30524fa
lecorguille
parents: 23
diff changeset
75 @COMMAND_FILE_LOAD@
11
d33e0ed5f32a planemo upload commit d8cc436fd91f5748dc396d0527a0a303d3221835-dirty
lecorguille
parents: 9
diff changeset
76
1
a887bff50e45 Uploaded
lecorguille
parents: 0
diff changeset
77 ]]></command>
0
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
78
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
79 <inputs>
25
230f0bc9e792 planemo upload commit a634879c0e651eb0eb7b435a107ee40cf30524fa
lecorguille
parents: 23
diff changeset
80
230f0bc9e792 planemo upload commit a634879c0e651eb0eb7b435a107ee40cf30524fa
lecorguille
parents: 23
diff changeset
81
0
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
82 <param name="image" type="data" label="RData file" format="rdata.xcms.fillpeaks,rdata" help="output file from another function xcms (fillPeaks)" />
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
83
30
fce12d692a41 planemo upload commit 2e3fcb07e9ff59974eaec8f868a9e78a63a89219
lecorguille
parents: 28
diff changeset
84 <section name="groupfwhm" title="Group co-eluted peaks based on RT [groupFWHM]" expanded="True">
28
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
85 <param name="sigma" type="integer" value="6" label="Multiplier of the standard deviation" help="[sigma]" />
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
86 <param name="perfwhm" type="float" value="0.6" max="1" min="0" label="Percentage of FWHM width" help="[perfwhm]" />
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
87 </section>
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
88
30
fce12d692a41 planemo upload commit 2e3fcb07e9ff59974eaec8f868a9e78a63a89219
lecorguille
parents: 28
diff changeset
89 <section name="findgeneral" title="Annotation general options" expanded="True">
fce12d692a41 planemo upload commit 2e3fcb07e9ff59974eaec8f868a9e78a63a89219
lecorguille
parents: 28
diff changeset
90 <param name="ppm" type="integer" value="5" label="General ppm error" help="[ppm]" />
fce12d692a41 planemo upload commit 2e3fcb07e9ff59974eaec8f868a9e78a63a89219
lecorguille
parents: 28
diff changeset
91 <param name="mzabs" type="float" value="0.015" label="General absolut error in m/z" help="[mzabs]" />
fce12d692a41 planemo upload commit 2e3fcb07e9ff59974eaec8f868a9e78a63a89219
lecorguille
parents: 28
diff changeset
92 </section>
fce12d692a41 planemo upload commit 2e3fcb07e9ff59974eaec8f868a9e78a63a89219
lecorguille
parents: 28
diff changeset
93
fce12d692a41 planemo upload commit 2e3fcb07e9ff59974eaec8f868a9e78a63a89219
lecorguille
parents: 28
diff changeset
94 <section name="findisotopes" title="Annotate Isotopes [findIsotopes]" expanded="True">
28
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
95 <param name="maxcharge" type="integer" value="3" label="Max. ion charge" help="[maxcharge]" />
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
96 <param name="maxiso" type="integer" value="4" label="Max. number of expected isotopes" help="[maxiso]" />
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
97 <param name="minfrac" type="float" value="0.5" max="1" min="0" label="The percentage number of samples, which must satisfy the C12/C13 rule for isotope annotation" help="[minfrac]" />
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
98 </section>
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
99
0
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
100 <conditional name="quick_block">
28
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
101 <param name="quick" type="select" label="Mode" help="[quick] If TRUE, use only groupFWHM and findIsotopes functions. Else if FALSE, use also groupCorr and findAdducts">
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
102 <option value="FALSE" selected="true">All functions</option>
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
103 <option value="TRUE">Only groupFWHM and findIsotopes functions [quick]</option>
0
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
104 </param>
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
105 <when value="FALSE">
30
fce12d692a41 planemo upload commit 2e3fcb07e9ff59974eaec8f868a9e78a63a89219
lecorguille
parents: 28
diff changeset
106
fce12d692a41 planemo upload commit 2e3fcb07e9ff59974eaec8f868a9e78a63a89219
lecorguille
parents: 28
diff changeset
107 <section name="groupcorr" title="Verifying grouping co-eluted peaks [groupCorr]" expanded="True">
fce12d692a41 planemo upload commit 2e3fcb07e9ff59974eaec8f868a9e78a63a89219
lecorguille
parents: 28
diff changeset
108 <param name="cor_eic_th" type="float" value="0.75" max="1" min="0" label="groupCorr: correlation threshold (0..1)" help="[cor_eic_th]" />
fce12d692a41 planemo upload commit 2e3fcb07e9ff59974eaec8f868a9e78a63a89219
lecorguille
parents: 28
diff changeset
109 <param name="graphMethod" type="select" label="groupCorr: Method selection for grouping peaks after correlation analysis into pseudospectra" help="[graphMethod]">
fce12d692a41 planemo upload commit 2e3fcb07e9ff59974eaec8f868a9e78a63a89219
lecorguille
parents: 28
diff changeset
110 <option value="hcs" selected="true">hcs</option>
fce12d692a41 planemo upload commit 2e3fcb07e9ff59974eaec8f868a9e78a63a89219
lecorguille
parents: 28
diff changeset
111 <option value="lpc">lpc</option>
fce12d692a41 planemo upload commit 2e3fcb07e9ff59974eaec8f868a9e78a63a89219
lecorguille
parents: 28
diff changeset
112 </param>
fce12d692a41 planemo upload commit 2e3fcb07e9ff59974eaec8f868a9e78a63a89219
lecorguille
parents: 28
diff changeset
113 <param name="pval" type="float" value="0.05" max="1" min="0" label="groupCorr: significant correlation threshold" help="[pval]" />
fce12d692a41 planemo upload commit 2e3fcb07e9ff59974eaec8f868a9e78a63a89219
lecorguille
parents: 28
diff changeset
114 <param name="calcCiS" type="boolean" checked="true" truevalue="TRUE" falsevalue="FALSE" label="groupCorr: Use correlation inside samples for peak grouping" help="[calcCiS]"/>
fce12d692a41 planemo upload commit 2e3fcb07e9ff59974eaec8f868a9e78a63a89219
lecorguille
parents: 28
diff changeset
115 <param name="calcIso" type="boolean" checked="false" truevalue="TRUE" falsevalue="FALSE" label="groupCorr: Use isotopic relationship for peak grouping" help="[calcIso]"/>
fce12d692a41 planemo upload commit 2e3fcb07e9ff59974eaec8f868a9e78a63a89219
lecorguille
parents: 28
diff changeset
116 <param name="calcCaS" type="boolean" checked="false" truevalue="TRUE" falsevalue="FALSE" label="groupCorr: Use correlation across samples for peak grouping" help="[calcCaS]"/>
fce12d692a41 planemo upload commit 2e3fcb07e9ff59974eaec8f868a9e78a63a89219
lecorguille
parents: 28
diff changeset
117 </section>
fce12d692a41 planemo upload commit 2e3fcb07e9ff59974eaec8f868a9e78a63a89219
lecorguille
parents: 28
diff changeset
118
fce12d692a41 planemo upload commit 2e3fcb07e9ff59974eaec8f868a9e78a63a89219
lecorguille
parents: 28
diff changeset
119 <section name="findadducts" title="Annotate Adducts [findAdducts]" expanded="True">
28
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
120 <param name="polarity" type="select" label="Which polarity mode was used for measuring of the ms sample" help="polarity">
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
121 <option value="positive" >positive</option>
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
122 <option value="negative" selected="true">negative</option>
25
230f0bc9e792 planemo upload commit a634879c0e651eb0eb7b435a107ee40cf30524fa
lecorguille
parents: 23
diff changeset
123 </param>
30
fce12d692a41 planemo upload commit 2e3fcb07e9ff59974eaec8f868a9e78a63a89219
lecorguille
parents: 28
diff changeset
124 <param name="max_peaks" type="integer" value="100" label="How much peaks will be calculated in every thread using the parallel mode" help="[max_peaks]" />
28
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
125 <conditional name="rules_block">
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
126 <param name="rules_select" type="select" label="Use a personal ruleset file">
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
127 <option value="TRUE">TRUE</option>
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
128 <option value="FALSE" selected="true">FALSE</option>
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
129 </param>
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
130 <when value="FALSE">
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
131 <param name="multiplier" type="integer" value="3" label="If no ruleset is provided, calculate ruleset with max. number n of [nM+x] clusterions" help="[multiplier]" />
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
132 </when>
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
133 <when value="TRUE">
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
134 <param name="rules" type="data" format="csv" label="User defined ruleset" help="[rules]" />
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
135 </when>
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
136 </conditional>
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
137 </section>
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
138
25
230f0bc9e792 planemo upload commit a634879c0e651eb0eb7b435a107ee40cf30524fa
lecorguille
parents: 23
diff changeset
139 </when>
230f0bc9e792 planemo upload commit a634879c0e651eb0eb7b435a107ee40cf30524fa
lecorguille
parents: 23
diff changeset
140 <when value="TRUE">
0
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
141 <param name="polarity" type="hidden" value="quick" label="for the output label" help="for the output label" />
25
230f0bc9e792 planemo upload commit a634879c0e651eb0eb7b435a107ee40cf30524fa
lecorguille
parents: 23
diff changeset
142 </when>
0
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
143 </conditional>
25
230f0bc9e792 planemo upload commit a634879c0e651eb0eb7b435a107ee40cf30524fa
lecorguille
parents: 23
diff changeset
144
28
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
145 <!-- Diffreport specific parameters -->
30
fce12d692a41 planemo upload commit 2e3fcb07e9ff59974eaec8f868a9e78a63a89219
lecorguille
parents: 28
diff changeset
146 <section name="diffreport" title="Statistics and results export: [diffreport]" expanded="True">
28
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
147 <conditional name="options">
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
148 <param name="option" type="select" label="Number of condition">
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
149 <option value="hide" selected="true">One condition</option>
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
150 <option value="show">Two or more conditions</option>
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
151 </param>
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
152 <when value="show">
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
153 <param name="eicmax" type="integer" value="0" label="Number of the most significantly different analytes to create EICs for" help="[eicmax]" />
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
154 <param name="eicwidth" type="integer" value="200" label="Width (in seconds) of EICs produced" help="[eicwidth]" />
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
155 <param name="value" type="select" label="Intensity values to be used for the diffreport" help="[value]">
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
156 <option value="into" selected="true">into</option>
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
157 <option value="maxo" >maxo</option>
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
158 <option value="intb">intb</option>
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
159 </param>
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
160 <param name="h" type="integer" value="480" label="Numeric variable for the height of the eic and boxplots that are printed out" help="[height]" />
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
161 <param name="w" type="integer" value="640" label="Numeric variable for the width of the eic and boxplots print out made" help="[width]" />
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
162 <param name="mzdec" type="integer" value="2" label="Number of decimal places of title m/z values in the eic plot" help="[mzdec]" />
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
163 <param name="sortpval" type="boolean" checked="false" truevalue="TRUE" falsevalue="FALSE" label="logical indicating whether the reports should be sorted by p-value" help="[sortpval]"/>
36
b6a8143c397c planemo upload commit aa538ae477bc2f901c95d916e11d70eab75b5e00
lecorguille
parents: 35
diff changeset
164 <param name="tabular2" type="select" label="Export the Diffreport files in ">
b6a8143c397c planemo upload commit aa538ae477bc2f901c95d916e11d70eab75b5e00
lecorguille
parents: 35
diff changeset
165 <option value="zip" selected="true">Zip</option>
b6a8143c397c planemo upload commit aa538ae477bc2f901c95d916e11d70eab75b5e00
lecorguille
parents: 35
diff changeset
166 <option value="datasetcollection">Individual file in a Dataset Collection</option>
b6a8143c397c planemo upload commit aa538ae477bc2f901c95d916e11d70eab75b5e00
lecorguille
parents: 35
diff changeset
167 </param>
b6a8143c397c planemo upload commit aa538ae477bc2f901c95d916e11d70eab75b5e00
lecorguille
parents: 35
diff changeset
168 <param name="png2" type="select" label="Export the EIC and boxplots in ">
b6a8143c397c planemo upload commit aa538ae477bc2f901c95d916e11d70eab75b5e00
lecorguille
parents: 35
diff changeset
169 <option value="zip" selected="true">Zip</option>
b6a8143c397c planemo upload commit aa538ae477bc2f901c95d916e11d70eab75b5e00
lecorguille
parents: 35
diff changeset
170 <option value="pdf">Individual pdf</option>
b6a8143c397c planemo upload commit aa538ae477bc2f901c95d916e11d70eab75b5e00
lecorguille
parents: 35
diff changeset
171 </param>
28
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
172 </when>
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
173 <when value="hide">
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
174 </when>
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
175 </conditional>
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
176 </section>
25
230f0bc9e792 planemo upload commit a634879c0e651eb0eb7b435a107ee40cf30524fa
lecorguille
parents: 23
diff changeset
177
28
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
178 <expand macro="input_peaklist"/>
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
179 <expand macro="input_file_load"/>
0
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
180 </inputs>
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
181
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
182 <outputs>
1
a887bff50e45 Uploaded
lecorguille
parents: 0
diff changeset
183 <data name="variableMetadata" format="tabular" label="${image.name[:-6]}.annotate.variableMetadata.tsv" />
32
23e33e354bb7 planemo upload commit 964980509aaa30c196b7ff20dbb78293f8286f06
lecorguille
parents: 30
diff changeset
184 <data name="rdata_quick_false" format="rdata.camera.quick" label="${image.name[:-6]}.annotate.${$quick_block.findadducts.polarity}.Rdata" >
23e33e354bb7 planemo upload commit 964980509aaa30c196b7ff20dbb78293f8286f06
lecorguille
parents: 30
diff changeset
185 <filter>quick_block['quick'] == 'FALSE'</filter>
0
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
186 <change_format>
28
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
187 <when input="quick_block.findadducts.polarity" value="positive" format="rdata.camera.positive" />
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
188 <when input="quick_block.findadducts.polarity" value="negative" format="rdata.camera.negative" />
0
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
189 </change_format>
1
a887bff50e45 Uploaded
lecorguille
parents: 0
diff changeset
190 </data>
32
23e33e354bb7 planemo upload commit 964980509aaa30c196b7ff20dbb78293f8286f06
lecorguille
parents: 30
diff changeset
191 <data name="rdata_quick_true" format="rdata.camera.quick" label="${image.name[:-6]}.annotate.quick.Rdata" >
23e33e354bb7 planemo upload commit 964980509aaa30c196b7ff20dbb78293f8286f06
lecorguille
parents: 30
diff changeset
192 <filter>quick_block['quick'] == 'TRUE'</filter>
30
fce12d692a41 planemo upload commit 2e3fcb07e9ff59974eaec8f868a9e78a63a89219
lecorguille
parents: 28
diff changeset
193 </data>
36
b6a8143c397c planemo upload commit aa538ae477bc2f901c95d916e11d70eab75b5e00
lecorguille
parents: 35
diff changeset
194
b6a8143c397c planemo upload commit aa538ae477bc2f901c95d916e11d70eab75b5e00
lecorguille
parents: 35
diff changeset
195 <data name="output_diffreport_eic_zip" format="zip" label="${image.name[:-6]}.annotateDiffreport_eic.zip" from_work_dir="eic.zip" >
b6a8143c397c planemo upload commit aa538ae477bc2f901c95d916e11d70eab75b5e00
lecorguille
parents: 35
diff changeset
196 <filter>diffreport['options']['option'] == 'show' and diffreport['options']['png2'] == 'zip'</filter>
b6a8143c397c planemo upload commit aa538ae477bc2f901c95d916e11d70eab75b5e00
lecorguille
parents: 35
diff changeset
197 </data>
b6a8143c397c planemo upload commit aa538ae477bc2f901c95d916e11d70eab75b5e00
lecorguille
parents: 35
diff changeset
198 <data name="output_diffreport_box_zip" format="zip" label="${image.name[:-6]}.annotateDiffreport_box.zip" from_work_dir="box.zip" >
b6a8143c397c planemo upload commit aa538ae477bc2f901c95d916e11d70eab75b5e00
lecorguille
parents: 35
diff changeset
199 <filter>diffreport['options']['option'] == 'show' and diffreport['options']['png2'] == 'zip'</filter>
25
230f0bc9e792 planemo upload commit a634879c0e651eb0eb7b435a107ee40cf30524fa
lecorguille
parents: 23
diff changeset
200 </data>
36
b6a8143c397c planemo upload commit aa538ae477bc2f901c95d916e11d70eab75b5e00
lecorguille
parents: 35
diff changeset
201 <collection name="output_diffreport_picture_pdf" type="list" label="${image.name[:-6]}.annotateDiffreport.pdf">
b6a8143c397c planemo upload commit aa538ae477bc2f901c95d916e11d70eab75b5e00
lecorguille
parents: 35
diff changeset
202 <filter>diffreport['options']['option'] == 'show' and diffreport['options']['png2'] == 'pdf'</filter>
37
636e36a64d31 planemo upload commit a5f400649acb64e1c66a92379027ac5abdb4f546
lecorguille
parents: 36
diff changeset
203 <discover_datasets pattern="__designation_and_ext__" directory="pdf" format="pdf" />
36
b6a8143c397c planemo upload commit aa538ae477bc2f901c95d916e11d70eab75b5e00
lecorguille
parents: 35
diff changeset
204 </collection>
b6a8143c397c planemo upload commit aa538ae477bc2f901c95d916e11d70eab75b5e00
lecorguille
parents: 35
diff changeset
205
37
636e36a64d31 planemo upload commit a5f400649acb64e1c66a92379027ac5abdb4f546
lecorguille
parents: 36
diff changeset
206 <data name="output_diffreport_table_zip" format="zip" label="${image.name[:-6]}.annotateDiffreport_table.pdf" from_work_dir="tabular.zip">
36
b6a8143c397c planemo upload commit aa538ae477bc2f901c95d916e11d70eab75b5e00
lecorguille
parents: 35
diff changeset
207 <filter>diffreport['options']['option'] == 'show' and diffreport['options']['tabular2'] == 'zip'</filter>
b6a8143c397c planemo upload commit aa538ae477bc2f901c95d916e11d70eab75b5e00
lecorguille
parents: 35
diff changeset
208 </data>
b6a8143c397c planemo upload commit aa538ae477bc2f901c95d916e11d70eab75b5e00
lecorguille
parents: 35
diff changeset
209 <collection name="output_diffreport_table_collection" type="list" label="${image.name[:-6]}.annotateDiffreport_table">
b6a8143c397c planemo upload commit aa538ae477bc2f901c95d916e11d70eab75b5e00
lecorguille
parents: 35
diff changeset
210 <filter>diffreport['options']['option'] == 'show' and diffreport['options']['tabular2'] == 'datasetcollection'</filter>
37
636e36a64d31 planemo upload commit a5f400649acb64e1c66a92379027ac5abdb4f546
lecorguille
parents: 36
diff changeset
211 <discover_datasets pattern="__designation_and_ext__" directory="tabular" format="tabular" />
36
b6a8143c397c planemo upload commit aa538ae477bc2f901c95d916e11d70eab75b5e00
lecorguille
parents: 35
diff changeset
212 </collection>
0
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
213 </outputs>
25
230f0bc9e792 planemo upload commit a634879c0e651eb0eb7b435a107ee40cf30524fa
lecorguille
parents: 23
diff changeset
214
0
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
215 <tests>
35
b02797fbead1 planemo upload commit 688b63e161c4df4364d248bf78536a7649564db4
lecorguille
parents: 34
diff changeset
216 <!--<test>
14
e98ca7f0dcbd planemo upload commit 2761472c8afc41d54cecd54cabd1c5a5713514a3-dirty
lecorguille
parents: 11
diff changeset
217 <param name="image" value="faahKO.xset.group.retcor.group.fillpeaks.RData"/>
28
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
218 <expand macro="test_annotate_diffreport"/>
30
fce12d692a41 planemo upload commit 2e3fcb07e9ff59974eaec8f868a9e78a63a89219
lecorguille
parents: 28
diff changeset
219 <expand macro="test_annotate_quick_true"/>
28
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
220 <expand macro="test_file_load_zip"/>
25
230f0bc9e792 planemo upload commit a634879c0e651eb0eb7b435a107ee40cf30524fa
lecorguille
parents: 23
diff changeset
221 <output name="variableMetadata" file="faahKO.xset.group.retcor.group.fillPeaks.annotate.variableMetadata.tsv" />
35
b02797fbead1 planemo upload commit 688b63e161c4df4364d248bf78536a7649564db4
lecorguille
parents: 34
diff changeset
222 </test>-->
25
230f0bc9e792 planemo upload commit a634879c0e651eb0eb7b435a107ee40cf30524fa
lecorguille
parents: 23
diff changeset
223 <test>
230f0bc9e792 planemo upload commit a634879c0e651eb0eb7b435a107ee40cf30524fa
lecorguille
parents: 23
diff changeset
224 <param name="image" value="faahKO-single.xset.merged.group.retcor.group.fillpeaks.RData"/>
28
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
225 <expand macro="test_annotate_diffreport"/>
30
fce12d692a41 planemo upload commit 2e3fcb07e9ff59974eaec8f868a9e78a63a89219
lecorguille
parents: 28
diff changeset
226 <expand macro="test_annotate_quick_true"/>
28
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
227 <expand macro="test_file_load_single"/>
36
b6a8143c397c planemo upload commit aa538ae477bc2f901c95d916e11d70eab75b5e00
lecorguille
parents: 35
diff changeset
228 <output name="variableMetadata" file="faahKO.xset.group.retcor.group.fillPeaks.annotate.variableMetadata.tsv" lines_diff="2" />
0
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
229 </test>
25
230f0bc9e792 planemo upload commit a634879c0e651eb0eb7b435a107ee40cf30524fa
lecorguille
parents: 23
diff changeset
230 <test>
35
b02797fbead1 planemo upload commit 688b63e161c4df4364d248bf78536a7649564db4
lecorguille
parents: 34
diff changeset
231 <param name="image" value="faahKO-single.xset.merged.group.retcor.group.fillpeaks-xcms3.RData"/>
b02797fbead1 planemo upload commit 688b63e161c4df4364d248bf78536a7649564db4
lecorguille
parents: 34
diff changeset
232 <expand macro="test_annotate_diffreport"/>
b02797fbead1 planemo upload commit 688b63e161c4df4364d248bf78536a7649564db4
lecorguille
parents: 34
diff changeset
233 <expand macro="test_annotate_quick_true"/>
b02797fbead1 planemo upload commit 688b63e161c4df4364d248bf78536a7649564db4
lecorguille
parents: 34
diff changeset
234 <expand macro="test_file_load_single"/>
36
b6a8143c397c planemo upload commit aa538ae477bc2f901c95d916e11d70eab75b5e00
lecorguille
parents: 35
diff changeset
235 <output name="variableMetadata" file="faahKO.xset.group.retcor.group.fillPeaks.annotate.variableMetadata-xcms3.tsv" lines_diff="2" />
35
b02797fbead1 planemo upload commit 688b63e161c4df4364d248bf78536a7649564db4
lecorguille
parents: 34
diff changeset
236 </test>
b02797fbead1 planemo upload commit 688b63e161c4df4364d248bf78536a7649564db4
lecorguille
parents: 34
diff changeset
237 <test>
25
230f0bc9e792 planemo upload commit a634879c0e651eb0eb7b435a107ee40cf30524fa
lecorguille
parents: 23
diff changeset
238 <param name="image" value="faahKO-single.xset.merged.group.retcor.group.fillpeaks.RData"/>
28
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
239 <expand macro="test_annotate_diffreport"/>
25
230f0bc9e792 planemo upload commit a634879c0e651eb0eb7b435a107ee40cf30524fa
lecorguille
parents: 23
diff changeset
240 <conditional name="quick_block">
30
fce12d692a41 planemo upload commit 2e3fcb07e9ff59974eaec8f868a9e78a63a89219
lecorguille
parents: 28
diff changeset
241 <expand macro="test_annotate_quick_false" />
28
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
242 <section name="findadducts">
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
243 <param name="polarity" value="negative"/>
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
244 <conditional name="rules_block">
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
245 <param name="rules_select" value="TRUE"/>
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
246 <param name="rules" value="CASMI_extended_NEG_rules.csv" ftype="csv"/>
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
247 </conditional>
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
248 </section>
25
230f0bc9e792 planemo upload commit a634879c0e651eb0eb7b435a107ee40cf30524fa
lecorguille
parents: 23
diff changeset
249 </conditional>
28
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
250 <expand macro="test_file_load_single"/>
36
b6a8143c397c planemo upload commit aa538ae477bc2f901c95d916e11d70eab75b5e00
lecorguille
parents: 35
diff changeset
251 <output name="variableMetadata" file="faahKO.xset.group.retcor.group.fillPeaks.annotate.rules.variableMetadata.tsv" lines_diff="2"/>
25
230f0bc9e792 planemo upload commit a634879c0e651eb0eb7b435a107ee40cf30524fa
lecorguille
parents: 23
diff changeset
252 </test>
0
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
253 </tests>
25
230f0bc9e792 planemo upload commit a634879c0e651eb0eb7b435a107ee40cf30524fa
lecorguille
parents: 23
diff changeset
254
230f0bc9e792 planemo upload commit a634879c0e651eb0eb7b435a107ee40cf30524fa
lecorguille
parents: 23
diff changeset
255
230f0bc9e792 planemo upload commit a634879c0e651eb0eb7b435a107ee40cf30524fa
lecorguille
parents: 23
diff changeset
256
1
a887bff50e45 Uploaded
lecorguille
parents: 0
diff changeset
257 <help><![CDATA[
25
230f0bc9e792 planemo upload commit a634879c0e651eb0eb7b435a107ee40cf30524fa
lecorguille
parents: 23
diff changeset
258
9
c02d80efba80 planemo upload commit d8cc436fd91f5748dc396d0527a0a303d3221835
lecorguille
parents: 6
diff changeset
259 @HELP_AUTHORS@
0
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
260
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
261 ================
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
262 CAMERA.annotate
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
263 ================
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
264
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
265 -----------
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
266 Description
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
267 -----------
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
268
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
269 The R-package CAMERA is a Collection of Algorithms for MEtabolite
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
270 pRofile Annotation. Its primary purpose is the annotation and evaluation of
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
271 LC-MS data. It includes algorithms for annotation of isotope peaks, adducts
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
272 and fragments in peak lists. Additional methods cluster mass signals that
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
273 originate from a single metabolite, based on rules for mass differences and
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
274 peak shape comparison. To use the strength of already existing programs,
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
275 CAMERA is designed to interact directly with processed peak data from the
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
276 R-package **xcms**.
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
277
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
278 **What it does?**
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
279
25
230f0bc9e792 planemo upload commit a634879c0e651eb0eb7b435a107ee40cf30524fa
lecorguille
parents: 23
diff changeset
280 The CAMERA annotation procedure can be split into two parts: We want to answer the questions which peaks occur from the same molecule and secondly compute its exact mass and annotate the ion species. Therefore CAMERA annotation workflow contains following primary functions: 1. peak grouping after retention time (**groupFWHM**) 2. peak group verification with peakshape correlation (**groupCorr**) Both methods separate peaks into different groups, which we define as ”pseu- dospectra”. Those pseudospectra can consists from one up to 100 ions, de- pending on the molecules amount and ionizability. Afterwards the exposure of the ion species can be performed with: 2 1. annotation of possible isotopes (**findIsotopes**) 2. annotation of adducts and calculating hypothetical masses for the group (**findAdducts**) This workflow results in a data-frame similar to a xcms peak table, that can be easily stored in a comma separated table .csv (Excel-readable).
0
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
281
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
282 If you have two or more conditions, it will return a diffreport result within the annotation results.
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
283 The diffreport result shows the most significant differences between two sets of samples. Optionally
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
284 create extracted ion chromatograms for the most significant differences.
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
285
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
286
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
287 -----------------
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
288 Workflow position
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
289 -----------------
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
290
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
291
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
292 **Upstream tools**
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
293
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
294 ========================= ==================== ====================== ==========
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
295 Name output file format parameter
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
296 ========================= ==================== ====================== ==========
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
297 xcms.fillPeaks xset.fillPeaks.RData rdata.xcms.fillpeaks RData file
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
298 ========================= ==================== ====================== ==========
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
299
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
300
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
301 **Downstream tools**
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
302
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
303 +---------------------------+---------------------------------------+------------------------------------------------+
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
304 | Name | Output file | Format |
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
305 +===========================+=======================================+================================================+
28
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
306 |CAMERA_combinexsAnnot |xset.annotate.Rdata | rdata.camera.positive or rdata.camera.negative |
0
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
307 +---------------------------+---------------------------------------+------------------------------------------------+
36
b6a8143c397c planemo upload commit aa538ae477bc2f901c95d916e11d70eab75b5e00
lecorguille
parents: 35
diff changeset
308 |Determine Vdk or Lowess |xset.annotate.variableMetadata.tsv | Tabular |
0
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
309 +---------------------------+---------------------------------------+------------------------------------------------+
36
b6a8143c397c planemo upload commit aa538ae477bc2f901c95d916e11d70eab75b5e00
lecorguille
parents: 35
diff changeset
310 |Normalization Vdk/Lowess |xset.annotate.variableMetadata.tsv | Tabular |
0
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
311 +---------------------------+---------------------------------------+------------------------------------------------+
36
b6a8143c397c planemo upload commit aa538ae477bc2f901c95d916e11d70eab75b5e00
lecorguille
parents: 35
diff changeset
312 |Anova |xset.annotate.variableMetadata.tsv | Tabular |
0
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
313 +---------------------------+---------------------------------------+------------------------------------------------+
36
b6a8143c397c planemo upload commit aa538ae477bc2f901c95d916e11d70eab75b5e00
lecorguille
parents: 35
diff changeset
314 |PCA |xset.annotate.variableMetadata.tsv | Tabular |
0
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
315 +---------------------------+---------------------------------------+------------------------------------------------+
36
b6a8143c397c planemo upload commit aa538ae477bc2f901c95d916e11d70eab75b5e00
lecorguille
parents: 35
diff changeset
316 |Hierarchical Clustering |xset.annotate.variableMetadata.tsv | Tabular |
0
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
317 +---------------------------+---------------------------------------+------------------------------------------------+
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
318
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
319
36
b6a8143c397c planemo upload commit aa538ae477bc2f901c95d916e11d70eab75b5e00
lecorguille
parents: 35
diff changeset
320 The output file **xset.annotate.variableMetadata.tsv** is an tabular file. You can continue your analysis using it in the following tools:
0
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
321
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
322 | Determine Vdk or Lowess
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
323 | Normalization Vdk/Lowess
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
324 | Anova
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
325 | PCA
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
326 | Hierarchical Clustering
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
327
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
328
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
329 **General schema of the metabolomic workflow**
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
330
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
331 .. image:: annotate_workflow.png
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
332
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
333 -----------
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
334 Input files
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
335 -----------
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
336
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
337 +---------------------------+---------------------------+
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
338 | Parameter : num + label | Format |
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
339 +===========================+===========================+
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
340 | 1 : RData file | rdata.xcms.fillpeaks |
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
341 +---------------------------+---------------------------+
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
342
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
343
28
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
344 [Optional] User defined ruleset:
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
345 --------------------------------
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
346
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
347 Example:
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
348
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
349 | "name","nmol","charge","massdiff","oidscore","quasi","ips"
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
350 | "[M-H]-",1,-1,-1.007276,1,1,1
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
351 | "[M-2H]2-",1,-2,-2.014552,2,0,1
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
352 | "[M-3H]3-",1,-3,-3.021828,3,0,1
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
353 | "[M-2H+Na]-",1,-1,20.974666,4,0,0.25
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
354 | "[M-H+Cl]2-",1,-2,33.962126,5,0,1
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
355 | "[M-2H+K]-",1,-1,36.948606,6,0,0.25
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
356 | "[M+Cl]-",1,-1,34.969402,7,1,1
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
357 | "[M+2Cl]2-",1,-2,69.938804,8,0,1
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
358 | "[2M-H]-",2,-1,-1.007276,1,0,0.5
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
359
0
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
360 ----------
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
361 Parameters
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
362 ----------
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
363
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
364 diffreport: Intensity values to be used for the diffreport
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
365 ----------------------------------------------------------
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
366
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
367 | If **value="into"**, integrated peak intensities are used.
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
368 | If **value="maxo"**, maximum peak intensities are used.
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
369 | If **value="intb"**, baseline corrected integrated peak intensities are used (only available if peak detection was done by ‘findPeaks.centWave’).
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
370
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
371
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
372
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
373 ------------
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
374 Output files
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
375 ------------
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
376
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
377 xset.annotate.variableMetadata.tsv
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
378
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
379 | For each metabolite (row) :
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
380 | the value of the intensity in each sample, fold, anova, mzmed, mzmin, mzmax, rtmed, rtmin, rtmax, npeaks, isotopes, adduct and pcgroup
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
381
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
382 xset.annotate.zip
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
383
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
384 | It contains filebase_eic, filebase_box and filebase.tsv for one conditon vs another (Anova analysis).
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
385
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
386 xset.annotate.Rdata rdata.camera.quick or rdata.camera.positive or rdata.camera.negative
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
387
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
388 | Rdata file, that be used outside Galaxy in R.
25
230f0bc9e792 planemo upload commit a634879c0e651eb0eb7b435a107ee40cf30524fa
lecorguille
parents: 23
diff changeset
389
0
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
390 ------
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
391
25
230f0bc9e792 planemo upload commit a634879c0e651eb0eb7b435a107ee40cf30524fa
lecorguille
parents: 23
diff changeset
392 .. class:: infomark
0
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
393
36
b6a8143c397c planemo upload commit aa538ae477bc2f901c95d916e11d70eab75b5e00
lecorguille
parents: 35
diff changeset
394 The output **"xset.annotate.variableMetadata.tsv"** is a tabular file. You can continue your analysis using it in the following tools of the workflow:
0
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
395
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
396 | Determine Vdk or Lowess (Data correction)
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
397 | Normalization Vdk/Lowess (Data correction)
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
398 | Anova (Statistical analysis)
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
399 | PCA (Statistical analysis)
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
400 | Hierarchical Clustering (Statistical analysis)
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
401
25
230f0bc9e792 planemo upload commit a634879c0e651eb0eb7b435a107ee40cf30524fa
lecorguille
parents: 23
diff changeset
402
0
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
403 ---------------------------------------------------
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
404
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
405 ---------------
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
406 Working example
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
407 ---------------
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
408
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
409 Input files
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
410 -----------
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
411
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
412 | RData file -> **xset.fillPeaks.RData**
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
413
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
414 Parameters
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
415 ----------
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
416
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
417 | sortpval -> **false**
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
418 | sigma -> **6 (default)**
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
419 | perfwhm -> **0.6 (default)**
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
420 | maxcharge -> **3 (default)**
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
421 | maxiso -> **4 (default)**
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
422 | minfrac -> **0.5 (default)**
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
423 | ppm -> **500**
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
424 | mzabs -> **0.015(default)**
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
425 | Advanced options -> **hide**
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
426 | Numver of condition -> Two or more conditioons
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
427 | eicmax -> **200**
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
428 | eicwidth -> **200 (default)**
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
429
25
230f0bc9e792 planemo upload commit a634879c0e651eb0eb7b435a107ee40cf30524fa
lecorguille
parents: 23
diff changeset
430
0
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
431
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
432 Output files
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
433 ------------
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
434
25
230f0bc9e792 planemo upload commit a634879c0e651eb0eb7b435a107ee40cf30524fa
lecorguille
parents: 23
diff changeset
435 **Example of a part of xset.annotate.variableMetadata.tsv output**
0
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
436
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
437 .. image:: annotatediffreport_variableMetadata.png
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
438
6
32b0e4bc881f Uploaded
lecorguille
parents: 5
diff changeset
439
32b0e4bc881f Uploaded
lecorguille
parents: 5
diff changeset
440 ---------------------------------------------------
32b0e4bc881f Uploaded
lecorguille
parents: 5
diff changeset
441
32b0e4bc881f Uploaded
lecorguille
parents: 5
diff changeset
442 Changelog/News
32b0e4bc881f Uploaded
lecorguille
parents: 5
diff changeset
443 --------------
32b0e4bc881f Uploaded
lecorguille
parents: 5
diff changeset
444
37
636e36a64d31 planemo upload commit a5f400649acb64e1c66a92379027ac5abdb4f546
lecorguille
parents: 36
diff changeset
445 .. _News: https://bioconductor.org/packages/release/bioc/news/CAMERA/NEWS
636e36a64d31 planemo upload commit a5f400649acb64e1c66a92379027ac5abdb4f546
lecorguille
parents: 36
diff changeset
446
636e36a64d31 planemo upload commit a5f400649acb64e1c66a92379027ac5abdb4f546
lecorguille
parents: 36
diff changeset
447 **Version 2.2.5 - 09/04/2019**
36
b6a8143c397c planemo upload commit aa538ae477bc2f901c95d916e11d70eab75b5e00
lecorguille
parents: 35
diff changeset
448
b6a8143c397c planemo upload commit aa538ae477bc2f901c95d916e11d70eab75b5e00
lecorguille
parents: 35
diff changeset
449 - NEW: zip export are back for pictures (eic and boxplot) and diffreport tables
37
636e36a64d31 planemo upload commit a5f400649acb64e1c66a92379027ac5abdb4f546
lecorguille
parents: 36
diff changeset
450 - UPGRADE: upgrade the CAMERA version from 1.34.0 to 1.38.1 (see CAMERA News_)
36
b6a8143c397c planemo upload commit aa538ae477bc2f901c95d916e11d70eab75b5e00
lecorguille
parents: 35
diff changeset
451
b6a8143c397c planemo upload commit aa538ae477bc2f901c95d916e11d70eab75b5e00
lecorguille
parents: 35
diff changeset
452 **Version 2.2.4 - 09/10/2018**
b6a8143c397c planemo upload commit aa538ae477bc2f901c95d916e11d70eab75b5e00
lecorguille
parents: 35
diff changeset
453
b6a8143c397c planemo upload commit aa538ae477bc2f901c95d916e11d70eab75b5e00
lecorguille
parents: 35
diff changeset
454 - NEW: CAMERA.annotate no longer export a DataMatrix. fillChromPeaks does the job
b6a8143c397c planemo upload commit aa538ae477bc2f901c95d916e11d70eab75b5e00
lecorguille
parents: 35
diff changeset
455
35
b02797fbead1 planemo upload commit 688b63e161c4df4364d248bf78536a7649564db4
lecorguille
parents: 34
diff changeset
456 **Version 2.2.3 - 30/04/2018**
b02797fbead1 planemo upload commit 688b63e161c4df4364d248bf78536a7649564db4
lecorguille
parents: 34
diff changeset
457
b02797fbead1 planemo upload commit 688b63e161c4df4364d248bf78536a7649564db4
lecorguille
parents: 34
diff changeset
458 - NEW: support the new xcms 3.0.0 wrapper
b02797fbead1 planemo upload commit 688b63e161c4df4364d248bf78536a7649564db4
lecorguille
parents: 34
diff changeset
459
34
34d89b4ad869 planemo upload commit 757700163128641f447d6fd089f2649d60a82f15
lecorguille
parents: 33
diff changeset
460 **Version 2.2.2 - 01/03/2018**
34d89b4ad869 planemo upload commit 757700163128641f447d6fd089f2649d60a82f15
lecorguille
parents: 33
diff changeset
461
34d89b4ad869 planemo upload commit 757700163128641f447d6fd089f2649d60a82f15
lecorguille
parents: 33
diff changeset
462 - UPGRADE: upgrate the CAMERA version from 1.26.0 to 1.32.0
34d89b4ad869 planemo upload commit 757700163128641f447d6fd089f2649d60a82f15
lecorguille
parents: 33
diff changeset
463
34d89b4ad869 planemo upload commit 757700163128641f447d6fd089f2649d60a82f15
lecorguille
parents: 33
diff changeset
464 **Version 2.2.1 - 29/11/2017**
34d89b4ad869 planemo upload commit 757700163128641f447d6fd089f2649d60a82f15
lecorguille
parents: 33
diff changeset
465
34d89b4ad869 planemo upload commit 757700163128641f447d6fd089f2649d60a82f15
lecorguille
parents: 33
diff changeset
466 - BUGFIX: To avoid issues with accented letter in the parentFile tag of the mzXML files, we changed a hidden mechanim to LC_ALL=C
34d89b4ad869 planemo upload commit 757700163128641f447d6fd089f2649d60a82f15
lecorguille
parents: 33
diff changeset
467
28
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
468 **Version 2.2.0 - 28/03/2017**
25
230f0bc9e792 planemo upload commit a634879c0e651eb0eb7b435a107ee40cf30524fa
lecorguille
parents: 23
diff changeset
469
230f0bc9e792 planemo upload commit a634879c0e651eb0eb7b435a107ee40cf30524fa
lecorguille
parents: 23
diff changeset
470 - BUGFIX: the diffreport ids didn't convert the rt in minute as the other export
230f0bc9e792 planemo upload commit a634879c0e651eb0eb7b435a107ee40cf30524fa
lecorguille
parents: 23
diff changeset
471
230f0bc9e792 planemo upload commit a634879c0e651eb0eb7b435a107ee40cf30524fa
lecorguille
parents: 23
diff changeset
472 - UPDATE: the settings (digits, convertion in minutes) of the identifiants will no longer modify the native one. Because we want to be conservative and because it can be dangerous for the data integrity during a futur merge of the table, we decide to put those customization in a new column namecustom within the variableMetadata.
230f0bc9e792 planemo upload commit a634879c0e651eb0eb7b435a107ee40cf30524fa
lecorguille
parents: 23
diff changeset
473
28
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
474 - IMPROVEMENT: add some sections within to separate the different parts of the process
25
230f0bc9e792 planemo upload commit a634879c0e651eb0eb7b435a107ee40cf30524fa
lecorguille
parents: 23
diff changeset
475
230f0bc9e792 planemo upload commit a634879c0e651eb0eb7b435a107ee40cf30524fa
lecorguille
parents: 23
diff changeset
476 - IMPROVEMENT: add the possibility to use defined ruleset
230f0bc9e792 planemo upload commit a634879c0e651eb0eb7b435a107ee40cf30524fa
lecorguille
parents: 23
diff changeset
477
28
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
478 - IMPROVEMENT: add the possibility to set the MZ digit within the identifiants
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
479
25
230f0bc9e792 planemo upload commit a634879c0e651eb0eb7b435a107ee40cf30524fa
lecorguille
parents: 23
diff changeset
480 - IMPROVEMENT: CAMERA.annotate is now compatible with merged individual data from xcms.xcmsSet
230f0bc9e792 planemo upload commit a634879c0e651eb0eb7b435a107ee40cf30524fa
lecorguille
parents: 23
diff changeset
481
230f0bc9e792 planemo upload commit a634879c0e651eb0eb7b435a107ee40cf30524fa
lecorguille
parents: 23
diff changeset
482
14
e98ca7f0dcbd planemo upload commit 2761472c8afc41d54cecd54cabd1c5a5713514a3-dirty
lecorguille
parents: 11
diff changeset
483 **Version 2.1.5 - 21/04/2016**
e98ca7f0dcbd planemo upload commit 2761472c8afc41d54cecd54cabd1c5a5713514a3-dirty
lecorguille
parents: 11
diff changeset
484
25
230f0bc9e792 planemo upload commit a634879c0e651eb0eb7b435a107ee40cf30524fa
lecorguille
parents: 23
diff changeset
485 - UPGRADE: upgrade the CAMERA version from 1.22.0 to 1.26.0
14
e98ca7f0dcbd planemo upload commit 2761472c8afc41d54cecd54cabd1c5a5713514a3-dirty
lecorguille
parents: 11
diff changeset
486
e98ca7f0dcbd planemo upload commit 2761472c8afc41d54cecd54cabd1c5a5713514a3-dirty
lecorguille
parents: 11
diff changeset
487
e98ca7f0dcbd planemo upload commit 2761472c8afc41d54cecd54cabd1c5a5713514a3-dirty
lecorguille
parents: 11
diff changeset
488 **Version 2.1.4 - 18/04/2016**
e98ca7f0dcbd planemo upload commit 2761472c8afc41d54cecd54cabd1c5a5713514a3-dirty
lecorguille
parents: 11
diff changeset
489
e98ca7f0dcbd planemo upload commit 2761472c8afc41d54cecd54cabd1c5a5713514a3-dirty
lecorguille
parents: 11
diff changeset
490 - TEST: refactoring to pass planemo test using conda dependencies
e98ca7f0dcbd planemo upload commit 2761472c8afc41d54cecd54cabd1c5a5713514a3-dirty
lecorguille
parents: 11
diff changeset
491
e98ca7f0dcbd planemo upload commit 2761472c8afc41d54cecd54cabd1c5a5713514a3-dirty
lecorguille
parents: 11
diff changeset
492
e98ca7f0dcbd planemo upload commit 2761472c8afc41d54cecd54cabd1c5a5713514a3-dirty
lecorguille
parents: 11
diff changeset
493 **Version 2.1.3 - 10/02/2016**
6
32b0e4bc881f Uploaded
lecorguille
parents: 5
diff changeset
494
32b0e4bc881f Uploaded
lecorguille
parents: 5
diff changeset
495 - BUGFIX: better management of errors. Datasets remained green although the process failed
32b0e4bc881f Uploaded
lecorguille
parents: 5
diff changeset
496
32b0e4bc881f Uploaded
lecorguille
parents: 5
diff changeset
497 - BUGFIX: the conversion into minutes of the retention time was applied to the diffreport outputs (several conditions)
32b0e4bc881f Uploaded
lecorguille
parents: 5
diff changeset
498
32b0e4bc881f Uploaded
lecorguille
parents: 5
diff changeset
499 - IMPROVEMENT: when there are several conditions, the tool will generate individual datasets (tsv, pdf) instead of a zip file. The usual png (eic, boxplot) will from now be integrated in two pdf.
32b0e4bc881f Uploaded
lecorguille
parents: 5
diff changeset
500
32b0e4bc881f Uploaded
lecorguille
parents: 5
diff changeset
501 - UPDATE: refactoring of internal management of inputs/outputs
32b0e4bc881f Uploaded
lecorguille
parents: 5
diff changeset
502
32b0e4bc881f Uploaded
lecorguille
parents: 5
diff changeset
503
28
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
504 **VERSION 2.1.0 - 09/10/2015**
6
32b0e4bc881f Uploaded
lecorguille
parents: 5
diff changeset
505
32b0e4bc881f Uploaded
lecorguille
parents: 5
diff changeset
506 - BUGFIX: There was a bug with the CAMERA.annotate (generating a bad dataMatrix (intensities which don't match with the metabolites))
32b0e4bc881f Uploaded
lecorguille
parents: 5
diff changeset
507
32b0e4bc881f Uploaded
lecorguille
parents: 5
diff changeset
508
28
591d26b9027e planemo upload commit d708b85fc764e790fac071552d19cd7a89d02d31
lecorguille
parents: 25
diff changeset
509 **VERSION 2.1.0 - 07/06/2015**
6
32b0e4bc881f Uploaded
lecorguille
parents: 5
diff changeset
510
32b0e4bc881f Uploaded
lecorguille
parents: 5
diff changeset
511 - IMPROVEMENT: new datatype/dataset formats (rdata.camera.positive, rdata.camera.negative, rdata.camera.quick ...) will facilitate the sequence of tools and so avoid incompatibility errors.
32b0e4bc881f Uploaded
lecorguille
parents: 5
diff changeset
512
32b0e4bc881f Uploaded
lecorguille
parents: 5
diff changeset
513 - IMPROVEMENT: parameter labels have changed to facilitate their reading.
32b0e4bc881f Uploaded
lecorguille
parents: 5
diff changeset
514
32b0e4bc881f Uploaded
lecorguille
parents: 5
diff changeset
515 - UPDATE: merged with annotateDiffreport. Some parameters are dedicated to experiences with several conditions
32b0e4bc881f Uploaded
lecorguille
parents: 5
diff changeset
516
32b0e4bc881f Uploaded
lecorguille
parents: 5
diff changeset
517
1
a887bff50e45 Uploaded
lecorguille
parents: 0
diff changeset
518 ]]></help>
0
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
519
9
c02d80efba80 planemo upload commit d8cc436fd91f5748dc396d0527a0a303d3221835
lecorguille
parents: 6
diff changeset
520 <expand macro="citation" />
0
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
521
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
522
b495191430d5 planemo upload
lecorguille
parents:
diff changeset
523 </tool>