Merge branch 'upstream-dev' into glows_l2_916

.github/workflows/test.yml

@@ -29,6 +29,8 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
       - uses: Gr1N/setup-poetry@v8
+        with:
+          poetry-version: "1.8.0"
 
 
       - name: Install dependencies and app

.gitignore

@@ -181,4 +181,5 @@ data/
 # Ignore specific SPICE kernels that get downloaded from NAIF automatically for tests
 # marked with @pytest.mark.external_kernel
 **/de440*.bsp
-**/pck0001*.tpc
+**/pck0001*.tpc
+**/earth_**_combined.bpc

imap_processing/cdf/config/imap_hi_variable_attrs.yaml

@@ -400,6 +400,11 @@ hi_de_nominal_bin:
 
 # ======= L1C PSET Section =======
 
+# Define override values for epoch as defined in imap_constant_attrs.yaml
+hi_pset_epoch:
+  CATDESC: Midpoint time of pointing, number of nanoseconds since J2000 with leap seconds included
+  BIN_LOCATION: 0.5
+
 hi_pset_esa_energy_step:
   <<: *default_esa_energy_step
   LABLAXIS: Energy Step

imap_processing/cdf/config/imap_idex_l1a_variable_attrs.yaml

@@ -38,13 +38,13 @@ l1a_data_base: &l1a_data_base
 
 l1a_tof_base: &l1a_tof_base
   <<: *l1a_data_base
-  DEPEND_1: time_high_sr
-  LABL_PTR_1: time_high_sr_label
+  DEPEND_1: time_high_sample_rate
+  LABL_PTR_1: time_high_sample_rate_label
 
 l1a_target_base: &l1a_target_base
   <<: *l1a_data_base
-  DEPEND_1: time_low_sr
-  LABL_PTR_1: time_low_sr_label
+  DEPEND_1: time_low_sample_rate
+  LABL_PTR_1: time_low_sample_rate_label
 
 sample_rate_base: &sample_rate_base
   DISPLAY_TYPE: no_plot
@@ -76,35 +76,59 @@ trigger_base: &trigger_base
   UNITS: " "
 
 # <=== LABL_PTR_i Attributes ===>
-time_high_sr_label:
+time_high_sample_rate_label:
   CATDESC: High sample rate time steps for a dust event.
   FIELDNAM: High Sample Rate Time
   FORMAT: A5
   VAR_TYPE: metadata
 
-time_low_sr_label:
+time_low_sample_rate_label:
   CATDESC: Low sample rate time steps for a dust event.
   FIELDNAM: Low Sample Rate Time
   FORMAT: A5
   VAR_TYPE: metadata
 
 # <=== Instrument Setting Attributes ===>
-low_sr_attrs:
+low_sample_rate_attrs:
   <<:  *sample_rate_base
   CATDESC: Low sample rate time steps for a dust event.
   FIELDNAM: Low Sample Rate Time
   VAR_NOTES: The low sample rate in microseconds. Steps are approximately 1/4.025
              microseconds in duration. Used by the Ion_Grid, Target_Low, and
              Target_High variables.
 
-high_sr_attrs:
+high_sample_rate_attrs:
   <<:  *sample_rate_base
   CATDESC: High sample rate time steps for a dust event.
   FIELDNAM: High Sample Rate Time
   VAR_NOTES: The high sample rate in microseconds. Steps are approximately 1/260
     microseconds in duration. Used by the TOF_High, TOF_Mid, and
     TOF_Low variables.
 
+time_low_sample_rate_index:
+  CATDESC: Low sampling rate time index
+  FIELDNAM: Low sample rate
+  FILLVAL: *int_fillval
+  FORMAT: I3
+  LABLAXIS: Sample Rate
+  SCALE_TYP: linear
+  UNITS: " "
+  VALIDMAX: 511
+  VALIDMIN: 0
+  VAR_TYPE: support_data
+
+time_high_sample_rate_index:
+  CATDESC: High sampling rate time index
+  FIELDNAM: Low sample rate
+  FILLVAL: *int_fillval
+  FORMAT: I3
+  LABLAXIS: Sample Rate
+  SCALE_TYP: linear
+  UNITS: " "
+  VALIDMAX: 8188
+  VALIDMIN: 0
+  VAR_TYPE: support_data
+
 tof_high_attrs:
   <<: *l1a_tof_base
   CATDESC: Time of flight waveform on the high-gain channel

imap_processing/cdf/config/imap_idex_l1b_variable_attrs.yaml

@@ -31,13 +31,13 @@ l1b_data_base: &l1b_data_base
 
 l1b_tof_base: &l1b_tof_base
   <<: *l1b_data_base
-  DEPEND_1: time_high_sr
-  LABL_PTR_1: time_high_sr_label
+  DEPEND_1: time_high_sample_rate
+  LABL_PTR_1: time_high_sample_rate_label
 
 l1b_target_base: &l1b_target_base
   <<: *l1b_data_base
-  DEPEND_1: time_low_sr
-  LABL_PTR_1: time_low_sr_label
+  DEPEND_1: time_low_sample_rate
+  LABL_PTR_1: time_low_sample_rate_label
 
 trigger_base: &trigger_base
   <<: *l1b_data_base
@@ -46,6 +46,16 @@ trigger_base: &trigger_base
   UNITS: " "
 
 # <=== Instrument Setting Attributes ===>
+trigger_mode:
+  <<: *string_base
+  FIELDNAM: Trigger Mode
+  CATDESC: Channel and mode that triggered the event
+
+trigger_level:
+  <<: *string_base
+  FIELDNAM: Trigger Level
+  CATDESC: Threshold signal level that triggered the event
+
 tof_high:
   <<: *l1b_tof_base
   CATDESC: Time of flight waveform on the high-gain channel

imap_processing/cdf/config/imap_ultra_l1b_variable_attrs.yaml

@@ -134,26 +134,20 @@ start_type:
   LABLAXIS: start type
   UNITS: " "
 
-vx_ultra:
+direct_event_velocity:
   <<: *default_float32
-  CATDESC: Normalized component of the velocity vector in x direction in the instrument frame.
-  FIELDNAM: vx_ultra
-  LABLAXIS: vx ultra
-  UNITS: " "
-
-vy_ultra:
-  <<: *default_float32
-  CATDESC: Normalized component of the velocity vector in y direction in the instrument frame.
-  FIELDNAM: vy_ultra
-  LABLAXIS: vy ultra
-  UNITS: " "
+  CATDESC: Direct event velocity vector in x, y, and z directions in the instrument frame.
+  DEPEND_1: component
+  FIELDNAM: v_ultra
+  LABLAXIS: v ultra
+  UNITS: "km/s"
 
-vz_ultra:
+velocity_magnitude:
   <<: *default_float32
-  CATDESC: Normalized component of the velocity vector in z direction in the instrument frame.
-  FIELDNAM: vz_ultra
-  LABLAXIS: vz ultra
-  UNITS: " "
+  CATDESC: Magnitude of the particle velocity.
+  FIELDNAM: vmag_ultra
+  LABLAXIS: vmag ultra
+  UNITS: "km/s"
 
 energy:
   <<: *default_float32
@@ -162,6 +156,13 @@ energy:
   LABLAXIS: energy
   UNITS: keV
 
+tof_energy:
+  <<: *default_float32
+  CATDESC: Energy measured using kinetic energy equation.
+  FIELDNAM: energy
+  LABLAXIS: energy
+  UNITS: keV
+
 species:
   <<: *default
   DISPLAY_TYPE: no_plot
@@ -186,74 +187,49 @@ path_length:
   LABLAXIS: path_length
   UNITS: mm / 100
 
-event_efficiency:
-  <<: *default_float32
-  CATDESC: Estimated event efficiency for this path through the instrument.
-  FIELDNAM: event_efficiency
-  LABLAXIS: event efficiency
-  UNITS: " "
-
-vx_sc:
-  <<: *default_float32
-  CATDESC: x-component of the velocity vector of the ena in the spacecraft frame.
-  FIELDNAM: vx_sc
-  LABLAXIS: vx sc
-  UNITS: " "
-
-vy_sc:
-  <<: *default_float32
-  CATDESC: y-component of the velocity vector of the ena in the spacecraft frame.
-  FIELDNAM: vy_sc
-  LABLAXIS: vy sc
-  UNITS: " "
-
-vz_sc:
-  <<: *default_float32
-  CATDESC: z-component of the velocity vector of the ena in the spacecraft frame.
-  FIELDNAM: vz_sc
-  LABLAXIS: vz sc
-  UNITS: " "
-
-vx_dps_sc:
+azimuth:
   <<: *default_float32
-  CATDESC: x-component of the velocity vector of the ena in the DPS frame at rest WRT spacecraft.
-  FIELDNAM: vx_dps_sc
-  LABLAXIS: vx dps sc
-  UNITS: " "
+  CATDESC: Azimuth.
+  FIELDNAM: azimuth
+  LABLAXIS: azimuth
+  UNITS: radians
 
-vy_dps_sc:
+elevation:
   <<: *default_float32
-  CATDESC: y-component of the velocity vector of the ena in the DPS frame at rest WRT spacecraft.
-  FIELDNAM: vy_dps_sc
-  LABLAXIS: vy dps sc
-  UNITS: " "
+  CATDESC: Elevation.
+  FIELDNAM: elevation
+  LABLAXIS: elevation
+  UNITS: radians
 
-vz_dps_sc:
+event_efficiency:
   <<: *default_float32
-  CATDESC: z-component of the velocity vector of the ena in the DPS frame at rest WRT spacecraft.
-  FIELDNAM: vz_dps_sc
-  LABLAXIS: vz dps sc
+  CATDESC: Estimated event efficiency for this path through the instrument.
+  FIELDNAM: event_efficiency
+  LABLAXIS: event efficiency
   UNITS: " "
 
-vx_dps_helio:
+velocity_sc:
   <<: *default_float32
-  CATDESC: x-component of the velocity vector of the ena in the DPS frame at rest WRT heliosphere.
-  FIELDNAM: vx_dps_helio
-  LABLAXIS: vx dps helio
+  CATDESC: x,y,z-components of the velocity vector of the ena in the spacecraft frame.
+  DEPEND_1: component
+  FIELDNAM: v_sc
+  LABLAXIS: v sc
   UNITS: " "
 
-vy_dps_helio:
+velocity_dps_sc:
   <<: *default_float32
-  CATDESC: y-component of the velocity vector of the ena in the DPS frame at rest WRT heliosphere.
-  FIELDNAM: vy_dps_helio
-  LABLAXIS: vy dps helio
+  CATDESC: x,y,z-components of the velocity vector of the ena in the DPS frame at rest WRT spacecraft.
+  DEPEND_1: component
+  FIELDNAM: v_dps_sc
+  LABLAXIS: v dps sc
   UNITS: " "
 
-vz_dps_helio:
+velocity_dps_helio:
   <<: *default_float32
-  CATDESC: z-component of the velocity vector of the ena in the DPS frame at rest WRT heliosphere.
-  FIELDNAM: vz_dps_helio
-  LABLAXIS: vz dps helio
+  CATDESC: x,y,z-components of the velocity vector of the ena in the DPS frame at rest WRT heliosphere.
+  DEPEND_1: component
+  FIELDNAM: v_dps_helio
+  LABLAXIS: v dps helio
   UNITS: " "
 
 de_event_met: