CDPP / AMDA_INTERNAL_METADATA

Commit 0b2c313f8800b91d1163a620761a5c9d3a7d70fe

Authored by Benjamin Renard
1 parent 46cad488
Exists in juice_jdc and in 1 other branch amdadev

Fix JUNO/JEDI Ions energy tables

Showing 36 changed files with 30 additions and 258 deletions   Show diff stats
Inline Side-by-side
INTERNAL_PARAM_DEF/jedi_i180_lower_energy_0.xml renamed to INTERNAL_PARAM_DEF/jedi_i180_lower_energy.xml
  Diff comments   View file @0b2c313
1 1 <?xml version="1.0"?>
2   -<param xml:id="jedi_i180_lower_energy_0">
  2 +<param xml:id="jedi_i180_lower_energy_##lookdir##">
3 3 <get>
4   - <amdaParam name="jedi_i180_mode"/>
  4 + <vi name='juno:jedi:i180'>
  5 + <baseParam name='LowerEnergy'/>
  6 + </vi>
5 7 </get>
6   - <process description="Lower energy for LookDir 0">#getJunoJediLowerEnergy($jedi_i180_mode;0)</process>
  8 + <process>$juno_jedi_i180_LowerEnergy[##lookdir##]</process>
7 9 <output/>
8 10 </param>
... ...
INTERNAL_PARAM_DEF/jedi_i180_lower_energy_1.xml renamed to INTERNAL_PARAM_DEF/jedi_i180_upper_energy.xml
  Diff comments   View file @0b2c313
1 1 <?xml version="1.0"?>
2   -<param xml:id="jedi_i180_lower_energy_1">
  2 +<param xml:id="jedi_i180_upper_energy_##lookdir##">
3 3 <get>
4   - <amdaParam name="jedi_i180_mode"/>
  4 + <vi name='juno:jedi:i180'>
  5 + <baseParam name='UpperEnergy'/>
  6 + </vi>
5 7 </get>
6   - <process description="Lower energy for LookDir 1">#getJunoJediLowerEnergy($jedi_i180_mode;1)</process>
  8 + <process>$juno_jedi_i180_UpperEnergy[##lookdir##]</process>
7 9 <output/>
8 10 </param>
... ...
INTERNAL_PARAM_DEF/jedi_i180_upper_energy_0.xml deleted
View file @46cad48
... ... @@ -1,8 +0,0 @@
1   -<?xml version="1.0"?>
2   -<param xml:id="jedi_i180_upper_energy_0">
3   - <get>
4   - <amdaParam name="jedi_i180_mode"/>
5   - </get>
6   - <process description="Upper energy for LookDir 0">#getJunoJediUpperEnergy($jedi_i180_mode;0)</process>
7   - <output/>
8   -</param>
INTERNAL_PARAM_DEF/jedi_i180_upper_energy_1.xml deleted
View file @46cad48
... ... @@ -1,8 +0,0 @@
1   -<?xml version="1.0"?>
2   -<param xml:id="jedi_i180_upper_energy_1">
3   - <get>
4   - <amdaParam name="jedi_i180_mode"/>
5   - </get>
6   - <process description="Upper energy for LookDir 1">#getJunoJediUpperEnergy($jedi_i180_mode;1)</process>
7   - <output/>
8   -</param>
INTERNAL_PARAM_DEF/jedi_i180_upper_energy_2.xml deleted
View file @46cad48
... ... @@ -1,8 +0,0 @@
1   -<?xml version="1.0"?>
2   -<param xml:id="jedi_i180_upper_energy_2">
3   - <get>
4   - <amdaParam name="jedi_i180_mode"/>
5   - </get>
6   - <process description="Upper energy for LookDir 2">#getJunoJediUpperEnergy($jedi_i180_mode;2)</process>
7   - <output/>
8   -</param>
INTERNAL_PARAM_DEF/jedi_i180_upper_energy_3.xml deleted
View file @46cad48
... ... @@ -1,8 +0,0 @@
1   -<?xml version="1.0"?>
2   -<param xml:id="jedi_i180_upper_energy_3">
3   - <get>
4   - <amdaParam name="jedi_i180_mode"/>
5   - </get>
6   - <process description="Upper energy for LookDir 3">#getJunoJediUpperEnergy($jedi_i180_mode;3)</process>
7   - <output/>
8   -</param>
INTERNAL_PARAM_DEF/jedi_i180_upper_energy_4.xml deleted
View file @46cad48
... ... @@ -1,8 +0,0 @@
1   -<?xml version="1.0"?>
2   -<param xml:id="jedi_i180_upper_energy_4">
3   - <get>
4   - <amdaParam name="jedi_i180_mode"/>
5   - </get>
6   - <process description="Upper energy for LookDir 4">#getJunoJediUpperEnergy($jedi_i180_mode;4)</process>
7   - <output/>
8   -</param>
INTERNAL_PARAM_DEF/jedi_i180_upper_energy_5.xml deleted
View file @46cad48
... ... @@ -1,8 +0,0 @@
1   -<?xml version="1.0"?>
2   -<param xml:id="jedi_i180_upper_energy_5">
3   - <get>
4   - <amdaParam name="jedi_i180_mode"/>
5   - </get>
6   - <process description="Upper energy for LookDir 5">#getJunoJediUpperEnergy($jedi_i180_mode;5)</process>
7   - <output/>
8   -</param>
INTERNAL_PARAM_DEF/jedi_i180_lower_energy_2.xml renamed to INTERNAL_PARAM_DEF/jedi_i270_lower_energy.xml
  Diff comments   View file @0b2c313
1 1 <?xml version="1.0"?>
2   -<param xml:id="jedi_i180_lower_energy_2">
  2 +<param xml:id="jedi_i270_lower_energy_##lookdir##">
3 3 <get>
4   - <amdaParam name="jedi_i180_mode"/>
  4 + <vi name='juno:jedi:i270'>
  5 + <baseParam name='LowerEnergy'/>
  6 + </vi>
5 7 </get>
6   - <process description="Lower energy for LookDir 2">#getJunoJediLowerEnergy($jedi_i180_mode;2)</process>
  8 + <process>$juno_jedi_i270_LowerEnergy[##lookdir##]</process>
7 9 <output/>
8 10 </param>
... ...
INTERNAL_PARAM_DEF/jedi_i270_lower_energy_0.xml deleted
View file @46cad48
... ... @@ -1,8 +0,0 @@
1   -<?xml version="1.0"?>
2   -<param xml:id="jedi_i270_lower_energy_0">
3   - <get>
4   - <amdaParam name="jedi_i270_mode"/>
5   - </get>
6   - <process description="Lower energy for LookDir 0">#getJunoJediLowerEnergy($jedi_i270_mode;0)</process>
7   - <output/>
8   -</param>
INTERNAL_PARAM_DEF/jedi_i270_lower_energy_1.xml deleted
View file @46cad48
... ... @@ -1,8 +0,0 @@
1   -<?xml version="1.0"?>
2   -<param xml:id="jedi_i270_lower_energy_1">
3   - <get>
4   - <amdaParam name="jedi_i270_mode"/>
5   - </get>
6   - <process description="Lower energy for LookDir 1">#getJunoJediLowerEnergy($jedi_i270_mode;1)</process>
7   - <output/>
8   -</param>
INTERNAL_PARAM_DEF/jedi_i270_lower_energy_2.xml deleted
View file @46cad48
... ... @@ -1,8 +0,0 @@
1   -<?xml version="1.0"?>
2   -<param xml:id="jedi_i270_lower_energy_2">
3   - <get>
4   - <amdaParam name="jedi_i270_mode"/>
5   - </get>
6   - <process description="Lower energy for LookDir 2">#getJunoJediLowerEnergy($jedi_i270_mode;2)</process>
7   - <output/>
8   -</param>
INTERNAL_PARAM_DEF/jedi_i270_lower_energy_3.xml deleted
View file @46cad48
... ... @@ -1,8 +0,0 @@
1   -<?xml version="1.0"?>
2   -<param xml:id="jedi_i270_lower_energy_3">
3   - <get>
4   - <amdaParam name="jedi_i270_mode"/>
5   - </get>
6   - <process description="Lower energy for LookDir 3">#getJunoJediLowerEnergy($jedi_i270_mode;3)</process>
7   - <output/>
8   -</param>
INTERNAL_PARAM_DEF/jedi_i270_lower_energy_4.xml deleted
View file @46cad48
... ... @@ -1,8 +0,0 @@
1   -<?xml version="1.0"?>
2   -<param xml:id="jedi_i270_lower_energy_4">
3   - <get>
4   - <amdaParam name="jedi_i270_mode"/>
5   - </get>
6   - <process description="Lower energy for LookDir 4">#getJunoJediLowerEnergy($jedi_i270_mode;4)</process>
7   - <output/>
8   -</param>
INTERNAL_PARAM_DEF/jedi_i270_lower_energy_5.xml deleted
View file @46cad48
... ... @@ -1,8 +0,0 @@
1   -<?xml version="1.0"?>
2   -<param xml:id="jedi_i270_lower_energy_5">
3   - <get>
4   - <amdaParam name="jedi_i270_mode"/>
5   - </get>
6   - <process description="Lower energy for LookDir 5">#getJunoJediLowerEnergy($jedi_i270_mode;5)</process>
7   - <output/>
8   -</param>
INTERNAL_PARAM_DEF/jedi_i180_lower_energy_3.xml renamed to INTERNAL_PARAM_DEF/jedi_i270_upper_energy.xml
  Diff comments   View file @0b2c313
1 1 <?xml version="1.0"?>
2   -<param xml:id="jedi_i180_lower_energy_3">
  2 +<param xml:id="jedi_i270_upper_energy_##lookdir##">
3 3 <get>
4   - <amdaParam name="jedi_i180_mode"/>
  4 + <vi name='juno:jedi:i270'>
  5 + <baseParam name='UpperEnergy'/>
  6 + </vi>
5 7 </get>
6   - <process description="Lower energy for LookDir 3">#getJunoJediLowerEnergy($jedi_i180_mode;3)</process>
  8 + <process>$juno_jedi_i270_UpperEnergy[##lookdir##]</process>
7 9 <output/>
8 10 </param>
... ...
INTERNAL_PARAM_DEF/jedi_i270_upper_energy_0.xml deleted
View file @46cad48
... ... @@ -1,8 +0,0 @@
1   -<?xml version="1.0"?>
2   -<param xml:id="jedi_i270_upper_energy_0">
3   - <get>
4   - <amdaParam name="jedi_i270_mode"/>
5   - </get>
6   - <process description="Upper energy for LookDir 0">#getJunoJediUpperEnergy($jedi_i270_mode;0)</process>
7   - <output/>
8   -</param>
INTERNAL_PARAM_DEF/jedi_i270_upper_energy_1.xml deleted
View file @46cad48
... ... @@ -1,8 +0,0 @@
1   -<?xml version="1.0"?>
2   -<param xml:id="jedi_i270_upper_energy_1">
3   - <get>
4   - <amdaParam name="jedi_i270_mode"/>
5   - </get>
6   - <process description="Upper energy for LookDir 1">#getJunoJediUpperEnergy($jedi_i270_mode;1)</process>
7   - <output/>
8   -</param>
INTERNAL_PARAM_DEF/jedi_i270_upper_energy_2.xml deleted
View file @46cad48
... ... @@ -1,8 +0,0 @@
1   -<?xml version="1.0"?>
2   -<param xml:id="jedi_i270_upper_energy_2">
3   - <get>
4   - <amdaParam name="jedi_i270_mode"/>
5   - </get>
6   - <process description="Upper energy for LookDir 2">#getJunoJediUpperEnergy($jedi_i270_mode;2)</process>
7   - <output/>
8   -</param>
INTERNAL_PARAM_DEF/jedi_i270_upper_energy_3.xml deleted
View file @46cad48
... ... @@ -1,8 +0,0 @@
1   -<?xml version="1.0"?>
2   -<param xml:id="jedi_i270_upper_energy_3">
3   - <get>
4   - <amdaParam name="jedi_i270_mode"/>
5   - </get>
6   - <process description="Upper energy for LookDir 3">#getJunoJediUpperEnergy($jedi_i270_mode;3)</process>
7   - <output/>
8   -</param>
INTERNAL_PARAM_DEF/jedi_i270_upper_energy_4.xml deleted
View file @46cad48
... ... @@ -1,8 +0,0 @@
1   -<?xml version="1.0"?>
2   -<param xml:id="jedi_i270_upper_energy_4">
3   - <get>
4   - <amdaParam name="jedi_i270_mode"/>
5   - </get>
6   - <process description="Upper energy for LookDir 4">#getJunoJediUpperEnergy($jedi_i270_mode;4)</process>
7   - <output/>
8   -</param>
INTERNAL_PARAM_DEF/jedi_i270_upper_energy_5.xml deleted
View file @46cad48
... ... @@ -1,8 +0,0 @@
1   -<?xml version="1.0"?>
2   -<param xml:id="jedi_i270_upper_energy_5">
3   - <get>
4   - <amdaParam name="jedi_i270_mode"/>
5   - </get>
6   - <process description="Upper energy for LookDir 5">#getJunoJediUpperEnergy($jedi_i270_mode;5)</process>
7   - <output/>
8   -</param>
INTERNAL_PARAM_DEF/jedi_i180_lower_energy_4.xml renamed to INTERNAL_PARAM_DEF/jedi_i90_lower_energy.xml
  Diff comments   View file @0b2c313
1 1 <?xml version="1.0"?>
2   -<param xml:id="jedi_i180_lower_energy_4">
  2 +<param xml:id="jedi_i90_lower_energy_##lookdir##">
3 3 <get>
4   - <amdaParam name="jedi_i180_mode"/>
  4 + <vi name='juno:jedi:i090'>
  5 + <baseParam name='LowerEnergy'/>
  6 + </vi>
5 7 </get>
6   - <process description="Lower energy for LookDir 4">#getJunoJediLowerEnergy($jedi_i180_mode;4)</process>
  8 + <process>$juno_jedi_i090_LowerEnergy[##lookdir##]</process>
7 9 <output/>
8 10 </param>
... ...
INTERNAL_PARAM_DEF/jedi_i90_lower_energy_0.xml deleted
View file @46cad48
... ... @@ -1,8 +0,0 @@
1   -<?xml version="1.0"?>
2   -<param xml:id="jedi_i90_lower_energy_0">
3   - <get>
4   - <amdaParam name="jedi_i90_mode"/>
5   - </get>
6   - <process description="Lower energy for LookDir 0">#getJunoJediLowerEnergy($jedi_i90_mode;0)</process>
7   - <output/>
8   -</param>
INTERNAL_PARAM_DEF/jedi_i90_lower_energy_1.xml deleted
View file @46cad48
... ... @@ -1,8 +0,0 @@
1   -<?xml version="1.0"?>
2   -<param xml:id="jedi_i90_lower_energy_1">
3   - <get>
4   - <amdaParam name="jedi_i90_mode"/>
5   - </get>
6   - <process description="Lower energy for LookDir 1">#getJunoJediLowerEnergy($jedi_i90_mode;1)</process>
7   - <output/>
8   -</param>
INTERNAL_PARAM_DEF/jedi_i90_lower_energy_2.xml deleted
View file @46cad48
... ... @@ -1,8 +0,0 @@
1   -<?xml version="1.0"?>
2   -<param xml:id="jedi_i90_lower_energy_2">
3   - <get>
4   - <amdaParam name="jedi_i90_mode"/>
5   - </get>
6   - <process description="Lower energy for LookDir 2">#getJunoJediLowerEnergy($jedi_i90_mode;2)</process>
7   - <output/>
8   -</param>
INTERNAL_PARAM_DEF/jedi_i90_lower_energy_3.xml deleted
View file @46cad48
... ... @@ -1,8 +0,0 @@
1   -<?xml version="1.0"?>
2   -<param xml:id="jedi_i90_lower_energy_3">
3   - <get>
4   - <amdaParam name="jedi_i90_mode"/>
5   - </get>
6   - <process description="Lower energy for LookDir 3">#getJunoJediLowerEnergy($jedi_i90_mode;3)</process>
7   - <output/>
8   -</param>
INTERNAL_PARAM_DEF/jedi_i90_lower_energy_4.xml deleted
View file @46cad48
... ... @@ -1,8 +0,0 @@
1   -<?xml version="1.0"?>
2   -<param xml:id="jedi_i90_lower_energy_4">
3   - <get>
4   - <amdaParam name="jedi_i90_mode"/>
5   - </get>
6   - <process description="Lower energy for LookDir 4">#getJunoJediLowerEnergy($jedi_i90_mode;4)</process>
7   - <output/>
8   -</param>
INTERNAL_PARAM_DEF/jedi_i90_lower_energy_5.xml deleted
View file @46cad48
... ... @@ -1,8 +0,0 @@
1   -<?xml version="1.0"?>
2   -<param xml:id="jedi_i90_lower_energy_5">
3   - <get>
4   - <amdaParam name="jedi_i90_mode"/>
5   - </get>
6   - <process description="Lower energy for LookDir 5">#getJunoJediLowerEnergy($jedi_i90_mode;5)</process>
7   - <output/>
8   -</param>
INTERNAL_PARAM_DEF/jedi_i180_lower_energy_5.xml renamed to INTERNAL_PARAM_DEF/jedi_i90_upper_energy.xml
  Diff comments   View file @0b2c313
1 1 <?xml version="1.0"?>
2   -<param xml:id="jedi_i180_lower_energy_5">
  2 +<param xml:id="jedi_i90_upper_energy_##lookdir##">
3 3 <get>
4   - <amdaParam name="jedi_i180_mode"/>
  4 + <vi name='juno:jedi:i090'>
  5 + <baseParam name='UpperEnergy'/>
  6 + </vi>
5 7 </get>
6   - <process description="Lower energy for LookDir 5">#getJunoJediLowerEnergy($jedi_i180_mode;5)</process>
  8 + <process>$juno_jedi_i090_UpperEnergy[##lookdir##]</process>
7 9 <output/>
8 10 </param>
... ...
INTERNAL_PARAM_DEF/jedi_i90_upper_energy_0.xml deleted
View file @46cad48
... ... @@ -1,8 +0,0 @@
1   -<?xml version="1.0"?>
2   -<param xml:id="jedi_i90_upper_energy_0">
3   - <get>
4   - <amdaParam name="jedi_i90_mode"/>
5   - </get>
6   - <process description="Upper energy for LookDir 0">#getJunoJediUpperEnergy($jedi_i90_mode;0)</process>
7   - <output/>
8   -</param>
INTERNAL_PARAM_DEF/jedi_i90_upper_energy_1.xml deleted
View file @46cad48
... ... @@ -1,8 +0,0 @@
1   -<?xml version="1.0"?>
2   -<param xml:id="jedi_i90_upper_energy_1">
3   - <get>
4   - <amdaParam name="jedi_i90_mode"/>
5   - </get>
6   - <process description="Upper energy for LookDir 1">#getJunoJediUpperEnergy($jedi_i90_mode;1)</process>
7   - <output/>
8   -</param>
INTERNAL_PARAM_DEF/jedi_i90_upper_energy_2.xml deleted
View file @46cad48
... ... @@ -1,8 +0,0 @@
1   -<?xml version="1.0"?>
2   -<param xml:id="jedi_i90_upper_energy_2">
3   - <get>
4   - <amdaParam name="jedi_i90_mode"/>
5   - </get>
6   - <process description="Upper energy for LookDir 2">#getJunoJediUpperEnergy($jedi_i90_mode;2)</process>
7   - <output/>
8   -</param>
INTERNAL_PARAM_DEF/jedi_i90_upper_energy_3.xml deleted
View file @46cad48
... ... @@ -1,8 +0,0 @@
1   -<?xml version="1.0"?>
2   -<param xml:id="jedi_i90_upper_energy_3">
3   - <get>
4   - <amdaParam name="jedi_i90_mode"/>
5   - </get>
6   - <process description="Upper energy for LookDir 3">#getJunoJediUpperEnergy($jedi_i90_mode;3)</process>
7   - <output/>
8   -</param>
INTERNAL_PARAM_DEF/jedi_i90_upper_energy_4.xml deleted
View file @46cad48
... ... @@ -1,8 +0,0 @@
1   -<?xml version="1.0"?>
2   -<param xml:id="jedi_i90_upper_energy_4">
3   - <get>
4   - <amdaParam name="jedi_i90_mode"/>
5   - </get>
6   - <process description="Upper energy for LookDir 4">#getJunoJediUpperEnergy($jedi_i90_mode;4)</process>
7   - <output/>
8   -</param>
INTERNAL_PARAM_DEF/jedi_i90_upper_energy_5.xml deleted
View file @46cad48
... ... @@ -1,8 +0,0 @@
1   -<?xml version="1.0"?>
2   -<param xml:id="jedi_i90_upper_energy_5">
3   - <get>
4   - <amdaParam name="jedi_i90_mode"/>
5   - </get>
6   - <process description="Upper energy for LookDir 5">#getJunoJediUpperEnergy($jedi_i90_mode;5)</process>
7   - <output/>
8   -</param>