CDPP / AMDA_INTERNAL_METADATA

Commit ee31e4324b268b3eb9397db66169c6360e7fa430

Authored by Benjamin Renard
1 parent 970090d3
Exists in master and in 7 other branches amdadev, artemis_lon_lat_9323, bepi_master, bepi_update, juice_jdc, juno_jade, soar

Fix Vex ELS parameter definition

Showing 3 changed files with 11 additions and 14 deletions   Show diff stats
Inline Side-by-side
INTERNAL_PARAM_DEF/vex_els_energy.xml
  Diff comments   View file @ee31e43
1 1 <?xml version="1.0"?>
2 2 <param xml:id="vex_els_energy">
  3 + <gap_threshold>20</gap_threshold>
3 4 <get>
4 5 <vi name="vex:els:all">
5 6 <baseParam name="EnergyTable" useNearestValue="true">
... ... @@ -11,6 +12,6 @@
11 12 </baseParam>
12 13 </vi>
13 14 </get>
14   - <process>#getClbInfo(#vex_els_decode($vex_els_all_EnergyTable);0:Etab0;1:Etab1;2:Etab2;3:Etab3;4:Etab4)*7.5</process>
  15 + <process>#getClbInfo(#vex_els_decode($vex_els_all_EnergyTable;$vex_els_all_EnergyTable);0:Etab0;1:Etab1;2:Etab2;3:Etab3;4:Etab4)*7.5</process>
15 16 <output/>
16   -</param>
17 17 \ No newline at end of file
  18 +</param>
... ...
INTERNAL_PARAM_DEF/vex_els_energytable.xml deleted
View file @970090d
... ... @@ -1,10 +0,0 @@
1   -<?xml version="1.0"?>
2   -<param xml:id="vex_els_energytable">
3   - <get>
4   - <vi name='vex:els:all'>
5   - <baseParam name="EnergyTable"/>
6   - </vi>
7   - </get>
8   - <process/>
9   - <output/>
10   -</param>
11 0 \ No newline at end of file
PARAM_DEF/vex_els_spec.xml
  Diff comments   View file @ee31e43
... ... @@ -8,14 +8,20 @@
8 8 <gap_threshold>20</gap_threshold>
9 9 <get>
10 10 <vi name="vex:els:all">
  11 + <baseParam name="EnergyTable" useNearestValue="true">
  12 + <clb name="Etab0"/>
  13 + <clb name="Etab1"/>
  14 + <clb name="Etab2"/>
  15 + <clb name="Etab3"/>
  16 + <clb name="Etab4"/>
  17 + </baseParam>
11 18 <baseParam name="ELS"/>
12 19 <baseParam name="TimeCompres"/>
13 20 <baseParam name="EnergyCompres"/>
14 21 </vi>
15 22 <amdaParam name="vex_els_energy"/>
16   - <amdaParam name="vex_els_energytable"/>
17 23 </get>
18   - <process>#vex_els_decode(mexvex_els_calculate($vex_els_all_ELS,$vex_els_all_TimeCompres,$vex_els_all_EnergyCompres,##anode##))</process>
  24 + <process>#vex_els_decode(mexvex_els_calculate($vex_els_all_ELS,$vex_els_all_TimeCompres,$vex_els_all_EnergyCompres,##anode##);$vex_els_energy)</process>
19 25 <output>
20 26 <plot>
21 27 <timePlot>
... ...