Commit c12d248c22a321843f2677397b820414dfdc439b
1 parent
98fbb2ef
Exists in
juice_jdc
and in
1 other branch
SolarOrbiter HET&EPD omni - Fix ID + table definition
Showing
16 changed files
with
134 additions
and
71 deletions
Show diff stats
PARAM_DEF/solo_ept_tot_aflux.xml renamed to PARAM_DEF/solo_ept_omni_aflux.xml
1 | 1 | <?xml version="1.0"?> |
2 | -<param xml:id='solo_ept_tot_aflux'> | |
2 | +<param xml:id='solo_ept_omni_aflux'> | |
3 | 3 | <info> |
4 | - <table> | |
5 | - <minMaxTable name="Energy" units="MeV" minName="Alpha_Bins_Low_Energy" maxName="Alpha_Bins_High_Energy"/> | |
6 | - </table> | |
4 | + <linkTable originParamId="solo_ept_asun_aflux" originTableDim="1"/> | |
7 | 5 | </info> |
8 | 6 | <reference_parameter>solo_ept_asun_aflux</reference_parameter> |
9 | 7 | <get> |
... | ... | @@ -17,7 +15,7 @@ |
17 | 15 | <plot> |
18 | 16 | <timePlot> |
19 | 17 | <params> |
20 | - <param id="solo_ept_tot_aflux"> | |
18 | + <param id="solo_ept_omni_aflux"> | |
21 | 19 | <spectro yAxis="y-left"/> |
22 | 20 | </param> |
23 | 21 | </params> | ... | ... |
PARAM_DEF/solo_ept_tot_eflux.xml renamed to PARAM_DEF/solo_ept_omni_eflux.xml
1 | 1 | <?xml version="1.0"?> |
2 | -<param xml:id='solo_ept_tot_eflux'> | |
2 | +<param xml:id='solo_ept_omni_eflux'> | |
3 | 3 | <info> |
4 | 4 | <table> |
5 | - <minMaxTable name="Energy" units="MeV" minName="Electron_Bins_Low_Energy" maxName="Electron_Bins_High_Energy"/> | |
5 | + <linkTable originParamId="solo_ept_anti_eflux" originTableDim="1"/> | |
6 | 6 | </table> |
7 | 7 | </info> |
8 | 8 | <reference_parameter>solo_ept_anti_eflux</reference_parameter> |
... | ... | @@ -17,7 +17,7 @@ |
17 | 17 | <plot> |
18 | 18 | <timePlot> |
19 | 19 | <params> |
20 | - <param id="solo_ept_tot_eflux"> | |
20 | + <param id="solo_ept_omni_eflux"> | |
21 | 21 | <spectro yAxis="y-left"/> |
22 | 22 | </param> |
23 | 23 | </params> | ... | ... |
PARAM_DEF/solo_ept_tot_iflux.xml renamed to PARAM_DEF/solo_ept_omni_iflux.xml
1 | 1 | <?xml version="1.0"?> |
2 | -<param xml:id='solo_ept_tot_iflux'> | |
2 | +<param xml:id='solo_ept_omni_iflux'> | |
3 | 3 | <info> |
4 | 4 | <table> |
5 | - <minMaxTable name="Energy" units="MeV" minName="Ion_Bins_Low_Energy" maxName="Ion_Bins_High_Energy"/> | |
5 | + <linkTable originParamId="solo_ept_asun_iflux" originTableDim="1"/> | |
6 | 6 | </table> |
7 | 7 | </info> |
8 | 8 | <reference_parameter>solo_ept_asun_iflux</reference_parameter> |
... | ... | @@ -17,7 +17,7 @@ |
17 | 17 | <plot> |
18 | 18 | <timePlot> |
19 | 19 | <params> |
20 | - <param id="solo_ept_tot_iflux"> | |
20 | + <param id="solo_ept_omni_iflux"> | |
21 | 21 | <spectro yAxis="y-left"/> |
22 | 22 | </param> |
23 | 23 | </params> | ... | ... |
PARAM_DEF/solo_het_tot_cflux.xml renamed to PARAM_DEF/solo_het_omni_cflux.xml
1 | 1 | <?xml version="1.0"?> |
2 | -<param xml:id='solo_het_tot_cflux'> | |
2 | +<param xml:id='solo_het_omni_cflux'> | |
3 | 3 | <info> |
4 | 4 | <table> |
5 | - <minMaxTable name="Energy" units="MeV/n" minName="C_Bins_Low_Energy" maxName="C_Bins_High_Energy"/> | |
5 | + <linkTable originParamId="solo_het_asun_cflux" originTableDim="1"/> | |
6 | 6 | </table> |
7 | 7 | </info> |
8 | 8 | <reference_parameter>solo_het_asun_cflux</reference_parameter> |
... | ... | @@ -17,7 +17,7 @@ |
17 | 17 | <plot> |
18 | 18 | <timePlot> |
19 | 19 | <params> |
20 | - <param id="solo_het_tot_cflux"> | |
20 | + <param id="solo_het_omni_cflux"> | |
21 | 21 | <spectro yAxis="y-left"/> |
22 | 22 | </param> |
23 | 23 | </params> | ... | ... |
... | ... | @@ -0,0 +1,34 @@ |
1 | +<?xml version="1.0"?> | |
2 | +<param xml:id='solo_het_omni_eflux'> | |
3 | + <table> | |
4 | + <linkTable originParamId="solo_het_asun_eflux" originTableDim="1"/> | |
5 | + </table> | |
6 | + <reference_parameter>solo_het_asun_eflux</reference_parameter> | |
7 | + <get> | |
8 | + <amdaParam name="solo_het_asun_eflux"/> | |
9 | + <amdaParam name="solo_het_sun_eflux"/> | |
10 | + <amdaParam name="solo_het_north_eflux"/> | |
11 | + <amdaParam name="solo_het_south_eflux"/> | |
12 | + </get> | |
13 | + <process>($solo_het_asun_eflux + $solo_het_sun_eflux + $solo_het_north_eflux + $solo_het_south_eflux) / 4.</process> | |
14 | + <output> | |
15 | + <plot> | |
16 | + <timePlot> | |
17 | + <params> | |
18 | + <param id="solo_het_omni_eflux"> | |
19 | + <spectro yAxis="y-left"/> | |
20 | + </param> | |
21 | + </params> | |
22 | + <axes> | |
23 | + <yAxis> | |
24 | + <digitalAxis id="y-left" scale="logarithmic"/> | |
25 | + </yAxis> | |
26 | + <zAxis> | |
27 | + <colorAxis scale="logarithmic"/> | |
28 | + </zAxis> | |
29 | + </axes> | |
30 | + </timePlot> | |
31 | + </plot> | |
32 | + </output> | |
33 | +</param> | |
34 | + | ... | ... |
... | ... | @@ -0,0 +1,36 @@ |
1 | +<?xml version="1.0"?> | |
2 | +<param xml:id='solo_het_omni_eheflux'> | |
3 | + <info> | |
4 | + <table> | |
5 | + <linkTable originParamId="solo_het_asun_eheflux" originTableDim="1"/> | |
6 | + </table> | |
7 | + </info> | |
8 | + <reference_parameter>solo_het_asun_eheflux</reference_parameter> | |
9 | + <get> | |
10 | + <amdaParam name="solo_het_asun_eheflux"/> | |
11 | + <amdaParam name="solo_het_sun_eheflux"/> | |
12 | + <amdaParam name="solo_het_north_eheflux"/> | |
13 | + <amdaParam name="solo_het_south_eheflux"/> | |
14 | + </get> | |
15 | + <process>($solo_het_asun_eheflux + $solo_het_sun_eheflux + $solo_het_north_eheflux + $solo_het_south_eheflux) / 4.</process> | |
16 | + <output> | |
17 | + <plot> | |
18 | + <timePlot> | |
19 | + <params> | |
20 | + <param id="solo_het_omni_eheflux"> | |
21 | + <spectro yAxis="y-left"/> | |
22 | + </param> | |
23 | + </params> | |
24 | + <axes> | |
25 | + <yAxis> | |
26 | + <digitalAxis id="y-left" scale="logarithmic"/> | |
27 | + </yAxis> | |
28 | + <zAxis> | |
29 | + <colorAxis scale="logarithmic"/> | |
30 | + </zAxis> | |
31 | + </axes> | |
32 | + </timePlot> | |
33 | + </plot> | |
34 | + </output> | |
35 | +</param> | |
36 | + | ... | ... |
PARAM_DEF/solo_het_tot_feflux.xml renamed to PARAM_DEF/solo_het_omni_feflux.xml
1 | 1 | <?xml version="1.0"?> |
2 | -<param xml:id='solo_het_tot_feflux'> | |
2 | +<param xml:id='solo_het_omni_feflux'> | |
3 | 3 | <info> |
4 | 4 | <table> |
5 | - <minMaxTable name="Energy" units="MeV/n" minName="Fe_Bins_Low_Energy" maxName="Fe_Bins_High_Energy"/> | |
5 | + <linkTable originParamId="solo_het_asun_feflux" originTableDim="1"/> | |
6 | 6 | </table> |
7 | 7 | </info> |
8 | 8 | <reference_parameter>solo_het_asun_feflux</reference_parameter> |
... | ... | @@ -17,7 +17,7 @@ |
17 | 17 | <plot> |
18 | 18 | <timePlot> |
19 | 19 | <params> |
20 | - <param id="solo_het_tot_feflux"> | |
20 | + <param id="solo_het_omni_feflux"> | |
21 | 21 | <spectro yAxis="y-left"/> |
22 | 22 | </param> |
23 | 23 | </params> | ... | ... |
PARAM_DEF/solo_het_tot_he3flux.xml renamed to PARAM_DEF/solo_het_omni_he3flux.xml
1 | 1 | <?xml version="1.0"?> |
2 | -<param xml:id='solo_het_tot_he3flux'> | |
2 | +<param xml:id='solo_het_omni_he3flux'> | |
3 | 3 | <info> |
4 | 4 | <table> |
5 | - <minMaxTable name="Energy" units="MeV/n" minName="He3_Bins_Low_Energy" maxName="He3_Bins_High_Energy"/> | |
5 | + <linkTable originParamId="solo_het_asun_he3flux" originTableDim="1"/> | |
6 | 6 | </table> |
7 | 7 | </info> |
8 | 8 | <reference_parameter>solo_het_asun_he3flux</reference_parameter> |
... | ... | @@ -17,7 +17,7 @@ |
17 | 17 | <plot> |
18 | 18 | <timePlot> |
19 | 19 | <params> |
20 | - <param id="solo_het_tot_he3flux"> | |
20 | + <param id="solo_het_omni_he3flux"> | |
21 | 21 | <spectro yAxis="y-left"/> |
22 | 22 | </param> |
23 | 23 | </params> | ... | ... |
PARAM_DEF/solo_het_tot_he4flux.xml renamed to PARAM_DEF/solo_het_omni_he4flux.xml
1 | 1 | <?xml version="1.0"?> |
2 | -<param xml:id='solo_het_tot_he4flux'> | |
2 | +<param xml:id='solo_het_omni_he4flux'> | |
3 | 3 | <info> |
4 | 4 | <table> |
5 | - <minMaxTable name="Energy" units="MeV/n" minName="He4_Bins_Low_Energy" maxName="He4_Bins_High_Energy"/> | |
5 | + <linkTable originParamId="solo_het_asun_he4flux" originTableDim="1"/> | |
6 | 6 | </table> |
7 | 7 | </info> |
8 | 8 | <reference_parameter>solo_het_asun_he4flux</reference_parameter> |
... | ... | @@ -17,7 +17,7 @@ |
17 | 17 | <plot> |
18 | 18 | <timePlot> |
19 | 19 | <params> |
20 | - <param id="solo_het_tot_he4flux"> | |
20 | + <param id="solo_het_omni_he4flux"> | |
21 | 21 | <spectro yAxis="y-left"/> |
22 | 22 | </param> |
23 | 23 | </params> | ... | ... |
PARAM_DEF/solo_het_total_hflux.xml renamed to PARAM_DEF/solo_het_omni_hflux.xml
1 | 1 | <?xml version="1.0"?> |
2 | -<param xml:id='solo_het_total_hflux'> | |
2 | +<param xml:id='solo_het_omni_hflux'> | |
3 | 3 | <info> |
4 | 4 | <table> |
5 | - <minMaxTable name="Energy" units="MeV" minName="H_Bins_Low_Energy" maxName="H_Bins_High_Energy"/> | |
5 | + <linkTable originParamId="solo_het_asun_hflux" originTableDim="1"/> | |
6 | 6 | </table> |
7 | 7 | </info> |
8 | 8 | <reference_parameter>solo_het_asun_hflux</reference_parameter> |
... | ... | @@ -17,7 +17,7 @@ |
17 | 17 | <plot> |
18 | 18 | <timePlot> |
19 | 19 | <params> |
20 | - <param id="solo_het_total_hflux"> | |
20 | + <param id="solo_het_omni_hflux"> | |
21 | 21 | <spectro yAxis="y-left"/> |
22 | 22 | </param> |
23 | 23 | </params> | ... | ... |
... | ... | @@ -0,0 +1,34 @@ |
1 | +<?xml version="1.0"?> | |
2 | +<param xml:id='solo_het_omni_hhcflux'> | |
3 | + <table> | |
4 | + <linkTable originParamId="solo_het_asun_hhcflux" originTableDim="1"/> | |
5 | + </table> | |
6 | + <reference_parameter>solo_het_asun_hhcflux</reference_parameter> | |
7 | + <get> | |
8 | + <amdaParam name="solo_het_asun_hhcflux"/> | |
9 | + <amdaParam name="solo_het_sun_hhcflux"/> | |
10 | + <amdaParam name="solo_het_north_hhcflux"/> | |
11 | + <amdaParam name="solo_het_south_hhcflux"/> | |
12 | + </get> | |
13 | + <process>($solo_het_asun_hhcflux + $solo_het_sun_hhcflux + $solo_het_north_hhcflux + $solo_het_south_hhcflux) / 4.</process> | |
14 | + <output> | |
15 | + <plot> | |
16 | + <timePlot> | |
17 | + <params> | |
18 | + <param id="solo_het_omni_hhcflux"> | |
19 | + <spectro yAxis="y-left"/> | |
20 | + </param> | |
21 | + </params> | |
22 | + <axes> | |
23 | + <yAxis> | |
24 | + <digitalAxis id="y-left" scale="logarithmic"/> | |
25 | + </yAxis> | |
26 | + <zAxis> | |
27 | + <colorAxis scale="logarithmic"/> | |
28 | + </zAxis> | |
29 | + </axes> | |
30 | + </timePlot> | |
31 | + </plot> | |
32 | + </output> | |
33 | +</param> | |
34 | + | ... | ... |
PARAM_DEF/solo_het_tot_nflux.xml renamed to PARAM_DEF/solo_het_omni_nflux.xml
1 | 1 | <?xml version="1.0"?> |
2 | -<param xml:id='solo_het_tot_nflux'> | |
2 | +<param xml:id='solo_het_omni_nflux'> | |
3 | 3 | <info> |
4 | 4 | <table> |
5 | - <minMaxTable name="Energy" units="MeV/n" minName="N_Bins_Low_Energy" maxName="N_Bins_High_Energy"/> | |
5 | + <linkTable originParamId="solo_het_asun_nflux" originTableDim="1"/> | |
6 | 6 | </table> |
7 | 7 | </info> |
8 | 8 | <reference_parameter>solo_het_asun_nflux</reference_parameter> |
... | ... | @@ -17,7 +17,7 @@ |
17 | 17 | <plot> |
18 | 18 | <timePlot> |
19 | 19 | <params> |
20 | - <param id="solo_het_tot_nflux"> | |
20 | + <param id="solo_het_omni_nflux"> | |
21 | 21 | <spectro yAxis="y-left"/> |
22 | 22 | </param> |
23 | 23 | </params> | ... | ... |
PARAM_DEF/solo_het_tot_oflux.xml renamed to PARAM_DEF/solo_het_omni_oflux.xml
1 | 1 | <?xml version="1.0"?> |
2 | -<param xml:id='solo_het_tot_oflux'> | |
2 | +<param xml:id='solo_het_omni_oflux'> | |
3 | 3 | <info> |
4 | 4 | <table> |
5 | - <minMaxTable name="Energy" units="MeV/n" minName="O_Bins_Low_Energy" maxName="O_Bins_High_Energy"/> | |
5 | + <linkTable originParamId="solo_het_asun_oflux" originTableDim="1"/> | |
6 | 6 | </table> |
7 | 7 | </info> |
8 | 8 | <reference_parameter>solo_het_asun_oflux</reference_parameter> |
... | ... | @@ -17,7 +17,7 @@ |
17 | 17 | <plot> |
18 | 18 | <timePlot> |
19 | 19 | <params> |
20 | - <param id="solo_het_tot_oflux"> | |
20 | + <param id="solo_het_omni_oflux"> | |
21 | 21 | <spectro yAxis="y-left"/> |
22 | 22 | </param> |
23 | 23 | </params> | ... | ... |
PARAM_DEF/solo_het_tot_eflux.xml deleted
... | ... | @@ -1,13 +0,0 @@ |
1 | -<?xml version="1.0"?> | |
2 | -<param xml:id='solo_het_tot_eflux'> | |
3 | - <reference_parameter>solo_het_asun_eflux</reference_parameter> | |
4 | - <get> | |
5 | - <amdaParam name="solo_het_asun_eflux"/> | |
6 | - <amdaParam name="solo_het_sun_eflux"/> | |
7 | - <amdaParam name="solo_het_north_eflux"/> | |
8 | - <amdaParam name="solo_het_south_eflux"/> | |
9 | - </get> | |
10 | - <process>($solo_het_asun_eflux + $solo_het_sun_eflux + $solo_het_north_eflux + $solo_het_south_eflux) / 4.</process> | |
11 | - <output/> | |
12 | -</param> | |
13 | - |
PARAM_DEF/solo_het_tot_eheflux.xml deleted
... | ... | @@ -1,13 +0,0 @@ |
1 | -<?xml version="1.0"?> | |
2 | -<param xml:id='solo_het_tot_eheflux'> | |
3 | - <reference_parameter>solo_het_asun_eheflux</reference_parameter> | |
4 | - <get> | |
5 | - <amdaParam name="solo_het_asun_eheflux"/> | |
6 | - <amdaParam name="solo_het_sun_eheflux"/> | |
7 | - <amdaParam name="solo_het_north_eheflux"/> | |
8 | - <amdaParam name="solo_het_south_eheflux"/> | |
9 | - </get> | |
10 | - <process>($solo_het_asun_eheflux + $solo_het_sun_eheflux + $solo_het_north_eheflux + $solo_het_south_eheflux) / 4.</process> | |
11 | - <output/> | |
12 | -</param> | |
13 | - |
PARAM_DEF/solo_het_tot_hhcflux.xml deleted
... | ... | @@ -1,13 +0,0 @@ |
1 | -<?xml version="1.0"?> | |
2 | -<param xml:id='solo_het_tot_hhcflux'> | |
3 | - <reference_parameter>solo_het_asun_hhcflux</reference_parameter> | |
4 | - <get> | |
5 | - <amdaParam name="solo_het_asun_hhcflux"/> | |
6 | - <amdaParam name="solo_het_sun_hhcflux"/> | |
7 | - <amdaParam name="solo_het_north_hhcflux"/> | |
8 | - <amdaParam name="solo_het_south_hhcflux"/> | |
9 | - </get> | |
10 | - <process>($solo_het_asun_hhcflux + $solo_het_sun_hhcflux + $solo_het_north_hhcflux + $solo_het_south_hhcflux) / 4.</process> | |
11 | - <output/> | |
12 | -</param> | |
13 | - |