CDPP / AMDA_INTERNAL_METADATA

Commit 2920549b2ab5a3a7056dd260d55c858c074536ff

Authored by Alexandre Schulz
2 parents 9b47ec28 1f66e09b
Exists in master and in 7 other branches amdadev, artemis_lon_lat_9323, bepi_master, bepi_update, juice_jdc, juno_jade, soar

Merge branch 'master' of https://gitlab.irap.omp.eu/CDPP/AMDA_INTERNAL_METADATA

Showing 15 changed files with 64 additions and 22 deletions   Show diff stats
Inline Side-by-side
INTERNAL_PARAM_DEF/psp_spe_energy.xml 0 → 100644
  Diff comments   View file @2920549
... ... @@ -0,0 +1,10 @@
  1 +<?xml version="1.0"?>
  2 +<param xml:id="psp_spe_energy">
  3 + <get>
  4 + <vi name="psp:spe:pad">
  5 + <baseParam name="ENERGY_VALS"/>
  6 + </vi>
  7 + </get>
  8 + <process/>
  9 + <output/>
  10 +</param>
... ...
PARAM_DEF/athp1_xyz_lse.xml
  Diff comments   View file @2920549
... ... @@ -3,7 +3,7 @@
3 3 <get>
4 4 <amdaParam name="thb_xyz"/>
5 5 </get>
6   - <process>#framesTransformation($thb_xyz*RADIUS_EARTH;GSE;LSE;true)</process>
  6 + <process>#framesTransformation($thb_xyz*RADIUS_EARTH;GSE;LSE;true)/1738.</process>
7 7 <output>
8 8 <plot>
9 9 <xyPlot isotropic="true">
... ...
PARAM_DEF/athp2_xyz_lse.xml
  Diff comments   View file @2920549
... ... @@ -3,7 +3,7 @@
3 3 <get>
4 4 <amdaParam name='thc_xyz'/>
5 5 </get>
6   - <process>#framesTransformation($thc_xyz*RADIUS_EARTH;GSE;LSE;true)</process>
  6 + <process>#framesTransformation($thc_xyz*RADIUS_EARTH;GSE;LSE;true)/1738.</process>
7 7 <output>
8 8 <plot>
9 9 <xyPlot isotropic="true">
... ...
PARAM_DEF/m10_bt.xml
  Diff comments   View file @2920549
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <param xml:id="m10_bt">
3 3 <get>
4   - <amdaParam name="m10_b_mo"/>
  4 + <amdaParam name="m10_b_mso"/>
5 5 </get>
6   - <process>magnitude($m10_b_mo)</process>
  6 + <process>magnitude($m10_b_mso)</process>
7 7 <output/>
8 8 </param>
... ...
PARAM_DEF/m10_m1_lat2.xml renamed to PARAM_DEF/m10_m1_hr_b_mseq.xml
  Diff comments   View file @2920549
1 1 <?xml version="1.0" encoding="UTF-8"?>
2   -<param xml:id="m10_m1_lat2">
  2 +<param xml:id="m10_m1_hr_b_mseq">
3 3 <get>
4   - <vi name="m10:m1:orb2">
5   - <baseParam name="POS_LAT"/>
  4 + <vi name="m10:mag:m1highres">
  5 + <baseParam name="B"/>
6 6 </vi>
7 7 </get>
8 8 <process></process>
... ...
PARAM_DEF/m10_m1_hr_bt.xml 0 → 100644
  Diff comments   View file @2920549
... ... @@ -0,0 +1,10 @@
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<param xml:id="m10_m1_hr_bt">
  3 + <get>
  4 + <amdaParam name="m10_m1_hr_b_mseq"/>
  5 + </get>
  6 + <process>magnitude($m10_m1_hr_b_mseq)</process>
  7 + <output>
  8 + <!---<plot>ORBIT</plot>-->
  9 + </output>
  10 +</param>
... ...
PARAM_DEF/m10_m2_b_seq.xml
  Diff comments   View file @2920549
... ... @@ -2,7 +2,7 @@
2 2 <param xml:id="m10_m2_b_seq">
3 3 <get>
4 4 <vi name="m10:mag:m2mean6s">
5   - <baseParam name="B_SEQ"/>
  5 + <baseParam name="B"/>
6 6 </vi>
7 7 </get>
8 8 <process></process>
... ...
PARAM_DEF/m10_m2_bt.xml 0 → 100644
  Diff comments   View file @2920549
... ... @@ -0,0 +1,10 @@
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<param xml:id="m10_m2_bt">
  3 + <get>
  4 + <amdaParam name="m10_m2_b_seq"/>
  5 + </get>
  6 + <process>magnitude($m10_m2_b_seq)</process>
  7 + <output>
  8 + <!---<plot>ORBIT</plot>-->
  9 + </output>
  10 +</param>
... ...
PARAM_DEF/m10_m3_bt.xml
  Diff comments   View file @2920549
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <param xml:id="m10_m3_bt">
3 3 <get>
4   - <amdaParam name="m10_m3_b_mo"/>
  4 + <amdaParam name="m10_m3_b_mso"/>
5 5 </get>
6   - <process>magnitude($m10_m3_b_mo)</process>
  6 + <process>magnitude($m10_m3_b_mso)</process>
7 7 <output/>
8 8 </param>
... ...
PARAM_DEF/m10_m1_lon2.xml renamed to PARAM_DEF/m10_m3_hr_b_mso.xml
  Diff comments   View file @2920549
1 1 <?xml version="1.0" encoding="UTF-8"?>
2   -<param xml:id="m10_m1_lon2">
  2 +<param xml:id="m10_m3_hr_b_mso">
3 3 <get>
4   - <vi name="m10:m1:orb2">
5   - <baseParam name="POS_LON"/>
  4 + <vi name="m10:mag:m3highres">
  5 + <baseParam name="B"/>
6 6 </vi>
7 7 </get>
8 8 <process></process>
... ...
PARAM_DEF/m10_m3_hr_bt.xml 0 → 100644
  Diff comments   View file @2920549
... ... @@ -0,0 +1,10 @@
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<param xml:id="m10_m3_hr_bt">
  3 + <get>
  4 + <amdaParam name="m10_m3_hr_b_mso"/>
  5 + </get>
  6 + <process>magnitude($m10_m3_hr_b_mso)</process>
  7 + <output>
  8 + <!---<plot>ORBIT</plot>-->
  9 + </output>
  10 +</param>
... ...
PARAM_DEF/m10_m3_xyz.xml
  Diff comments   View file @2920549
... ... @@ -2,7 +2,7 @@
2 2 <param xml:id="m10_m3_xyz">
3 3 <get>
4 4 <vi name="m10:m3:orb">
5   - <baseParam name="POS"/>
  5 + <baseParam name="POS_SEQ"/>
6 6 </vi>
7 7 </get>
8 8 <process></process>
... ...
PARAM_DEF/psp_spe_EvsEvspa.xml
  Diff comments   View file @2920549
... ... @@ -2,18 +2,18 @@
2 2 <param xml:id="psp_spe_EvsEvspa">
3 3 <info>
4 4 <table>
5   - <centerAutoTable dim="0" name="Energy" centerName="Energy" units="eV" log="false"/>
6   - <centerAutoTable dim="1" name="Pitch Angle" centerName="PitchAngle" units="deg" log="false"/>
  5 + <centerAutoTable dim="0" name="Pitch Angle" centerName="PitchAngle" units="deg" log="false"/>
  6 + <centerAutoTable dim="1" name="Energy" variable="true" centerName="psp_spe_energy" units="eV" log="false"/>
7 7 </table>
8 8 </info>
9 9 <gap_threshold>50</gap_threshold>
10 10 <get>
11 11 <vi name="psp:spe:pad">
12 12 <baseParam name="EFLUX_VS_PA_E">
13   - <clb name="PitchAngle"/>
14   - <clb name="Energy"/>
15   - </baseParam>
  13 + <clb name="PitchAngle"/>
  14 + </baseParam>
16 15 </vi>
  16 + <amdaParam name='psp_spe_energy'/>
17 17 </get>
18 18 <process/>
19 19 <output>
... ... @@ -26,7 +26,7 @@
26 26 </params>
27 27 <axes>
28 28 <yAxis>
29   - <digitalAxis id="y-left" scale="logarithmic"/>
  29 + <digitalAxis id="y-left" scale="linear"/>
30 30 </yAxis>
31 31 <zAxis>
32 32 <colorAxis scale="logarithmic"/>
... ...
PARAM_DEF/thb_ion_sp.xml
  Diff comments   View file @2920549
... ... @@ -7,7 +7,9 @@
7 7 </info>
8 8 <gap_threshold>8</gap_threshold>
9 9 <get>
10   - <amdaParam name='thb_ion_sp'/>
  10 + <vi name="thb:esa:l2i">
  11 + <baseParam name="Flux"/>
  12 + </vi>
11 13 <amdaParam name='thb_ion_sp_energy'/>
12 14 </get>
13 15 <process></process>
... ...
PARAM_INFO_PREDEFINED/info_psp_spe_EvsEvspa.xml
  Diff comments   View file @2920549
1 1 <?xml version="1.0" encoding="UTF-8"?>
2   -<paraminfo id="psp_spe_pad_EFLUX_VS_PA_E"><dimensions dim_1="32" dim_2="12"/><components/><tables><table relatedDim="dim_1" name="Energy" units="eV"><channel min="1618.6" max="1969.3"/><channel min="1302.1" max="1618.6"/><channel min="1047.6" max="1302.1"/><channel min="842.7" max="1047.6"/><channel min="677.8" max="842.7"/><channel min="545.3" max="677.8"/><channel min="438.8" max="545.3"/><channel min="352.9" max="438.8"/><channel min="283.9" max="352.9"/><channel min="228.6" max="283.9"/><channel min="183.7" max="228.6"/><channel min="147.8" max="183.7"/><channel min="119.0" max="147.8"/><channel min="95.6" max="119.0"/><channel min="77.0" max="95.6"/><channel min="61.9" max="77.0"/><channel min="49.7" max="61.9"/><channel min="40.0" max="49.7"/><channel min="32.1" max="40.0"/><channel min="25.7" max="32.1"/><channel min="20.6" max="25.7"/><channel min="16.6" max="20.6"/><channel min="13.5" max="16.6"/><channel min="11.0" max="13.5"/><channel min="8.7" max="11.0"/><channel min="6.9" max="8.7"/><channel min="5.6" max="6.9"/><channel min="4.6" max="5.6"/><channel min="3.6" max="4.6"/><channel min="2.8" max="3.6"/><channel min="2.3" max="2.8"/><channel min="1.8" max="2.3"/></table><table relatedDim="dim_2" name="Pitch Angle" units="deg"><channel min="0.0" max="15.0"/><channel min="15.0" max="30.0"/><channel min="30.0" max="45.0"/><channel min="45.0" max="60.0"/><channel min="60.0" max="75.0"/><channel min="75.0" max="90.0"/><channel min="90.0" max="105.0"/><channel min="105.0" max="120.0"/><channel min="120.0" max="135.0"/><channel min="135.0" max="150.0"/><channel min="150.0" max="165.0"/><channel min="165.0" max="180.0"/></table></tables></paraminfo>
  2 +<paraminfo id="psp_spe_pad_EFLUX_VS_PA_E"><dimensions dim_1="12" dim_2="32"/><components/><tables><table relatedDim="dim_2" name="Energy" units="eV"><channel min="1618.6" max="1969.3"/><channel min="1302.1" max="1618.6"/><channel min="1047.6" max="1302.1"/><channel min="842.7" max="1047.6"/><channel min="677.8" max="842.7"/><channel min="545.3" max="677.8"/><channel min="438.8" max="545.3"/><channel min="352.9" max="438.8"/><channel min="283.9" max="352.9"/><channel min="228.6" max="283.9"/><channel min="183.7" max="228.6"/><channel min="147.8" max="183.7"/><channel min="119.0" max="147.8"/><channel min="95.6" max="119.0"/><channel min="77.0" max="95.6"/><channel min="61.9" max="77.0"/><channel min="49.7" max="61.9"/><channel min="40.0" max="49.7"/><channel min="32.1" max="40.0"/><channel min="25.7" max="32.1"/><channel min="20.6" max="25.7"/><channel min="16.6" max="20.6"/><channel min="13.5" max="16.6"/><channel min="11.0" max="13.5"/><channel min="8.7" max="11.0"/><channel min="6.9" max="8.7"/><channel min="5.6" max="6.9"/><channel min="4.6" max="5.6"/><channel min="3.6" max="4.6"/><channel min="2.8" max="3.6"/><channel min="2.3" max="2.8"/><channel min="1.8" max="2.3"/></table><table relatedDim="dim_1" name="Pitch Angle" units="deg"><channel min="0.0" max="15.0"/><channel min="15.0" max="30.0"/><channel min="30.0" max="45.0"/><channel min="45.0" max="60.0"/><channel min="60.0" max="75.0"/><channel min="75.0" max="90.0"/><channel min="90.0" max="105.0"/><channel min="105.0" max="120.0"/><channel min="120.0" max="135.0"/><channel min="135.0" max="150.0"/><channel min="150.0" max="165.0"/><channel min="165.0" max="180.0"/></table></tables></paraminfo>
... ...