Commit d9dd15a4ef326e6e0778c6efd26551e8ca2171a0
1 parent
a2f3db51
Exists in
juice_jdc
and in
1 other branch
Solo/EAS-PAD
Showing
8 changed files
with
11 additions
and
159 deletions
Show diff stats
INTERNAL_PARAM_DEF/eas_pad_elevation.xml deleted
PARAM_DEF/eas_pad_2d_azimuth.xml deleted
| ... | ... | @@ -1,38 +0,0 @@ |
| 1 | -<?xml version="1.0"?> | |
| 2 | -<param xml:id="eas_pad_2d_azimuth_##min##_##max##"> | |
| 3 | - <info> | |
| 4 | - <table> | |
| 5 | - <centerAutoTable dim="0" name="Elevation" units="deg" centerName="eas_pad_elevation" log="false" variable="true"/> | |
| 6 | - <centerAutoTable dim="1" name="Energy" units="eV" centerName="eas_pad_energy" log="false" variable="true"/> | |
| 7 | - </table> | |
| 8 | - </info> | |
| 9 | - <get> | |
| 10 | - <vi name="solo:eas:pad"> | |
| 11 | - <baseParam name="SWA_EAS_PAD_PSD_Data" dim3Num="2" minSumIndex="##min##" maxSumIndex="##max##" useNearestValue="true"> | |
| 12 | - <clb name="azimuth"/> | |
| 13 | - </baseParam> | |
| 14 | - </vi> | |
| 15 | - <amdaParam name="eas_pad_elevation"/> | |
| 16 | - <amdaParam name="eas_pad_energy"/> | |
| 17 | - </get> | |
| 18 | - <process/> | |
| 19 | - <output> | |
| 20 | - <plot> | |
| 21 | - <timePlot> | |
| 22 | - <params> | |
| 23 | - <param id="eas_pad_2d_azimuth_##min##_##max##"> | |
| 24 | - <spectro yAxis="y-left" uselog0asmin="true"/> | |
| 25 | - </param> | |
| 26 | - </params> | |
| 27 | - <axes> | |
| 28 | - <yAxis> | |
| 29 | - <digitalAxis id="y-left" scale="logarithmic"/> | |
| 30 | - </yAxis> | |
| 31 | - <zAxis> | |
| 32 | - <colorAxis scale="logarithmic"/> | |
| 33 | - </zAxis> | |
| 34 | - </axes> | |
| 35 | - </timePlot> | |
| 36 | - </plot> | |
| 37 | - </output> | |
| 38 | -</param> |
PARAM_DEF/eas_pad_2d_energy.xml deleted
| ... | ... | @@ -1,37 +0,0 @@ |
| 1 | -<?xml version="1.0"?> | |
| 2 | -<param xml:id="eas_pad_2d_energy_##min##_##max##"> | |
| 3 | - <info> | |
| 4 | - <table> | |
| 5 | - <centerAutoTable dim="0" name="Elevation" units="deg" centerName="eas_pad_elevation" log="false" variable="true"/> | |
| 6 | - <centerAutoTable dim="1" name="Azimuth" units="deg" centerName="azimuth" log="false"/> | |
| 7 | - </table> | |
| 8 | - </info> | |
| 9 | - <get> | |
| 10 | - <vi name="solo:eas:pad"> | |
| 11 | - <baseParam name="SWA_EAS_PAD_PSD_Data" dim3Num="1" minSumIndex="##min##" maxSumIndex="##max##" useNearestValue="true"> | |
| 12 | - <clb name="azimuth"/> | |
| 13 | - </baseParam> | |
| 14 | - </vi> | |
| 15 | - <amdaParam name="eas_pad_elevation"/> | |
| 16 | - </get> | |
| 17 | - <process/> | |
| 18 | - <output> | |
| 19 | - <plot> | |
| 20 | - <timePlot> | |
| 21 | - <params> | |
| 22 | - <param id="eas_pad_2d_energy_##min##_##max##"> | |
| 23 | - <spectro yAxis="y-left" uselog0asmin="true"/> | |
| 24 | - </param> | |
| 25 | - </params> | |
| 26 | - <axes> | |
| 27 | - <yAxis> | |
| 28 | - <digitalAxis id="y-left" scale="logarithmic"/> | |
| 29 | - </yAxis> | |
| 30 | - <zAxis> | |
| 31 | - <colorAxis scale="logarithmic"/> | |
| 32 | - </zAxis> | |
| 33 | - </axes> | |
| 34 | - </timePlot> | |
| 35 | - </plot> | |
| 36 | - </output> | |
| 37 | -</param> |
PARAM_DEF/eas_pad_2d_elevation.xml renamed to PARAM_DEF/eas_pad_psd.xml
| 1 | 1 | <?xml version="1.0"?> |
| 2 | -<param xml:id="eas_pad_2d_elevation_##min##_##max##"> | |
| 2 | +<param xml:id="eas_pad_psd_##elevmin##_##elevmax##"> | |
| 3 | 3 | <info> |
| 4 | 4 | <table> |
| 5 | 5 | <centerAutoTable dim="0" name="Energy" units="eV" centerName="eas_pad_energy" log="false" variable="true"/> |
| 6 | - <centerAutoTable dim="1" name="Azimuth" units="deg" centerName="azimuth" log="false"/> | |
| 6 | + <centerAutoTable dim="1" name="PAD" units="deg" centerName="PAD" log="false"/> | |
| 7 | 7 | </table> |
| 8 | 8 | </info> |
| 9 | 9 | <get> |
| 10 | 10 | <vi name="solo:eas:pad"> |
| 11 | - <baseParam name="SWA_EAS_PAD_PSD_Data" dim3Num="0" minSumIndex="##min##" maxSumIndex="##max##" useNearestValue="true"> | |
| 12 | - <clb name="azimuth"/> | |
| 11 | + <baseParam name="SWA_EAS_PAD_PSD_Data" dim3Num="0" minSumIndex="##elevmin##" maxSumIndex="##elevmax##" useNearestValue="true"> | |
| 12 | + <clb name="PAD"/> | |
| 13 | 13 | </baseParam> |
| 14 | 14 | </vi> |
| 15 | 15 | <amdaParam name="eas_pad_energy"/> |
| ... | ... | @@ -19,13 +19,13 @@ |
| 19 | 19 | <plot> |
| 20 | 20 | <timePlot> |
| 21 | 21 | <params> |
| 22 | - <param id="eas_pad_2d_elevation_##min##_##max##"> | |
| 22 | + <param id="eas_pad_psd_##elevmin##_##elevmax##"> | |
| 23 | 23 | <spectro yAxis="y-left" uselog0asmin="true"/> |
| 24 | 24 | </param> |
| 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_eas_pad_2d_azimuth.xml deleted
| ... | ... | @@ -1,9 +0,0 @@ |
| 1 | -<?xml version="1.0" encoding="UTF-8"?> | |
| 2 | -<paraminfo id="solo_eas_pad_SWA_EAS_PAD_PSD_Data_SUM_2_0_31"> | |
| 3 | - <dimensions dim_1="2" dim_2="64"/> | |
| 4 | - <components></components> | |
| 5 | - <tables> | |
| 6 | - <table relatedDim="dim_1" name="Elevation" units="deg" variable="true"/> | |
| 7 | - <table relatedDim="dim_2" name="Energy" units="eV" variable="true"/> | |
| 8 | - </tables> | |
| 9 | -</paraminfo> |
PARAM_INFO_PREDEFINED/info_eas_pad_2d_energy.xml deleted
| ... | ... | @@ -1,42 +0,0 @@ |
| 1 | -<?xml version="1.0" encoding="UTF-8"?> | |
| 2 | -<paraminfo id="solo_eas_pad_SWA_EAS_PAD_PSD_Data_SUM_1_0_63"> | |
| 3 | - <dimensions dim_1="2" dim_2="32"/> | |
| 4 | - <components></components> | |
| 5 | - <tables> | |
| 6 | - <table relatedDim="dim_1" name="Elevation" units="deg" variable="true"/> | |
| 7 | - <table relatedDim="dim_2" name="Azimuth" units="deg"> | |
| 8 | - <channel min="0.000000" max="11.250000"/> | |
| 9 | - <channel min="11.250000" max="22.500000"/> | |
| 10 | - <channel min="22.500000" max="33.750000"/> | |
| 11 | - <channel min="33.750000" max="45.000000"/> | |
| 12 | - <channel min="45.000000" max="56.250000"/> | |
| 13 | - <channel min="56.250000" max="67.500000"/> | |
| 14 | - <channel min="67.500000" max="78.750000"/> | |
| 15 | - <channel min="78.750000" max="90.000000"/> | |
| 16 | - <channel min="90.000000" max="101.250000"/> | |
| 17 | - <channel min="101.250000" max="112.500000"/> | |
| 18 | - <channel min="112.500000" max="123.750000"/> | |
| 19 | - <channel min="123.750000" max="135.000000"/> | |
| 20 | - <channel min="135.000000" max="146.250000"/> | |
| 21 | - <channel min="146.250000" max="157.500000"/> | |
| 22 | - <channel min="157.500000" max="168.750000"/> | |
| 23 | - <channel min="168.750000" max="180.000000"/> | |
| 24 | - <channel min="180.000000" max="191.250000"/> | |
| 25 | - <channel min="191.250000" max="202.500000"/> | |
| 26 | - <channel min="202.500000" max="213.750000"/> | |
| 27 | - <channel min="213.750000" max="225.000000"/> | |
| 28 | - <channel min="225.000000" max="236.250000"/> | |
| 29 | - <channel min="236.250000" max="247.500000"/> | |
| 30 | - <channel min="247.500000" max="258.750000"/> | |
| 31 | - <channel min="258.750000" max="270.000000"/> | |
| 32 | - <channel min="270.000000" max="281.250000"/> | |
| 33 | - <channel min="281.250000" max="292.500000"/> | |
| 34 | - <channel min="292.500000" max="303.750000"/> | |
| 35 | - <channel min="303.750000" max="315.000000"/> | |
| 36 | - <channel min="315.000000" max="326.250000"/> | |
| 37 | - <channel min="326.250000" max="337.500000"/> | |
| 38 | - <channel min="337.500000" max="348.750000"/> | |
| 39 | - <channel min="348.750000" max="360.000000"/> | |
| 40 | - </table> | |
| 41 | - </tables> | |
| 42 | -</paraminfo> |
PARAM_INFO_PREDEFINED/info_eas_pad_2d_elevation.xml renamed to PARAM_INFO_PREDEFINED/info_eas_pad_psd.xml
| ... | ... | @@ -3,8 +3,8 @@ |
| 3 | 3 | <dimensions dim_1="64" dim_2="32"/> |
| 4 | 4 | <components></components> |
| 5 | 5 | <tables> |
| 6 | - <table relatedDim="dim_1" name="Energy" units="eV" variable="true"/> | |
| 7 | - <table relatedDim="dim_2" name="Azimuth" units="deg"> | |
| 6 | + <table relatedDim="dim_1" name="Energy" units="eV" minValue="0" maxValue="6000." variable="true"/> | |
| 7 | + <table relatedDim="dim_2" name="Azimuth" units="deg" mainDim="true"> | |
| 8 | 8 | <channel min="0.000000" max="11.250000"/> |
| 9 | 9 | <channel min="11.250000" max="22.500000"/> |
| 10 | 10 | <channel min="22.500000" max="33.750000"/> | ... | ... |
ParamTemplateList.xml
| ... | ... | @@ -2026,22 +2026,10 @@ |
| 2026 | 2026 | <argument key="max" name="Ener. Max" type="generated-list" minkey="0" maxkey="95" subtype="int" nametpl="Ener. ##key##" default="95"/> |
| 2027 | 2027 | </arguments> |
| 2028 | 2028 | </paramTemplate> |
| 2029 | - <paramTemplate paramId="eas_pad_2d_elevation" fileName="eas_pad_2d_elevation_##min##_##max##"> | |
| 2029 | + <paramTemplate paramId="eas_pad_psd" fileName="eas_pad_psd_##elevmin##_##elevmax##"> | |
| 2030 | 2030 | <arguments> |
| 2031 | - <argument key="min" name="Elev Min" type="generated-list" minkey="0" maxkey="1" subtype="int" nametpl="Elev. ##key##" default="0"/> | |
| 2032 | - <argument key="max" name="Elev Max" type="generated-list" minkey="0" maxkey="1" subtype="int" nametpl="Elev. ##key##" default="1"/> | |
| 2033 | - </arguments> | |
| 2034 | - </paramTemplate> | |
| 2035 | - <paramTemplate paramId="eas_pad_2d_energy" fileName="eas_pad_2d_energy_##min##_##max##"> | |
| 2036 | - <arguments> | |
| 2037 | - <argument key="min" name="Ener. Min" type="generated-list" minkey="0" maxkey="63" subtype="int" nametpl="Ener. ##key##" default="0"/> | |
| 2038 | - <argument key="max" name="Ener. Max" type="generated-list" minkey="0" maxkey="63" subtype="int" nametpl="Ener. ##key##" default="63"/> | |
| 2039 | - </arguments> | |
| 2040 | - </paramTemplate> | |
| 2041 | - <paramTemplate paramId="eas_pad_2d_azimuth" fileName="eas_pad_2d_azimuth_##min##_##max##"> | |
| 2042 | - <arguments> | |
| 2043 | - <argument key="min" name="Azim. Min" type="generated-list" minkey="0" maxkey="31" subtype="int" nametpl="Azim. ##key##" default="0"/> | |
| 2044 | - <argument key="max" name="Azim. Max" type="generated-list" minkey="0" maxkey="31" subtype="int" nametpl="Azim. ##key##" default="31"/> | |
| 2031 | + <argument key="elevmin" name="Elev Min" type="generated-list" minkey="0" maxkey="1" subtype="int" nametpl="Elev. ##key##" default="0"/> | |
| 2032 | + <argument key="elevmax" name="Elev Max" type="generated-list" minkey="0" maxkey="1" subtype="int" nametpl="Elev. ##key##" default="1"/> | |
| 2045 | 2033 | </arguments> |
| 2046 | 2034 | </paramTemplate> |
| 2047 | 2035 | <paramTemplate paramId="eas1_nm3d_2d_elevation" fileName="eas1_nm3d_2d_elevation_##min##_##max##"> | ... | ... |