Commit cb9062a918cd44aa3e4009fa85aecd407bc7c0b5
1 parent
c03732d8
Exists in
master
and in
7 other branches
mex/vex els
Showing
5 changed files
with
114 additions
and
46 deletions
Show diff stats
PARAM_DEF/mex_els_spec.xml
1 | 1 | <?xml version="1.0"?> |
2 | -<param xml:id="mex_els_spec"> | |
2 | +<param xml:id="mex_els_spec_##anode##"> | |
3 | 3 | <info> |
4 | - <name>mex_els_spec</name> | |
5 | - <short_name>spectra</short_name> | |
6 | - <components/> | |
7 | - <units>counts</units> | |
8 | - <coordinates_system/> | |
9 | - <tensor_order/> | |
10 | - <si_conversion/> | |
11 | - <table> | |
12 | - <centerAutoTable variable="true" name="Energy" units="eV" centerName="mex_els_energy" log="false"/> | |
13 | - </table> | |
14 | - <fill_value/> | |
15 | - <ucd>phys.count;phys.electron</ucd> | |
16 | - <dataset_id>mex-els-all</dataset_id> | |
4 | + <table> | |
5 | + <centerAutoTable variable="true" name="Energy" units="eV" centerName="mex_els_energy" log="false"/> | |
6 | + </table> | |
17 | 7 | </info> |
18 | 8 | <gap_threshold>20</gap_threshold> |
19 | 9 | <get> |
... | ... | @@ -25,6 +15,24 @@ |
25 | 15 | <amdaParam name="mex_els_energy"/> |
26 | 16 | <amdaParam name="mex_els_energytable"/> |
27 | 17 | </get> |
28 | - <process>#mex_els_decode(mexvex_els_calculate($mex_els_all_ELS,$mex_els_all_TimeCompres,$mex_els_all_EnergyCompres,8))</process> | |
29 | - <output/> | |
18 | + <process>#mex_els_decode(mexvex_els_calculate($mex_els_all_ELS,$mex_els_all_TimeCompres,$mex_els_all_EnergyCompres,##anode##))</process> | |
19 | + <output> | |
20 | + <plot> | |
21 | + <timePlot> | |
22 | + <params> | |
23 | + <param id="mex_els_spec_##anode##"> | |
24 | + <spectro yAxis="y-left"/> | |
25 | + </param> | |
26 | + </params> | |
27 | + <axes> | |
28 | + <yAxis> | |
29 | + <digitalAxis id="y-left" scale="logarithmic"/> | |
30 | + </yAxis> | |
31 | + <zAxis> | |
32 | + <colorAxis scale="logarithmic"/> | |
33 | + </zAxis> | |
34 | + </axes> | |
35 | + </timePlot> | |
36 | + </plot> | |
37 | + </output> | |
30 | 38 | </param> |
... | ... |
PARAM_DEF/vex_els_spec.xml
1 | 1 | <?xml version="1.0"?> |
2 | -<param xml:id="vex_els_spec"> | |
2 | +<param xml:id="vex_els_spec_##anode##"> | |
3 | 3 | <info> |
4 | - <name>vex_els_spec</name> | |
5 | - <short_name>spectra</short_name> | |
6 | - <components/> | |
7 | - <units>counts</units> | |
8 | - <coordinates_system/> | |
9 | - <tensor_order/> | |
10 | - <si_conversion/> | |
11 | 4 | <table> |
12 | 5 | <centerAutoTable variable="true" name="Energy" units="eV" centerName="vex_els_energy" log="false"/> |
13 | - </table> | |
14 | - <fill_value/> | |
15 | - <ucd>phys.count;phys.electron</ucd> | |
16 | - <dataset_id>vex-els-all</dataset_id> | |
6 | + </table> | |
17 | 7 | </info> |
18 | 8 | <gap_threshold>20</gap_threshold> |
19 | 9 | <get> |
... | ... | @@ -25,6 +15,24 @@ |
25 | 15 | <amdaParam name="vex_els_energy"/> |
26 | 16 | <amdaParam name="vex_els_energytable"/> |
27 | 17 | </get> |
28 | - <process>#vex_els_decode(mexvex_els_calculate($vex_els_all_ELS,$vex_els_all_TimeCompres,$vex_els_all_EnergyCompres,8))</process> | |
29 | - <output/> | |
18 | + <process>#vex_els_decode(mexvex_els_calculate($vex_els_all_ELS,$vex_els_all_TimeCompres,$vex_els_all_EnergyCompres,##anode##))</process> | |
19 | + <output> | |
20 | + <plot> | |
21 | + <timePlot> | |
22 | + <params> | |
23 | + <param id="vex_els_spec_##anode##"> | |
24 | + <spectro yAxis="y-left"/> | |
25 | + </param> | |
26 | + </params> | |
27 | + <axes> | |
28 | + <yAxis> | |
29 | + <digitalAxis id="y-left" scale="logarithmic"/> | |
30 | + </yAxis> | |
31 | + <zAxis> | |
32 | + <colorAxis scale="logarithmic"/> | |
33 | + </zAxis> | |
34 | + </axes> | |
35 | + </timePlot> | |
36 | + </plot> | |
37 | + </output> | |
30 | 38 | </param> |
... | ... |
ParamTemplateList.xml
1 | 1 | <?xml version="1.0"?> |
2 | - | |
3 | 2 | <paramTemplateList> |
4 | 3 | <paramTemplate paramId='jedi_e90_flux' fileName='jedi_e90_flux_##lookdir##'> |
5 | 4 | <arguments> |
... | ... | @@ -205,22 +204,66 @@ |
205 | 204 | </argument> |
206 | 205 | </arguments> |
207 | 206 | </paramTemplate> |
208 | - <paramTemplate paramId='jedi_i270_cps' fileName='jedi_i270_cps_##lookdir##'> | |
209 | - <arguments> | |
210 | - <argument key='lookdir' name='Look Direction' type='list' default='0'> | |
211 | - <item key='0' name='Look Dir. 0'/> | |
212 | - <item key='1' name='Look Dir. 1'/> | |
213 | - <item key='2' name='Look Dir. 2'/> | |
214 | - <item key='3' name='Look Dir. 3'/> | |
215 | - <item key='4' name='Look Dir. 4'/> | |
216 | - <item key='5' name='Look Dir. 5'/> | |
217 | - </argument> | |
218 | - </arguments> | |
219 | - </paramTemplate> | |
207 | + <paramTemplate paramId='jedi_i270_cps' fileName='jedi_i270_cps_##lookdir##'> | |
208 | + <arguments> | |
209 | + <argument key='lookdir' name='Look Direction' type='list' default='0'> | |
210 | + <item key='0' name='Look Dir. 0'/> | |
211 | + <item key='1' name='Look Dir. 1'/> | |
212 | + <item key='2' name='Look Dir. 2'/> | |
213 | + <item key='3' name='Look Dir. 3'/> | |
214 | + <item key='4' name='Look Dir. 4'/> | |
215 | + <item key='5' name='Look Dir. 5'/> | |
216 | + </argument> | |
217 | + </arguments> | |
218 | + </paramTemplate> | |
219 | + <paramTemplate paramId='vex_els_spec' fileName='vex_els_spec_##anode##'> | |
220 | + <arguments> | |
221 | + <argument key='anode' name='Anode' type='list' default='0'> | |
222 | + <item key='0' name='Anode 0'/> | |
223 | + <item key='1' name='Anode 1'/> | |
224 | + <item key='2' name='Anode 2'/> | |
225 | + <item key='3' name='Anode 3'/> | |
226 | + <item key='4' name='Anode 4'/> | |
227 | + <item key='5' name='Anode 5'/> | |
228 | + <item key='6' name='Anode 6'/> | |
229 | + <item key='7' name='Anode 7'/> | |
230 | + <item key='8' name='Anode 8'/> | |
231 | + <item key='9' name='Anode 9'/> | |
232 | + <item key='10' name='Anode 10'/> | |
233 | + <item key='11' name='Anode 11'/> | |
234 | + <item key='12' name='Anode 12'/> | |
235 | + <item key='13' name='Anode 13'/> | |
236 | + <item key='14' name='Anode 14'/> | |
237 | + <item key='15' name='Anode 15'/> | |
238 | + </argument> | |
239 | + </arguments> | |
240 | + </paramTemplate> | |
241 | + <paramTemplate paramId='mex_els_spec' fileName='mex_els_spec_##anode##'> | |
242 | + <arguments> | |
243 | + <argument key='anode' name='Anode' type='list' default='0'> | |
244 | + <item key='0' name='Anode 0'/> | |
245 | + <item key='1' name='Anode 1'/> | |
246 | + <item key='2' name='Anode 2'/> | |
247 | + <item key='3' name='Anode 3'/> | |
248 | + <item key='4' name='Anode 4'/> | |
249 | + <item key='5' name='Anode 5'/> | |
250 | + <item key='6' name='Anode 6'/> | |
251 | + <item key='7' name='Anode 7'/> | |
252 | + <item key='8' name='Anode 8'/> | |
253 | + <item key='9' name='Anode 9'/> | |
254 | + <item key='10' name='Anode 10'/> | |
255 | + <item key='11' name='Anode 11'/> | |
256 | + <item key='12' name='Anode 12'/> | |
257 | + <item key='13' name='Anode 13'/> | |
258 | + <item key='14' name='Anode 14'/> | |
259 | + <item key='15' name='Anode 15'/> | |
260 | + </argument> | |
261 | + </arguments> | |
262 | + </paramTemplate> | |
220 | 263 | <paramTemplate paramId='sum_into_table_range' fileName='sum_into_table_range_##paramid##_##relateddim##_##min##_##max##'> |
221 | 264 | <arguments> |
222 | - <argument key='min' name='Min.' type='float' default='0'/> | |
223 | - <argument key='max' name='Max.' type='float' default='0'/> | |
265 | + <argument key='min' name='Min' type='float' default='0'/> | |
266 | + <argument key='max' name='Max' type='float' default='0'/> | |
224 | 267 | <argument key='paramid' name='Parameter Id' type='string' default=''/> |
225 | 268 | <argument key='relateddim' name='Related Id' type='int' default='0'/> |
226 | 269 | </arguments> |
... | ... | @@ -445,7 +488,6 @@ |
445 | 488 | </argument> |
446 | 489 | </arguments> |
447 | 490 | </paramTemplate> |
448 | - | |
449 | 491 | <paramTemplate paramId='eiscat_vhf_ne' fileName='eiscat_vhf_ne_##mode##_##corrected##_##yaxis##'> |
450 | 492 | <arguments> |
451 | 493 | <argument key='mode' name='Mode' type='list' default='all'> |
... | ... |