CDPP / AMDA_INTERNAL_METADATA

Commit 4e6de991e100f6dab05cf363e1c27af1cd50c5c6

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

psp epoLo pe wedge

Showing 6 changed files with 21 additions and 99 deletions   Show diff stats
Inline Side-by-side
PARAM_DEF/psp_lope_Eecr.xml
  Diff comments   View file @4e6de99
... ... @@ -2,14 +2,14 @@
2 2 <param xml:id="psp_lope_Eecr">
3 3 <info>
4 4 <table>
5   - <centerAutoTable dim="0" name="wedges" centerName="wedges" units="nb" log="false"/>
6   - <centerAutoTable dim="1" name="Energy" centerName="enTabElectrons" units="keV" log="false"/>
  5 + <centerAutoTable dim="0" name="ch.E, Wedges" centerName="wedges" units="nb" log="false"/>
  6 + <boundsTable dim="1" name="ch.E, Energy" boundsName="enTabElecBnds" units="keV"/>
7 7 </table>
8 8 </info>
9 9 <get>
10 10 <vi name="psp:lope:che">
11 11 <baseParam name="Electron_CountRate_ChanE">
12   - <clb name="enTabElectrons"/>
  12 + <clb name="enTabElecBnds"/>
13 13 <clb name="wedge"/>
14 14 </baseParam>
15 15 </vi>
... ... @@ -25,7 +25,7 @@
25 25 </params>
26 26 <axes>
27 27 <yAxis>
28   - <digitalAxis id="y-left" scale="logarithmic"/>
  28 + <digitalAxis id="y-left" scale="linear"/>
29 29 </yAxis>
30 30 <zAxis>
31 31 <colorAxis scale="logarithmic"/>
... ...
PARAM_DEF/psp_lope_Fecr.xml
  Diff comments   View file @4e6de99
... ... @@ -2,14 +2,14 @@
2 2 <param xml:id="psp_lope_Fecr">
3 3 <info>
4 4 <table>
5   - <centerAutoTable dim="0" name="wedges" centerName="wedges" units="nb" log="false"/>
6   - <centerAutoTable dim="1" name="Energy" centerName="enTabElectrons" units="keV" log="false"/>
  5 + <centerAutoTable dim="0" name="ch.F, Wedges" centerName="wedges" units="nb" log="false"/>
  6 + <boundsTable dim="1" name="ch.F, Energy" boundsName="enTabElecBnds" units="keV"/>
7 7 </table>
8 8 </info>
9 9 <get>
10 10 <vi name="psp:lope:chf">
11 11 <baseParam name="Electron_CountRate_ChanF">
12   - <clb name="enTabElectrons"/>
  12 + <clb name="enTabElecBnds"/>
13 13 <clb name="wedge"/>
14 14 </baseParam>
15 15 </vi>
... ... @@ -25,7 +25,7 @@
25 25 </params>
26 26 <axes>
27 27 <yAxis>
28   - <digitalAxis id="y-left" scale="logarithmic"/>
  28 + <digitalAxis id="y-left" scale="linear"/>
29 29 </yAxis>
30 30 <zAxis>
31 31 <colorAxis scale="logarithmic"/>
... ...
PARAM_DEF/psp_lope_Gecr.xml
  Diff comments   View file @4e6de99
... ... @@ -2,14 +2,14 @@
2 2 <param xml:id="psp_lope_Gecr">
3 3 <info>
4 4 <table>
5   - <centerAutoTable dim="0" name="wedges" centerName="wedges" units="nb" log="false"/>
6   - <centerAutoTable dim="1" name="Energy" centerName="enTabElectrons" units="keV" log="false"/>
  5 + <centerAutoTable dim="0" name="ch.G, Wedges" centerName="wedges" units="nb" log="false"/>
  6 + <boundsTable dim="1" name="ch.G, Energy" bounndsName="enTabElecBnds" units="keV"/>
7 7 </table>
8 8 </info>
9 9 <get>
10 10 <vi name="psp:lope:chg">
11 11 <baseParam name="Electron_Rate_w">
12   - <clb name="enTabElectrons"/>
  12 + <clb name="enTabElecBnds"/>
13 13 <clb name="wedge"/>
14 14 </baseParam>
15 15 </vi>
... ... @@ -25,7 +25,7 @@
25 25 </params>
26 26 <axes>
27 27 <yAxis>
28   - <digitalAxis id="y-left" scale="logarithmic"/>
  28 + <digitalAxis id="y-left" scale="linear"/>
29 29 </yAxis>
30 30 <zAxis>
31 31 <colorAxis scale="logarithmic"/>
... ...
PARAM_INFO_PREDEFINED/info_psp_lope_Eecr.xml
  Diff comments   View file @4e6de99
1   -<?xml version="1.0"?>
2   -<paraminfo xml:id="psp_lope_Eecr.xml">
3   - <dimensions dim_1="8" dim_2="15">
4   - <tables>
5   - <table relatedDim="dim_1" name="wedges" units="indx">
6   - <channel min="0" max="0"/>
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<paraminfo id="psp_lope_che_Electron_CountRate_ChanE"><dimensions dim_1="8" dim_2="17"/><components/><tables><table relatedDim="dim_1" name="Wedges" units="nb"><channel min="0" max="0"/>
7 3 <channel min="1" max="1"/>
8 4 <channel min="2" max="2"/>
9 5 <channel min="3" max="3"/>
... ... @@ -11,26 +7,4 @@
11 7 <channel min="5" max="5"/>
12 8 <channel min="6" max="6"/>
13 9 <channel min="7" max="7"/>
14   - </table>
15   - <table relatedDim="dim_2" name="Energy" units="keV">
16   - <channel min="nan" max="nan"/>
17   - <channel min="27.34355" max="27.34355"/>
18   - <channel min="30.31262" max="30.31262"/>
19   - <channel min="34.14862" max="34.14862"/>
20   - <channel min="39.21075" max="39.21075"/>
21   - <channel min="45.78645" max="45.78645"/>
22   - <channel min="54.20792" max="54.20792"/>
23   - <channel min="64.83251" max="64.83251"/>
24   - <channel min="78.23837" max="78.23837"/>
25   - <channel min="95.03201" max="95.03201"/>
26   - <channel min="116.017" max="116.017"/>
27   - <channel min="142.0707" max="142.0707"/>
28   - <channel min="174.2827" max="174.2827"/>
29   - <channel min="214.5046" max="214.5046"/>
30   - <channel min="264.2843" max="264.2843"/>
31   - <channel min="325.66" max="325.66"/>
32   - <channel min="374.7551" max="374.7551"/>
33   - </table>
34   - </tables>
35   - </dimensions>
36   -</paraminfo>
  10 +</table><table relatedDim="dim_2" name="Energy" units="keV"><channel min="-" max="-"/><channel min="26.1" max="28.8"/><channel min="28.8" max="32.2"/><channel min="32.2" max="36.7"/><channel min="36.7" max="42.5"/><channel min="42.5" max="50.0"/><channel min="50.0" max="59.5"/><channel min="59.5" max="71.5"/><channel min="71.5" max="86.6"/><channel min="86.6" max="105.5"/><channel min="105.5" max="129.0"/><channel min="129.0" max="158.2"/><channel min="158.2" max="194.4"/><channel min="194.4" max="239.4"/><channel min="239.4" max="295.0"/><channel min="295.0" max="350.2"/><channel min="350.2" max="400.0"/></table></tables></paraminfo>
... ...
PARAM_INFO_PREDEFINED/info_psp_lope_Fecr.xml
  Diff comments   View file @4e6de99
1   -<?xml version="1.0"?>
2   -<paraminfo xml:id="psp_lope_Fecr.xml">
3   - <dimensions dim_1="8" dim_2="15">
4   - <tables>
5   - <table relatedDim="dim_1" name="wedges" units="indx">
6   - <channel min="0" max="0"/>
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<paraminfo id="psp_lope_chf_Electron_CountRate_ChanF"><dimensions dim_1="8" dim_2="10"/><components/><tables><table relatedDim="dim_1" name="wedges" units="nb"><channel min="0" max="0"/>
7 3 <channel min="1" max="1"/>
8 4 <channel min="2" max="2"/>
9 5 <channel min="3" max="3"/>
... ... @@ -11,26 +7,4 @@
11 7 <channel min="5" max="5"/>
12 8 <channel min="6" max="6"/>
13 9 <channel min="7" max="7"/>
14   - </table>
15   - <table relatedDim="dim_2" name="Energy" units="keV">
16   - <channel min="nan" max="nan"/>
17   - <channel min="27.34355" max="27.34355"/>
18   - <channel min="30.31262" max="30.31262"/>
19   - <channel min="34.14862" max="34.14862"/>
20   - <channel min="39.21075" max="39.21075"/>
21   - <channel min="45.78645" max="45.78645"/>
22   - <channel min="54.20792" max="54.20792"/>
23   - <channel min="64.83251" max="64.83251"/>
24   - <channel min="78.23837" max="78.23837"/>
25   - <channel min="95.03201" max="95.03201"/>
26   - <channel min="116.017" max="116.017"/>
27   - <channel min="142.0707" max="142.0707"/>
28   - <channel min="174.2827" max="174.2827"/>
29   - <channel min="214.5046" max="214.5046"/>
30   - <channel min="264.2843" max="264.2843"/>
31   - <channel min="325.66" max="325.66"/>
32   - <channel min="374.7551" max="374.7551"/>
33   - </table>
34   - </tables>
35   - </dimensions>
36   -</paraminfo>
  10 +</table><table relatedDim="dim_2" name="Energy" units="keV"><channel min="-" max="-"/><channel min="26.0" max="39.0"/><channel min="39.0" max="50.0"/><channel min="50.0" max="60.0"/><channel min="60.0" max="75.0"/><channel min="75.0" max="107.0"/><channel min="107.0" max="160.0"/><channel min="160.0" max="243.0"/><channel min="243.0" max="334.0"/><channel min="334.0" max="410.0"/></table></tables></paraminfo>
... ...
PARAM_INFO_PREDEFINED/info_psp_lope_Gecr.xml
  Diff comments   View file @4e6de99
1   -<?xml version="1.0"?>
2   -<paraminfo xml:id="psp_lope_Gecr.xml">
3   - <dimensions dim_1="8" dim_2="15">
4   - <tables>
5   - <table relatedDim="dim_1" name="wedges" units="indx">
6   - <channel min="0" max="0"/>
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<paraminfo id="psp_lope_chg_Electron_Rate_w"><dimensions dim_1="8" dim_2="17"/><components/><tables><table relatedDim="dim_1" name="wedges" units="nb"><channel min="0" max="0"/>
7 3 <channel min="1" max="1"/>
8 4 <channel min="2" max="2"/>
9 5 <channel min="3" max="3"/>
... ... @@ -11,26 +7,4 @@
11 7 <channel min="5" max="5"/>
12 8 <channel min="6" max="6"/>
13 9 <channel min="7" max="7"/>
14   - </table>
15   - <table relatedDim="dim_2" name="Energy" units="keV">
16   - <channel min="nan" max="nan"/>
17   - <channel min="27.34355" max="27.34355"/>
18   - <channel min="30.31262" max="30.31262"/>
19   - <channel min="34.14862" max="34.14862"/>
20   - <channel min="39.21075" max="39.21075"/>
21   - <channel min="45.78645" max="45.78645"/>
22   - <channel min="54.20792" max="54.20792"/>
23   - <channel min="64.83251" max="64.83251"/>
24   - <channel min="78.23837" max="78.23837"/>
25   - <channel min="95.03201" max="95.03201"/>
26   - <channel min="116.017" max="116.017"/>
27   - <channel min="142.0707" max="142.0707"/>
28   - <channel min="174.2827" max="174.2827"/>
29   - <channel min="214.5046" max="214.5046"/>
30   - <channel min="264.2843" max="264.2843"/>
31   - <channel min="325.66" max="325.66"/>
32   - <channel min="374.7551" max="374.7551"/>
33   - </table>
34   - </tables>
35   - </dimensions>
36   -</paraminfo>
  10 +</table><table relatedDim="dim_2" name="Energy" units="keV"><channel min="-" max="-"/><channel min="26.0" max="28.8"/><channel min="28.8" max="32.2"/><channel min="32.2" max="36.7"/><channel min="36.7" max="42.5"/><channel min="42.5" max="50.0"/><channel min="50.0" max="59.5"/><channel min="59.5" max="71.5"/><channel min="71.5" max="86.6"/><channel min="86.6" max="105.5"/><channel min="105.5" max="129.0"/><channel min="129.0" max="158.2"/><channel min="158.2" max="194.4"/><channel min="194.4" max="239.4"/><channel min="239.4" max="295.0"/><channel min="295.0" max="350.2"/><channel min="350.2" max="400.0"/></table></tables></paraminfo>
... ...