CDPP / AMDA_INTERNAL_METADATA

Commit 687f1b21227ba2f22373b8a5ae0cd8ea6e1ffbc8

Authored by Benjamin Renard
1 parent 2920549b
Exists in master and in 7 other branches amdadev, artemis_lon_lat_9323, bepi_master, bepi_update, juice_jdc, juno_jade, soar

Merge in master solo_ept_tot_*** & solo_het_tot_*** & cass_caps_***

Showing 22 changed files with 282 additions and 38 deletions   Show diff stats
Inline Side-by-side
PARAM_DEF/cass_caps_els.xml
  Diff comments   View file @687f1b2
1 1 <?xml version="1.0"?>
2   -<param xml:id="cass_caps_els">
  2 +<param xml:id="cass_caps_els_##ANODE##">
3 3 <info>
4 4 <table>
5   - <boundsTable dim="1" name="Energy" boundsName="Energy" units="eV"/>
  5 + <boundsTable name="Energy" boundsName="Energy" units="eV"/>
6 6 </table>
7 7 </info>
8 8 <get>
9   - <vi name="cass:caps:elssec">
  9 + <vi name="cass:caps:elssec" >
10 10 <baseParam name="ELS">
11 11 <clb name="Energy"/>
12 12 </baseParam>
13 13 </vi>
14 14 </get>
15   - <process/>
  15 + <process>$cass_caps_elssec_ELS[##ANODE##]</process>
16 16 <output><plot>
17 17 <timePlot>
18 18 <params>
19   - <param id="cass_caps_els">
  19 + <param id="cass_caps_els_##ANODE##">
20 20 <spectro yAxis="y-left"/>
21 21 </param>
22 22 </params>
... ...
PARAM_DEF/cass_caps_els_sum.xml 0 → 100644
  Diff comments   View file @687f1b2
... ... @@ -0,0 +1,34 @@
  1 +<?xml version="1.0"?>
  2 +<param xml:id="cass_caps_els_sum">
  3 + <info>
  4 + <table>
  5 + <boundsTable name="Energy" boundsName="Energy" units="eV"/>
  6 + </table>
  7 + </info>
  8 + <get>
  9 + <vi name="cass:caps:elssec" >
  10 + <baseParam name="ELS">
  11 + <clb name="Energy"/>
  12 + </baseParam>
  13 + </vi>
  14 + </get>
  15 + <process>total($cass_caps_elssec_ELS,1)</process>
  16 + <output><plot>
  17 + <timePlot>
  18 + <params>
  19 + <param id="cass_caps_els_sum">
  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>
... ...
PARAM_DEF/cass_caps_sng.xml
  Diff comments   View file @687f1b2
1 1 <?xml version="1.0"?>
2   -<param xml:id="cass_caps_sng">
  2 +<param xml:id="cass_caps_sng_##ANODE##">
3 3 <info>
4 4 <table>
5   - <boundsTable dim="1" name="Energy" boundsName="Energy" units="eV"/>
  5 + <boundsTable name="Energy" boundsName="Energy" units="eV"/>
6 6 </table>
7 7 </info>
8 8 <gap_threshold>8</gap_threshold>
... ... @@ -13,12 +13,12 @@
13 13 </baseParam>
14 14 </vi>
15 15 </get>
16   - <process/>
  16 + <process>$cass_caps_snghr_SNG[##ANODE##]</process>
17 17 <output>
18 18 <plot>
19 19 <timePlot>
20 20 <params>
21   - <param id="cass_caps_sng">
  21 + <param id="cass_caps_sng_##ANODE##">
22 22 <spectro yAxis="y-left"/>
23 23 </param>
24 24 </params>
... ...
PARAM_DEF/cass_caps_sng_sum.xml 0 → 100644
  Diff comments   View file @687f1b2
... ... @@ -0,0 +1,36 @@
  1 +<?xml version="1.0"?>
  2 +<param xml:id="cass_caps_sng_sum">
  3 + <info>
  4 + <table>
  5 + <boundsTable name="Energy" boundsName="Energy" units="eV"/>
  6 + </table>
  7 + </info>
  8 + <gap_threshold>8</gap_threshold>
  9 + <get>
  10 + <vi name="cass:caps:snghr">
  11 + <baseParam name="SNG">
  12 + <clb name="Energy"/>
  13 + </baseParam>
  14 + </vi>
  15 + </get>
  16 + <process>total($cass_caps_snghr_SNG,1)</process>
  17 + <output>
  18 + <plot>
  19 + <timePlot>
  20 + <params>
  21 + <param id="cass_caps_sng_sum">
  22 + <spectro yAxis="y-left"/>
  23 + </param>
  24 + </params>
  25 + <axes>
  26 + <yAxis>
  27 + <digitalAxis id="y-left" scale="logarithmic"/>
  28 + </yAxis>
  29 + <zAxis>
  30 + <colorAxis scale="logarithmic"/>
  31 + </zAxis>
  32 + </axes>
  33 + </timePlot>
  34 + </plot>
  35 + </output>
  36 +</param>
... ...
PARAM_DEF/solo_ept_tot_aflux.xml
  Diff comments   View file @687f1b2
... ... @@ -5,6 +5,7 @@
5 5 <minMaxTable name="Energy" units="MeV" minName="Alpha_Bins_Low_Energy" maxName="Alpha_Bins_High_Energy"/>
6 6 </table>
7 7 </info>
  8 + <reference_parameter>solo_ept_asun_aflux</reference_parameter>
8 9 <get>
9 10 <amdaParam name="solo_ept_asun_aflux"/>
10 11 <amdaParam name="solo_ept_sun_aflux"/>
... ...
PARAM_DEF/solo_ept_tot_eflux.xml
  Diff comments   View file @687f1b2
... ... @@ -5,6 +5,7 @@
5 5 <minMaxTable name="Energy" units="MeV" minName="Electron_Bins_Low_Energy" maxName="Electron_Bins_High_Energy"/>
6 6 </table>
7 7 </info>
  8 + <reference_parameter>solo_ept_anti_eflux</reference_parameter>
8 9 <get>
9 10 <amdaParam name="solo_ept_anti_eflux"/>
10 11 <amdaParam name="solo_ept_sun_eflux"/>
... ...
PARAM_DEF/solo_ept_tot_iflux.xml
  Diff comments   View file @687f1b2
... ... @@ -5,6 +5,7 @@
5 5 <minMaxTable name="Energy" units="MeV" minName="Ion_Bins_Low_Energy" maxName="Ion_Bins_High_Energy"/>
6 6 </table>
7 7 </info>
  8 + <reference_parameter>solo_ept_asun_iflux</reference_parameter>
8 9 <get>
9 10 <amdaParam name="solo_ept_asun_iflux"/>
10 11 <amdaParam name="solo_ept_sun_iflux"/>
... ...
PARAM_DEF/solo_het_tot_cflux.xml
  Diff comments   View file @687f1b2
... ... @@ -5,6 +5,7 @@
5 5 <minMaxTable name="Energy" units="MeV/n" minName="C_Bins_Low_Energy" maxName="C_Bins_High_Energy"/>
6 6 </table>
7 7 </info>
  8 + <reference_parameter>solo_het_asun_cflux</reference_parameter>
8 9 <get>
9 10 <amdaParam name="solo_het_asun_cflux"/>
10 11 <amdaParam name="solo_het_sun_cflux"/>
... ...
PARAM_DEF/solo_het_tot_eflux.xml
  Diff comments   View file @687f1b2
1 1 <?xml version="1.0"?>
2 2 <param xml:id='solo_het_tot_eflux'>
  3 + <reference_parameter>solo_het_asun_eflux</reference_parameter>
3 4 <get>
4 5 <amdaParam name="solo_het_asun_eflux"/>
5 6 <amdaParam name="solo_het_sun_eflux"/>
... ...
PARAM_DEF/solo_het_tot_eheflux.xml
  Diff comments   View file @687f1b2
1 1 <?xml version="1.0"?>
2 2 <param xml:id='solo_het_tot_eheflux'>
  3 + <reference_parameter>solo_het_asun_eheflux</reference_parameter>
3 4 <get>
4 5 <amdaParam name="solo_het_asun_eheflux"/>
5 6 <amdaParam name="solo_het_sun_eheflux"/>
... ...
PARAM_DEF/solo_het_tot_feflux.xml
  Diff comments   View file @687f1b2
... ... @@ -5,6 +5,7 @@
5 5 <minMaxTable name="Energy" units="MeV/n" minName="Fe_Bins_Low_Energy" maxName="Fe_Bins_High_Energy"/>
6 6 </table>
7 7 </info>
  8 + <reference_parameter>solo_het_asun_feflux</reference_parameter>
8 9 <get>
9 10 <amdaParam name="solo_het_asun_feflux"/>
10 11 <amdaParam name="solo_het_sun_feflux"/>
... ...
PARAM_DEF/solo_het_tot_he3flux.xml
  Diff comments   View file @687f1b2
... ... @@ -5,6 +5,7 @@
5 5 <minMaxTable name="Energy" units="MeV/n" minName="He3_Bins_Low_Energy" maxName="He3_Bins_High_Energy"/>
6 6 </table>
7 7 </info>
  8 + <reference_parameter>solo_het_asun_he3flux</reference_parameter>
8 9 <get>
9 10 <amdaParam name="solo_het_asun_he3flux"/>
10 11 <amdaParam name="solo_het_sun_he3flux"/>
... ...
PARAM_DEF/solo_het_tot_he4flux.xml
  Diff comments   View file @687f1b2
... ... @@ -5,6 +5,7 @@
5 5 <minMaxTable name="Energy" units="MeV/n" minName="He4_Bins_Low_Energy" maxName="He4_Bins_High_Energy"/>
6 6 </table>
7 7 </info>
  8 + <reference_parameter>solo_het_asun_he4flux</reference_parameter>
8 9 <get>
9 10 <amdaParam name="solo_het_asun_he4flux"/>
10 11 <amdaParam name="solo_het_sun_he4flux"/>
... ...
PARAM_DEF/solo_het_tot_hhcflux.xml
  Diff comments   View file @687f1b2
1 1 <?xml version="1.0"?>
2 2 <param xml:id='solo_het_tot_hhcflux'>
  3 + <reference_parameter>solo_het_asun_hhcflux</reference_parameter>
3 4 <get>
4 5 <amdaParam name="solo_het_asun_hhcflux"/>
5 6 <amdaParam name="solo_het_sun_hhcflux"/>
... ...
PARAM_DEF/solo_het_tot_nflux.xml
  Diff comments   View file @687f1b2
... ... @@ -5,6 +5,7 @@
5 5 <minMaxTable name="Energy" units="MeV/n" minName="N_Bins_Low_Energy" maxName="N_Bins_High_Energy"/>
6 6 </table>
7 7 </info>
  8 + <reference_parameter>solo_het_asun_nflux</reference_parameter>
8 9 <get>
9 10 <amdaParam name="solo_het_asun_nflux"/>
10 11 <amdaParam name="solo_het_sun_nflux"/>
... ...
PARAM_DEF/solo_het_tot_oflux.xml
  Diff comments   View file @687f1b2
... ... @@ -5,6 +5,7 @@
5 5 <minMaxTable name="Energy" units="MeV/n" minName="O_Bins_Low_Energy" maxName="O_Bins_High_Energy"/>
6 6 </table>
7 7 </info>
  8 + <reference_parameter>solo_het_asun_oflux</reference_parameter>
8 9 <get>
9 10 <amdaParam name="solo_het_asun_oflux"/>
10 11 <amdaParam name="solo_het_sun_oflux"/>
... ...
PARAM_DEF/solo_het_total_hflux.xml
  Diff comments   View file @687f1b2
... ... @@ -5,6 +5,7 @@
5 5 <minMaxTable name="Energy" units="MeV" minName="H_Bins_Low_Energy" maxName="H_Bins_High_Energy"/>
6 6 </table>
7 7 </info>
  8 + <reference_parameter>solo_het_asun_hflux</reference_parameter>
8 9 <get>
9 10 <amdaParam name="solo_het_asun_hflux"/>
10 11 <amdaParam name="solo_het_sun_hflux"/>
... ...
PARAM_INFO_PREDEFINED/info_cass_caps_els.xml
  Diff comments   View file @687f1b2
1 1 <?xml version="1.0" encoding="UTF-8"?>
2   -<paraminfo id="cass_caps_elssec_ELS">
3   - <dimensions dim_1="8" dim_2="63"/>
4   - <components>
5   - <component index_1="0" name="anode 1"/>
6   - <component index_1="1" name="anode 2"/>
7   - <component index_1="2" name="anode 3"/>
8   - <component index_1="3" name="anode 4"/>
9   - <component index_1="4" name="anode 5"/>
10   - <component index_1="5" name="anode 6"/>
11   - <component index_1="6" name="anode 7"/>
12   - <component index_1="7" name="anode 8"/>
13   - </components>
14   - <tables>
15   - <table relatedDim="dim_2" name="Energy" units="eV">
  2 +<paraminfo id="cass_caps_els">
  3 + <dimensions dim_1="63"/>
  4 + <tables>
  5 + <table relatedDim="dim_1" name="Energy" units="eV">
16 6 <channel min="24133" max="26040"/>
17 7 <channel min="20609" max="24133"/>
18 8 <channel min="17623" max="20609"/>
... ... @@ -87,4 +77,4 @@
87 77  
88 78  
89 79  
90   -
91 80 \ No newline at end of file
  81 +
... ...
PARAM_INFO_PREDEFINED/info_cass_caps_els_sum.xml 0 → 100644
  Diff comments   View file @687f1b2
... ... @@ -0,0 +1,80 @@
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<paraminfo id="cass_caps_els_sum">
  3 + <dimensions dim_1="63"/>
  4 + <tables>
  5 + <table relatedDim="dim_1" name="Energy" units="eV">
  6 + <channel min="24133" max="26040"/>
  7 + <channel min="20609" max="24133"/>
  8 + <channel min="17623" max="20609"/>
  9 + <channel min="15066" max="17623"/>
  10 + <channel min="12871" max="15066"/>
  11 + <channel min="11005" max="12871"/>
  12 + <channel min="9408" max="11005"/>
  13 + <channel min="8044" max="9408"/>
  14 + <channel min="6875" max="8044"/>
  15 + <channel min="5876" max="6875"/>
  16 + <channel min="5023" max="5876"/>
  17 + <channel min="4293" max="5023"/>
  18 + <channel min="3669" max="4293"/>
  19 + <channel min="3136" max="3669"/>
  20 + <channel min="2680" max="3136"/>
  21 + <channel min="2291" max="2680"/>
  22 + <channel min="1958" max="2291"/>
  23 + <channel min="1674" max="1958"/>
  24 + <channel min="1431" max="1674"/>
  25 + <channel min="1223" max="1431"/>
  26 + <channel min="1046" max="1223"/>
  27 + <channel min="894" max="1046"/>
  28 + <channel min="764" max="894"/>
  29 + <channel min="653" max="764"/>
  30 + <channel min="558" max="653"/>
  31 + <channel min="477" max="558"/>
  32 + <channel min="407" max="477"/>
  33 + <channel min="348" max="407"/>
  34 + <channel min="298" max="348"/>
  35 + <channel min="254" max="298"/>
  36 + <channel min="217" max="254"/>
  37 + <channel min="186" max="217"/>
  38 + <channel min="159" max="186"/>
  39 + <channel min="136" max="159"/>
  40 + <channel min="116" max="136"/>
  41 + <channel min="100" max="116"/>
  42 + <channel min="85" max="100"/>
  43 + <channel min="72" max="85"/>
  44 + <channel min="62" max="72"/>
  45 + <channel min="53" max="62"/>
  46 + <channel min="45.4" max="53"/>
  47 + <channel min="38.8" max="45.4"/>
  48 + <channel min="33.1" max="38.8"/>
  49 + <channel min="28.4" max="33.1"/>
  50 + <channel min="24.2" max="28.4"/>
  51 + <channel min="20.7" max="24.2"/>
  52 + <channel min="17.7" max="20.7"/>
  53 + <channel min="15.15" max="17.7"/>
  54 + <channel min="12.81" max="15.15"/>
  55 + <channel min="10.76" max="12.81"/>
  56 + <channel min="9.30" max="10.76"/>
  57 + <channel min="8.14" max="9.30"/>
  58 + <channel min="6.97" max="8.14"/>
  59 + <channel min="5.81" max="6.97"/>
  60 + <channel min="4.93" max="5.81"/>
  61 + <channel min="4.35" max="4.93"/>
  62 + <channel min="3.77" max="4.35"/>
  63 + <channel min="3.19" max="3.77"/>
  64 + <channel min="2.61" max="3.19"/>
  65 + <channel min="2.03" max="2.61"/>
  66 + <channel min="1.45" max="2.03"/>
  67 + <channel min="0.87" max="1.45"/>
  68 + <channel min="0.58" max="0.87"/>
  69 + </table>
  70 + </tables>
  71 +</paraminfo>
  72 +
  73 +
  74 +
  75 +
  76 +
  77 +
  78 +
  79 +
  80 +
... ...
PARAM_INFO_PREDEFINED/info_cass_caps_sng.xml
  Diff comments   View file @687f1b2
1 1 <?xml version="1.0" encoding="UTF-8"?>
2   -<paraminfo id="cass_caps_snghr_SNG">
3   - <dimensions dim_1="8" dim_2="63"/>
4   - <components>
5   - <component index_1="0" name="anode 1"/>
6   - <component index_1="1" name="anode 2"/>
7   - <component index_1="2" name="anode 3"/>
8   - <component index_1="3" name="anode 4"/>
9   - <component index_1="4" name="anode 5"/>
10   - <component index_1="5" name="anode 6"/>
11   - <component index_1="6" name="anode 7"/>
12   - <component index_1="7" name="anode 8"/>
13   - </components>
  2 +<paraminfo id="cass_caps_sng">
  3 + <dimensions dim_1="63"/>
14 4 <tables>
15   - <table relatedDim="dim_2" name="Energy" units="eV">
  5 + <table relatedDim="dim_1" name="Energy" units="eV">
16 6 <channel min="42654" max="46343"/>
17 7 <channel min="35868" max="42654"/>
18 8 <channel min="30164" max="35868"/>
... ... @@ -80,4 +70,4 @@
80 70 </tables>
81 71 </paraminfo>
82 72  
83   -
84 73 \ No newline at end of file
  74 +
... ...
PARAM_INFO_PREDEFINED/info_cass_caps_sng_sum.xml 0 → 100644
  Diff comments   View file @687f1b2
... ... @@ -0,0 +1,73 @@
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<paraminfo id="cass_caps_sng_sum">
  3 + <dimensions dim_1="63"/>
  4 + <tables>
  5 + <table relatedDim="dim_1" name="Energy" units="eV">
  6 + <channel min="42654" max="46343"/>
  7 + <channel min="35868" max="42654"/>
  8 + <channel min="30164" max="35868"/>
  9 + <channel min="25361" max="30164"/>
  10 + <channel min="21327" max="25361"/>
  11 + <channel min="17937" max="21327"/>
  12 + <channel min="15080" max="17937"/>
  13 + <channel min="12680" max="15080"/>
  14 + <channel min="10666" max="12680"/>
  15 + <channel min="8968" max="10666"/>
  16 + <channel min="7542" max="8968"/>
  17 + <channel min="6343" max="7542"/>
  18 + <channel min="5330" max="6343"/>
  19 + <channel min="4481" max="5330"/>
  20 + <channel min="3768" max="4481"/>
  21 + <channel min="3168" max="3768"/>
  22 + <channel min="2665" max="3168"/>
  23 + <channel min="2240" max="2665"/>
  24 + <channel min="1884" max="2240"/>
  25 + <channel min="1584" max="1884"/>
  26 + <channel min="1333" max="1584"/>
  27 + <channel min="1120" max="1333"/>
  28 + <channel min="942" max="1120"/>
  29 + <channel min="792" max="942"/>
  30 + <channel min="666" max="792"/>
  31 + <channel min="560" max="666"/>
  32 + <channel min="471" max="560"/>
  33 + <channel min="396" max="471"/>
  34 + <channel min="333" max="396"/>
  35 + <channel min="280" max="333"/>
  36 + <channel min="235" max="280"/>
  37 + <channel min="198" max="235"/>
  38 + <channel min="166" max="198"/>
  39 + <channel min="140" max="166"/>
  40 + <channel min="117" max="140"/>
  41 + <channel min="99.0" max="117"/>
  42 + <channel min="83.2" max="99.0"/>
  43 + <channel min="70.0" max="83.2"/>
  44 + <channel min="58.8" max="70.0"/>
  45 + <channel min="49.5" max="58.8"/>
  46 + <channel min="41.6" max="49.5"/>
  47 + <channel min="35.0" max="41.6"/>
  48 + <channel min="29.4" max="35.0"/>
  49 + <channel min="24.7" max="29.4"/>
  50 + <channel min="20.8" max="24.7"/>
  51 + <channel min="17.5" max="20.8"/>
  52 + <channel min="14.7" max="17.5"/>
  53 + <channel min="12.3" max="14.7"/>
  54 + <channel min="10.40" max="12.3"/>
  55 + <channel min="8.75" max="10.40"/>
  56 + <channel min="7.37" max="8.75"/>
  57 + <channel min="6.21" max="7.37"/>
  58 + <channel min="5.21" max="6.21"/>
  59 + <channel min="4.37" max="5.21"/>
  60 + <channel min="3.68" max="4.37"/>
  61 + <channel min="3.09" max="3.68"/>
  62 + <channel min="2.59" max="3.09"/>
  63 + <channel min="2.18" max="2.59"/>
  64 + <channel min="1.84" max="2.18"/>
  65 + <channel min="1.56" max="1.84"/>
  66 + <channel min="1.31" max="1.56"/>
  67 + <channel min="1.10" max="1.31"/>
  68 + <channel min="1.00" max="1.10"/>
  69 + </table>
  70 + </tables>
  71 +</paraminfo>
  72 +
  73 +
... ...
ParamTemplateList.xml
  Diff comments   View file @687f1b2
... ... @@ -1530,4 +1530,32 @@
1530 1530 </argument>
1531 1531 </arguments>
1532 1532 </paramTemplate>
  1533 + <paramTemplate paramId="cass_caps_els" fileName="cass_caps_els_##ANODE##">
  1534 + <arguments>
  1535 + <argument key="ANODE" name="Anode" type="list" subtype="int" default="0">
  1536 + <item key="0" name="Anode 1"/>
  1537 + <item key="1" name="Anode 2"/>
  1538 + <item key="2" name="Anode 3"/>
  1539 + <item key="3" name="Anode 4"/>
  1540 + <item key="4" name="Anode 5"/>
  1541 + <item key="5" name="Anode 6"/>
  1542 + <item key="6" name="Anode 7"/>
  1543 + <item key="7" name="Anode 8"/>
  1544 + </argument>
  1545 + </arguments>
  1546 + </paramTemplate>
  1547 + <paramTemplate paramId="cass_caps_sng" fileName="cass_caps_sng_##ANODE##">
  1548 + <arguments>
  1549 + <argument key="ANODE" name="Anode" type="list" subtype="int" default="0">
  1550 + <item key="0" name="Anode 1"/>
  1551 + <item key="1" name="Anode 2"/>
  1552 + <item key="2" name="Anode 3"/>
  1553 + <item key="3" name="Anode 4"/>
  1554 + <item key="4" name="Anode 5"/>
  1555 + <item key="5" name="Anode 6"/>
  1556 + <item key="6" name="Anode 7"/>
  1557 + <item key="7" name="Anode 8"/>
  1558 + </argument>
  1559 + </arguments>
  1560 + </paramTemplate>
1533 1561 </paramTemplateList>
... ...