CDPP / AMDA_INTERNAL_METADATA

Commit b5bf5099a87f8f6acfde1ff819b516502eb0b7c1

Authored by Benjamin Renard
1 parent 6de3f8ec
Exists in juice_jdc and in 1 other branch amdadev

Update JASON3 AMBRE parameters

Showing 30 changed files with 188 additions and 30 deletions   Show diff stats
Inline Side-by-side
PARAM_DEF/jason_amb_b.xml
  Diff comments   View file @b5bf509
... ... @@ -2,7 +2,7 @@
2 2 <param xml:id="jason_amb_b">
3 3 <get>
4 4 <vi name="jason:amb:mag">
5   - <baseParam name="B"/>
  5 + <baseParam name="B_Calc"/>
6 6 </vi>
7 7 </get>
8 8 <process></process>
... ...
PARAM_DEF/jason_amb_beq.xml
  Diff comments   View file @b5bf509
... ... @@ -2,7 +2,7 @@
2 2 <param xml:id="jason_amb_beq">
3 3 <get>
4 4 <vi name="jason:amb:mag">
5   - <baseParam name="B_eq"/>
  5 + <baseParam name="B_Eq"/>
6 6 </vi>
7 7 </get>
8 8 <process></process>
... ...
PARAM_DEF/jason_amb_ct1.xml renamed to PARAM_DEF/jason_amb_ect1.xml
  Diff comments   View file @b5bf509
1 1 <?xml version="1.0"?>
2   -<param xml:id="jason_amb_ct1">
  2 +<param xml:id="jason_amb_ect1">
3 3 <info>
4 4 <table>
5 5 <minMaxTable variable="true" name="Energy" units="eV" minName="jason_amb_ele_enmin" maxName="jason_amb_ele_enmax"/>
6 6 </table>
7 7 </info>
8 8 <get><vi name="jason:amb:ele">
9   - <baseParam name="ct_ele1"/>
  9 + <baseParam name="CountRate_ELE1"/>
10 10 </vi>
11 11 <amdaParam name="jason_amb_ele_enmin"/>
12 12 <amdaParam name="jason_amb_ele_enmax"/>
... ... @@ -16,7 +16,7 @@
16 16 <plot>
17 17 <timePlot>
18 18 <params>
19   - <param id="jason_amb_ct1">
  19 + <param id="jason_amb_ect1">
20 20 <spectro yAxis="y-left"/>
21 21 </param>
22 22 </params>
... ...
PARAM_DEF/jason_amb_ect1234.xml 0 → 100644
  Diff comments   View file @b5bf509
... ... @@ -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>
... ...
PARAM_DEF/jason_amb_ct2.xml renamed to PARAM_DEF/jason_amb_ect2.xml
  Diff comments   View file @b5bf509
1 1 <?xml version="1.0"?>
2   -<param xml:id="jason_amb_ct2">
  2 +<param xml:id="jason_amb_ect2">
3 3 <info>
4 4 <table>
5 5 <minMaxTable variable="true" name="Energy" units="eV" minName="jason_amb_ele_enmin" maxName="jason_amb_ele_enmax"/>
6 6 </table>
7 7 </info>
8 8 <get><vi name="jason:amb:ele">
9   - <baseParam name="ct_ele2"/>
  9 + <baseParam name="CountRate_ELE2"/>
10 10 </vi>
11 11 <amdaParam name="jason_amb_ele_enmin"/>
12 12 <amdaParam name="jason_amb_ele_enmax"/>
... ... @@ -16,7 +16,7 @@
16 16 <plot>
17 17 <timePlot>
18 18 <params>
19   - <param id="jason_amb_ct2">
  19 + <param id="jason_amb_ect2">
20 20 <spectro yAxis="y-left"/>
21 21 </param>
22 22 </params>
... ...
PARAM_DEF/jason_amb_ct3.xml renamed to PARAM_DEF/jason_amb_ect3.xml
  Diff comments   View file @b5bf509
1 1 <?xml version="1.0"?>
2   -<param xml:id="jason_amb_ct3">
  2 +<param xml:id="jason_amb_ect3">
3 3 <info>
4 4 <table>
5 5 <minMaxTable variable="true" name="Energy" units="eV" minName="jason_amb_ele_enmin" maxName="jason_amb_ele_enmax"/>
6 6 </table>
7 7 </info>
8 8 <get><vi name="jason:amb:ele">
9   - <baseParam name="ct_ele3"/>
  9 + <baseParam name="CountRate_ELE3"/>
10 10 </vi>
11 11 <amdaParam name="jason_amb_ele_enmin"/>
12 12 <amdaParam name="jason_amb_ele_enmax"/>
... ... @@ -16,7 +16,7 @@
16 16 <plot>
17 17 <timePlot>
18 18 <params>
19   - <param id="jason_amb_ct3">
  19 + <param id="jason_amb_ect3">
20 20 <spectro yAxis="y-left"/>
21 21 </param>
22 22 </params>
... ...
PARAM_DEF/jason_amb_ct4.xml renamed to PARAM_DEF/jason_amb_ect4.xml
  Diff comments   View file @b5bf509
1 1 <?xml version="1.0"?>
2   -<param xml:id="jason_amb_ct4">
  2 +<param xml:id="jason_amb_ect4">
3 3 <info>
4 4 <table>
5 5 <minMaxTable variable="true" name="Energy" units="eV" minName="jason_amb_ele_enmin" maxName="jason_amb_ele_enmax"/>
6 6 </table>
7 7 </info>
8 8 <get><vi name="jason:amb:ele">
9   - <baseParam name="ct_ele4"/>
  9 + <baseParam name="CountRate_ELE4"/>
10 10 </vi>
11 11 <amdaParam name="jason_amb_ele_enmin"/>
12 12 <amdaParam name="jason_amb_ele_enmax"/>
... ...
PARAM_DEF/jason_amb_pa1.xml renamed to PARAM_DEF/jason_amb_epa1.xml
  Diff comments   View file @b5bf509
1 1 <?xml version="1.0"?>
2   -<param xml:id="jason_amb_pa1">
  2 +<param xml:id="jason_amb_epa1">
3 3 <get>
4 4 <vi name="jason:amb:ele">
5   - <baseParam name="pa_ele1_eq"/>
  5 + <baseParam name="Alpha_ELE1"/>
6 6 </vi>
7 7 </get>
8 8 <process></process>
... ...
PARAM_DEF/jason_amb_pa2.xml renamed to PARAM_DEF/jason_amb_epa2.xml
  Diff comments   View file @b5bf509
1 1 <?xml version="1.0"?>
2   -<param xml:id="jason_amb_pa2">
  2 +<param xml:id="jason_amb_epa2">
3 3 <get>
4 4 <vi name="jason:amb:ele">
5   - <baseParam name="pa_ele2_eq"/>
  5 + <baseParam name="Alpha_ELE2"/>
6 6 </vi>
7 7 </get>
8 8 <process></process>
... ...
PARAM_DEF/jason_amb_pa3.xml renamed to PARAM_DEF/jason_amb_epa3.xml
  Diff comments   View file @b5bf509
1 1 <?xml version="1.0"?>
2   -<param xml:id="jason_amb_pa3">
  2 +<param xml:id="jason_amb_epa3">
3 3 <get>
4 4 <vi name="jason:amb:ele">
5   - <baseParam name="pa_ele3_eq"/>
  5 + <baseParam name="Alpha_ELE3"/>
6 6 </vi>
7 7 </get>
8 8 <process></process>
... ...
PARAM_DEF/jason_amb_pa4.xml renamed to PARAM_DEF/jason_amb_epa4.xml
  Diff comments   View file @b5bf509
1 1 <?xml version="1.0"?>
2   -<param xml:id="jason_amb_pa4">
  2 +<param xml:id="jason_amb_epa4">
3 3 <get>
4 4 <vi name="jason:amb:ele">
5   - <baseParam name="pa_ele4_eq"/>
  5 + <baseParam name="Alpha_ELE4"/>
6 6 </vi>
7 7 </get>
8 8 <process></process>
... ...
PARAM_DEF/jason_amb_epaeq1.xml 0 → 100644
  Diff comments   View file @b5bf509
... ... @@ -0,0 +1,10 @@
  1 +<?xml version="1.0"?>
  2 +<param xml:id="jason_amb_epaeq1">
  3 + <get>
  4 + <vi name="jason:amb:ele">
  5 + <baseParam name="Alpha_ELE1_Eq"/>
  6 + </vi>
  7 + </get>
  8 + <process></process>
  9 + <output/>
  10 +</param>
... ...
PARAM_DEF/jason_amb_epaeq2.xml 0 → 100644
  Diff comments   View file @b5bf509
... ... @@ -0,0 +1,10 @@
  1 +<?xml version="1.0"?>
  2 +<param xml:id="jason_amb_epaeq2">
  3 + <get>
  4 + <vi name="jason:amb:ele">
  5 + <baseParam name="Alpha_ELE2_Eq"/>
  6 + </vi>
  7 + </get>
  8 + <process></process>
  9 + <output/>
  10 +</param>
... ...
PARAM_DEF/jason_amb_epaeq3.xml 0 → 100644
  Diff comments   View file @b5bf509
... ... @@ -0,0 +1,10 @@
  1 +<?xml version="1.0"?>
  2 +<param xml:id="jason_amb_epaeq3">
  3 + <get>
  4 + <vi name="jason:amb:ele">
  5 + <baseParam name="Alpha_ELE3_Eq"/>
  6 + </vi>
  7 + </get>
  8 + <process></process>
  9 + <output/>
  10 +</param>
... ...
PARAM_DEF/jason_amb_epaeq4.xml 0 → 100644
  Diff comments   View file @b5bf509
... ... @@ -0,0 +1,10 @@
  1 +<?xml version="1.0"?>
  2 +<param xml:id="jason_amb_epaeq4">
  3 + <get>
  4 + <vi name="jason:amb:ele">
  5 + <baseParam name="Alpha_ELE4_Eq"/>
  6 + </vi>
  7 + </get>
  8 + <process></process>
  9 + <output/>
  10 +</param>
... ...
PARAM_DEF/jason_amb_ict1.xml
  Diff comments   View file @b5bf509
... ... @@ -6,7 +6,7 @@
6 6 </table>
7 7 </info>
8 8 <get><vi name="jason:amb:ion">
9   - <baseParam name="ct_ion1"/>
  9 + <baseParam name="CountRate_ION1"/>
10 10 </vi>
11 11 <amdaParam name="jason_amb_ion_enmin"/>
12 12 <amdaParam name="jason_amb_ion_enmax"/>
... ...
PARAM_DEF/jason_amb_ict1234.xml 0 → 100644
  Diff comments   View file @b5bf509
... ... @@ -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
  Diff comments   View file @b5bf509
... ... @@ -6,7 +6,7 @@
6 6 </table>
7 7 </info>
8 8 <get><vi name="jason:amb:ion">
9   - <baseParam name="ct_ion2"/>
  9 + <baseParam name="CountRate_ION2"/>
10 10 </vi>
11 11 <amdaParam name="jason_amb_ion_enmin"/>
12 12 <amdaParam name="jason_amb_ion_enmax"/>
... ...
PARAM_DEF/jason_amb_ict3.xml
  Diff comments   View file @b5bf509
... ... @@ -6,7 +6,7 @@
6 6 </table>
7 7 </info>
8 8 <get><vi name="jason:amb:ion">
9   - <baseParam name="ct_ion3"/>
  9 + <baseParam name="CountRate_ION3"/>
10 10 </vi>
11 11 <amdaParam name="jason_amb_ion_enmin"/>
12 12 <amdaParam name="jason_amb_ion_enmax"/>
... ...
PARAM_DEF/jason_amb_ict4.xml
  Diff comments   View file @b5bf509
... ... @@ -6,7 +6,7 @@
6 6 </table>
7 7 </info>
8 8 <get><vi name="jason:amb:ion">
9   - <baseParam name="ct_ion4"/>
  9 + <baseParam name="CountRate_ION4"/>
10 10 </vi>
11 11 <amdaParam name="jason_amb_ion_enmin"/>
12 12 <amdaParam name="jason_amb_ion_enmax"/>
... ...
PARAM_DEF/jason_amb_ipa1.xml
  Diff comments   View file @b5bf509
... ... @@ -2,7 +2,7 @@
2 2 <param xml:id="jason_amb_ipa1">
3 3 <get>
4 4 <vi name="jason:amb:ion">
5   - <baseParam name="pa_ion1_eq"/>
  5 + <baseParam name="Alpha_ION1"/>
6 6 </vi>
7 7 </get>
8 8 <process></process>
... ...
PARAM_DEF/jason_amb_ipa2.xml
  Diff comments   View file @b5bf509
... ... @@ -2,7 +2,7 @@
2 2 <param xml:id="jason_amb_ipa2">
3 3 <get>
4 4 <vi name="jason:amb:ion">
5   - <baseParam name="pa_ion2_eq"/>
  5 + <baseParam name="Alpha_ION2"/>
6 6 </vi>
7 7 </get>
8 8 <process></process>
... ...
PARAM_DEF/jason_amb_ipa3.xml
  Diff comments   View file @b5bf509
... ... @@ -2,7 +2,7 @@
2 2 <param xml:id="jason_amb_ipa3">
3 3 <get>
4 4 <vi name="jason:amb:ion">
5   - <baseParam name="pa_ion3_eq"/>
  5 + <baseParam name="Alpha_ION3"/>
6 6 </vi>
7 7 </get>
8 8 <process></process>
... ...
PARAM_DEF/jason_amb_ipa4.xml
  Diff comments   View file @b5bf509
... ... @@ -2,7 +2,7 @@
2 2 <param xml:id="jason_amb_ipa4">
3 3 <get>
4 4 <vi name="jason:amb:ion">
5   - <baseParam name="pa_ion4_eq"/>
  5 + <baseParam name="Alpha_ION4"/>
6 6 </vi>
7 7 </get>
8 8 <process></process>
... ...
PARAM_DEF/jason_amb_ipaeq1.xml 0 → 100644
  Diff comments   View file @b5bf509
... ... @@ -0,0 +1,10 @@
  1 +<?xml version="1.0"?>
  2 +<param xml:id="jason_amb_ipaeq1">
  3 + <get>
  4 + <vi name="jason:amb:ion">
  5 + <baseParam name="Alpha_ION1_Eq"/>
  6 + </vi>
  7 + </get>
  8 + <process></process>
  9 + <output/>
  10 +</param>
... ...
PARAM_DEF/jason_amb_ipaeq2.xml 0 → 100644
  Diff comments   View file @b5bf509
... ... @@ -0,0 +1,10 @@
  1 +<?xml version="1.0"?>
  2 +<param xml:id="jason_amb_ipaeq2">
  3 + <get>
  4 + <vi name="jason:amb:ion">
  5 + <baseParam name="Alpha_ION2_Eq"/>
  6 + </vi>
  7 + </get>
  8 + <process></process>
  9 + <output/>
  10 +</param>
... ...
PARAM_DEF/jason_amb_ipaeq3.xml 0 → 100644
  Diff comments   View file @b5bf509
... ... @@ -0,0 +1,10 @@
  1 +<?xml version="1.0"?>
  2 +<param xml:id="jason_amb_ipaeq3">
  3 + <get>
  4 + <vi name="jason:amb:ion">
  5 + <baseParam name="Alpha_ION3_Eq"/>
  6 + </vi>
  7 + </get>
  8 + <process></process>
  9 + <output/>
  10 +</param>
... ...
PARAM_DEF/jason_amb_ipaeq4.xml 0 → 100644
  Diff comments   View file @b5bf509
... ... @@ -0,0 +1,10 @@
  1 +<?xml version="1.0"?>
  2 +<param xml:id="jason_amb_ipaeq4">
  3 + <get>
  4 + <vi name="jason:amb:ion">
  5 + <baseParam name="Alpha_ION4_Eq"/>
  6 + </vi>
  7 + </get>
  8 + <process></process>
  9 + <output/>
  10 +</param>
... ...
PARAM_DEF/jason_amb_mlt.xml 0 → 100644
  Diff comments   View file @b5bf509
... ... @@ -0,0 +1,10 @@
  1 +<?xml version="1.0"?>
  2 +<param xml:id="jason_amb_mlt">
  3 + <get>
  4 + <vi name="jason:amb:pos">
  5 + <baseParam name="MLT"/>
  6 + </vi>
  7 + </get>
  8 + <process></process>
  9 + <output/>
  10 +</param>
... ...
PARAM_DEF/jason_amb_xyz.xml
  Diff comments   View file @b5bf509
... ... @@ -2,7 +2,7 @@
2 2 <param xml:id="jason_amb_xyz">
3 3 <get>
4 4 <vi name="jason:amb:pos">
5   - <baseParam name="POS_GEO"/>
  5 + <baseParam name="Position"/>
6 6 </vi>
7 7 </get>
8 8 <process></process>
... ...