imap-processing 0.17.0__py3-none-any.whl → 0.19.0__py3-none-any.whl

imap_processing/cdf/config/imap_codice_l1a_variable_attrs.yaml

@@ -1,3 +1,5 @@
+# TODO: Add DEPEND_1 to energy delta variables (energy_h_minus, energy_h_plus, etc.)
+
 # <=== Useful Variables ===>
 int_fillval: &int_fillval -9223372036854775808
 uint8_fillval: &uint8_fillval 255
@@ -294,6 +296,17 @@ energy_table:
     VALIDMAX: 14100.0
     VAR_TYPE: support_data
 
+k_factor:
+    CATDESC: K Factor constant that is used to convert voltages to energies
+    FIELDNAM: K Factor
+    FORMAT: F5.2
+    LABLAXIS: K Factor
+    SCALETYP: linear
+    UNITS: " "
+    VALIDMIN: 1.0
+    VALIDMAX: 100.0
+    VAR_TYPE: support_data
+
 nso_half_spin:
     <<: *default
     CATDESC: When No Scan Operation (NSO) was activated
@@ -370,97 +383,97 @@ sw_bias_gain_mode:
 
 # The following are data product-specific
 # hi-counters-aggregated
-hi-counters-aggregated-DCR:
+hi-counters-aggregated-dcr:
     <<: *events
     CATDESC: Event B - Double Coincidence Rate (DCR)
     FIELDNAM: DCRs
     LABLAXIS: "events"
 
-hi-counters-aggregated-STO:
+hi-counters-aggregated-sto:
     <<: *events
     CATDESC: Event C - Start Only (STO)
     FIELDNAM: Start Only
     LABLAXIS: "events"
 
-hi-counters-aggregated-SPO:
+hi-counters-aggregated-spo:
     <<: *events
     CATDESC: Event D - Stop Only (SPO)
     FIELDNAM: Stop Only
     LABLAXIS: "events"
 
-hi-counters-aggregated-Reserved1:
+hi-counters-aggregated-reserved1:
     <<: *events
     CATDESC: Reserved 1
     FIELDNAM: Reserved 1
     LABLAXIS: "events"
 
-hi-counters-aggregated-MST:
+hi-counters-aggregated-mst:
     <<: *events
     CATDESC: Event H - Multi Start (MST)
     FIELDNAM: Multi Start
     LABLAXIS: "events"
 
-hi-counters-aggregated-Reserved2:
+hi-counters-aggregated-reserved2:
     <<: *events
     CATDESC: Reserved 2
     FIELDNAM: Reserved 2
     LABLAXIS: "events"
 
-hi-counters-aggregated-Reserved3:
+hi-counters-aggregated-reserved3:
     <<: *events
     CATDESC: Reserved 3
     FIELDNAM: Reserved 3
     LABLAXIS: "events"
 
-hi-counters-aggregated-Reserved4:
+hi-counters-aggregated-reserved4:
     <<: *events
     CATDESC: Reserved 4
     FIELDNAM: Reserved 4
     LABLAXIS: "events"
 
-hi-counters-aggregated-Reserved5:
+hi-counters-aggregated-reserved5:
     <<: *events
     CATDESC: Reserved 5
     FIELDNAM: Reserved 5
     LABLAXIS: "events"
 
-hi-counters-aggregated-LowTOFCutoff:
+hi-counters-aggregated-low_tof_cutoff:
     <<: *events
     CATDESC: Low TOF Cutoff
     FIELDNAM: Low TOF Cutoff
     LABLAXIS: "events"
 
-hi-counters-aggregated-Reserved6:
+hi-counters-aggregated-reserved6:
     <<: *events
     CATDESC: Reserved 6
     FIELDNAM: Reserved 6
     LABLAXIS: "events"
 
-hi-counters-aggregated-Reserved7:
+hi-counters-aggregated-reserved7:
     <<: *events
     CATDESC: Reserved 7
     FIELDNAM: Reserved 7
     LABLAXIS: "events"
 
-hi-counters-aggregated-ASIC1FlagInvalid:
+hi-counters-aggregated-asic1_flag_invalid:
     <<: *events
     CATDESC: ASIC 1 Flag Invalid Count
     FIELDNAM: ASIC 1 Flag Invalid
     LABLAXIS: "events"
 
-hi-counters-aggregated-ASIC2FlagInvalid:
+hi-counters-aggregated-asic2_flag_invalid:
     <<: *events
     CATDESC: ASIC 2 Flag Invalid Count
     FIELDNAM: ASIC 2 Flag Invalid
     LABLAXIS: "events"
 
-hi-counters-aggregated-ASIC1ChannelInvalid:
+hi-counters-aggregated-asic1_channel_invalid:
     <<: *events
     CATDESC: ASIC 1 Channel Invalid Count
     FIELDNAM: ASIC 1 Channel Invalid
     LABLAXIS: "events"
 
-hi-counters-aggregated-ASIC2ChannelInvalid:
+hi-counters-aggregated-asic2_channel_invalid:
     <<: *events
     CATDESC: ASIC 2 Channel Invalid Count
     FIELDNAM: ASIC 2 Channel Invalid
@@ -503,13 +516,18 @@ hi-ialirt-h:
 hi-ialirt-energy_h:
     <<: *hi_energies_default
     CATDESC: Energy Table for h
-    DELTA_MINUS_VAR: energy_h_delta
-    DELTA_PLUS_VAR: energy_h_delta
+    DELTA_MINUS_VAR: energy_h_minus
+    DELTA_PLUS_VAR: energy_h_plus
+
+hi-ialirt-energy_h_minus:
+    <<: *hi_energies_default
+    CATDESC: Energy Table Minus Value for h
+    FIELDNAM: Energy Delta Minus
 
-hi-ialirt-energy_h_delta:
+hi-ialirt-energy_h_plus:
     <<: *hi_energies_default
-    CATDESC: Delta of energies for h
-    FIELDNAM: Delta Energy
+    CATDESC: Energy Table Plus Value for h
+    FIELDNAM: Energy Delta Plus
 
 # hi-omni
 hi-omni-h:
@@ -522,13 +540,18 @@ hi-omni-h:
 hi-omni-energy_h:
     <<: *hi_energies_default
     CATDESC: Energy Table for h
-    DELTA_MINUS_VAR: energy_h_delta
-    DELTA_PLUS_VAR: energy_h_delta
+    DELTA_MINUS_VAR: energy_h_minus
+    DELTA_PLUS_VAR: energy_h_plus
 
-hi-omni-energy_h_delta:
+hi-omni-energy_h_minus:
     <<: *hi_energies_default
-    CATDESC: Delta of energies for h
-    FIELDNAM: Delta Energy
+    CATDESC: Energy Table Minus Value for h
+    FIELDNAM: Energy Delta Minus
+
+hi-omni-energy_h_plus:
+    <<: *hi_energies_default
+    CATDESC: Energy Table Plus Value for h
+    FIELDNAM: Energy Delta Plus
 
 hi-omni-he3:
     <<: *counters
@@ -540,13 +563,18 @@ hi-omni-he3:
 hi-omni-energy_he3:
     <<: *hi_energies_default
     CATDESC: Energy Table for he3
-    DELTA_MINUS_VAR: energy_he3_delta
-    DELTA_PLUS_VAR: energy_he3_delta
+    DELTA_MINUS_VAR: energy_he3_minus
+    DELTA_PLUS_VAR: energy_he3_plus
+
+hi-omni-energy_he3_minus:
+    <<: *hi_energies_default
+    CATDESC: Energy Table Minus Value for he3
+    FIELDNAM: Energy Delta Minus
 
-hi-omni-energy_he3_delta:
+hi-omni-energy_he3_plus:
     <<: *hi_energies_default
-    CATDESC: Delta of energies for he3
-    FIELDNAM: Delta Energy
+    CATDESC: Energy Table Plus Value for he3
+    FIELDNAM: Energy Delta Plus
 
 hi-omni-he4:
     <<: *counters
@@ -558,13 +586,18 @@ hi-omni-he4:
 hi-omni-energy_he4:
     <<: *hi_energies_default
     CATDESC: Energy Table for he4
-    DELTA_MINUS_VAR: energy_he4_delta
-    DELTA_PLUS_VAR: energy_he4_delta
+    DELTA_MINUS_VAR: energy_he4_minus
+    DELTA_PLUS_VAR: energy_he4_plus
 
-hi-omni-energy_he4_delta:
+hi-omni-energy_he4_minus:
     <<: *hi_energies_default
-    CATDESC: Delta of energies for he4
-    FIELDNAM: Delta Energy
+    CATDESC: Energy Table Minus Value for he4
+    FIELDNAM: Energy Delta Minus
+
+hi-omni-energy_he4_plus:
+    <<: *hi_energies_default
+    CATDESC: Energy Table Plus Value for he4
+    FIELDNAM: Energy Delta Plus
 
 hi-omni-c:
     <<: *counters
@@ -576,13 +609,18 @@ hi-omni-c:
 hi-omni-energy_c:
     <<: *hi_energies_default
     CATDESC: Energy Table for c
-    DELTA_MINUS_VAR: energy_c_delta
-    DELTA_PLUS_VAR: energy_c_delta
+    DELTA_MINUS_VAR: energy_c_minus
+    DELTA_PLUS_VAR: energy_c_plus
+
+hi-omni-energy_c_minus:
+    <<: *hi_energies_default
+    CATDESC: Energy Table Minus Value for c
+    FIELDNAM: Energy Delta Minus
 
-hi-omni-energy_c_delta:
+hi-omni-energy_c_plus:
     <<: *hi_energies_default
-    CATDESC: Delta of energies for c
-    FIELDNAM: Delta Energy
+    CATDESC: Energy Table Plus Value for c
+    FIELDNAM: Energy Delta Plus
 
 hi-omni-o:
     <<: *counters
@@ -594,13 +632,18 @@ hi-omni-o:
 hi-omni-energy_o:
     <<: *hi_energies_default
     CATDESC: Energy Table for o
-    DELTA_MINUS_VAR: energy_o_delta
-    DELTA_PLUS_VAR: energy_o_delta
+    DELTA_MINUS_VAR: energy_o_minus
+    DELTA_PLUS_VAR: energy_o_plus
 
-hi-omni-energy_o_delta:
+hi-omni-energy_o_minus:
     <<: *hi_energies_default
-    CATDESC: Delta of energies for o
-    FIELDNAM: Delta Energy
+    CATDESC: Energy Table Minus Value for o
+    FIELDNAM: Energy Delta Minus
+
+hi-omni-energy_o_plus:
+    <<: *hi_energies_default
+    CATDESC: Energy Table Plus Value for o
+    FIELDNAM: Energy Delta Plus
 
 hi-omni-ne_mg_si:
     <<: *counters
@@ -612,13 +655,18 @@ hi-omni-ne_mg_si:
 hi-omni-energy_ne_mg_si:
     <<: *hi_energies_default
     CATDESC: Energy Table for ne_mg_si
-    DELTA_MINUS_VAR: energy_ne_mg_si_delta
-    DELTA_PLUS_VAR: energy_ne_mg_si_delta
+    DELTA_MINUS_VAR: energy_ne_mg_si_minus
+    DELTA_PLUS_VAR: energy_ne_mg_si_plus
+
+hi-omni-energy_ne_mg_si_minus:
+    <<: *hi_energies_default
+    CATDESC: Energy Table Minus Value for ne_mg_si
+    FIELDNAM: Energy Delta Minus
 
-hi-omni-energy_ne_mg_si_delta:
+hi-omni-energy_ne_mg_si_plus:
     <<: *hi_energies_default
-    CATDESC: Delta of energies for ne_mg_si
-    FIELDNAM: Delta Energy
+    CATDESC: Energy Table Plus Value for ne_mg_si
+    FIELDNAM: Energy Delta Plus
 
 hi-omni-fe:
     <<: *counters
@@ -630,13 +678,18 @@ hi-omni-fe:
 hi-omni-energy_fe:
     <<: *hi_energies_default
     CATDESC: Energy Table for fe
-    DELTA_MINUS_VAR: energy_fe_delta
-    DELTA_PLUS_VAR: energy_fe_delta
+    DELTA_MINUS_VAR: energy_fe_minus
+    DELTA_PLUS_VAR: energy_fe_plus
 
-hi-omni-energy_fe_delta:
+hi-omni-energy_fe_minus:
     <<: *hi_energies_default
-    CATDESC: Delta of energies for fe
-    FIELDNAM: Delta Energy
+    CATDESC: Energy Table Minus Value for fe
+    FIELDNAM: Energy Delta Minus
+
+hi-omni-energy_fe_plus:
+    <<: *hi_energies_default
+    CATDESC: Energy Table Plus Value for fe
+    FIELDNAM: Energy Delta Plus
 
 hi-omni-uh:
     <<: *counters
@@ -648,13 +701,18 @@ hi-omni-uh:
 hi-omni-energy_uh:
     <<: *hi_energies_default
     CATDESC: Energy Table for uh
-    DELTA_MINUS_VAR: energy_uh_delta
-    DELTA_PLUS_VAR: energy_uh_delta
+    DELTA_MINUS_VAR: energy_uh_minus
+    DELTA_PLUS_VAR: energy_uh_plus
+
+hi-omni-energy_uh_minus:
+    <<: *hi_energies_default
+    CATDESC: Energy Table Minus Value for uh
+    FIELDNAM: Energy Delta Minus
 
-hi-omni-energy_uh_delta:
+hi-omni-energy_uh_plus:
     <<: *hi_energies_default
-    CATDESC: Delta of energies for uh
-    FIELDNAM: Delta Energy
+    CATDESC: Energy Table Plus Value for uh
+    FIELDNAM: Energy Delta Plus
 
 hi-omni-junk:
     <<: *counters
@@ -666,13 +724,18 @@ hi-omni-junk:
 hi-omni-energy_junk:
     <<: *hi_energies_default
     CATDESC: Energy Table for junk
-    DELTA_MINUS_VAR: energy_junk_delta
-    DELTA_PLUS_VAR: energy_junk_delta
+    DELTA_MINUS_VAR: energy_junk_minus
+    DELTA_PLUS_VAR: energy_junk_plus
 
-hi-omni-energy_junk_delta:
+hi-omni-energy_junk_minus:
     <<: *hi_energies_default
-    CATDESC: Delta of energies for junk
-    FIELDNAM: Delta Energy
+    CATDESC: Energy Table Minus Value for junk
+    FIELDNAM: Energy Delta Minus
+
+hi-omni-energy_junk_plus:
+    <<: *hi_energies_default
+    CATDESC: Energy Table Plus Value for junk
+    FIELDNAM: Energy Delta Plus
 
 # hi-priority
 hi-priority-Priority0:
@@ -720,13 +783,18 @@ hi-sectored-h:
 hi-sectored-energy_h:
     <<: *hi_energies_default
     CATDESC: Energy Table for H
-    DELTA_MINUS_VAR: energy_h_delta
-    DELTA_PLUS_VAR: energy_h_delta
+    DELTA_MINUS_VAR: energy_h_minus
+    DELTA_PLUS_VAR: energy_h_plus
+
+hi-sectored-energy_h_minus:
+    <<: *hi_energies_default
+    CATDESC: Energy Table Minus Value for h
+    FIELDNAM: Energy Delta Minus
 
-hi-sectored-energy_h_delta:
+hi-sectored-energy_h_plus:
     <<: *hi_energies_default
-    CATDESC: Delta of energies for H
-    FIELDNAM: Delta Energy
+    CATDESC: Energy Table Plus Value for h
+    FIELDNAM: Energy Delta Plus
 
 hi-sectored-he3he4:
     <<: *counters
@@ -742,13 +810,18 @@ hi-sectored-he3he4:
 hi-sectored-energy_he3he4:
     <<: *hi_energies_default
     CATDESC: Energy Table for He3He4
-    DELTA_MINUS_VAR: energy_he3he4_delta
-    DELTA_PLUS_VAR: energy_he3he4_delta
+    DELTA_MINUS_VAR: energy_he3he4_minus
+    DELTA_PLUS_VAR: energy_he3he4_plus
 
-hi-sectored-energy_he3he4_delta:
+hi-sectored-energy_he3he4_minus:
     <<: *hi_energies_default
-    CATDESC: Delta of energies for He3He4
-    FIELDNAM: Delta Energy
+    CATDESC: Energy Table Minus Value for he3he4
+    FIELDNAM: Energy Delta Minus
+
+hi-sectored-energy_he3he3_plus:
+    <<: *hi_energies_default
+    CATDESC: Energy Table Plus Value for he3he3
+    FIELDNAM: Energy Delta Plus
 
 hi-sectored-cno:
     <<: *counters
@@ -764,13 +837,18 @@ hi-sectored-cno:
 hi-sectored-energy_cno:
     <<: *hi_energies_default
     CATDESC: Energy Table for CNO
-    DELTA_MINUS_VAR: energy_cno_delta
-    DELTA_PLUS_VAR: energy_cno_delta
+    DELTA_MINUS_VAR: energy_cno_minus
+    DELTA_PLUS_VAR: energy_cno_plus
+
+hi-sectored-energy_cno_minus:
+    <<: *hi_energies_default
+    CATDESC: Energy Table Minus Value for cno
+    FIELDNAM: Energy Delta Minus
 
-hi-sectored-energy_cno_delta:
+hi-sectored-energy_cno_plus:
     <<: *hi_energies_default
-    CATDESC: Delta of energies for CNO
-    FIELDNAM: Delta Energy
+    CATDESC: Energy Table Plus Value for cno
+    FIELDNAM: Energy Delta Plus
 
 hi-sectored-fe:
     <<: *counters
@@ -786,16 +864,21 @@ hi-sectored-fe:
 hi-sectored-energy_fe:
     <<: *hi_energies_default
     CATDESC: Energy Table for Fe
-    DELTA_MINUS_VAR: energy_fe_delta
-    DELTA_PLUS_VAR: energy_fe_delta
+    DELTA_MINUS_VAR: energy_fe_minus
+    DELTA_PLUS_VAR: energy_fe_plus
 
-hi-sectored-energy_fe_delta:
+hi-sectored-energy_fe_minus:
     <<: *hi_energies_default
-    CATDESC: Delta of energies for Fe
-    FIELDNAM: Delta Energy
+    CATDESC: Energy Table Minus Value for fe
+    FIELDNAM: Energy Delta Minus
+
+hi-sectored-energy_fe_plus:
+    <<: *hi_energies_default
+    CATDESC: Energy Table Plus Value for fe
+    FIELDNAM: Energy Delta Plus
 
 # lo-counters-aggregated
-lo-counters-aggregated-TCR:
+lo-counters-aggregated-tcr:
     <<: *events
     CATDESC: Triple Coincidence Rate
     FIELDNAM: Event A - Triple Coincidence Rate
@@ -804,7 +887,7 @@ lo-counters-aggregated-TCR:
     LABL_PTR_1: spin_sector_pairs_label
     LABL_PTR_2: esa_step_label
 
-lo-counters-aggregated-DCR:
+lo-counters-aggregated-dcr:
     <<: *events
     CATDESC: Double Coincidence Rate
     FIELDNAM: Event B - Double Coincidence Rate
@@ -813,7 +896,7 @@ lo-counters-aggregated-DCR:
     LABL_PTR_1: spin_sector_pairs_label
     LABL_PTR_2: esa_step_label
 
-lo-counters-aggregated-TOFPlusAPD:
+lo-counters-aggregated-tof_plus_apd:
     <<: *events
     CATDESC: TOF + APD
     FIELDNAM: Event C - TOF + APD
@@ -822,7 +905,7 @@ lo-counters-aggregated-TOFPlusAPD:
     LABL_PTR_1: spin_sector_pairs_label
     LABL_PTR_2: esa_step_label
 
-lo-counters-aggregated-TOFOnly:
+lo-counters-aggregated-tof_only:
     <<: *events
     CATDESC: TOF Only
     FIELDNAM: Event D - TOF Only
@@ -831,7 +914,7 @@ lo-counters-aggregated-TOFOnly:
     LABL_PTR_1: spin_sector_pairs_label
     LABL_PTR_2: esa_step_label
 
-lo-counters-aggregated-PositionPlusAPD:
+lo-counters-aggregated-position_plus_apd:
     <<: *events
     CATDESC: Position + APD
     FIELDNAM: Event E - Position + APD
@@ -840,7 +923,7 @@ lo-counters-aggregated-PositionPlusAPD:
     LABL_PTR_1: spin_sector_pairs_label
     LABL_PTR_2: esa_step_label
 
-lo-counters-aggregated-PositionOnly:
+lo-counters-aggregated-position_only:
     <<: *events
     CATDESC: Position Only
     FIELDNAM: Event F - Position Only
@@ -849,7 +932,7 @@ lo-counters-aggregated-PositionOnly:
     LABL_PTR_1: spin_sector_pairs_label
     LABL_PTR_2: esa_step_label
 
-lo-counters-aggregated-STAorSTBPlusAPD:
+lo-counters-aggregated-sta_or_stb_plus_apd:
     <<: *events
     CATDESC: STA or STB + APD
     FIELDNAM: Event G - STA or STB + APD
@@ -858,7 +941,7 @@ lo-counters-aggregated-STAorSTBPlusAPD:
     LABL_PTR_1: spin_sector_pairs_label
     LABL_PTR_2: esa_step_label
 
-lo-counters-aggregated-STAorSTBOnly:
+lo-counters-aggregated-sta_or_stb_only:
     <<: *events
     CATDESC: STA or STB Only
     FIELDNAM: Event H - STA or STB Only
@@ -867,7 +950,7 @@ lo-counters-aggregated-STAorSTBOnly:
     LABL_PTR_1: spin_sector_pairs_label
     LABL_PTR_2: esa_step_label
 
-lo-counters-aggregated-Reserved1:
+lo-counters-aggregated-reserved1:
     <<: *events
     CATDESC: Reserved
     FIELDNAM: Reserved 1
@@ -876,7 +959,7 @@ lo-counters-aggregated-Reserved1:
     LABL_PTR_1: spin_sector_pairs_label
     LABL_PTR_2: esa_step_label
 
-lo-counters-aggregated-Reserved2:
+lo-counters-aggregated-reserved2:
     <<: *events
     CATDESC: Reserved
     FIELDNAM: Reserved 2
@@ -885,7 +968,7 @@ lo-counters-aggregated-Reserved2:
     LABL_PTR_1: spin_sector_pairs_label
     LABL_PTR_2: esa_step_label
 
-lo-counters-aggregated-SPOnly:
+lo-counters-aggregated-sp_only:
     <<: *events
     CATDESC: SP Only
     FIELDNAM: Event K - SP Only
@@ -894,7 +977,7 @@ lo-counters-aggregated-SPOnly:
     LABL_PTR_1: spin_sector_pairs_label
     LABL_PTR_2: esa_step_label
 
-lo-counters-aggregated-APDOnly:
+lo-counters-aggregated-apd_only:
     <<: *events
     CATDESC: APD Only
     FIELDNAM: Event L - APD Only
@@ -903,7 +986,7 @@ lo-counters-aggregated-APDOnly:
     LABL_PTR_1: spin_sector_pairs_label
     LABL_PTR_2: esa_step_label
 
-lo-counters-aggregated-LowTOFCutoff:
+lo-counters-aggregated-low_tof_cutoff:
     <<: *events
     CATDESC: Low TOF Cutoff
     FIELDNAM: Low TOF Cutoff
@@ -912,7 +995,7 @@ lo-counters-aggregated-LowTOFCutoff:
     LABL_PTR_1: spin_sector_pairs_label
     LABL_PTR_2: esa_step_label
 
-lo-counters-aggregated-STA:
+lo-counters-aggregated-sta:
     <<: *events
     CATDESC: Start A
     FIELDNAM: Singles - Start-A (STA)
@@ -921,7 +1004,7 @@ lo-counters-aggregated-STA:
     LABL_PTR_1: spin_sector_pairs_label
     LABL_PTR_2: esa_step_label
 
-lo-counters-aggregated-STB:
+lo-counters-aggregated-stb:
     <<: *events
     CATDESC: Start B
     FIELDNAM: Singles - Start-B (STB)
@@ -930,7 +1013,7 @@ lo-counters-aggregated-STB:
     LABL_PTR_1: spin_sector_pairs_label
     LABL_PTR_2: esa_step_label
 
-lo-counters-aggregated-SP:
+lo-counters-aggregated-sp:
     <<: *events
     CATDESC: Stop
     FIELDNAM: Singles - Stop (SP)
@@ -939,7 +1022,7 @@ lo-counters-aggregated-SP:
     LABL_PTR_1: spin_sector_pairs_label
     LABL_PTR_2: esa_step_label
 
-lo-counters-aggregated-TotalPositionCount:
+lo-counters-aggregated-total_position_count:
     <<: *events
     CATDESC: Total Position Count
     FIELDNAM: Singles - Total Position Count
@@ -948,7 +1031,7 @@ lo-counters-aggregated-TotalPositionCount:
     LABL_PTR_1: spin_sector_pairs_label
     LABL_PTR_2: esa_step_label
 
-lo-counters-aggregated-InvalidPositionCount:
+lo-counters-aggregated-invalid_position_count:
     <<: *events
     CATDESC: Invalid Position Count
     FIELDNAM: Singles - Invalid Position Count
@@ -957,7 +1040,7 @@ lo-counters-aggregated-InvalidPositionCount:
     LABL_PTR_1: spin_sector_pairs_label
     LABL_PTR_2: esa_step_label
 
-lo-counters-aggregated-ASIC1FlagInvalid:
+lo-counters-aggregated-asic1_flag_invalid:
     <<: *events
     CATDESC: ASIC 1 Flag Invalid
     FIELDNAM: ASIC 1 Flag Invalid Count
@@ -966,7 +1049,7 @@ lo-counters-aggregated-ASIC1FlagInvalid:
     LABL_PTR_1: spin_sector_pairs_label
     LABL_PTR_2: esa_step_label
 
-lo-counters-aggregated-ASIC2FlagInvalid:
+lo-counters-aggregated-asic2_flag_invalid:
     <<: *events
     CATDESC: ASIC 2 Flag Invalid
     FIELDNAM: ASIC 2 Flag Invalid Count
@@ -975,7 +1058,7 @@ lo-counters-aggregated-ASIC2FlagInvalid:
     LABL_PTR_1: spin_sector_pairs_label
     LABL_PTR_2: esa_step_label
 
-lo-counters-aggregated-ASIC1ChannelInvalid:
+lo-counters-aggregated-asic1_channel_invalid:
     <<: *events
     CATDESC: ASIC 1 Channel Invalid
     FIELDNAM: ASIC 1 Channel Invalid Count
@@ -984,7 +1067,7 @@ lo-counters-aggregated-ASIC1ChannelInvalid:
     LABL_PTR_1: spin_sector_pairs_label
     LABL_PTR_2: esa_step_label
 
-lo-counters-aggregated-ASIC2ChannelInvalid:
+lo-counters-aggregated-asic2_channel_invalid:
     <<: *events
     CATDESC: ASIC 2 Channel Invalid
     FIELDNAM: ASIC 2 Channel Invalid Count
@@ -993,7 +1076,7 @@ lo-counters-aggregated-ASIC2ChannelInvalid:
     LABL_PTR_1: spin_sector_pairs_label
     LABL_PTR_2: esa_step_label
 
-lo-counters-aggregated-TEC4TimeoutTOFNoPos:
+lo-counters-aggregated-tec4_timeout_tof_no_pos:
     <<: *events
     CATDESC: TEC-4 Timeout TOF no Position
     FIELDNAM: TEC-4 Timeout Count; TOF, No Position
@@ -1002,7 +1085,7 @@ lo-counters-aggregated-TEC4TimeoutTOFNoPos:
     LABL_PTR_1: spin_sector_pairs_label
     LABL_PTR_2: esa_step_label
 
-lo-counters-aggregated-TEC4TimeoutPosNoTOF:
+lo-counters-aggregated-tec4_timeout_pos_no_tof:
     <<: *events
     CATDESC: TEC-4 Timeout Position no TOF
     FIELDNAM: TEC-4 Timeout Count; Position, No TOF
@@ -1011,7 +1094,7 @@ lo-counters-aggregated-TEC4TimeoutPosNoTOF:
     LABL_PTR_1: spin_sector_pairs_label
     LABL_PTR_2: esa_step_label
 
-lo-counters-aggregated-TEC4TimeoutNoPosTOF:
+lo-counters-aggregated-tec4_timeout_no_pos_tof:
     <<: *events
     CATDESC: TEC-4 Timeout No Position or TOF
     FIELDNAM: TEC-4 Timeout Count; No Position or TOF
@@ -1020,7 +1103,7 @@ lo-counters-aggregated-TEC4TimeoutNoPosTOF:
     LABL_PTR_1: spin_sector_pairs_label
     LABL_PTR_2: esa_step_label
 
-lo-counters-aggregated-TEC5TimeoutTOFNoPos:
+lo-counters-aggregated-tec5_timeout_tof_no_pos:
     <<: *events
     CATDESC: TEC-5 Timeout TOF no Position
     FIELDNAM: TEC-5 Timeout Count; TOF, No Position
@@ -1029,7 +1112,7 @@ lo-counters-aggregated-TEC5TimeoutTOFNoPos:
     LABL_PTR_1: spin_sector_pairs_label
     LABL_PTR_2: esa_step_label
 
-lo-counters-aggregated-TEC5TimeoutPosNoTOF:
+lo-counters-aggregated-tec5_timeout_pos_no_tof:
     <<: *events
     CATDESC: TEC-5 Timeout Position no TOF
     FIELDNAM: TEC-5 Timeout Count; Position, No TOF
@@ -1038,7 +1121,7 @@ lo-counters-aggregated-TEC5TimeoutPosNoTOF:
     LABL_PTR_1: spin_sector_pairs_label
     LABL_PTR_2: esa_step_label
 
-lo-counters-aggregated-TEC5TimeoutNoPosTOF:
+lo-counters-aggregated-tec5_timeout_no_pos_tof:
     <<: *events
     CATDESC: TEC-5 Timeout No Position or TOF
     FIELDNAM: TEC-5 Timeout Count; No Position or TOF
@@ -1489,7 +1572,10 @@ lo-ialirt-fe_hiq:
     VALIDMAX: *max_uint24
 
 # <=== Direct Events Attributes ===>
-P0_APD_ID:
+# TODO: The lo-direct-events product defines "gain" with different values
+#       than what is found in hi-direct-events. Come up with a way to
+#       distinguish these in the code.
+p0_apd_id:
     <<: *direct_events
     CATDESC: Priority 0 APD ID
     DEPEND_1: event_num
@@ -1497,7 +1583,7 @@ P0_APD_ID:
     LABL_PTR_1: event_num_label
     VALIDMAX: 32
 
-P0_APDEnergy:
+p0_apd_energy:
     <<: *direct_events
     CATDESC: Priority 0 APD Energy
     DEPEND_1: event_num
@@ -1506,7 +1592,7 @@ P0_APDEnergy:
     LABL_PTR_1: event_num_label
     VALIDMAX: 512
 
-P0_APDGain:
+p0_gain:
     <<: *direct_events
     CATDESC: Priority 0 APD Gain
     DEPEND_1: event_num
@@ -1514,14 +1600,14 @@ P0_APDGain:
     LABL_PTR_1: event_num_label
     VALIDMAX: 1
 
-P0_DataQuality:
+p0_data_quality:
     <<: *direct_events
     CATDESC: Priority 0 Data Quality
     FIELDNAM: Priority 0 Data Quality
     LABLAXIS: " "
     VALIDMAX: 1
 
-P0_EnergyStep:
+p0_energy_step:
     <<: *direct_events
     CATDESC: Priority 0 Energy Step
     DEPEND_1: event_num
@@ -1529,15 +1615,7 @@ P0_EnergyStep:
     LABL_PTR_1: event_num_label
     VALIDMAX: 128
 
-P0_ERGE:
-    <<: *direct_events
-    CATDESC: Priority 0 Energy Range
-    DEPEND_1: event_num
-    FIELDNAM: Priority 0 Energy Range
-    LABL_PTR_1: event_num_label
-    VALIDMAX: 4
-
-P0_MultiFlag:
+p0_multi_flag:
     <<: *direct_events
     CATDESC: Priority 0 Multi Flag
     DEPEND_1: event_num
@@ -1545,14 +1623,14 @@ P0_MultiFlag:
     LABL_PTR_1: event_num_label
     VALIDMAX: 1
 
-P0_NumEvents:
+p0_num_events:
     <<: *direct_events
     CATDESC: Priority 0 Number of Events
     FIELDNAM: Priority 0 Number of Events
     FILLVAL: 65535
     LABLAXIS: " "
 
-P0_PHAType:
+p0_type:
     <<: *direct_events
     CATDESC: Priority 0 PHA Type
     DEPEND_1: event_num
@@ -1560,7 +1638,7 @@ P0_PHAType:
     LABL_PTR_1: event_num_label
     VALIDMAX: 4
 
-P0_Position:
+p0_position:
     <<: *direct_events
     CATDESC: Priority 0 Position
     DEPEND_1: event_num
@@ -1568,7 +1646,7 @@ P0_Position:
     LABL_PTR_1: event_num_label
     VALIDMAX: 32
 
-P0_SpinAngle:
+p0_spin_sector:
     <<: *direct_events
     CATDESC: Priority 0 Spin Angle
     DEPEND_1: event_num
@@ -1576,7 +1654,7 @@ P0_SpinAngle:
     LABL_PTR_1: event_num_label
     VALIDMAX: 128
 
-P0_SpinNumber:
+p0_spin_number:
     <<: *direct_events
     CATDESC: Priority 0 Spin Number
     DEPEND_1: event_num
@@ -1584,7 +1662,7 @@ P0_SpinNumber:
     LABL_PTR_1: event_num_label
     VALIDMAX: 32
 
-P0_SSD_ID:
+p0_ssd_id:
     <<: *direct_events
     CATDESC: Priority 0 SSD ID or Azimuth Angle
     DEPEND_1: event_num
@@ -1592,7 +1670,7 @@ P0_SSD_ID:
     LABL_PTR_1: event_num_label
     VALIDMAX: 32
 
-P0_SSDEnergy:
+p0_ssd_energy:
     <<: *direct_events
     CATDESC: Priority 0 APD Energy
     DEPEND_1: event_num
@@ -1600,7 +1678,7 @@ P0_SSDEnergy:
     LABL_PTR_1: event_num_label
     VALIDMAX: 2048
 
-P0_TOF:
+p0_tof:
     <<: *direct_events
     CATDESC: Priority 0 Time of Flight
     DEPEND_1: event_num
@@ -1609,7 +1687,7 @@ P0_TOF:
     LABL_PTR_1: event_num_label
     VALIDMAX: 1024
 
-P0_Type:
+p0_type:
     <<: *direct_events
     CATDESC: Priority 0 Type
     DEPEND_1: event_num
@@ -1617,7 +1695,7 @@ P0_Type:
     LABL_PTR_1: event_num_label
     VALIDMAX: 3
 
-P1_APD_ID:
+p1_apd_id:
     <<: *direct_events
     CATDESC: Priority 1 APD ID
     DEPEND_1: event_num
@@ -1625,7 +1703,7 @@ P1_APD_ID:
     LABL_PTR_1: event_num_label
     VALIDMAX: 32
 
-P1_APDEnergy:
+p1_apd_energy:
     <<: *direct_events
     CATDESC: Priority 1 APD Energy
     DEPEND_1: event_num
@@ -1634,7 +1712,7 @@ P1_APDEnergy:
     LABL_PTR_1: event_num_label
     VALIDMAX: 512
 
-P1_APDGain:
+p1_gain:
     <<: *direct_events
     CATDESC: Priority 1 APD Gain
     DEPEND_1: event_num
@@ -1642,14 +1720,14 @@ P1_APDGain:
     LABL_PTR_1: event_num_label
     VALIDMAX: 1
 
-P1_DataQuality:
+p1_data_quality:
     <<: *direct_events
     CATDESC: Priority 1 Data Quality
     FIELDNAM: Priority 1 Data Quality
     LABLAXIS: " "
     VALIDMAX: 1
 
-P1_EnergyStep:
+p1_energy_step:
     <<: *direct_events
     CATDESC: Priority 1 Energy Step
     DEPEND_1: event_num
@@ -1657,15 +1735,7 @@ P1_EnergyStep:
     LABL_PTR_1: event_num_label
     VALIDMAX: 128
 
-P1_ERGE:
-    <<: *direct_events
-    CATDESC: Priority 1 Energy Range
-    DEPEND_1: event_num
-    FIELDNAM: Priority 1 Energy Range
-    LABL_PTR_1: event_num_label
-    VALIDMAX: 4
-
-P1_MultiFlag:
+p1_multi_flag:
     <<: *direct_events
     CATDESC: Priority 1 Multi Flag
     DEPEND_1: event_num
@@ -1673,14 +1743,14 @@ P1_MultiFlag:
     LABL_PTR_1: event_num_label
     VALIDMAX: 1
 
-P1_NumEvents:
+p1_num_events:
     <<: *direct_events
     CATDESC: Priority 1 Number of Events
     FIELDNAM: Priority 1 Number of Events
     FILLVAL: 65535
     LABLAXIS: " "
 
-P1_PHAType:
+p1_type:
     <<: *direct_events
     CATDESC: Priority 1 PHA Type
     DEPEND_1: event_num
@@ -1688,7 +1758,7 @@ P1_PHAType:
     LABL_PTR_1: event_num_label
     VALIDMAX: 4
 
-P1_Position:
+p1_position:
     <<: *direct_events
     CATDESC: Priority 1 Position
     DEPEND_1: event_num
@@ -1696,7 +1766,7 @@ P1_Position:
     LABL_PTR_1: event_num_label
     VALIDMAX: 32
 
-P1_SpinAngle:
+p1_spin_sector:
     <<: *direct_events
     CATDESC: Priority 1 Spin Angle
     DEPEND_1: event_num
@@ -1704,7 +1774,7 @@ P1_SpinAngle:
     LABL_PTR_1: event_num_label
     VALIDMAX: 128
 
-P1_SpinNumber:
+p1_spin_number:
     <<: *direct_events
     CATDESC: Priority 1 Spin Number
     DEPEND_1: event_num
@@ -1712,7 +1782,7 @@ P1_SpinNumber:
     LABL_PTR_1: event_num_label
     VALIDMAX: 32
 
-P1_SSD_ID:
+p1_ssd_id:
     <<: *direct_events
     CATDESC: Priority 1 SSD ID or Azimuth Angle
     DEPEND_1: event_num
@@ -1720,7 +1790,7 @@ P1_SSD_ID:
     LABL_PTR_1: event_num_label
     VALIDMAX: 32
 
-P1_SSDEnergy:
+p1_ssd_energy:
     <<: *direct_events
     CATDESC: Priority 1 APD Energy
     DEPEND_1: event_num
@@ -1728,7 +1798,7 @@ P1_SSDEnergy:
     LABL_PTR_1: event_num_label
     VALIDMAX: 2048
 
-P1_TOF:
+p1_tof:
     <<: *direct_events
     CATDESC: Priority 1 Time of Flight
     DEPEND_1: event_num
@@ -1737,7 +1807,7 @@ P1_TOF:
     LABL_PTR_1: event_num_label
     VALIDMAX: 1024
 
-P1_Type:
+p1_Type:
     <<: *direct_events
     CATDESC: Priority 1 Type
     DEPEND_1: event_num
@@ -1745,7 +1815,7 @@ P1_Type:
     LABL_PTR_1: event_num_label
     VALIDMAX: 3
 
-P2_APD_ID:
+p2_apd_id:
     <<: *direct_events
     CATDESC: Priority 2 APD ID
     DEPEND_1: event_num
@@ -1753,7 +1823,7 @@ P2_APD_ID:
     LABL_PTR_1: event_num_label
     VALIDMAX: 32
 
-P2_APDEnergy:
+p2_apd_energy:
     <<: *direct_events
     CATDESC: Priority 2 APD Energy
     DEPEND_1: event_num
@@ -1762,7 +1832,7 @@ P2_APDEnergy:
     LABL_PTR_1: event_num_label
     VALIDMAX: 512
 
-P2_APDGain:
+p2_gain:
     <<: *direct_events
     CATDESC: Priority 2 APD Gain
     DEPEND_1: event_num
@@ -1770,14 +1840,14 @@ P2_APDGain:
     LABL_PTR_1: event_num_label
     VALIDMAX: 1
 
-P2_DataQuality:
+p2_data_quality:
     <<: *direct_events
     CATDESC: Priority 2 Data Quality
     FIELDNAM: Priority 2 Data Quality
     LABLAXIS: " "
     VALIDMAX: 1
 
-P2_EnergyStep:
+p2_energy_step:
     <<: *direct_events
     CATDESC: Priority 2 Energy Step
     DEPEND_1: event_num
@@ -1785,15 +1855,7 @@ P2_EnergyStep:
     LABL_PTR_1: event_num_label
     VALIDMAX: 128
 
-P2_ERGE:
-    <<: *direct_events
-    CATDESC: Priority 2 Energy Range
-    DEPEND_1: event_num
-    FIELDNAM: Priority 2 Energy Range
-    LABL_PTR_1: event_num_label
-    VALIDMAX: 4
-
-P2_MultiFlag:
+p2_multi_flag:
     <<: *direct_events
     CATDESC: Priority 2 Multi Flag
     DEPEND_1: event_num
@@ -1801,14 +1863,14 @@ P2_MultiFlag:
     LABL_PTR_1: event_num_label
     VALIDMAX: 1
 
-P2_NumEvents:
+p2_num_events:
     <<: *direct_events
     CATDESC: Priority 2 Number of Events
     FIELDNAM: Priority 2 Number of Events
     FILLVAL: 65535
     LABLAXIS: " "
 
-P2_PHAType:
+p2_type:
     <<: *direct_events
     CATDESC: Priority 2 PHA Type
     DEPEND_1: event_num
@@ -1816,7 +1878,7 @@ P2_PHAType:
     LABL_PTR_1: event_num_label
     VALIDMAX: 4
 
-P2_Position:
+p2_position:
     <<: *direct_events
     CATDESC: Priority 2 Position
     DEPEND_1: event_num
@@ -1824,7 +1886,7 @@ P2_Position:
     LABL_PTR_1: event_num_label
     VALIDMAX: 32
 
-P2_SpinAngle:
+p2_spin_sector:
     <<: *direct_events
     CATDESC: Priority 2 Spin Angle
     DEPEND_1: event_num
@@ -1832,7 +1894,7 @@ P2_SpinAngle:
     LABL_PTR_1: event_num_label
     VALIDMAX: 128
 
-P2_SpinNumber:
+p2_spin_number:
     <<: *direct_events
     CATDESC: Priority 2 Spin Number
     DEPEND_1: event_num
@@ -1840,7 +1902,7 @@ P2_SpinNumber:
     LABL_PTR_1: event_num_label
     VALIDMAX: 32
 
-P2_SSD_ID:
+p2_ssd_id:
     <<: *direct_events
     CATDESC: Priority 2 SSD ID or Azimuth Angle
     DEPEND_1: event_num
@@ -1848,7 +1910,7 @@ P2_SSD_ID:
     LABL_PTR_1: event_num_label
     VALIDMAX: 32
 
-P2_SSDEnergy:
+p2_ssd_energy:
     <<: *direct_events
     CATDESC: Priority 2 APD Energy
     DEPEND_1: event_num
@@ -1856,7 +1918,7 @@ P2_SSDEnergy:
     LABL_PTR_1: event_num_label
     VALIDMAX: 2048
 
-P2_TOF:
+p2_tof:
     <<: *direct_events
     CATDESC: Priority 2 Time of Flight
     DEPEND_1: event_num
@@ -1865,7 +1927,7 @@ P2_TOF:
     LABL_PTR_1: event_num_label
     VALIDMAX: 1024
 
-P2_Type:
+p2_Type:
     <<: *direct_events
     CATDESC: Priority 2 Type
     DEPEND_1: event_num
@@ -1873,7 +1935,7 @@ P2_Type:
     LABL_PTR_1: event_num_label
     VALIDMAX: 3
 
-P3_APD_ID:
+p3_apd_id:
     <<: *direct_events
     CATDESC: Priority 3 APD ID
     DEPEND_1: event_num
@@ -1881,7 +1943,7 @@ P3_APD_ID:
     LABL_PTR_1: event_num_label
     VALIDMAX: 32
 
-P3_APDEnergy:
+p3_apd_energy:
     <<: *direct_events
     CATDESC: Priority 3 APD Energy
     DEPEND_1: event_num
@@ -1890,7 +1952,7 @@ P3_APDEnergy:
     LABL_PTR_1: event_num_label
     VALIDMAX: 512
 
-P3_APDGain:
+p3_gain:
     <<: *direct_events
     CATDESC: Priority 3 APD Gain
     DEPEND_1: event_num
@@ -1898,14 +1960,14 @@ P3_APDGain:
     LABL_PTR_1: event_num_label
     VALIDMAX: 1
 
-P3_DataQuality:
+p3_data_quality:
     <<: *direct_events
     CATDESC: Priority 3 Data Quality
     FIELDNAM: Priority 3 Data Quality
     LABLAXIS: " "
     VALIDMAX: 1
 
-P3_EnergyStep:
+p3_energy_step:
     <<: *direct_events
     CATDESC: Priority 3 Energy Step
     DEPEND_1: event_num
@@ -1913,15 +1975,7 @@ P3_EnergyStep:
     LABL_PTR_1: event_num_label
     VALIDMAX: 128
 
-P3_ERGE:
-    <<: *direct_events
-    CATDESC: Priority 3 Energy Range
-    DEPEND_1: event_num
-    FIELDNAM: Priority 3 Energy Range
-    LABL_PTR_1: event_num_label
-    VALIDMAX: 4
-
-P3_MultiFlag:
+p3_multi_flag:
     <<: *direct_events
     CATDESC: Priority 3 Multi Flag
     DEPEND_1: event_num
@@ -1929,14 +1983,14 @@ P3_MultiFlag:
     LABL_PTR_1: event_num_label
     VALIDMAX: 1
 
-P3_NumEvents:
+p3_num_events:
     <<: *direct_events
     CATDESC: Priority 3 Number of Events
     FIELDNAM: Priority 3 Number of Events
     FILLVAL: 65535
     LABLAXIS: " "
 
-P3_PHAType:
+p3_type:
     <<: *direct_events
     CATDESC: Priority 3 PHA Type
     DEPEND_1: event_num
@@ -1944,7 +1998,7 @@ P3_PHAType:
     LABL_PTR_1: event_num_label
     VALIDMAX: 4
 
-P3_Position:
+p3_position:
     <<: *direct_events
     CATDESC: Priority 3 Position
     DEPEND_1: event_num
@@ -1952,7 +2006,7 @@ P3_Position:
     LABL_PTR_1: event_num_label
     VALIDMAX: 32
 
-P3_SpinAngle:
+p3_spin_sector:
     <<: *direct_events
     CATDESC: Priority 3 Spin Angle
     DEPEND_1: event_num
@@ -1960,7 +2014,7 @@ P3_SpinAngle:
     LABL_PTR_1: event_num_label
     VALIDMAX: 128
 
-P3_SpinNumber:
+p3_spin_number:
     <<: *direct_events
     CATDESC: Priority 3 Spin Number
     DEPEND_1: event_num
@@ -1968,7 +2022,7 @@ P3_SpinNumber:
     LABL_PTR_1: event_num_label
     VALIDMAX: 32
 
-P3_SSD_ID:
+p3_ssd_id:
     <<: *direct_events
     CATDESC: Priority 3 SSD ID or Azimuth Angle
     DEPEND_1: event_num
@@ -1976,7 +2030,7 @@ P3_SSD_ID:
     LABL_PTR_1: event_num_label
     VALIDMAX: 32
 
-P3_SSDEnergy:
+p3_ssd_energy:
     <<: *direct_events
     CATDESC: Priority 3 APD Energy
     DEPEND_1: event_num
@@ -1984,7 +2038,7 @@ P3_SSDEnergy:
     LABL_PTR_1: event_num_label
     VALIDMAX: 2048
 
-P3_TOF:
+p3_tof:
     <<: *direct_events
     CATDESC: Priority 3 Time of Flight
     DEPEND_1: event_num
@@ -1993,7 +2047,7 @@ P3_TOF:
     LABL_PTR_1: event_num_label
     VALIDMAX: 1024
 
-P3_Type:
+p3_Type:
     <<: *direct_events
     CATDESC: Priority 3 Type
     DEPEND_1: event_num
@@ -2001,7 +2055,7 @@ P3_Type:
     LABL_PTR_1: event_num_label
     VALIDMAX: 3
 
-P4_APD_ID:
+p4_apd_id:
     <<: *direct_events
     CATDESC: Priority 4 APD ID
     DEPEND_1: event_num
@@ -2009,7 +2063,7 @@ P4_APD_ID:
     LABL_PTR_1: event_num_label
     VALIDMAX: 32
 
-P4_APDEnergy:
+p4_apd_energy:
     <<: *direct_events
     CATDESC: Priority 4 APD Energy
     DEPEND_1: event_num
@@ -2018,7 +2072,7 @@ P4_APDEnergy:
     LABL_PTR_1: event_num_label
     VALIDMAX: 512
 
-P4_APDGain:
+p4_gain:
     <<: *direct_events
     CATDESC: Priority 4 APD Gain
     DEPEND_1: event_num
@@ -2026,14 +2080,14 @@ P4_APDGain:
     LABL_PTR_1: event_num_label
     VALIDMAX: 1
 
-P4_DataQuality:
+p4_data_quality:
     <<: *direct_events
     CATDESC: Priority 4 Data Quality
     FIELDNAM: Priority 4 Data Quality
     LABLAXIS: " "
     VALIDMAX: 1
 
-P4_EnergyStep:
+p4_energy_step:
     <<: *direct_events
     CATDESC: Priority 4 Energy Step
     DEPEND_1: event_num
@@ -2041,15 +2095,7 @@ P4_EnergyStep:
     LABL_PTR_1: event_num_label
     VALIDMAX: 128
 
-P4_ERGE:
-    <<: *direct_events
-    CATDESC: Priority 4 Energy Range
-    DEPEND_1: event_num
-    FIELDNAM: Priority 4 Energy Range
-    LABL_PTR_1: event_num_label
-    VALIDMAX: 4
-
-P4_MultiFlag:
+p4_multi_flag:
     <<: *direct_events
     CATDESC: Priority 4 Multi Flag
     DEPEND_1: event_num
@@ -2057,14 +2103,14 @@ P4_MultiFlag:
     LABL_PTR_1: event_num_label
     VALIDMAX: 1
 
-P4_NumEvents:
+p4_num_events:
     <<: *direct_events
     CATDESC: Priority 4 Number of Events
     FIELDNAM: Priority 4 Number of Events
     FILLVAL: 65535
     LABLAXIS: " "
 
-P4_PHAType:
+p4_type:
     <<: *direct_events
     CATDESC: Priority 4 PHA Type
     DEPEND_1: event_num
@@ -2072,7 +2118,7 @@ P4_PHAType:
     LABL_PTR_1: event_num_label
     VALIDMAX: 4
 
-P4_Position:
+p4_position:
     <<: *direct_events
     CATDESC: Priority 4 Position
     DEPEND_1: event_num
@@ -2080,7 +2126,7 @@ P4_Position:
     LABL_PTR_1: event_num_label
     VALIDMAX: 32
 
-P4_SpinAngle:
+p4_spin_sector:
     <<: *direct_events
     CATDESC: Priority 4 Spin Angle
     DEPEND_1: event_num
@@ -2088,7 +2134,7 @@ P4_SpinAngle:
     LABL_PTR_1: event_num_label
     VALIDMAX: 128
 
-P4_SpinNumber:
+p4_spin_number:
     <<: *direct_events
     CATDESC: Priority 4 Spin Number
     DEPEND_1: event_num
@@ -2096,7 +2142,7 @@ P4_SpinNumber:
     LABL_PTR_1: event_num_label
     VALIDMAX: 32
 
-P4_SSD_ID:
+p4_ssd_id:
     <<: *direct_events
     CATDESC: Priority 4 SSD ID or Azimuth Angle
     DEPEND_1: event_num
@@ -2104,7 +2150,7 @@ P4_SSD_ID:
     LABL_PTR_1: event_num_label
     VALIDMAX: 32
 
-P4_SSDEnergy:
+p4_ssd_energy:
     <<: *direct_events
     CATDESC: Priority 4 APD Energy
     DEPEND_1: event_num
@@ -2112,7 +2158,7 @@ P4_SSDEnergy:
     LABL_PTR_1: event_num_label
     VALIDMAX: 2048
 
-P4_TOF:
+p4_tof:
     <<: *direct_events
     CATDESC: Priority 4 Time of Flight
     DEPEND_1: event_num
@@ -2121,7 +2167,7 @@ P4_TOF:
     LABL_PTR_1: event_num_label
     VALIDMAX: 1024
 
-P4_Type:
+p4_Type:
     <<: *direct_events
     CATDESC: Priority 4 Type
     DEPEND_1: event_num
@@ -2129,7 +2175,7 @@ P4_Type:
     LABL_PTR_1: event_num_label
     VALIDMAX: 3
 
-P5_APD_ID:
+p5_apd_id:
     <<: *direct_events
     CATDESC: Priority 5 APD ID
     DEPEND_1: event_num
@@ -2137,7 +2183,7 @@ P5_APD_ID:
     LABL_PTR_1: event_num_label
     VALIDMAX: 32
 
-P5_APDEnergy:
+p5_apd_energy:
     <<: *direct_events
     CATDESC: Priority 5 APD Energy
     DEPEND_1: event_num
@@ -2146,7 +2192,7 @@ P5_APDEnergy:
     LABL_PTR_1: event_num_label
     VALIDMAX: 512
 
-P5_APDGain:
+p5_gain:
     <<: *direct_events
     CATDESC: Priority 5 APD Gain
     DEPEND_1: event_num
@@ -2154,14 +2200,14 @@ P5_APDGain:
     LABL_PTR_1: event_num_label
     VALIDMAX: 1
 
-P5_DataQuality:
+p5_data_quality:
     <<: *direct_events
     CATDESC: Priority 5 Data Quality
     FIELDNAM: Priority 5 Data Quality
     LABLAXIS: " "
     VALIDMAX: 1
 
-P5_EnergyStep:
+p5_energy_step:
     <<: *direct_events
     CATDESC: Priority 5 Energy Step
     DEPEND_1: event_num
@@ -2169,15 +2215,7 @@ P5_EnergyStep:
     LABL_PTR_1: event_num_label
     VALIDMAX: 128
 
-P5_ERGE:
-    <<: *direct_events
-    CATDESC: Priority 5 Energy Range
-    DEPEND_1: event_num
-    FIELDNAM: Priority 5 Energy Range
-    LABL_PTR_1: event_num_label
-    VALIDMAX: 4
-
-P5_MultiFlag:
+p5_multi_flag:
     <<: *direct_events
     CATDESC: Priority 5 Multi Flag
     DEPEND_1: event_num
@@ -2185,14 +2223,14 @@ P5_MultiFlag:
     LABL_PTR_1: event_num_label
     VALIDMAX: 1
 
-P5_NumEvents:
+p5_num_events:
     <<: *direct_events
     CATDESC: Priority 5 Number of Events
     FIELDNAM: Priority 5 Number of Events
     FILLVAL: 65535
     LABLAXIS: " "
 
-P5_PHAType:
+p5_type:
     <<: *direct_events
     CATDESC: Priority 5 PHA Type
     DEPEND_1: event_num
@@ -2200,7 +2238,7 @@ P5_PHAType:
     LABL_PTR_1: event_num_label
     VALIDMAX: 4
 
-P5_Position:
+p5_position:
     <<: *direct_events
     CATDESC: Priority 5 Position
     DEPEND_1: event_num
@@ -2208,7 +2246,7 @@ P5_Position:
     LABL_PTR_1: event_num_label
     VALIDMAX: 32
 
-P5_SpinAngle:
+p5_spin_sector:
     <<: *direct_events
     CATDESC: Priority 5 Spin Angle
     DEPEND_1: event_num
@@ -2216,7 +2254,7 @@ P5_SpinAngle:
     LABL_PTR_1: event_num_label
     VALIDMAX: 128
 
-P5_SpinNumber:
+p5_spin_number:
     <<: *direct_events
     CATDESC: Priority 5 Spin Number
     DEPEND_1: event_num
@@ -2224,7 +2262,7 @@ P5_SpinNumber:
     LABL_PTR_1: event_num_label
     VALIDMAX: 32
 
-P5_SSD_ID:
+p5_ssd_id:
     <<: *direct_events
     CATDESC: Priority 5 SSD ID or Azimuth Angle
     DEPEND_1: event_num
@@ -2232,7 +2270,7 @@ P5_SSD_ID:
     LABL_PTR_1: event_num_label
     VALIDMAX: 32
 
-P5_SSDEnergy:
+p5_ssd_energy:
     <<: *direct_events
     CATDESC: Priority 5 APD Energy
     DEPEND_1: event_num
@@ -2240,7 +2278,7 @@ P5_SSDEnergy:
     LABL_PTR_1: event_num_label
     VALIDMAX: 2048
 
-P5_TOF:
+p5_tof:
     <<: *direct_events
     CATDESC: Priority 5 Time of Flight
     DEPEND_1: event_num
@@ -2249,7 +2287,7 @@ P5_TOF:
     LABL_PTR_1: event_num_label
     VALIDMAX: 1024
 
-P5_Type:
+p5_Type:
     <<: *direct_events
     CATDESC: Priority 5 Type
     DEPEND_1: event_num
@@ -2257,7 +2295,7 @@ P5_Type:
     LABL_PTR_1: event_num_label
     VALIDMAX: 3
 
-P6_APD_ID:
+p6_apd_id:
     <<: *direct_events
     CATDESC: Priority 6 APD ID
     DEPEND_1: event_num
@@ -2265,7 +2303,7 @@ P6_APD_ID:
     LABL_PTR_1: event_num_label
     VALIDMAX: 32
 
-P6_APDEnergy:
+p6_apd_energy:
     <<: *direct_events
     CATDESC: Priority 6 APD Energy
     DEPEND_1: event_num
@@ -2274,7 +2312,7 @@ P6_APDEnergy:
     LABL_PTR_1: event_num_label
     VALIDMAX: 512
 
-P6_APDGain:
+p6_gain:
     <<: *direct_events
     CATDESC: Priority 6 APD Gain
     DEPEND_1: event_num
@@ -2282,14 +2320,14 @@ P6_APDGain:
     LABL_PTR_1: event_num_label
     VALIDMAX: 1
 
-P6_DataQuality:
+p6_data_quality:
     <<: *direct_events
     CATDESC: Priority 6 Data Quality
     FIELDNAM: Priority 6 Data Quality
     LABLAXIS: " "
     VALIDMAX: 1
 
-P6_EnergyStep:
+p6_energy_step:
     <<: *direct_events
     CATDESC: Priority 6 Energy Step
     DEPEND_1: event_num
@@ -2297,7 +2335,7 @@ P6_EnergyStep:
     LABL_PTR_1: event_num_label
     VALIDMAX: 128
 
-P6_MultiFlag:
+p6_multi_flag:
     <<: *direct_events
     CATDESC: Priority 6 Multi Flag
     DEPEND_1: event_num
@@ -2305,14 +2343,14 @@ P6_MultiFlag:
     LABL_PTR_1: event_num_label
     VALIDMAX: 1
 
-P6_NumEvents:
+p6_num_events:
     <<: *direct_events
     CATDESC: Priority 6 Number of Events
     FIELDNAM: Priority 6 Number of Events
     FILLVAL: 65535
     LABLAXIS: " "
 
-P6_PHAType:
+p6_type:
     <<: *direct_events
     CATDESC: Priority 6 PHA Type
     DEPEND_1: event_num
@@ -2320,7 +2358,7 @@ P6_PHAType:
     LABL_PTR_1: event_num_label
     VALIDMAX: 4
 
-P6_Position:
+p6_position:
     <<: *direct_events
     CATDESC: Priority 6 Position
     DEPEND_1: event_num
@@ -2328,7 +2366,7 @@ P6_Position:
     LABL_PTR_1: event_num_label
     VALIDMAX: 32
 
-P6_SpinAngle:
+p6_spin_sector:
     <<: *direct_events
     CATDESC: Priority 6 Spin Angle
     DEPEND_1: event_num
@@ -2336,7 +2374,7 @@ P6_SpinAngle:
     LABL_PTR_1: event_num_label
     VALIDMAX: 128
 
-P6_TOF:
+p6_tof:
     <<: *direct_events
     CATDESC: Priority 6 Time of Flight
     DEPEND_1: event_num
@@ -2345,7 +2383,7 @@ P6_TOF:
     LABL_PTR_1: event_num_label
     VALIDMAX: 1024
 
-P7_APD_ID:
+p7_apd_id:
     <<: *direct_events
     CATDESC: Priority 7 APD ID
     DEPEND_1: event_num
@@ -2353,7 +2391,7 @@ P7_APD_ID:
     LABL_PTR_1: event_num_label
     VALIDMAX: 32
 
-P7_APDEnergy:
+p7_apd_energy:
     <<: *direct_events
     CATDESC: Priority 7 APD Energy
     DEPEND_1: event_num
@@ -2362,7 +2400,7 @@ P7_APDEnergy:
     LABL_PTR_1: event_num_label
     VALIDMAX: 512
 
-P7_APDGain:
+p7_gain:
     <<: *direct_events
     CATDESC: Priority 7 APD Gain
     DEPEND_1: event_num
@@ -2370,14 +2408,14 @@ P7_APDGain:
     LABL_PTR_1: event_num_label
     VALIDMAX: 1
 
-P7_DataQuality:
+p7_data_quality:
     <<: *direct_events
     CATDESC: Priority 7 Data Quality
     FIELDNAM: Priority 7 Data Quality
     LABLAXIS: " "
     VALIDMAX: 1
 
-P7_EnergyStep:
+p7_energy_step:
     <<: *direct_events
     CATDESC: Priority 7 Energy Step
     DEPEND_1: event_num
@@ -2385,7 +2423,7 @@ P7_EnergyStep:
     LABL_PTR_1: event_num_label
     VALIDMAX: 128
 
-P7_MultiFlag:
+p7_multi_flag:
     <<: *direct_events
     CATDESC: Priority 7 Multi Flag
     DEPEND_1: event_num
@@ -2393,14 +2431,14 @@ P7_MultiFlag:
     LABL_PTR_1: event_num_label
     VALIDMAX: 1
 
-P7_NumEvents:
+p7_num_events:
     <<: *direct_events
     CATDESC: Priority 7 Number of Events
     FIELDNAM: Priority 7 Number of Events
     FILLVAL: 65535
     LABLAXIS: " "
 
-P7_PHAType:
+p7_type:
     <<: *direct_events
     CATDESC: Priority 7 PHA Type
     DEPEND_1: event_num
@@ -2408,7 +2446,7 @@ P7_PHAType:
     LABL_PTR_1: event_num_label
     VALIDMAX: 4
 
-P7_Position:
+p7_position:
     <<: *direct_events
     CATDESC: Priority 7 Position
     DEPEND_1: event_num
@@ -2416,7 +2454,7 @@ P7_Position:
     LABL_PTR_1: event_num_label
     VALIDMAX: 32
 
-P7_SpinAngle:
+p7_spin_sector:
     <<: *direct_events
     CATDESC: Priority 7 Spin Angle
     DEPEND_1: event_num
@@ -2424,7 +2462,7 @@ P7_SpinAngle:
     LABL_PTR_1: event_num_label
     VALIDMAX: 128
 
-P7_TOF:
+p7_tof:
     <<: *direct_events
     CATDESC: Priority 7 Time of Flight
     DEPEND_1: event_num