CDPP / AMDA_INTERNAL_METADATA

Commit 4d1b18949945d1e58b408bfbd552ab45cd994a0a

Authored by Elena.Budnik
1 parent 288af7bd
Exists in master and in 7 other branches amdadev, artemis_lon_lat_9323, bepi_master, bepi_update, juice_jdc, juno_jade, soar

correct mav_swia/swea

Showing 4 changed files with 118 additions and 65 deletions   Show diff stats
Inline Side-by-side
PARAM_DEF/mav_swea_svyspec.xml
  Diff comments   View file @4d1b189
... ... @@ -22,33 +22,29 @@
22 22 <spectro yAxis="y-left"/>
23 23 </param>
24 24 </params>
25   - <!--<axes><xAxis>
26   - <timeAxis format="dd/mm/yy" reverse="false" scale="linear" 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   - </timeAxis>
31   - </xAxis>
32   - <yAxis>
33   - <digitalAxis id="y-left" 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   - <legend/>
37   - </digitalAxis>
38   - <digitalAxis id="y-right" position="right" reverse="false" scale="logarithmic" color="[0,0,0]" thickness="1" showLegend="true" showTickMark="true">
39   - <range extend="true"/>
40   - <tick position="outwards" minorGrid="false" majorGrid="false"/>
41   - <legend/>
42   - </digitalAxis>
43   - </yAxis>
  25 + <axes>
  26 + <xAxis>
  27 + <timeAxis format="dd/mm/yy" reverse="false" scale="linear" color="[0,0,0]" thickness="1" showLegend="true" showTickMark="true">
  28 + <range extend="true"/>
  29 + <tick position="outwards" minorGrid="false" majorGrid="false"/>
  30 + <legend/>
  31 + </timeAxis>
  32 + </xAxis>
  33 + <yAxis>
  34 + <digitalAxis id="y-left" reverse="false" scale="logarithmic" color="[0,0,0]" thickness="1" showLegend="true" showTickMark="true">
  35 + <range extend="true"/>
  36 + <tick position="outwards" minorGrid="false" majorGrid="false"/>
  37 + <legend/>
  38 + </digitalAxis>
  39 + </yAxis>
44 40 <zAxis>
45 41 <colorAxis colorMapIndex="1" reverse="false" scale="logarithmic" color="[0,0,0]" thickness="1" showLegend="true" showTickMark="true">
46 42 <range extend="true"/>
47 43 <tick position="outwards" minorGrid="false" majorGrid="false"/>
48 44 </colorAxis>
49 45 </zAxis>
50   - </axes>-->
51   - </timePlot>
52   - </plot>
  46 + </axes>
  47 + </timePlot>
  48 + </plot>
53 49 </output>
54 50 </param>
... ...
PARAM_DEF/mav_swea_svyspecf.xml
  Diff comments   View file @4d1b189
1   -fluxes<?xml version="1.0"?>
2   -<param xml:id="mav_swea_svyspecf">
  1 +<?xml version="1.0"?>
  2 +<param xml:id="mav_swea_svyspecf">
3 3 <info>
4 4 <table>
5 5 <boundsTable name="Energy" boundsName="EnergyBounds" units="eV"/>
... ... @@ -9,7 +9,7 @@ fluxes&lt;?xml version=&quot;1.0&quot;?&gt;
9 9 <get>
10 10 <vi name="mavpds:swea:svyspec">
11 11 <baseParam name="diff_en_fluxes">
12   - <clb name="EnergyBounds"/>
  12 + <clb name="EnergyBounds"/>
13 13 </baseParam>
14 14 </vi>
15 15 </get>
... ... @@ -22,33 +22,29 @@ fluxes&lt;?xml version=&quot;1.0&quot;?&gt;
22 22 <spectro yAxis="y-left"/>
23 23 </param>
24 24 </params>
25   - <!--<axes><xAxis>
26   - <timeAxis format="dd/mm/yy" reverse="false" scale="linear" 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   - </timeAxis>
31   - </xAxis>
32   - <yAxis>
33   - <digitalAxis id="y-left" 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   - <legend/>
37   - </digitalAxis>
38   - <digitalAxis id="y-right" position="right" reverse="false" scale="logarithmic" color="[0,0,0]" thickness="1" showLegend="true" showTickMark="true">
39   - <range extend="true"/>
40   - <tick position="outwards" minorGrid="false" majorGrid="false"/>
41   - <legend/>
42   - </digitalAxis>
43   - </yAxis>
  25 + <axes>
  26 + <xAxis>
  27 + <timeAxis format="dd/mm/yy" reverse="false" scale="linear" color="[0,0,0]" thickness="1" showLegend="true" showTickMark="true">
  28 + <range extend="true"/>
  29 + <tick position="outwards" minorGrid="false" majorGrid="false"/>
  30 + <legend/>
  31 + </timeAxis>
  32 + </xAxis>
  33 + <yAxis>
  34 + <digitalAxis id="y-left" reverse="false" scale="logarithmic" color="[0,0,0]" thickness="1" showLegend="true" showTickMark="true">
  35 + <range extend="true"/>
  36 + <tick position="outwards" minorGrid="false" majorGrid="false"/>
  37 + <legend/>
  38 + </digitalAxis>
  39 + </yAxis>
44 40 <zAxis>
45 41 <colorAxis colorMapIndex="1" reverse="false" scale="logarithmic" color="[0,0,0]" thickness="1" showLegend="true" showTickMark="true">
46 42 <range extend="true"/>
47 43 <tick position="outwards" minorGrid="false" majorGrid="false"/>
48 44 </colorAxis>
49 45 </zAxis>
50   - </axes>-->
51   - </timePlot>
52   - </plot>
  46 + </axes>
  47 + </timePlot>
  48 + </plot>
53 49 </output>
54 50 </param>
... ...
PARAM_DEF/mav_swia_cspec.xml
  Diff comments   View file @4d1b189
... ... @@ -9,12 +9,42 @@
9 9 <get>
10 10 <vi name="mavpds:swia:specboard">
11 11 <baseParam name="spectra_counts">
12   - <clb name="EnergyBound"/>
  12 + <clb name="EnergyBounds"/>
13 13 </baseParam>
14 14 </vi>
15 15 </get>
16 16 <process/>
17   - <output>
18   - <!--<plot>SPECTRA</plot>-->
  17 + <output>
  18 + <plot>
  19 + <timePlot>
  20 + <params>
  21 + <param id="mav_swia_cspec">
  22 + <spectro yAxis="y-left"/>
  23 + </param>
  24 + </params>
  25 + <axes>
  26 + <xAxis>
  27 + <timeAxis format="dd/mm/yy" reverse="false" scale="linear" color="[0,0,0]" thickness="1" showLegend="true" showTickMark="true">
  28 + <range extend="true"/>
  29 + <tick position="outwards" minorGrid="false" majorGrid="false"/>
  30 + <legend/>
  31 + </timeAxis>
  32 + </xAxis>
  33 + <yAxis>
  34 + <digitalAxis id="y-left" reverse="false" scale="logarithmic" color="[0,0,0]" thickness="1" showLegend="true" showTickMark="true">
  35 + <range extend="true"/>
  36 + <tick position="outwards" minorGrid="false" majorGrid="false"/>
  37 + <legend/>
  38 + </digitalAxis>
  39 + </yAxis>
  40 + <zAxis>
  41 + <colorAxis colorMapIndex="1" reverse="false" scale="logarithmic" color="[0,0,0]" thickness="1" showLegend="true" showTickMark="true">
  42 + <range extend="true"/>
  43 + <tick position="outwards" minorGrid="false" majorGrid="false"/>
  44 + </colorAxis>
  45 + </zAxis>
  46 + </axes>
  47 + </timePlot>
  48 + </plot>
19 49 </output>
20 50 </param>
... ...
PARAM_DEF/mav_swia_fspec.xml
  Diff comments   View file @4d1b189
1 1 <?xml version="1.0"?>
2 2 <!-- TBD ENERGY TABLE CHANGING -->
3 3 <param xml:id="mav_swia_fspec">
4   -<info>
5   -<table>
6   - <boundsTable name="Energy" boundsName="EnergyBounds" units="eV"/>
7   -</table>
8   -</info>
9   -<get>
10   -<vi name="mavpds:swia:specboard">
11   -<baseParam name="spectra_diff_en_fluxes"/>
12   -<clb name="energyBounds"/>
13   -</vi>
14   -</get>
15   -<process/>
16   -<output>
17   -<!--<plot>SPECTRA</plot>-->
18   -</output>
  4 + <info>
  5 + <table>
  6 + <boundsTable name="Energy" boundsName="EnergyBounds" units="eV"/>
  7 + </table>
  8 + </info>
  9 + <get>
  10 + <vi name="mavpds:swia:specboard">
  11 + <baseParam name="spectra_diff_en_fluxes">
  12 + <clb name="EnergyBounds"/>
  13 + </baseParam>
  14 + </vi>
  15 + </get>
  16 + <process/>
  17 + <output>
  18 + <plot>
  19 + <timePlot>
  20 + <params>
  21 + <param id="mav_swia_fspec">
  22 + <spectro yAxis="y-left"/>
  23 + </param>
  24 + </params>
  25 + <axes>
  26 + <xAxis>
  27 + <timeAxis format="dd/mm/yy" reverse="false" scale="linear" color="[0,0,0]" thickness="1" showLegend="true" showTickMark="true">
  28 + <range extend="true"/>
  29 + <tick position="outwards" minorGrid="false" majorGrid="false"/>
  30 + <legend/>
  31 + </timeAxis>
  32 + </xAxis>
  33 + <yAxis>
  34 + <digitalAxis id="y-left" reverse="false" scale="logarithmic" color="[0,0,0]" thickness="1" showLegend="true" showTickMark="true">
  35 + <range extend="true"/>
  36 + <tick position="outwards" minorGrid="false" majorGrid="false"/>
  37 + <legend/>
  38 + </digitalAxis>
  39 + </yAxis>
  40 + <zAxis>
  41 + <colorAxis colorMapIndex="1" reverse="false" scale="logarithmic" color="[0,0,0]" thickness="1" showLegend="true" showTickMark="true">
  42 + <range extend="true"/>
  43 + <tick position="outwards" minorGrid="false" majorGrid="false"/>
  44 + </colorAxis>
  45 + </zAxis>
  46 + </axes>
  47 + </timePlot>
  48 + </plot>
  49 + </output>
19 50 </param>
20 51  
... ...