CDPP / AMDA_INTERNAL_METADATA

Commit 021c7d39ae8f5d8149322651f0aa1074cc95e80f

Authored by Benjamin Renard
1 parent f58335b7
Exists in master and in 4 other branches bepi_master, bepi_update, juno_jade, soar

Merge Fix JUNO / JADE parameters definition from amdadev

Showing 28 changed files with 40 additions and 156 deletions   Show diff stats
Inline Side-by-side
INTERNAL_PARAM_DEF/jade_e180_sum_lower_energy.xml renamed to INTERNAL_PARAM_DEF/jade_e180_energy.xml
  Diff comments   View file @021c7d3
1 1 <?xml version="1.0" encoding="UTF-8"?>
2   -<param xml:id="jade_e180_sum_lower_energy">
  2 +<param xml:id="jade_e180_energy">
3 3 <get>
4 4 <vi name='juno:jade:e180'>
5   - <baseParam name='LOWER_ENERGY_E180' useNearestValue="true"/>
  5 + <baseParam name='ENERGY_E180' useNearestValue="true"/>
6 6 </vi>
7 7 </get>
8   - <process description="LookDir 0">$juno_jade_e180_LOWER_ENERGY_E180[0]</process>
  8 + <process/>
9 9 <output/>
10 10 </param>
... ...
INTERNAL_PARAM_DEF/jade_e180_lower_energy.xml deleted
View file @f58335b
... ... @@ -1,10 +0,0 @@
1   -<?xml version="1.0" encoding="UTF-8"?>
2   -<param xml:id="jade_e180_lower_energy_##lookdir##">
3   - <get>
4   - <vi name='juno:jade:e180'>
5   - <baseParam name='LOWER_ENERGY_E180' useNearestValue="true"/>
6   - </vi>
7   - </get>
8   - <process description="LookDir ##lookdir##">$juno_jade_e180_LOWER_ENERGY_E180[##lookdir##]</process>
9   - <output/>
10   -</param>
INTERNAL_PARAM_DEF/jade_e180_sum_upper_energy.xml deleted
View file @f58335b
... ... @@ -1,10 +0,0 @@
1   -<?xml version="1.0" encoding="UTF-8"?>
2   -<param xml:id="jade_e180_sum_upper_energy">
3   - <get>
4   - <vi name='juno:jade:e180'>
5   - <baseParam name='UPPER_ENERGY_E180' useNearestValue="true"/>
6   - </vi>
7   - </get>
8   - <process description="LookDir 0">$juno_jade_e180_UPPER_ENERGY_E180[0]</process>
9   - <output/>
10   -</param>
INTERNAL_PARAM_DEF/jade_e180_upper_energy.xml deleted
View file @f58335b
... ... @@ -1,10 +0,0 @@
1   -<?xml version="1.0" encoding="UTF-8"?>
2   -<param xml:id="jade_e180_upper_energy_##lookdir##">
3   - <get>
4   - <vi name='juno:jade:e180'>
5   - <baseParam name='UPPER_ENERGY_E180' useNearestValue="true"/>
6   - </vi>
7   - </get>
8   - <process description="LookDir ##lookdir##">$juno_jade_e180_UPPER_ENERGY_E180[##lookdir##]</process>
9   - <output/>
10   -</param>
INTERNAL_PARAM_DEF/jade_e300_sum_lower_energy.xml renamed to INTERNAL_PARAM_DEF/jade_e300_energy.xml
  Diff comments   View file @021c7d3
1 1 <?xml version="1.0" encoding="UTF-8"?>
2   -<param xml:id="jade_e300_sum_lower_energy">
  2 +<param xml:id="jade_e300_energy">
3 3 <get>
4 4 <vi name='juno:jade:e300'>
5   - <baseParam name='LOWER_ENERGY_E300' useNearestValue="true"/>
  5 + <baseParam name='ENERGY_E300' useNearestValue="true"/>
6 6 </vi>
7 7 </get>
8   - <process description="LookDir 0">$juno_jade_e300_LOWER_ENERGY_E300[0]</process>
  8 + <process/>
9 9 <output/>
10 10 </param>
... ...
INTERNAL_PARAM_DEF/jade_e300_lower_energy.xml deleted
View file @f58335b
... ... @@ -1,10 +0,0 @@
1   -<?xml version="1.0" encoding="UTF-8"?>
2   -<param xml:id="jade_e300_lower_energy_##lookdir##">
3   - <get>
4   - <vi name='juno:jade:e300'>
5   - <baseParam name='LOWER_ENERGY_E300' useNearestValue="true"/>
6   - </vi>
7   - </get>
8   - <process description="LookDir ##lookdir##">$juno_jade_e300_LOWER_ENERGY_E300[##lookdir##]</process>
9   - <output/>
10   -</param>
INTERNAL_PARAM_DEF/jade_e300_sum_upper_energy.xml deleted
View file @f58335b
... ... @@ -1,10 +0,0 @@
1   -<?xml version="1.0" encoding="UTF-8"?>
2   -<param xml:id="jade_e300_sum_upper_energy">
3   - <get>
4   - <vi name='juno:jade:e300'>
5   - <baseParam name='UPPER_ENERGY_E300' useNearestValue="true"/>
6   - </vi>
7   - </get>
8   - <process description="LookDir 0">$juno_jade_e300_UPPER_ENERGY_E300[0]</process>
9   - <output/>
10   -</param>
INTERNAL_PARAM_DEF/jade_e300_upper_energy.xml deleted
View file @f58335b
... ... @@ -1,10 +0,0 @@
1   -<?xml version="1.0" encoding="UTF-8"?>
2   -<param xml:id="jade_e300_upper_energy_##lookdir##">
3   - <get>
4   - <vi name='juno:jade:e300'>
5   - <baseParam name='UPPER_ENERGY_E300' useNearestValue="true"/>
6   - </vi>
7   - </get>
8   - <process description="LookDir ##lookdir##">$juno_jade_e300_UPPER_ENERGY_E300[##lookdir##]</process>
9   - <output/>
10   -</param>
INTERNAL_PARAM_DEF/jade_e60_sum_lower_energy.xml renamed to INTERNAL_PARAM_DEF/jade_e60_energy.xml
  Diff comments   View file @021c7d3
1 1 <?xml version="1.0" encoding="UTF-8"?>
2   -<param xml:id="jade_e60_sum_lower_energy">
  2 +<param xml:id="jade_e60_energy">
3 3 <get>
4 4 <vi name='juno:jade:e060'>
5   - <baseParam name='LOWER_ENERGY_E060' useNearestValue="true"/>
  5 + <baseParam name='ENERGY_E060' useNearestValue="true"/>
6 6 </vi>
7 7 </get>
8   - <process description="LookDir 0">$juno_jade_e060_LOWER_ENERGY_E060[0]</process>
  8 + <process/>
9 9 <output/>
10 10 </param>
... ...
INTERNAL_PARAM_DEF/jade_e60_lower_energy.xml deleted
View file @f58335b
... ... @@ -1,10 +0,0 @@
1   -<?xml version="1.0" encoding="UTF-8"?>
2   -<param xml:id="jade_e60_lower_energy_##lookdir##">
3   - <get>
4   - <vi name='juno:jade:e060'>
5   - <baseParam name='LOWER_ENERGY_E060' useNearestValue="true"/>
6   - </vi>
7   - </get>
8   - <process description="LookDir ##lookdir##">$juno_jade_e060_LOWER_ENERGY_E060[##lookdir##]</process>
9   - <output/>
10   -</param>
INTERNAL_PARAM_DEF/jade_e60_sum_upper_energy.xml deleted
View file @f58335b
... ... @@ -1,10 +0,0 @@
1   -<?xml version="1.0" encoding="UTF-8"?>
2   -<param xml:id="jade_e60_sum_upper_energy">
3   - <get>
4   - <vi name='juno:jade:e060'>
5   - <baseParam name='UPPER_ENERGY_E060' useNearestValue="true"/>
6   - </vi>
7   - </get>
8   - <process description="LookDir 0">$juno_jade_e060_UPPER_ENERGY_E060[0]</process>
9   - <output/>
10   -</param>
INTERNAL_PARAM_DEF/jade_e60_upper_energy.xml deleted
View file @f58335b
... ... @@ -1,10 +0,0 @@
1   -<?xml version="1.0" encoding="UTF-8"?>
2   -<param xml:id="jade_e60_upper_energy_##lookdir##">
3   - <get>
4   - <vi name='juno:jade:e060'>
5   - <baseParam name='UPPER_ENERGY_E060' useNearestValue="true"/>
6   - </vi>
7   - </get>
8   - <process description="LookDir ##lookdir##">$juno_jade_e060_UPPER_ENERGY_E060[##lookdir##]</process>
9   - <output/>
10   -</param>
INTERNAL_PARAM_DEF/jade_ispec_lower_energy.xml renamed to INTERNAL_PARAM_DEF/jade_ispec_energy.xml
  Diff comments   View file @021c7d3
1 1 <?xml version="1.0" encoding="UTF-8"?>
2   -<param xml:id="jade_ispec_lower_energy_##species##_##lookdir##">
  2 +<param xml:id="jade_ispec_energy">
3 3 <get>
4 4 <vi name='juno:jade:ions'>
5   - <baseParam name='LOWER_ENERGY_##species##' useNearestValue="true"/>
  5 + <baseParam name='ENERGY' useNearestValue="true"/>
6 6 </vi>
7 7 </get>
8   - <process description="LookDir ##lookdir##">$juno_jade_ions_LOWER_ENERGY_##species##[##lookdir##]</process>
  8 + <process/>
9 9 <output/>
10 10 </param>
... ...
INTERNAL_PARAM_DEF/jade_ispec_sum_lower_energy.xml deleted
View file @f58335b
... ... @@ -1,10 +0,0 @@
1   -<?xml version="1.0" encoding="UTF-8"?>
2   -<param xml:id="jade_ispec_sum_lower_energy_##species##">
3   - <get>
4   - <vi name='juno:jade:ions'>
5   - <baseParam name='LOWER_ENERGY_##species##' useNearestValue="true"/>
6   - </vi>
7   - </get>
8   - <process description="LookDir 0">$juno_jade_ions_LOWER_ENERGY_##species##[0]</process>
9   - <output/>
10   -</param>
INTERNAL_PARAM_DEF/jade_ispec_sum_upper_energy.xml deleted
View file @f58335b
... ... @@ -1,10 +0,0 @@
1   -<?xml version="1.0" encoding="UTF-8"?>
2   -<param xml:id="jade_ispec_sum_upper_energy_##species##">
3   - <get>
4   - <vi name='juno:jade:ions'>
5   - <baseParam name='UPPER_ENERGY_##species##' useNearestValue="true"/>
6   - </vi>
7   - </get>
8   - <process description="LookDir 0">$juno_jade_ions_UPPER_ENERGY_##species##[0]</process>
9   - <output/>
10   -</param>
INTERNAL_PARAM_DEF/jade_ispec_upper_energy.xml deleted
View file @f58335b
... ... @@ -1,10 +0,0 @@
1   -<?xml version="1.0" encoding="UTF-8"?>
2   -<param xml:id="jade_ispec_upper_energy_##species##_##lookdir##">
3   - <get>
4   - <vi name='juno:jade:ions'>
5   - <baseParam name='UPPER_ENERGY_##species##' useNearestValue="true"/>
6   - </vi>
7   - </get>
8   - <process description="LookDir ##lookdir##">$juno_jade_ions_UPPER_ENERGY_##species##[##lookdir##]</process>
9   - <output/>
10   -</param>
PARAM_DEF/jade_e180_cps.xml
  Diff comments   View file @021c7d3
... ... @@ -2,15 +2,15 @@
2 2 <param xml:id="jade_e180_cps_##lookdir##">
3 3 <info>
4 4 <table>
5   - <minMaxTable variable="true" fullVariable="true" name="Energy" units="eV" minName="jade_e180_lower_energy_##lookdir##" maxName="jade_e180_upper_energy_##lookdir##"/>
  5 + <centerAutoTable variable="true" fullVariable="true" name="Energy" units="eV" centerName="jade_e180_energy" log="true"/>
6 6 </table>
7 7 </info>
  8 + <gap_threshold>100</gap_threshold>
8 9 <get>
9 10 <vi name='juno:jade:e180'>
10 11 <baseParam name='DATA_E180' useNearestValue="true"/>
11 12 </vi>
12   - <amdaParam name="jade_e180_lower_energy_##lookdir##"/>
13   - <amdaParam name="jade_e180_upper_energy_##lookdir##"/>
  13 + <amdaParam name="jade_e180_energy"/>
14 14 </get>
15 15 <process description="LookDir ##lookdir##">$juno_jade_e180_DATA_E180[##lookdir##]</process>
16 16 <output>
... ...
PARAM_DEF/jade_e180_cps_sum.xml
  Diff comments   View file @021c7d3
... ... @@ -2,15 +2,15 @@
2 2 <param xml:id="jade_e180_cps_sum">
3 3 <info>
4 4 <table>
5   - <minMaxTable variable="true" fullVariable="true" name="Energy" units="eV" minName="jade_e180_sum_lower_energy" maxName="jade_e180_sum_upper_energy"/>
  5 + <centerAutoTable variable="true" fullVariable="true" name="Energy" units="eV" centerName="jade_e180_energy" log="true"/>
6 6 </table>
7 7 </info>
  8 + <gap_threshold>100</gap_threshold>
8 9 <get>
9 10 <vi name='juno:jade:e180'>
10 11 <baseParam name='DATA_E180' useNearestValue="true"/>
11 12 </vi>
12   - <amdaParam name="jade_e180_sum_lower_energy"/>
13   - <amdaParam name="jade_e180_sum_upper_energy"/>
  13 + <amdaParam name="jade_e180_energy"/>
14 14 </get>
15 15 <process description="All Look Dir.">total($juno_jade_e180_DATA_E180,1)</process>
16 16 <output>
... ...
PARAM_DEF/jade_e180_mode.xml
  Diff comments   View file @021c7d3
1 1 <?xml version="1.0"?>
2 2 <param xml:id='jade_e180_mode'>
  3 + <gap_threshold>100</gap_threshold>
3 4 <get>
4 5 <vi name='juno:jade:e180'>
5 6 <baseParam name='Mode' useNearestValue="true"/>
... ...
PARAM_DEF/jade_e300_cps.xml
  Diff comments   View file @021c7d3
... ... @@ -2,15 +2,15 @@
2 2 <param xml:id="jade_e300_cps_##lookdir##">
3 3 <info>
4 4 <table>
5   - <minMaxTable variable="true" fullVariable="true" name="Energy" units="eV" minName="jade_e300_lower_energy_##lookdir##" maxName="jade_e300_upper_energy_##lookdir##"/>
  5 + <centerAutoTable variable="true" fullVariable="true" name="Energy" units="eV" centerName="jade_e300_energy" log="true"/>
6 6 </table>
7 7 </info>
  8 + <gap_threshold>100</gap_threshold>
8 9 <get>
9 10 <vi name='juno:jade:e300'>
10 11 <baseParam name='DATA_E300' useNearestValue="true"/>
11 12 </vi>
12   - <amdaParam name="jade_e300_lower_energy_##lookdir##"/>
13   - <amdaParam name="jade_e300_upper_energy_##lookdir##"/>
  13 + <amdaParam name="jade_e300_energy"/>
14 14 </get>
15 15 <process description="LookDir ##lookdir##">$juno_jade_e300_DATA_E300[##lookdir##]</process>
16 16 <output>
... ...
PARAM_DEF/jade_e300_cps_sum.xml
  Diff comments   View file @021c7d3
... ... @@ -2,15 +2,15 @@
2 2 <param xml:id="jade_e300_cps_sum">
3 3 <info>
4 4 <table>
5   - <minMaxTable variable="true" fullVariable="true" name="Energy" units="eV" minName="jade_e300_sum_lower_energy" maxName="jade_e300_sum_upper_energy"/>
  5 + <centerAutoTable variable="true" fullVariable="true" name="Energy" units="eV" centerName="jade_e300_energy" log="true"/>
6 6 </table>
7 7 </info>
  8 + <gap_threshold>100</gap_threshold>
8 9 <get>
9 10 <vi name='juno:jade:e300'>
10 11 <baseParam name='DATA_E300' useNearestValue="true"/>
11 12 </vi>
12   - <amdaParam name="jade_e300_sum_lower_energy"/>
13   - <amdaParam name="jade_e300_sum_upper_energy"/>
  13 + <amdaParam name="jade_e300_energy"/>
14 14 </get>
15 15 <process description="All Look Dir.">total($juno_jade_e300_DATA_E300,1)</process>
16 16 <output>
... ...
PARAM_DEF/jade_e300_mode.xml
  Diff comments   View file @021c7d3
1 1 <?xml version="1.0"?>
2 2 <param xml:id='jade_e300_mode'>
  3 + <gap_threshold>100</gap_threshold>
3 4 <get>
4 5 <vi name='juno:jade:e300'>
5 6 <baseParam name='Mode' useNearestValue="true"/>
... ...
PARAM_DEF/jade_e60_cps.xml
  Diff comments   View file @021c7d3
... ... @@ -2,15 +2,15 @@
2 2 <param xml:id="jade_e60_cps_##lookdir##">
3 3 <info>
4 4 <table>
5   - <minMaxTable variable="true" fullVariable="true" name="Energy" units="eV" minName="jade_e60_lower_energy_##lookdir##" maxName="jade_e60_upper_energy_##lookdir##"/>
  5 + <centerAutoTable variable="true" fullVariable="true" name="Energy" units="eV" centerName="jade_e60_energy" log="true"/>
6 6 </table>
7 7 </info>
  8 + <gap_threshold>100</gap_threshold>
8 9 <get>
9 10 <vi name='juno:jade:e060'>
10 11 <baseParam name='DATA_E060' useNearestValue="true"/>
11 12 </vi>
12   - <amdaParam name="jade_e60_lower_energy_##lookdir##"/>
13   - <amdaParam name="jade_e60_upper_energy_##lookdir##"/>
  13 + <amdaParam name="jade_e60_energy"/>
14 14 </get>
15 15 <process description="LookDir ##lookdir##">$juno_jade_e060_DATA_E060[##lookdir##]</process>
16 16 <output>
... ...
PARAM_DEF/jade_e60_cps_sum.xml
  Diff comments   View file @021c7d3
... ... @@ -2,15 +2,15 @@
2 2 <param xml:id="jade_e60_cps_sum">
3 3 <info>
4 4 <table>
5   - <minMaxTable variable="true" fullVariable="true" name="Energy" units="eV" minName="jade_e60_sum_lower_energy" maxName="jade_e60_sum_upper_energy"/>
  5 + <centerAutoTable variable="true" fullVariable="true" name="Energy" units="eV" centerName="jade_e60_energy" log="true"/>
6 6 </table>
7 7 </info>
  8 + <gap_threshold>100</gap_threshold>
8 9 <get>
9 10 <vi name='juno:jade:e060'>
10 11 <baseParam name='DATA_E060' useNearestValue="true"/>
11 12 </vi>
12   - <amdaParam name="jade_e60_sum_lower_energy"/>
13   - <amdaParam name="jade_e60_sum_upper_energy"/>
  13 + <amdaParam name="jade_e60_energy"/>
14 14 </get>
15 15 <process description="All Look Dir.">total($juno_jade_e060_DATA_E060,1)</process>
16 16 <output>
... ...
PARAM_DEF/jade_e60_mode.xml
  Diff comments   View file @021c7d3
1 1 <?xml version="1.0"?>
2 2 <param xml:id='jade_e60_mode'>
  3 + <gap_threshold>100</gap_threshold>
3 4 <get>
4 5 <vi name='juno:jade:e060'>
5 6 <baseParam name='Mode' useNearestValue="true"/>
... ...
PARAM_DEF/jade_ispec_cps.xml
  Diff comments   View file @021c7d3
... ... @@ -2,15 +2,15 @@
2 2 <param xml:id="jade_ispec_cps_##species##_##lookdir##">
3 3 <info>
4 4 <table>
5   - <minMaxTable variable="true" fullVariable="true" name="Energy" units="eV" minName="jade_ispec_lower_energy_##species##_##lookdir##" maxName="jade_ispec_upper_energy_##species##_##lookdir##"/>
  5 + <centerAutoTable variable="true" fullVariable="true" name="Energy" units="eV" centerName="jade_ispec_energy" log="true"/>
6 6 </table>
7 7 </info>
  8 + <gap_threshold>100</gap_threshold>
8 9 <get>
9 10 <vi name='juno:jade:ions'>
10 11 <baseParam name='DATA_##species##' useNearestValue="true"/>
11 12 </vi>
12   - <amdaParam name="jade_ispec_lower_energy_##species##_##lookdir##"/>
13   - <amdaParam name="jade_ispec_upper_energy_##species##_##lookdir##"/>
  13 + <amdaParam name="jade_ispec_energy"/>
14 14 </get>
15 15 <process description="LookDir ##lookdir##">$juno_jade_ions_DATA_##species##[##lookdir##]</process>
16 16 <output>
... ...
PARAM_DEF/jade_ispec_cps_sum.xml
  Diff comments   View file @021c7d3
... ... @@ -2,15 +2,15 @@
2 2 <param xml:id="jade_ispec_cps_sum_##species##">
3 3 <info>
4 4 <table>
5   - <minMaxTable variable="true" fullVariable="true" name="Energy" units="eV" minName="jade_ispec_sum_lower_energy_##species##" maxName="jade_ispec_sum_upper_energy_##species##"/>
  5 + <centerAutoTable variable="true" fullVariable="true" name="Energy" units="eV" centerName="jade_ispec_energy" log="true"/>
6 6 </table>
7 7 </info>
  8 + <gap_threshold>100</gap_threshold>
8 9 <get>
9 10 <vi name='juno:jade:ions'>
10 11 <baseParam name='DATA_##species##' useNearestValue="true"/>
11 12 </vi>
12   - <amdaParam name="jade_ispec_sum_lower_energy_##species##"/>
13   - <amdaParam name="jade_ispec_sum_upper_energy_##species##"/>
  13 + <amdaParam name="jade_ispec_energy"/>
14 14 </get>
15 15 <process description="LookDir ##lookdir##">total($juno_jade_ions_DATA_##species##,1)</process>
16 16 <output>
... ...
PARAM_DEF/jade_ispec_mode.xml
  Diff comments   View file @021c7d3
1 1 <?xml version="1.0"?>
2 2 <param xml:id='jade_ispec_mode'>
  3 + <gap_threshold>100</gap_threshold>
3 4 <get>
4 5 <vi name='juno:jade:ions'>
5 6 <baseParam name='Mode' useNearestValue="true"/>
... ...