Commit c449102e416b1ba96424fa945e67b3d3baab9e86
1 parent
50f85368
Exists in
master
and in
6 other branches
Merge JASON3 AMBRE from amdadev
Showing
44 changed files
with
483 additions
and
23 deletions
Show diff stats
... | ... | @@ -0,0 +1,15 @@ |
1 | +<?xml version="1.0"?> | |
2 | +<param xml:id="jason_amb_ele_conf"> | |
3 | + <get> | |
4 | + <vi name="jason:amb:ele"> | |
5 | + <baseParam name="config" useNearestValue="true"> | |
6 | + <clb name="Eelec_32E_MIN"/> | |
7 | + <clb name="Eelec_16E_MIN"/> | |
8 | + <clb name="Eelec_32E_MAX"/> | |
9 | + <clb name="Eelec_16E_MAX"/> | |
10 | + </baseParam> | |
11 | + </vi> | |
12 | + </get> | |
13 | + <process/> | |
14 | + <output/> | |
15 | +</param> | ... | ... |
... | ... | @@ -0,0 +1,15 @@ |
1 | +<?xml version="1.0"?> | |
2 | +<param xml:id="jason_amb_ion_conf"> | |
3 | + <get> | |
4 | + <vi name="jason:amb:ion"> | |
5 | + <baseParam name="config" useNearestValue="true"> | |
6 | + <clb name="Eion_32E_MIN"/> | |
7 | + <clb name="Eion_16E_MIN"/> | |
8 | + <clb name="Eion_32E_MAX"/> | |
9 | + <clb name="Eion_16E_MAX"/> | |
10 | + </baseParam> | |
11 | + </vi> | |
12 | + </get> | |
13 | + <process/> | |
14 | + <output/> | |
15 | +</param> | ... | ... |
PARAM_DEF/jason_amb_b.xml
PARAM_DEF/jason_amb_beq.xml
... | ... | @@ -0,0 +1,34 @@ |
1 | +<?xml version="1.0"?> | |
2 | +<param xml:id="jason_amb_ect1"> | |
3 | + <info> | |
4 | + <table> | |
5 | + <minMaxTable variable="true" name="Energy" units="eV" minName="jason_amb_ele_enmin" maxName="jason_amb_ele_enmax"/> | |
6 | + </table> | |
7 | + </info> | |
8 | + <get><vi name="jason:amb:ele"> | |
9 | + <baseParam name="CountRate_ELE1"/> | |
10 | + </vi> | |
11 | + <amdaParam name="jason_amb_ele_enmin"/> | |
12 | + <amdaParam name="jason_amb_ele_enmax"/> | |
13 | + </get> | |
14 | + <process/> | |
15 | + <output> | |
16 | + <plot> | |
17 | + <timePlot> | |
18 | + <params> | |
19 | + <param id="jason_amb_ect1"> | |
20 | + <spectro yAxis="y-left"/> | |
21 | + </param> | |
22 | + </params> | |
23 | + <axes> | |
24 | + <yAxis> | |
25 | + <digitalAxis id="y-left" scale="logarithmic"/> | |
26 | + </yAxis> | |
27 | + <zAxis> | |
28 | + <colorAxis colorMapIndex="1" scale="logarithmic"/> | |
29 | + </zAxis> | |
30 | + </axes> | |
31 | + </timePlot> | |
32 | + </plot> | |
33 | + </output> | |
34 | +</param> | ... | ... |
... | ... | @@ -0,0 +1,34 @@ |
1 | +<?xml version="1.0"?> | |
2 | +<param xml:id="jason_amb_ect1234"> | |
3 | + <info> | |
4 | + <table> | |
5 | + <minMaxTable variable="true" name="Energy" units="eV" minName="jason_amb_ele_enmin" maxName="jason_amb_ele_enmax"/> | |
6 | + </table> | |
7 | + </info> | |
8 | + <get> | |
9 | + <amdaParam name="jason_amb_ect1"/> | |
10 | + <amdaParam name="jason_amb_ect2"/> | |
11 | + <amdaParam name="jason_amb_ect3"/> | |
12 | + <amdaParam name="jason_amb_ect4"/> | |
13 | + </get> | |
14 | + <process>($jason_amb_ect1+$jason_amb_ect2+$jason_amb_ect3+$jason_amb_ect4)/4.</process> | |
15 | + <output> | |
16 | + <plot> | |
17 | + <timePlot> | |
18 | + <params> | |
19 | + <param id="jason_amb_ect1234"> | |
20 | + <spectro yAxis="y-left"/> | |
21 | + </param> | |
22 | + </params> | |
23 | + <axes> | |
24 | + <yAxis> | |
25 | + <digitalAxis id="y-left" scale="logarithmic"/> | |
26 | + </yAxis> | |
27 | + <zAxis> | |
28 | + <colorAxis colorMapIndex="1" scale="logarithmic"/> | |
29 | + </zAxis> | |
30 | + </axes> | |
31 | + </timePlot> | |
32 | + </plot> | |
33 | + </output> | |
34 | +</param> | ... | ... |
... | ... | @@ -0,0 +1,34 @@ |
1 | +<?xml version="1.0"?> | |
2 | +<param xml:id="jason_amb_ect2"> | |
3 | + <info> | |
4 | + <table> | |
5 | + <minMaxTable variable="true" name="Energy" units="eV" minName="jason_amb_ele_enmin" maxName="jason_amb_ele_enmax"/> | |
6 | + </table> | |
7 | + </info> | |
8 | + <get><vi name="jason:amb:ele"> | |
9 | + <baseParam name="CountRate_ELE2"/> | |
10 | + </vi> | |
11 | + <amdaParam name="jason_amb_ele_enmin"/> | |
12 | + <amdaParam name="jason_amb_ele_enmax"/> | |
13 | + </get> | |
14 | + <process/> | |
15 | + <output> | |
16 | + <plot> | |
17 | + <timePlot> | |
18 | + <params> | |
19 | + <param id="jason_amb_ect2"> | |
20 | + <spectro yAxis="y-left"/> | |
21 | + </param> | |
22 | + </params> | |
23 | + <axes> | |
24 | + <yAxis> | |
25 | + <digitalAxis id="y-left" scale="logarithmic"/> | |
26 | + </yAxis> | |
27 | + <zAxis> | |
28 | + <colorAxis colorMapIndex="1" scale="logarithmic"/> | |
29 | + </zAxis> | |
30 | + </axes> | |
31 | + </timePlot> | |
32 | + </plot> | |
33 | + </output> | |
34 | +</param> | ... | ... |
... | ... | @@ -0,0 +1,34 @@ |
1 | +<?xml version="1.0"?> | |
2 | +<param xml:id="jason_amb_ect3"> | |
3 | + <info> | |
4 | + <table> | |
5 | + <minMaxTable variable="true" name="Energy" units="eV" minName="jason_amb_ele_enmin" maxName="jason_amb_ele_enmax"/> | |
6 | + </table> | |
7 | + </info> | |
8 | + <get><vi name="jason:amb:ele"> | |
9 | + <baseParam name="CountRate_ELE3"/> | |
10 | + </vi> | |
11 | + <amdaParam name="jason_amb_ele_enmin"/> | |
12 | + <amdaParam name="jason_amb_ele_enmax"/> | |
13 | + </get> | |
14 | + <process/> | |
15 | + <output> | |
16 | + <plot> | |
17 | + <timePlot> | |
18 | + <params> | |
19 | + <param id="jason_amb_ect3"> | |
20 | + <spectro yAxis="y-left"/> | |
21 | + </param> | |
22 | + </params> | |
23 | + <axes> | |
24 | + <yAxis> | |
25 | + <digitalAxis id="y-left" scale="logarithmic"/> | |
26 | + </yAxis> | |
27 | + <zAxis> | |
28 | + <colorAxis colorMapIndex="1" scale="logarithmic"/> | |
29 | + </zAxis> | |
30 | + </axes> | |
31 | + </timePlot> | |
32 | + </plot> | |
33 | + </output> | |
34 | +</param> | ... | ... |
... | ... | @@ -0,0 +1,34 @@ |
1 | +<?xml version="1.0"?> | |
2 | +<param xml:id="jason_amb_ect4"> | |
3 | + <info> | |
4 | + <table> | |
5 | + <minMaxTable variable="true" name="Energy" units="eV" minName="jason_amb_ele_enmin" maxName="jason_amb_ele_enmax"/> | |
6 | + </table> | |
7 | + </info> | |
8 | + <get><vi name="jason:amb:ele"> | |
9 | + <baseParam name="CountRate_ELE4"/> | |
10 | + </vi> | |
11 | + <amdaParam name="jason_amb_ele_enmin"/> | |
12 | + <amdaParam name="jason_amb_ele_enmax"/> | |
13 | + </get> | |
14 | + <process/> | |
15 | + <output> | |
16 | + <plot> | |
17 | + <timePlot> | |
18 | + <params> | |
19 | + <param id="jason_amb_ect4"> | |
20 | + <spectro yAxis="y-left"/> | |
21 | + </param> | |
22 | + </params> | |
23 | + <axes> | |
24 | + <yAxis> | |
25 | + <digitalAxis id="y-left" scale="logarithmic"/> | |
26 | + </yAxis> | |
27 | + <zAxis> | |
28 | + <colorAxis colorMapIndex="1" scale="logarithmic"/> | |
29 | + </zAxis> | |
30 | + </axes> | |
31 | + </timePlot> | |
32 | + </plot> | |
33 | + </output> | |
34 | +</param> | ... | ... |
PARAM_DEF/jason_amb_ict1.xml
... | ... | @@ -2,14 +2,14 @@ |
2 | 2 | <param xml:id="jason_amb_ict1"> |
3 | 3 | <info> |
4 | 4 | <table> |
5 | - <boundsTable name="Energy" units="eV" boundsName="Energybounds"/> | |
5 | + <minMaxTable variable="true" name="Energy" units="eV" minName="jason_amb_ion_enmin" maxName="jason_amb_ion_enmax"/> | |
6 | 6 | </table> |
7 | 7 | </info> |
8 | 8 | <get><vi name="jason:amb:ion"> |
9 | - <baseParam name="ct_ion1"> | |
10 | - <clb name="Energybounds"/> | |
11 | - </baseParam> | |
9 | + <baseParam name="CountRate_ION1"/> | |
12 | 10 | </vi> |
11 | + <amdaParam name="jason_amb_ion_enmin"/> | |
12 | + <amdaParam name="jason_amb_ion_enmax"/> | |
13 | 13 | </get> |
14 | 14 | <process/> |
15 | 15 | <output> | ... | ... |
... | ... | @@ -0,0 +1,34 @@ |
1 | +<?xml version="1.0"?> | |
2 | +<param xml:id="jason_amb_ict1234"> | |
3 | + <info> | |
4 | + <table> | |
5 | + <minMaxTable variable="true" name="Energy" units="eV" minName="jason_amb_ion_enmin" maxName="jason_amb_ion_enmax"/> | |
6 | + </table> | |
7 | + </info> | |
8 | + <get> | |
9 | + <amdaParam name="jason_amb_ict1"/> | |
10 | + <amdaParam name="jason_amb_ict2"/> | |
11 | + <amdaParam name="jason_amb_ict3"/> | |
12 | + <amdaParam name="jason_amb_ict4"/> | |
13 | + </get> | |
14 | + <process>($jason_amb_ict1+$jason_amb_ict2+$jason_amb_ict3+$jason_amb_ict4)/4.</process> | |
15 | + <output> | |
16 | + <plot> | |
17 | + <timePlot> | |
18 | + <params> | |
19 | + <param id="jason_amb_ict1234"> | |
20 | + <spectro yAxis="y-left"/> | |
21 | + </param> | |
22 | + </params> | |
23 | + <axes> | |
24 | + <yAxis> | |
25 | + <digitalAxis id="y-left" scale="logarithmic"/> | |
26 | + </yAxis> | |
27 | + <zAxis> | |
28 | + <colorAxis colorMapIndex="1" scale="logarithmic"/> | |
29 | + </zAxis> | |
30 | + </axes> | |
31 | + </timePlot> | |
32 | + </plot> | |
33 | + </output> | |
34 | +</param> | ... | ... |
PARAM_DEF/jason_amb_ict2.xml
... | ... | @@ -2,14 +2,14 @@ |
2 | 2 | <param xml:id="jason_amb_ict2"> |
3 | 3 | <info> |
4 | 4 | <table> |
5 | - <boundsTable name="Energy" units="eV" boundsName="Energybounds"/> | |
5 | + <minMaxTable variable="true" name="Energy" units="eV" minName="jason_amb_ion_enmin" maxName="jason_amb_ion_enmax"/> | |
6 | 6 | </table> |
7 | 7 | </info> |
8 | 8 | <get><vi name="jason:amb:ion"> |
9 | - <baseParam name="ct_ion2"> | |
10 | - <clb name="Energybounds"/> | |
11 | - </baseParam> | |
9 | + <baseParam name="CountRate_ION2"/> | |
12 | 10 | </vi> |
11 | + <amdaParam name="jason_amb_ion_enmin"/> | |
12 | + <amdaParam name="jason_amb_ion_enmax"/> | |
13 | 13 | </get> |
14 | 14 | <process/> |
15 | 15 | <output> | ... | ... |
PARAM_DEF/jason_amb_ict3.xml
... | ... | @@ -2,14 +2,14 @@ |
2 | 2 | <param xml:id="jason_amb_ict3"> |
3 | 3 | <info> |
4 | 4 | <table> |
5 | - <boundsTable name="Energy" units="eV" boundsName="Energybounds"/> | |
5 | + <minMaxTable variable="true" name="Energy" units="eV" minName="jason_amb_ion_enmin" maxName="jason_amb_ion_enmax"/> | |
6 | 6 | </table> |
7 | 7 | </info> |
8 | 8 | <get><vi name="jason:amb:ion"> |
9 | - <baseParam name="ct_ion3"> | |
10 | - <clb name="Energybounds"/> | |
11 | - </baseParam> | |
9 | + <baseParam name="CountRate_ION3"/> | |
12 | 10 | </vi> |
11 | + <amdaParam name="jason_amb_ion_enmin"/> | |
12 | + <amdaParam name="jason_amb_ion_enmax"/> | |
13 | 13 | </get> |
14 | 14 | <process/> |
15 | 15 | <output> | ... | ... |
PARAM_DEF/jason_amb_ict4.xml
... | ... | @@ -2,14 +2,14 @@ |
2 | 2 | <param xml:id="jason_amb_ict4"> |
3 | 3 | <info> |
4 | 4 | <table> |
5 | - <boundsTable name="Energy" units="eV" boundsName="Energybounds"/> | |
5 | + <minMaxTable variable="true" name="Energy" units="eV" minName="jason_amb_ion_enmin" maxName="jason_amb_ion_enmax"/> | |
6 | 6 | </table> |
7 | 7 | </info> |
8 | 8 | <get><vi name="jason:amb:ion"> |
9 | - <baseParam name="ct_ion4"> | |
10 | - <clb name="Energybounds"/> | |
11 | - </baseParam> | |
9 | + <baseParam name="CountRate_ION4"/> | |
12 | 10 | </vi> |
11 | + <amdaParam name="jason_amb_ion_enmin"/> | |
12 | + <amdaParam name="jason_amb_ion_enmax"/> | |
13 | 13 | </get> |
14 | 14 | <process/> |
15 | 15 | <output> | ... | ... |
PARAM_DEF/jason_amb_ipa1.xml
PARAM_DEF/jason_amb_ipa2.xml
PARAM_DEF/jason_amb_ipa3.xml
PARAM_DEF/jason_amb_ipa4.xml
PARAM_DEF/jason_amb_xyz.xml