CDPP / AMDA_INTERNAL_METADATA

Commit eb46d52fed025b556e800cbb48cd8fb8ad37808f

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

Merge SolarOrbiter / PAS / L2 from master

Showing 15 changed files with 86 additions and 64 deletions   Show diff stats
Inline Side-by-side
ACCESS/access.xml
  Diff comments   View file @eb46d52
1 1 <?xml version="1.0"?>
2 2 <accessRights>
3 3 <!--<mission xml:id='Ephemerides' group='NOTTESTED' restriction=''/>-->
4   - <instrument xml:id='PSP_spe' group='PAS' restriction=''/>
5   - <instrument xml:id='SolO_pas' group='PAS' restriction=''/>
6   - <instrument xml:id='SolO_mag' group='PAS' restriction=''/>
7   - <instrument xml:id='Bepi_mea1' group='BEPI' restriction=''/>
8   - <instrument xml:id='Bepi_mea2' group='BEPI' restriction=''/>
  4 + <!--<instrument xml:id='Bepi_mea1' group='BEPI' restriction=''/>
  5 + <instrument xml:id='Bepi_mea2' group='BEPI' restriction=''/> -->
9 6 <instrument xml:id='cain_cainrun' group='TBD' restriction=''/>
10 7 <instrument xml:id='Rosetta_ica' group='TBD' restriction=''/>
11 8 <instrument xml:id="Cluster1_rapid" group='TBD' restriction=''/>
12 9 <instrument xml:id="Cluster2_rapid" group='TBD' restriction=''/>
13 10 <instrument xml:id="Cluster3_rapid" group='TBD' restriction=''/>
14   - <instrument xml:id="Cluster4_rapid" group='TBD' restriction=''/>
15   - <instrument xml:id="STEREO-A_het" group='TBD' restriction=''/>
16   - <instrument xml:id="STEREO-A_sit" group='TBD' restriction=''/>
17   - <instrument xml:id="STEREO-B_het" group='TBD' restriction=''/>
18   - <instrument xml:id="STEREO-B_sit" group='TBD' restriction=''/>
19   - <datasetGroup xml:id='mich_sat' group='TBD' restriction=''/>
20   - <dataset xml:id='ros-rsn-den' group='Rosetta' restriction='plotOnly'/>
21   - <dataset xml:id='ros-mip-estim' group='Rosetta' restriction=''/>
  11 + <instrument xml:id="Cluster4_rapid" group='TBD' restriction=''/>
22 12 <dataset xml:id='juno-jedi-epitch' group='TBD' restriction=''/>
23 13 <dataset xml:id='juno-jedi-tof90' group='TBD' restriction=''/>
24   - <dataset xml:id='helios1-mag-corefit' group='TBD' restriction=''/>
25   - <dataset xml:id='helios2-mag-corefit' group='TBD' restriction=''/>
26   - <observatory xml:id='SW_Propagation_Model_PSP' group='TBD' restriction=''/>
27   - <observatory xml:id='SW_Propagation_Model_SolO' group='TBD' restriction=''/>
  14 + <dataset xml:id='bepi-mpo-earth' group='SuperBEPI' restriction=''/>
  15 + <dataset xml:id='solo-mag-hr.cdag' group='CDAG' restriction=''/>
  16 + <dataset xml:id='solo-rpw-density' group='PAS' restriction=''/>
  17 + <dataset xml:id='so-pas-3d' group='PAS' restriction=''/>
  18 + <dataset xml:id='so-pas-hk' group='PAS' restriction=''/>
  19 + <dataset xml:id='so-pas-mom' group='PAS' restriction=''/>
  20 + <dataset xml:id='so-pas-l2.3d' group='PAS' restriction=''/>
  21 + <dataset xml:id='so-pas-l2.omni' group='PAS' restriction=''/>
  22 + <dataset xml:id='so-pas-momgr1' group='PAS' restriction=''/>
  23 + <dataset xml:id='so-pas-momtest' group='PAS' restriction=''/>
  24 + <dataset xml:id='so-pas-l2.omnitest' group='PAS' restriction=''/>
  25 + <dataset xml:id='bepi-mea1-3d' group='BEPI' restriction=''/>
  26 + <dataset xml:id='bepi-mea1-omni16' group='BEPI' restriction=''/>
  27 + <dataset xml:id='bepi-mea1-pap' group='BEPI' restriction=''/>
  28 + <dataset xml:id='bepi-mea1-pap0' group='BEPI' restriction=''/>
  29 + <dataset xml:id='bepi-mea1-pap1' group='BEPI' restriction=''/>
  30 + <dataset xml:id='bepi-mea1-pap2' group='BEPI' restriction=''/>
  31 + <dataset xml:id='bepi-mea1-pap3' group='BEPI' restriction=''/>
  32 + <dataset xml:id='bepi-mea1-vml' group='InProgress' restriction=''/>
  33 + <dataset xml:id='bepi-mea1-vml0' group='InProgress' restriction=''/>
  34 + <dataset xml:id='bepi-mea1-vml1' group='InProgress' restriction=''/>
  35 + <dataset xml:id='bepi-mea1-vml2' group='InProgress' restriction=''/>
  36 + <dataset xml:id='bepi-mea1-vml3' group='InProgress' restriction=''/>
  37 + <dataset xml:id='bepi-mea1-vml4' group='InProgress' restriction=''/>
  38 + <dataset xml:id='bepi-mea1-vml5' group='InProgress' restriction=''/>
  39 + <dataset xml:id='bepi-mea2-3d' group='BEPI' restriction=''/>
  40 + <dataset xml:id='bepi-mea2-omni16' group='BEPI' restriction=''/>
  41 + <dataset xml:id='bepi-mea2-pap' group='BEPI' restriction=''/>
  42 + <dataset xml:id='bepi-mea2-pap0' group='BEPI' restriction=''/>
  43 + <dataset xml:id='bepi-mea2-pap1' group='BEPI' restriction=''/>
  44 + <dataset xml:id='bepi-mea2-pap2' group='BEPI' restriction=''/>
  45 + <dataset xml:id='bepi-mea2-pap3' group='BEPI' restriction=''/>
  46 + <dataset xml:id='bepi-mea2-vml' group='InProgress' restriction=''/>
  47 + <dataset xml:id='bepi-mea2-vml0' group='InProgress' restriction=''/>
  48 + <dataset xml:id='bepi-mea2-vml1' group='InProgress' restriction=''/>
  49 + <dataset xml:id='bepi-mea2-vml2' group='InProgress' restriction=''/>
  50 + <dataset xml:id='bepi-mea2-vml3' group='InProgress' restriction=''/>
  51 + <dataset xml:id='bepi-mea2-vml4' group='InProgress' restriction=''/>
  52 + <dataset xml:id='bepi-mea2-vml5' group='InProgress' restriction=''/>
  53 + <dataset xml:id="bepi-mia-venus1" group='BEPIMIA' restriction=''/>
  54 + <dataset xml:id="bepi-mia-earth" group='BEPIMIA' restriction=''/>
  55 + <dataset xml:id="bepi-mia-venus2" group='BEPIMIA' restriction=''/>
  56 + <dataset xml:id="bepi-msa-venus2" group='BEPIMIA' restriction=''/>
  57 + <dataset xml:id="bepi-mgf-venus2" group='BEPIMIA' restriction=''/>
  58 + <dataset xml:id="bepi-ena-venus2" group='BEPIMIA' restriction=''/>
28 59 </accessRights>
... ...
PARAM_DEF/pas_l2_3d_e0.xml
  Diff comments   View file @eb46d52
... ... @@ -2,7 +2,7 @@
2 2 <param xml:id="pas_l2_3d_e0">
3 3 <get>
4 4 <vi name='so:pas:l2.3d'>
5   - <baseParam name="firstE"/>
  5 + <baseParam name="start_energy"/>
6 6 </vi>
7 7 </get>
8 8 <process/>
... ...
PARAM_DEF/pas_l2_3d_el0.xml
  Diff comments   View file @eb46d52
... ... @@ -2,7 +2,7 @@
2 2 <param xml:id="pas_l2_3d_el0">
3 3 <get>
4 4 <vi name='so:pas:l2.3d'>
5   - <baseParam name="firsteL"/>
  5 + <baseParam name="start_elevation"/>
6 6 </vi>
7 7 </get>
8 8 <process/>
... ...
PARAM_DEF/pas_l2_3d_enb.xml
  Diff comments   View file @eb46d52
... ... @@ -2,7 +2,7 @@
2 2 <param xml:id="pas_l2_3d_enb">
3 3 <get>
4 4 <vi name='so:pas:l2.3d'>
5   - <baseParam name="nbE"/>
  5 + <baseParam name="nb_energy"/>
6 6 </vi>
7 7 </get>
8 8 <process/>
... ...
PARAM_DEF/pas_l2_3d_nbel.xml
  Diff comments   View file @eb46d52
... ... @@ -2,7 +2,7 @@
2 2 <param xml:id="pas_l2_3d_nbel">
3 3 <get>
4 4 <vi name='so:pas:l2.3d'>
5   - <baseParam name="nbeL"/>
  5 + <baseParam name="nb_elevation"/>
6 6 </vi>
7 7 </get>
8 8 <process/>
... ...
PARAM_DEF/pas_omni_e0_new.xml renamed to PARAM_DEF/pas_l2_3d_quality.xml
  Diff comments   View file @eb46d52
1 1 <?xml version="1.0"?>
2   -<param xml:id="pas_omni_e0_new">
  2 +<param xml:id="pas_l2_3d_quality">
3 3 <get>
4   - <vi name="so:pas:l2.omni.new">
5   - <baseParam name="start_energy"/>
  4 + <vi name="so:pas:l2.3d">
  5 + <baseParam name="quality_factor"/>
6 6 </vi>
7 7 </get>
8 8 <process/>
... ...
PARAM_DEF/pas_l2_omni.xml
  Diff comments   View file @eb46d52
... ... @@ -7,7 +7,7 @@
7 7 </info>
8 8 <get>
9 9 <vi name="so:pas:l2.omni">
10   - <baseParam name="df">
  10 + <baseParam name="eflux">
11 11 <clb name="eMin"/>
12 12 <clb name="eMax"/>
13 13 </baseParam>
... ...
PARAM_DEF/pas_l2_omni_new.xml renamed to PARAM_DEF/pas_l2_omnitest.xml
  Diff comments   View file @eb46d52
1 1 <?xml version="1.0"?>
2   -<param xml:id="pas_l2_omni_new">
  2 +<param xml:id="pas_l2_omnitest">
3 3 <info>
4 4 <table>
5 5 <minMaxTable name="Energy" units="eV" minName="eMin" maxName="eMax"/>
6 6 </table>
7 7 </info>
8 8 <get>
9   - <vi name="so:pas:l2.omni.new">
10   - <baseParam name="eflux">
  9 + <vi name="so:pas:l2.omnitest">
  10 + <baseParam name="df">
11 11 <clb name="eMin"/>
12 12 <clb name="eMax"/>
13 13 </baseParam>
... ... @@ -18,7 +18,7 @@
18 18 <plot>
19 19 <timePlot>
20 20 <params>
21   - <param id="pas_l2_omni_new">
  21 + <param id="pas_l2_omnitest">
22 22 <spectro yAxis="y-left" uselog0asmin="true"/>
23 23 </param>
24 24 </params>
... ...
PARAM_DEF/pas_omni_enb_new.xml renamed to PARAM_DEF/pas_momgr1_quality.xml
  Diff comments   View file @eb46d52
1 1 <?xml version="1.0"?>
2   -<param xml:id="pas_omni_enb_new">
  2 +<param xml:id="pas_momgr1_quality">
3 3 <get>
4   - <vi name="so:pas:l2.omni.new">
5   - <baseParam name="nb_energy"/>
  4 + <vi name="so:pas:momgr1">
  5 + <baseParam name="quality_factor"/>
6 6 </vi>
7 7 </get>
8 8 <process/>
... ...
PARAM_DEF/pas_momgr1_validity.xml deleted
View file @b5d8457
... ... @@ -1,29 +0,0 @@
1   -<?xml version="1.0"?>
2   -<param xml:id="pas_momgr1_validity">
3   - <info>
4   - <status_def>
5   - <status minVal="1" maxVal="1" name="V lt 270"/>
6   - <status minVal="2" maxVal="2" name="V lt 380"/>
7   - <status minVal="3" maxVal="3" name="V gt 380"/>
8   - </status_def>
9   - </info>
10   - <gap_threshold>20</gap_threshold>
11   - <get>
12   - <vi name='so:pas:momgr1'>
13   - <baseParam name="validity" useNearestValue="true"/>
14   - </vi>
15   - </get>
16   - <process/>
17   - <process/>
18   - <output>
19   - <plot>
20   - <statusPlot position="top" colorMapIndex="0">
21   - <params>
22   - <param id="pas_momgr1_validity">
23   - <serie/>
24   - </param>
25   - </params>
26   - </statusPlot>
27   - </plot>
28   - </output>
29   -</param>
PARAM_DEF/pas_omni_e0.xml
  Diff comments   View file @eb46d52
... ... @@ -2,7 +2,7 @@
2 2 <param xml:id="pas_omni_e0">
3 3 <get>
4 4 <vi name="so:pas:l2.omni">
5   - <baseParam name="firstE"/>
  5 + <baseParam name="start_energy"/>
6 6 </vi>
7 7 </get>
8 8 <process/>
... ...
PARAM_DEF/pas_omni_enb.xml
  Diff comments   View file @eb46d52
... ... @@ -2,7 +2,7 @@
2 2 <param xml:id="pas_omni_enb">
3 3 <get>
4 4 <vi name="so:pas:l2.omni">
5   - <baseParam name="nbE"/>
  5 + <baseParam name="nb_energy"/>
6 6 </vi>
7 7 </get>
8 8 <process/>
... ...
PARAM_DEF/pas_omni_quality.xml
  Diff comments   View file @eb46d52
1 1 <?xml version="1.0"?>
2 2 <param xml:id="pas_omni_quality">
3 3 <get>
4   - <vi name="so:pas:l2.omni.new">
  4 + <vi name="so:pas:l2.omni">
5 5 <baseParam name="quality_factor"/>
6 6 </vi>
7 7 </get>
... ...
PARAM_DEF/pas_omnitest_e0.xml 0 → 100644
  Diff comments   View file @eb46d52
... ... @@ -0,0 +1,10 @@
  1 +<?xml version="1.0"?>
  2 +<param xml:id="pas_omnitest_e0">
  3 + <get>
  4 + <vi name="so:pas:l2.omnitest">
  5 + <baseParam name="firstE"/>
  6 + </vi>
  7 + </get>
  8 + <process/>
  9 + <output/>
  10 +</param>
... ...
PARAM_DEF/pas_omnitest_enb.xml 0 → 100644
  Diff comments   View file @eb46d52
... ... @@ -0,0 +1,10 @@
  1 +<?xml version="1.0"?>
  2 +<param xml:id="pas_omnitest_enb">
  3 + <get>
  4 + <vi name="so:pas:l2.omnitest">
  5 + <baseParam name="nbE"/>
  6 + </vi>
  7 + </get>
  8 + <process/>
  9 + <output/>
  10 +</param>
... ...