CDPP / AMDA_INTERNAL_METADATA

Commit 234b7fa1162afa6698ae5acc6e9fe05c4d49a059

Authored by Myriam Bouchemit
2 parents d2e04518 f90f0dfe
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 24 changed files with 214 additions and 24 deletions   Show diff stats
Inline Side-by-side
INTERNAL_PARAM_DEF/mav_c6_energy.xml 0 → 100644
  Diff comments   View file @234b7fa
... ... @@ -0,0 +1,15 @@
  1 +<?xml version="1.0"?>
  2 +<param xml:id="mav_c6_energy">
  3 + <get>
  4 + <vi name='mavpds:sta:c6'>
  5 + <baseParam name="swp_ind" useNearestValue="true">
  6 + <clb name="energy"/>
  7 + <clb name="nswp"/>
  8 + <clb name="nmass"/>
  9 + <clb name="nenergy"/>
  10 + </baseParam>
  11 + </vi>
  12 + </get>
  13 + <process description="MAVEN STATIC C6 Energy - ave">#getMavenStaticEnergy($mavpds_sta_c6_swp_ind;32)</process>
  14 + <output/>
  15 +</param>
... ...
INTERNAL_PARAM_DEF/mav_c6_energy_ave.xml 0 → 100644
  Diff comments   View file @234b7fa
... ... @@ -0,0 +1,8 @@
  1 +<?xml version="1.0"?>
  2 +<param xml:id="mav_c6_energy_ave">
  3 + <get>
  4 + <amdaParam name="mav_sta_c6_ind"/>
  5 + </get>
  6 + <process description="MAVEN STATIC C6 Energy - ave">#getMavenStaticEnergy($mav_sta_c6_ind;32;0)</process>
  7 + <output/>
  8 +</param>
... ...
INTERNAL_PARAM_DEF/mav_c6_mass_ave.xml 0 → 100644
  Diff comments   View file @234b7fa
... ... @@ -0,0 +1,8 @@
  1 +<?xml version="1.0"?>
  2 +<param xml:id="mav_c6_mass_ave">
  3 + <get>
  4 + <amdaParam name="mav_sta_c6_ind"/>
  5 + </get>
  6 + <process description="MAVEN STATIC C6 Mass - ave">#getMavenStaticEnergy($mav_sta_c6_ind;16;1)</process>
  7 + <output/>
  8 +</param>
... ...
INTERNAL_PARAM_DEF/sum_into_table_range_2d.xml 0 → 100644
  Diff comments   View file @234b7fa
... ... @@ -0,0 +1,8 @@
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<param xml:id="sum_into_table_range_2d_##paramid##_##relateddim1##_##min1##_##max1##_##min2##_##max2##">
  3 + <get>
  4 + <amdaParam name='##paramid##'/>
  5 + </get>
  6 + <process description="sum_into_table_range(##paramid##, ##relateddim1##, ##min1##, ##max1##, ##min2##, ##max2##)">#sum_into_table_range($##paramid##;##relateddim1##;##min1##;##max1##;##min2##;##max2##)</process>
  7 + <output/>
  8 +</param>
... ...
PARAM_DEF/e_mgs_er.xml renamed to PARAM_DEF/e_mgs_omni.xml
  Diff comments   View file @234b7fa
1 1 <?xml version="1.0" encoding="UTF-8"?>
2   -<param xml:id="e_mgs_er">
  2 +<param xml:id="e_mgs_omni">
3 3 <info>
4 4 <table>
5 5 <boundsTable name="Energy" boundsName="energy" units="eV"/>
... ... @@ -17,23 +17,15 @@
17 17 <plot>
18 18 <timePlot>
19 19 <params>
20   - <param id="e_mgs_er">
  20 + <param id="e_mgs_omni">
21 21 <spectro yAxis="y-left"/>
22 22 </param>
23 23 </params>
24 24 <axes>
25 25 <yAxis>
26   - <digitalAxis id="y-left" reverse="false" scale="logarithmic" color="[0,0,0]" thickness="1" showLegend="true" showTickMark="true">
27   - <range extend="true"/>
28   - <tick position="outwards" minorGrid="false" majorGrid="false"/>
29   - <legend/>
30   - </digitalAxis>
31   - </yAxis>
  26 + <digitalAxis id="y-left" scale="logarithmic"/>
32 27 <zAxis>
33   - <colorAxis colorMapIndex="1" reverse="false" scale="logarithmic" color="[0,0,0]" thickness="1" showLegend="true" showTickMark="true">
34   - <range extend="true"/>
35   - <tick position="outwards" minorGrid="false" majorGrid="false"/>
36   - </colorAxis>
  28 + <colorAxis colorMapIndex="1" scale="logarithmic"/>
37 29 </zAxis>
38 30 </axes>
39 31 </timePlot>
... ...
PARAM_DEF/lat_mgs_iau.xml 0 → 100644
  Diff comments   View file @234b7fa
... ... @@ -0,0 +1,10 @@
  1 +<?xml version="1.0"?>
  2 +<param xml:id="lat_mgs_iau">
  3 + <get>
  4 + <vi name="mgs:orb:all">
  5 + <baseParam name="LAT_IAU_MARS"/>
  6 + </vi>
  7 + </get>
  8 + <process>$mgs_orb_all_LAT_IAU_MARS*RAD2DEG</process>
  9 + <output/>
  10 +</param>
... ...
PARAM_DEF/lon_mgs_iau.xml 0 → 100644
  Diff comments   View file @234b7fa
... ... @@ -0,0 +1,10 @@
  1 +<?xml version="1.0"?>
  2 +<param xml:id="lon_mgs_iau">
  3 + <get>
  4 + <vi name="mgs:orb:all">
  5 + <baseParam name="LON_IAU_MARS"/>
  6 + </vi>
  7 + </get>
  8 + <process>$mgs_orb_all_LON_IAU_MARS*RAD2DEG</process>
  9 + <output/>
  10 +</param>
... ...
PARAM_DEF/mav_sta_c6_energy.xml 0 → 100644
  Diff comments   View file @234b7fa
... ... @@ -0,0 +1,35 @@
  1 +<?xml version="1.0"?>
  2 +<param xml:id="mav_sta_c6_energy">
  3 + <info>
  4 + <table>
  5 + <centerAutoTable variable="true" name="Energy" units="eV" centerName="mav_c6_energy_ave" log="false"/>
  6 + </table>
  7 + </info>
  8 + <get>
  9 + <vi name="mavpds:sta:c6">
  10 + <baseParam name="eflux"/>
  11 + </vi>
  12 + <amdaParam name="mav_c6_energy_ave"/>
  13 + </get>
  14 + <process description="Sum Over Masses">total($mavpds_sta_c6_eflux,1)</process>
  15 + <output>
  16 + <plot>
  17 + <timePlot>
  18 + <params>
  19 + <param id="mav_sta_c6_energy">
  20 + <spectro yAxis="y-left"/>
  21 + </param>
  22 + </params>
  23 + <axes>
  24 + <yAxis>
  25 + <digitalAxis id="y-left" scale="logarithmic"/>
  26 + </yAxis>
  27 + <zAxis>
  28 + <colorAxis scale="logarithmic"/>
  29 + </zAxis>
  30 + </axes>
  31 + </timePlot>
  32 + </plot>
  33 + </output>
  34 +</param>
  35 +
... ...
PARAM_DEF/mav_sta_c6_ind.xml 0 → 100644
  Diff comments   View file @234b7fa
... ... @@ -0,0 +1,16 @@
  1 +<?xml version="1.0"?>
  2 +<param xml:id="mav_sta_c6_ind">
  3 + <get>
  4 + <vi name='mavpds:sta:c6'>
  5 + <baseParam name="swp_ind" useNearestValue="true">
  6 + <clb name="mass_arr"/>
  7 + <clb name="energy"/>
  8 + <clb name="nswp"/>
  9 + <clb name="nmass"/>
  10 + <clb name="nenergy"/>
  11 + </baseParam>
  12 + </vi>
  13 + </get>
  14 + <process/>
  15 + <output/>
  16 +</param>
0 17 \ No newline at end of file
... ...
PARAM_DEF/mav_sta_c6_mass.xml 0 → 100644
  Diff comments   View file @234b7fa
... ... @@ -0,0 +1,35 @@
  1 +<?xml version="1.0"?>
  2 +<param xml:id="mav_sta_c6_mass">
  3 + <info>
  4 + <table>
  5 + <centerAutoTable variable="true" name="Mass" units="AMU" centerName="mav_c6_mass_ave" log="false"/>
  6 + </table>
  7 + </info>
  8 + <get>
  9 + <vi name="mavpds:sta:c6">
  10 + <baseParam name="eflux"/>
  11 + </vi>
  12 + <amdaParam name="mav_c6_mass_ave"/>
  13 + </get>
  14 + <process description="Sum over energy">total($mavpds_sta_c6_eflux,2)</process>
  15 + <output>
  16 + <plot>
  17 + <timePlot>
  18 + <params>
  19 + <param id="mav_sta_c6_mass">
  20 + <spectro yAxis="y-left"/>
  21 + </param>
  22 + </params>
  23 + <axes>
  24 + <yAxis>
  25 + <digitalAxis id="y-left" scale="logarithmic"/>
  26 + </yAxis>
  27 + <zAxis>
  28 + <colorAxis scale="logarithmic"/>
  29 + </zAxis>
  30 + </axes>
  31 + </timePlot>
  32 + </plot>
  33 + </output>
  34 +</param>
  35 +
... ...
PARAM_DEF/mex_o_vtot.xml 0 → 100644
  Diff comments   View file @234b7fa
... ... @@ -0,0 +1,9 @@
  1 +<?xml version="1.0"?>
  2 +<param xml:id="mex_o_vtot">
  3 + <get><vi name="mex:ima:param">
  4 + <baseParam name="VelocityMag_O"/>
  5 + </vi>
  6 + </get>
  7 + <process/>
  8 + <output/>
  9 +</param>
... ...
PARAM_DEF/mgs_mars_r.xml 0 → 100644
  Diff comments   View file @234b7fa
... ... @@ -0,0 +1,10 @@
  1 +<?xml version="1.0"?>
  2 +<param xml:id="mgs_mars_r">
  3 + <get>
  4 + <vi name="mgs:orb:all">
  5 + <baseParam name="R_IAU_MARS"/>
  6 + </vi>
  7 + </get>
  8 + <process/>
  9 + <output/>
  10 +</param>
... ...
PARAM_DEF/omni_f107.xml 0 → 100644
  Diff comments   View file @234b7fa
... ... @@ -0,0 +1,3 @@
  1 +<?xml version="1.0"?>
  2 +<param xml:id="omni_f107">
  3 + <get><vi name="omni:hour:all"><baseParam name="F10_Index"/></vi></get><process/><output/></param>
... ...
PARAM_DEF/omni_sunspots.xml
  Diff comments   View file @234b7fa
1 1 <?xml version="1.0"?>
2   -<param xml:id="omni_sunspots"><!--<TemporaryFillValue>NaN</TemporaryFillValue>--><get><vi name="omni:hour:all"><baseParam name="R"/></vi></get><process/><output/></param>
  2 +<param xml:id="omni_sunspots">
  3 + <get><vi name="omni:hour:all"><baseParam name="R"/></vi></get><process/><output/></param>
... ...
PARAM_DEF/pol_mgs_pc.xml deleted
View file @d2e0451
... ... @@ -1,2 +0,0 @@
1   -<?xml version="1.0"?>
2   -<param xml:id="pol_mgs_pc"><!--<TemporaryFillValue>NaN</TemporaryFillValue>--><get><vi name="mgs:orb:all"><baseParam name="PClat"/></vi></get><process/><output/></param>
PARAM_DEF/ros_b_ib.xml deleted
View file @d2e0451
... ... @@ -1,2 +0,0 @@
1   -<?xml version="1.0"?>
2   -<param xml:id="ros_b_ib"><!--<TemporaryFillValue>NaN</TemporaryFillValue>--><get><vi name="ros:magib:raw"><baseParam name="B_IB"/></vi></get><process/><output/></param>
PARAM_DEF/ros_b_ob.xml deleted
View file @d2e0451
... ... @@ -1,2 +0,0 @@
1   -<?xml version="1.0"?>
2   -<param xml:id="ros_b_ob"><!--<TemporaryFillValue>NaN</TemporaryFillValue>--><get><vi name="ros:magob:raw"><baseParam name="B_OB"/></vi></get><process/><output/></param>
PARAM_DEF/ros_r.xml renamed to PARAM_DEF/ros_cg_r.xml
  Diff comments   View file @234b7fa
1 1 <?xml version="1.0"?>
2   -<param xml:id="ros_r">
  2 +<param xml:id="ros_cg_r">
3 3 <get>
4 4 <vi name="ros:orb:comet">
5 5 <baseParam name="R"/>
... ...
PARAM_DEF/vex_venus_r.xml 0 → 100644
  Diff comments   View file @234b7fa
... ... @@ -0,0 +1,10 @@
  1 +<?xml version="1.0"?>
  2 +<param xml:id="vex_venus_r">
  3 + <get>
  4 + <vi name="vex:orb:all">
  5 + <baseParam name="VEX"/>
  6 + </vi>
  7 + </get>
  8 + <process>magnitude($vex_orb_all_VEX)/RADIUS_VENUS</process>
  9 + <output/>
  10 +</param>
... ...
PARAM_DEF/vex_xyz.xml renamed to PARAM_DEF/vex_xyz_vso.xml
  Diff comments   View file @234b7fa
1 1 <?xml version="1.0"?>
2   -<param xml:id="vex_xyz">
  2 +<param xml:id="vex_xyz_vso">
3 3 <get>
4 4 <vi name="vex:orb:all">
5 5 <baseParam name="VEX"/>
... ... @@ -10,7 +10,7 @@
10 10 <plot>
11 11 <xyPlot isotropic="true">
12 12 <params>
13   - <param id="vex_xyz">
  13 + <param id="vex_xyz_vso">
14 14 <orbitserie projection="XR" xAxis="xaxis_id" yAxis="y-left" id="1">
15 15 <line type="line" style="plain" width="1" color="[0,0,255]" />
16 16 <timeTick step="auto" number="0" minor="0" color="[255,0,0]">
... ...
PARAM_INFO_PREDEFINED/info_e_mgs_er.xml renamed to PARAM_INFO_PREDEFINED/info_e_mgs_omni.xml
  Diff comments   View file @234b7fa
1 1 <?xml version="1.0" encoding="UTF-8"?>
2   -<paraminfo id="mgs_er_omni_e_flux">
  2 +<paraminfo id="e_mgs_omni">
3 3 <dimensions dim_1="19"/>
4 4 <tables>
5 5 <table relatedDim="dim_1" name="Energy" units="eV">
... ...
PARAM_INFO_PREDEFINED/info_mav_sta_c6_energy.xml 0 → 100644
  Diff comments   View file @234b7fa
... ... @@ -0,0 +1,8 @@
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<paraminfo id="mav_sta_c6_energy">
  3 + <dimensions dim_1="32"/>
  4 + <tables>
  5 + <table relatedDim="dim_1" name="Energy" units="eV" variable="true"/>
  6 + </tables>
  7 +</paraminfo>
  8 +
0 9 \ No newline at end of file
... ...
PARAM_INFO_PREDEFINED/info_mav_sta_c6_mass.xml 0 → 100644
  Diff comments   View file @234b7fa
... ... @@ -0,0 +1,8 @@
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<paraminfo id="mav_sta_c6_mass">
  3 + <dimensions dim_1="64"/>
  4 + <tables>
  5 + <table relatedDim="dim_1" name="Mass" units="AMU" variable="true"/>
  6 + </tables>
  7 +</paraminfo>
  8 +
0 9 \ No newline at end of file
... ...
ParamTemplateList.xml
  Diff comments   View file @234b7fa
... ... @@ -290,7 +290,7 @@
290 290 </argument>
291 291 </arguments>
292 292 </paramTemplate>
293   - <paramTemplate paramId='sum_into_table_range' fileName='sum_into_table_range_##paramid##_##relateddim##_##min##_##max##'>
  293 + <paramTemplate paramId='sum_into_table_range' fileName='sum_into_table_range_##paramid##_##relateddim##_##min##_##max##'>
294 294 <arguments>
295 295 <argument key='min' name='Min' type='float' default='0'/>
296 296 <argument key='max' name='Max' type='float' default='0'/>
... ... @@ -298,6 +298,16 @@
298 298 <argument key='relateddim' name='Related Id' type='int' default='0'/>
299 299 </arguments>
300 300 </paramTemplate>
  301 + <paramTemplate paramId='sum_into_table_range_2d' fileName='sum_into_table_range_2d_##paramid##_##relateddim1##_##min1##_##max1##_##min2##_##max2##'>
  302 + <arguments>
  303 + <argument key='min1' name='Min 1' type='float' default='0'/>
  304 + <argument key='max1' name='Max 1' type='float' default='0'/>
  305 + <argument key='paramid' name='Parameter Id' type='string' default=''/>
  306 + <argument key='relateddim1' name='Related Id 1' type='int' default='0'/>
  307 + <argument key='min2' name='Min 2' type='float' default='0'/>
  308 + <argument key='max2' name='Max 2' type='float' default='0'/>
  309 + </arguments>
  310 + </paramTemplate>
301 311 <paramTemplate paramId='total_2D' fileName='total_2D_##paramid##'>
302 312 <arguments>
303 313 <argument key='paramid' name='Parameter Id' type='string' default=''/>
... ...