From 1fd0b03a30a3c9213e24ec5a5fa855c069536b5e Mon Sep 17 00:00:00 2001 From: Benjamin Renard <benjamin.renard@akka.eu> Date: Wed, 11 May 2022 11:16:16 +0200 Subject: [PATCH] SolarOrbiter EPD/EPT&HET: total flux -> omni flux (#10123) --- PARAM_DEF/solo_ept_tot_aflux.xml | 2 +- PARAM_DEF/solo_ept_tot_eflux.xml | 2 +- PARAM_DEF/solo_ept_tot_iflux.xml | 2 +- PARAM_DEF/solo_het_tot_cflux.xml | 2 +- PARAM_DEF/solo_het_tot_eflux.xml | 2 +- PARAM_DEF/solo_het_tot_eheflux.xml | 2 +- PARAM_DEF/solo_het_tot_feflux.xml | 2 +- PARAM_DEF/solo_het_tot_he3flux.xml | 2 +- PARAM_DEF/solo_het_tot_he4flux.xml | 2 +- PARAM_DEF/solo_het_tot_hhcflux.xml | 2 +- PARAM_DEF/solo_het_tot_nflux.xml | 2 +- PARAM_DEF/solo_het_tot_oflux.xml | 2 +- PARAM_DEF/solo_het_total_hflux.xml | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/PARAM_DEF/solo_ept_tot_aflux.xml b/PARAM_DEF/solo_ept_tot_aflux.xml index 9c2fefe..8489118 100644 --- a/PARAM_DEF/solo_ept_tot_aflux.xml +++ b/PARAM_DEF/solo_ept_tot_aflux.xml @@ -12,7 +12,7 @@ <amdaParam name="solo_ept_north_aflux"/> <amdaParam name="solo_ept_south_aflux"/> </get> - <process>$solo_ept_asun_aflux + $solo_ept_sun_aflux + $solo_ept_north_aflux + $solo_ept_south_aflux</process> + <process>($solo_ept_asun_aflux + $solo_ept_sun_aflux + $solo_ept_north_aflux + $solo_ept_south_aflux) / 4.</process> <output> <plot> <timePlot> diff --git a/PARAM_DEF/solo_ept_tot_eflux.xml b/PARAM_DEF/solo_ept_tot_eflux.xml index 75d7c81..5adfb06 100644 --- a/PARAM_DEF/solo_ept_tot_eflux.xml +++ b/PARAM_DEF/solo_ept_tot_eflux.xml @@ -12,7 +12,7 @@ <amdaParam name="solo_ept_north_eflux"/> <amdaParam name="solo_ept_south_eflux"/> </get> - <process>$solo_ept_anti_eflux + $solo_ept_sun_eflux + $solo_ept_north_eflux + $solo_ept_south_eflux</process> + <process>($solo_ept_anti_eflux + $solo_ept_sun_eflux + $solo_ept_north_eflux + $solo_ept_south_eflux) / 4.</process> <output> <plot> <timePlot> diff --git a/PARAM_DEF/solo_ept_tot_iflux.xml b/PARAM_DEF/solo_ept_tot_iflux.xml index 8917879..919024c 100644 --- a/PARAM_DEF/solo_ept_tot_iflux.xml +++ b/PARAM_DEF/solo_ept_tot_iflux.xml @@ -12,7 +12,7 @@ <amdaParam name="solo_ept_north_iflux"/> <amdaParam name="solo_ept_south_iflux"/> </get> - <process>$solo_ept_asun_iflux + $solo_ept_sun_iflux + $solo_ept_north_iflux + $solo_ept_south_iflux</process> + <process>($solo_ept_asun_iflux + $solo_ept_sun_iflux + $solo_ept_north_iflux + $solo_ept_south_iflux) / 4.</process> <output> <plot> <timePlot> diff --git a/PARAM_DEF/solo_het_tot_cflux.xml b/PARAM_DEF/solo_het_tot_cflux.xml index 7730ef0..23c9e32 100644 --- a/PARAM_DEF/solo_het_tot_cflux.xml +++ b/PARAM_DEF/solo_het_tot_cflux.xml @@ -12,7 +12,7 @@ <amdaParam name="solo_het_north_cflux"/> <amdaParam name="solo_het_south_cflux"/> </get> - <process>$solo_het_asun_cflux + $solo_het_sun_cflux + $solo_het_north_cflux + $solo_het_south_cflux</process> + <process>($solo_het_asun_cflux + $solo_het_sun_cflux + $solo_het_north_cflux + $solo_het_south_cflux) / 4.</process> <output> <plot> <timePlot> diff --git a/PARAM_DEF/solo_het_tot_eflux.xml b/PARAM_DEF/solo_het_tot_eflux.xml index 7d1578f..f45951f 100644 --- a/PARAM_DEF/solo_het_tot_eflux.xml +++ b/PARAM_DEF/solo_het_tot_eflux.xml @@ -7,7 +7,7 @@ <amdaParam name="solo_het_north_eflux"/> <amdaParam name="solo_het_south_eflux"/> </get> - <process>$solo_het_asun_eflux + $solo_het_sun_eflux + $solo_het_north_eflux + $solo_het_south_eflux</process> + <process>($solo_het_asun_eflux + $solo_het_sun_eflux + $solo_het_north_eflux + $solo_het_south_eflux) / 4.</process> <output/> </param> diff --git a/PARAM_DEF/solo_het_tot_eheflux.xml b/PARAM_DEF/solo_het_tot_eheflux.xml index 3afc010..562bdb6 100644 --- a/PARAM_DEF/solo_het_tot_eheflux.xml +++ b/PARAM_DEF/solo_het_tot_eheflux.xml @@ -7,7 +7,7 @@ <amdaParam name="solo_het_north_eheflux"/> <amdaParam name="solo_het_south_eheflux"/> </get> - <process>$solo_het_asun_eheflux + $solo_het_sun_eheflux + $solo_het_north_eheflux + $solo_het_south_eheflux</process> + <process>($solo_het_asun_eheflux + $solo_het_sun_eheflux + $solo_het_north_eheflux + $solo_het_south_eheflux) / 4.</process> <output/> </param> diff --git a/PARAM_DEF/solo_het_tot_feflux.xml b/PARAM_DEF/solo_het_tot_feflux.xml index 858f9ae..8ec2e7a 100644 --- a/PARAM_DEF/solo_het_tot_feflux.xml +++ b/PARAM_DEF/solo_het_tot_feflux.xml @@ -12,7 +12,7 @@ <amdaParam name="solo_het_north_feflux"/> <amdaParam name="solo_het_south_feflux"/> </get> - <process>$solo_het_asun_feflux + $solo_het_sun_feflux + $solo_het_north_feflux + $solo_het_south_feflux</process> + <process>($solo_het_asun_feflux + $solo_het_sun_feflux + $solo_het_north_feflux + $solo_het_south_feflux) / 4.</process> <output> <plot> <timePlot> diff --git a/PARAM_DEF/solo_het_tot_he3flux.xml b/PARAM_DEF/solo_het_tot_he3flux.xml index 6c124a2..9a16dd6 100644 --- a/PARAM_DEF/solo_het_tot_he3flux.xml +++ b/PARAM_DEF/solo_het_tot_he3flux.xml @@ -12,7 +12,7 @@ <amdaParam name="solo_het_north_he3flux"/> <amdaParam name="solo_het_south_he3flux"/> </get> - <process>$solo_het_asun_he3flux + $solo_het_sun_he3flux + $solo_het_north_he3flux + $solo_het_south_he3flux</process> + <process>($solo_het_asun_he3flux + $solo_het_sun_he3flux + $solo_het_north_he3flux + $solo_het_south_he3flux) / 4.</process> <output> <plot> <timePlot> diff --git a/PARAM_DEF/solo_het_tot_he4flux.xml b/PARAM_DEF/solo_het_tot_he4flux.xml index b4839b8..6a584a7 100644 --- a/PARAM_DEF/solo_het_tot_he4flux.xml +++ b/PARAM_DEF/solo_het_tot_he4flux.xml @@ -12,7 +12,7 @@ <amdaParam name="solo_het_north_he4flux"/> <amdaParam name="solo_het_south_he4flux"/> </get> - <process>$solo_het_asun_he4flux + $solo_het_sun_he4flux + $solo_het_north_he4flux + $solo_het_south_he4flux</process> + <process>($solo_het_asun_he4flux + $solo_het_sun_he4flux + $solo_het_north_he4flux + $solo_het_south_he4flux) / 4.</process> <output> <plot> <timePlot> diff --git a/PARAM_DEF/solo_het_tot_hhcflux.xml b/PARAM_DEF/solo_het_tot_hhcflux.xml index 24a2110..a230b53 100644 --- a/PARAM_DEF/solo_het_tot_hhcflux.xml +++ b/PARAM_DEF/solo_het_tot_hhcflux.xml @@ -7,7 +7,7 @@ <amdaParam name="solo_het_north_hhcflux"/> <amdaParam name="solo_het_south_hhcflux"/> </get> - <process>$solo_het_asun_hhcflux + $solo_het_sun_hhcflux + $solo_het_north_hhcflux + $solo_het_south_hhcflux</process> + <process>($solo_het_asun_hhcflux + $solo_het_sun_hhcflux + $solo_het_north_hhcflux + $solo_het_south_hhcflux) / 4.</process> <output/> </param> diff --git a/PARAM_DEF/solo_het_tot_nflux.xml b/PARAM_DEF/solo_het_tot_nflux.xml index 35fbbc6..2c2fea5 100644 --- a/PARAM_DEF/solo_het_tot_nflux.xml +++ b/PARAM_DEF/solo_het_tot_nflux.xml @@ -12,7 +12,7 @@ <amdaParam name="solo_het_north_nflux"/> <amdaParam name="solo_het_south_nflux"/> </get> - <process>$solo_het_asun_nflux + $solo_het_sun_nflux + $solo_het_north_nflux + $solo_het_south_nflux</process> + <process>($solo_het_asun_nflux + $solo_het_sun_nflux + $solo_het_north_nflux + $solo_het_south_nflux) / 4.</process> <output> <plot> <timePlot> diff --git a/PARAM_DEF/solo_het_tot_oflux.xml b/PARAM_DEF/solo_het_tot_oflux.xml index 670fb78..11eaf81 100644 --- a/PARAM_DEF/solo_het_tot_oflux.xml +++ b/PARAM_DEF/solo_het_tot_oflux.xml @@ -12,7 +12,7 @@ <amdaParam name="solo_het_north_oflux"/> <amdaParam name="solo_het_south_oflux"/> </get> - <process>$solo_het_asun_oflux + $solo_het_sun_oflux + $solo_het_north_oflux + $solo_het_south_oflux</process> + <process>($solo_het_asun_oflux + $solo_het_sun_oflux + $solo_het_north_oflux + $solo_het_south_oflux) / 4.</process> <output> <plot> <timePlot> diff --git a/PARAM_DEF/solo_het_total_hflux.xml b/PARAM_DEF/solo_het_total_hflux.xml index 706f273..bbad37e 100644 --- a/PARAM_DEF/solo_het_total_hflux.xml +++ b/PARAM_DEF/solo_het_total_hflux.xml @@ -12,7 +12,7 @@ <amdaParam name="solo_het_north_hflux"/> <amdaParam name="solo_het_south_hflux"/> </get> - <process>$solo_het_asun_hflux + $solo_het_sun_hflux + $solo_het_north_hflux + $solo_het_south_hflux</process> + <process>($solo_het_asun_hflux + $solo_het_sun_hflux + $solo_het_north_hflux + $solo_het_south_hflux) / 4.</process> <output> <plot> <timePlot> -- libgit2 0.21.2