Commit c27a3cd64dc5bd834789df4e04c60c6c2727ed01

Authored by Benjamin Renard
1 parent 5c41da6e
Exists in master

Merge JUICE/JEI parameters from amdadev into master

ACCESS/access.xml
... ... @@ -8,7 +8,7 @@
8 8 <instrument xml:id="Cluster3_rapid" group='TBD' restriction=''/>
9 9 <instrument xml:id="Cluster4_rapid" group='TBD' restriction=''/>
10 10 <instrument xml:id="Juice_jdc" group='JUICE_PEP' restriction='' hideIfRestricted='1'/>
11   - <instrument xml:id="Juice_jei" group='JUICE_PEP' restriction='' hideIfRestricted='1'/>
  11 + <instrument xml:id="Juice_jei" group='JUICE_PEP_JEI' restriction='' hideIfRestricted='1'/>
12 12 <instrument xml:id="Juice_jeni" group='JUICE_PEP' restriction='' hideIfRestricted='1'/>
13 13 <instrument xml:id="Juice_jna" group='JUICE_PEP' restriction='' hideIfRestricted='1'/>
14 14 <instrument xml:id="Juice_joee" group='JUICE_PEP' restriction='' hideIfRestricted='1'/>
... ...
INTERNAL_PARAM_DEF/jei_ehighcruise_energy.xml 0 → 100644
... ... @@ -0,0 +1,12 @@
  1 +<?xml version="1.0"?>
  2 +<param xml:id="jei_ehighcruise_energy">
  3 + <get>
  4 + <vi name='juice:jei:ehigh.cruise'>
  5 + <baseParam name="energy_index" useNearestValue="true">
  6 + <clb name="ENERGY_TABLES"/>
  7 + </baseParam>
  8 + </vi>
  9 + </get>
  10 + <process description="Energy table">#getClbInfo($juice_jei_ehigh_46_cruise_energy_index;0:ENERGY_TABLES_0;1:ENERGY_TABLES_1)</process>
  11 + <output/>
  12 +</param>
... ...
INTERNAL_PARAM_DEF/jei_ehighearthmoon_energy.xml 0 → 100644
... ... @@ -0,0 +1,12 @@
  1 +<?xml version="1.0"?>
  2 +<param xml:id="jei_ehighearthmoon_energy">
  3 + <get>
  4 + <vi name='juice:jei:ehigh.earthmoon'>
  5 + <baseParam name="energy_index" useNearestValue="true">
  6 + <clb name="ENERGY_TABLES"/>
  7 + </baseParam>
  8 + </vi>
  9 + </get>
  10 + <process description="Energy table">#getClbInfo($juice_jei_ehigh_46_earthmoon_energy_index;0:ENERGY_TABLES_0;1:ENERGY_TABLES_1)</process>
  11 + <output/>
  12 +</param>
... ...
INTERNAL_PARAM_DEF/jei_ihighcruise_energy.xml 0 → 100644
... ... @@ -0,0 +1,12 @@
  1 +<?xml version="1.0"?>
  2 +<param xml:id="jei_ihighcruise_energy">
  3 + <get>
  4 + <vi name='juice:jei:ihigh.cruise'>
  5 + <baseParam name="energy_index" useNearestValue="true">
  6 + <clb name="ENERGY_TABLES"/>
  7 + </baseParam>
  8 + </vi>
  9 + </get>
  10 + <process description="Energy table">#getClbInfo($juice_jei_ihigh_46_cruise_energy_index;0:ENERGY_TABLES_0;1:ENERGY_TABLES_1)</process>
  11 + <output/>
  12 +</param>
... ...
INTERNAL_PARAM_DEF/jei_ihighearthmoon_energy.xml 0 → 100644
... ... @@ -0,0 +1,12 @@
  1 +<?xml version="1.0"?>
  2 +<param xml:id="jei_ihighearthmoon_energy">
  3 + <get>
  4 + <vi name='juice:jei:ihigh.earthmoon'>
  5 + <baseParam name="energy_index" useNearestValue="true">
  6 + <clb name="ENERGY_TABLES"/>
  7 + </baseParam>
  8 + </vi>
  9 + </get>
  10 + <process description="Energy table">#getClbInfo($juice_jei_ihigh_46_earthmoon_energy_index;0:ENERGY_TABLES_0;1:ENERGY_TABLES_1)</process>
  11 + <output/>
  12 +</param>
... ...
PARAM_DEF/jei_ehighcruise_counts.xml 0 → 100644
... ... @@ -0,0 +1,34 @@
  1 +<?xml version="1.0"?>
  2 +<param xml:id='jei_ehighcruise_counts_##CEM_INDEX##'>
  3 + <info>
  4 + <table>
  5 + <centerAutoTable variable="true" fullVariable="false" name="Energy" units="eV" centerName="jei_ehighcruise_energy" log="true"/>
  6 + </table>
  7 + </info>
  8 + <get>
  9 + <vi name='juice:jei:ehigh.cruise'>
  10 + <baseParam name='CEM##CEM_INDEX##_##CEM_INDEX##E'/>
  11 + </vi>
  12 + <amdaParam name="jei_ehighcruise_energy"/>
  13 + </get>
  14 + <process/>
  15 + <output>
  16 + <plot>
  17 + <timePlot>
  18 + <params>
  19 + <param id="jei_ehighcruise_counts_##CEM_INDEX##">
  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/jei_ehighcruise_measinfonumall.xml 0 → 100644
... ... @@ -0,0 +1,10 @@
  1 +<?xml version="1.0"?>
  2 +<param xml:id='jei_ehighcruise_measinfonumall'>
  3 + <get>
  4 + <vi name='juice:jei:ehigh.cruise'>
  5 + <baseParam name='MeasInfoNum_All' useNearestValue="true"/>
  6 + </vi>
  7 + </get>
  8 + <process/>
  9 + <output/>
  10 +</param>
... ...
PARAM_DEF/jei_ehighcruise_sciconfig.xml 0 → 100644
... ... @@ -0,0 +1,10 @@
  1 +<?xml version="1.0"?>
  2 +<param xml:id='jei_ehighcruise_sciconfig'>
  3 + <get>
  4 + <vi name='juice:jei:ehigh.cruise'>
  5 + <baseParam name='SciConfig' useNearestValue="true"/>
  6 + </vi>
  7 + </get>
  8 + <process/>
  9 + <output/>
  10 +</param>
... ...
PARAM_DEF/jei_ehighcruise_scimode.xml 0 → 100644
... ... @@ -0,0 +1,10 @@
  1 +<?xml version="1.0"?>
  2 +<param xml:id='jei_ehighcruise_scimode'>
  3 + <get>
  4 + <vi name='juice:jei:ehigh.cruise'>
  5 + <baseParam name='SciMode' useNearestValue="true"/>
  6 + </vi>
  7 + </get>
  8 + <process/>
  9 + <output/>
  10 +</param>
... ...
PARAM_DEF/jei_ehighcruise_thetamed.xml 0 → 100644
... ... @@ -0,0 +1,10 @@
  1 +<?xml version="1.0"?>
  2 +<param xml:id='jei_ehighcruise_thetamed'>
  3 + <get>
  4 + <vi name='juice:jei:ehigh.cruise'>
  5 + <baseParam name='Theta_med' useNearestValue="true"/>
  6 + </vi>
  7 + </get>
  8 + <process/>
  9 + <output/>
  10 +</param>
... ...
PARAM_DEF/jei_ehighearthmoon_counts.xml 0 → 100644
... ... @@ -0,0 +1,34 @@
  1 +<?xml version="1.0"?>
  2 +<param xml:id='jei_ehighearthmoon_counts_##CEM_INDEX##'>
  3 + <info>
  4 + <table>
  5 + <centerAutoTable variable="true" fullVariable="false" name="Energy" units="eV" centerName="jei_ehighearthmoon_energy" log="true"/>
  6 + </table>
  7 + </info>
  8 + <get>
  9 + <vi name='juice:jei:ehigh.earthmoon'>
  10 + <baseParam name='CEM##CEM_INDEX##_##CEM_INDEX##E'/>
  11 + </vi>
  12 + <amdaParam name="jei_ehighearthmoon_energy"/>
  13 + </get>
  14 + <process/>
  15 + <output>
  16 + <plot>
  17 + <timePlot>
  18 + <params>
  19 + <param id="jei_ehighearthmoon_counts_##CEM_INDEX##">
  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/jei_ehighearthmoon_measinfonumall.xml 0 → 100644
... ... @@ -0,0 +1,10 @@
  1 +<?xml version="1.0"?>
  2 +<param xml:id='jei_ehighearthmoon_measinfonumall'>
  3 + <get>
  4 + <vi name='juice:jei:ehigh.earthmoon'>
  5 + <baseParam name='MeasInfoNum_All' useNearestValue="true"/>
  6 + </vi>
  7 + </get>
  8 + <process/>
  9 + <output/>
  10 +</param>
... ...
PARAM_DEF/jei_ehighearthmoon_sciconfig.xml 0 → 100644
... ... @@ -0,0 +1,10 @@
  1 +<?xml version="1.0"?>
  2 +<param xml:id='jei_ehighearthmoon_sciconfig'>
  3 + <get>
  4 + <vi name='juice:jei:ehigh.earthmoon'>
  5 + <baseParam name='SciConfig' useNearestValue="true"/>
  6 + </vi>
  7 + </get>
  8 + <process/>
  9 + <output/>
  10 +</param>
... ...
PARAM_DEF/jei_ehighearthmoon_scimode.xml 0 → 100644
... ... @@ -0,0 +1,10 @@
  1 +<?xml version="1.0"?>
  2 +<param xml:id='jei_ehighearthmoon_scimode'>
  3 + <get>
  4 + <vi name='juice:jei:ehigh.earthmoon'>
  5 + <baseParam name='SciMode' useNearestValue="true"/>
  6 + </vi>
  7 + </get>
  8 + <process/>
  9 + <output/>
  10 +</param>
... ...
PARAM_DEF/jei_ehighearthmoon_thetamed.xml 0 → 100644
... ... @@ -0,0 +1,10 @@
  1 +<?xml version="1.0"?>
  2 +<param xml:id='jei_ehighearthmoon_thetamed'>
  3 + <get>
  4 + <vi name='juice:jei:ehigh.earthmoon'>
  5 + <baseParam name='Theta_med' useNearestValue="true"/>
  6 + </vi>
  7 + </get>
  8 + <process/>
  9 + <output/>
  10 +</param>
... ...
PARAM_DEF/jei_ihighcruise_counts.xml 0 → 100644
... ... @@ -0,0 +1,34 @@
  1 +<?xml version="1.0"?>
  2 +<param xml:id='jei_ihighcruise_counts_##CEM_INDEX##'>
  3 + <info>
  4 + <table>
  5 + <centerAutoTable variable="true" fullVariable="false" name="Energy" units="eV" centerName="jei_ihighcruise_energy" log="true"/>
  6 + </table>
  7 + </info>
  8 + <get>
  9 + <vi name='juice:jei:ihigh.cruise'>
  10 + <baseParam name='CEM##CEM_INDEX##_##CEM_INDEX##E'/>
  11 + </vi>
  12 + <amdaParam name="jei_ihighcruise_energy"/>
  13 + </get>
  14 + <process/>
  15 + <output>
  16 + <plot>
  17 + <timePlot>
  18 + <params>
  19 + <param id="jei_ihighcruise_counts_##CEM_INDEX##">
  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/jei_ihighcruise_measinfonumall.xml 0 → 100644
... ... @@ -0,0 +1,10 @@
  1 +<?xml version="1.0"?>
  2 +<param xml:id='jei_ihighcruise_measinfonumall'>
  3 + <get>
  4 + <vi name='juice:jei:ihigh.cruise'>
  5 + <baseParam name='MeasInfoNum_All' useNearestValue="true"/>
  6 + </vi>
  7 + </get>
  8 + <process/>
  9 + <output/>
  10 +</param>
... ...
PARAM_DEF/jei_ihighcruise_sciconfig.xml 0 → 100644
... ... @@ -0,0 +1,10 @@
  1 +<?xml version="1.0"?>
  2 +<param xml:id='jei_ihighcruise_sciconfig'>
  3 + <get>
  4 + <vi name='juice:jei:ihigh.cruise'>
  5 + <baseParam name='SciConfig' useNearestValue="true"/>
  6 + </vi>
  7 + </get>
  8 + <process/>
  9 + <output/>
  10 +</param>
... ...
PARAM_DEF/jei_ihighcruise_scimode.xml 0 → 100644
... ... @@ -0,0 +1,10 @@
  1 +<?xml version="1.0"?>
  2 +<param xml:id='jei_ihighcruise_scimode'>
  3 + <get>
  4 + <vi name='juice:jei:ihigh.cruise'>
  5 + <baseParam name='SciMode' useNearestValue="true"/>
  6 + </vi>
  7 + </get>
  8 + <process/>
  9 + <output/>
  10 +</param>
... ...
PARAM_DEF/jei_ihighcruise_thetamed.xml 0 → 100644
... ... @@ -0,0 +1,10 @@
  1 +<?xml version="1.0"?>
  2 +<param xml:id='jei_ihighcruise_thetamed'>
  3 + <get>
  4 + <vi name='juice:jei:ihigh.cruise'>
  5 + <baseParam name='Theta_med' useNearestValue="true"/>
  6 + </vi>
  7 + </get>
  8 + <process/>
  9 + <output/>
  10 +</param>
... ...
PARAM_DEF/jei_ihighearthmoon_counts.xml 0 → 100644
... ... @@ -0,0 +1,34 @@
  1 +<?xml version="1.0"?>
  2 +<param xml:id='jei_ihighearthmoon_counts_##CEM_INDEX##'>
  3 + <info>
  4 + <table>
  5 + <centerAutoTable variable="true" fullVariable="false" name="Energy" units="eV" centerName="jei_ihighearthmoon_energy" log="true"/>
  6 + </table>
  7 + </info>
  8 + <get>
  9 + <vi name='juice:jei:ihigh.earthmoon'>
  10 + <baseParam name='CEM##CEM_INDEX##_##CEM_INDEX##E'/>
  11 + </vi>
  12 + <amdaParam name="jei_ihighearthmoon_energy"/>
  13 + </get>
  14 + <process/>
  15 + <output>
  16 + <plot>
  17 + <timePlot>
  18 + <params>
  19 + <param id="jei_ihighearthmoon_counts_##CEM_INDEX##">
  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/jei_ihighearthmoon_measinfonumall.xml 0 → 100644
... ... @@ -0,0 +1,10 @@
  1 +<?xml version="1.0"?>
  2 +<param xml:id='jei_ihighearthmoon_measinfonumall'>
  3 + <get>
  4 + <vi name='juice:jei:ihigh.earthmoon'>
  5 + <baseParam name='MeasInfoNum_All' useNearestValue="true"/>
  6 + </vi>
  7 + </get>
  8 + <process/>
  9 + <output/>
  10 +</param>
... ...
PARAM_DEF/jei_ihighearthmoon_sciconfig.xml 0 → 100644
... ... @@ -0,0 +1,10 @@
  1 +<?xml version="1.0"?>
  2 +<param xml:id='jei_ihighearthmoon_sciconfig'>
  3 + <get>
  4 + <vi name='juice:jei:ihigh.earthmoon'>
  5 + <baseParam name='SciConfig' useNearestValue="true"/>
  6 + </vi>
  7 + </get>
  8 + <process/>
  9 + <output/>
  10 +</param>
... ...
PARAM_DEF/jei_ihighearthmoon_scimode.xml 0 → 100644
... ... @@ -0,0 +1,10 @@
  1 +<?xml version="1.0"?>
  2 +<param xml:id='jei_ihighearthmoon_scimode'>
  3 + <get>
  4 + <vi name='juice:jei:ihigh.earthmoon'>
  5 + <baseParam name='SciMode' useNearestValue="true"/>
  6 + </vi>
  7 + </get>
  8 + <process/>
  9 + <output/>
  10 +</param>
... ...
PARAM_DEF/jei_ihighearthmoon_thetamed.xml 0 → 100644
... ... @@ -0,0 +1,10 @@
  1 +<?xml version="1.0"?>
  2 +<param xml:id='jei_ihighearthmoon_thetamed'>
  3 + <get>
  4 + <vi name='juice:jei:ihigh.earthmoon'>
  5 + <baseParam name='Theta_med' useNearestValue="true"/>
  6 + </vi>
  7 + </get>
  8 + <process/>
  9 + <output/>
  10 +</param>
... ...
PARAM_INFO_PREDEFINED/info_jei_ehighcruise_counts.xml 0 → 100644
... ... @@ -0,0 +1,8 @@
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<paraminfo id="info_jei_ehighcruise_counts">
  3 + <dimensions dim_1="128"/>
  4 + <tables>
  5 + <table relatedDim="dim_1" name="Energy" units="eV" minValue="0" maxValue="10000" variable="true"/>
  6 + </tables>
  7 +</paraminfo>
  8 +
... ...
PARAM_INFO_PREDEFINED/info_jei_ehighearthmoon_counts.xml 0 → 100644
... ... @@ -0,0 +1,8 @@
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<paraminfo id="info_jei_ehighearthmoon_counts">
  3 + <dimensions dim_1="128"/>
  4 + <tables>
  5 + <table relatedDim="dim_1" name="Energy" units="eV" minValue="0" maxValue="10000" variable="true"/>
  6 + </tables>
  7 +</paraminfo>
  8 +
... ...
PARAM_INFO_PREDEFINED/info_jei_ihighcruise_counts.xml 0 → 100644
... ... @@ -0,0 +1,8 @@
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<paraminfo id="info_jei_ihighcruise_counts">
  3 + <dimensions dim_1="128"/>
  4 + <tables>
  5 + <table relatedDim="dim_1" name="Energy" units="eV" minValue="0" maxValue="10000" variable="true"/>
  6 + </tables>
  7 +</paraminfo>
  8 +
... ...
PARAM_INFO_PREDEFINED/info_jei_ihighearthmoon_counts.xml 0 → 100644
... ... @@ -0,0 +1,8 @@
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<paraminfo id="info_jei_ihighearthmoon_counts">
  3 + <dimensions dim_1="128"/>
  4 + <tables>
  5 + <table relatedDim="dim_1" name="Energy" units="eV" minValue="0" maxValue="10000" variable="true"/>
  6 + </tables>
  7 +</paraminfo>
  8 +
... ...
ParamTemplateList.xml
... ... @@ -3295,6 +3295,27 @@
3295 3295 </arguments>
3296 3296 </paramTemplate>
3297 3297  
  3298 + <paramTemplate paramId="jei_ehighcruise_counts" fileName="jei_ehighcruise_counts_##CEM_INDEX##">
  3299 + <arguments>
  3300 + <argument key="CEM_INDEX" name="Channel" type="generated-list" minkey="0" maxkey="15" subtype="int" nametpl="CEM##key##" default="0"/>
  3301 + </arguments>
  3302 + </paramTemplate>
  3303 + <paramTemplate paramId="jei_ehighearthmoon_counts" fileName="jei_ehighearthmoon_counts_##CEM_INDEX##">
  3304 + <arguments>
  3305 + <argument key="CEM_INDEX" name="Channel" type="generated-list" minkey="0" maxkey="15" subtype="int" nametpl="CEM##key##" default="0"/>
  3306 + </arguments>
  3307 + </paramTemplate>
  3308 + <paramTemplate paramId="jei_ihighcruise_counts" fileName="jei_ihighcruise_counts_##CEM_INDEX##">
  3309 + <arguments>
  3310 + <argument key="CEM_INDEX" name="Channel" type="generated-list" minkey="0" maxkey="15" subtype="int" nametpl="CEM##key##" default="0"/>
  3311 + </arguments>
  3312 + </paramTemplate>
  3313 + <paramTemplate paramId="jei_ihighearthmoon_counts" fileName="jei_ihighearthmoon_counts_##CEM_INDEX##">
  3314 + <arguments>
  3315 + <argument key="CEM_INDEX" name="Channel" type="generated-list" minkey="0" maxkey="15" subtype="int" nametpl="CEM##key##" default="0"/>
  3316 + </arguments>
  3317 + </paramTemplate>
  3318 +
3298 3319 <paramTemplate paramId="bepi_sixp_p" fileName="bepi_sixp_p_##side##">
3299 3320 <arguments>
3300 3321 <argument key="side" name="Side" type="generated-list" minkey="0" maxkey="3" subtype="int" nametpl="Side ##key##" default="0"/>
... ...