Harrison L3 2748 - GSTU/EYEA - Lo: Add latitude_delta and longitude_delta to ISN product

Author: Menlo Innovations - CAVA Project

imap_l3_processing/cdf/config/imap_lo_l3_variable_attrs.yaml

@@ -317,6 +317,7 @@ solid_angle:
   NAME: solid_angle
   DATA_TYPE: CDF_REAL4
   CATDESC: Solid angle of subtended by each pixel
+  DEPEND_0: epoch
   DEPEND_1: longitude
   DEPEND_2: latitude
   VAR_TYPE: support_data

imap_l3_processing/lo/lo_processor.py

@@ -94,8 +94,10 @@ def isn_background_subtraction(isn_rate_data: ISNRateData) -> ISNBackgroundSubtr
         bg_rate_stat_uncert=isn_rate_data.bg_rate_stat_uncert,
         bg_rate_sys_err=isn_rate_data.bg_rate_sys_err,
         latitude=isn_rate_data.latitude,
+        latitude_delta=isn_rate_data.latitude_delta,
         latitude_label=isn_rate_data.latitude_label,
         longitude=isn_rate_data.longitude,
+        longitude_delta=isn_rate_data.longitude_delta,
         longitude_label=isn_rate_data.longitude_label,
         isn_bg_rate_subtracted=isn_rate_background_subtracted,
         isn_bg_rate_subtracted_stat_uncert=isn_bg_subtracted_stat_err,

imap_l3_processing/maps/map_models.py

@@ -113,7 +113,9 @@ class ISNBackgroundSubtractedData(MapData):
     isn_bg_rate_subtracted_sys_err: np.ndarray
     isn_bg_rate_subtracted: np.ndarray
     latitude_label: np.ndarray
+    latitude_delta: np.ndarray
     longitude_label: np.ndarray
+    longitude_delta: np.ndarray
 
 
 @dataclass
@@ -161,8 +163,10 @@ class ISNRateData:
     ena_count_rate: np.ndarray
     ena_count_rate_stat_uncert: np.ndarray
     latitude: np.ndarray
+    latitude_delta: np.ndarray
     latitude_label: np.ndarray
     longitude: np.ndarray
+    longitude_delta: np.ndarray
     longitude_label: np.ndarray
     obs_date: np.ndarray
     obs_date_range: np.ndarray
@@ -196,8 +200,10 @@ def read_from_path(cls, cdf_path: Path | str) -> ISNRateData:
                 ena_count_rate=read_numeric_variable(cdf['ena_count_rate']),
                 ena_count_rate_stat_uncert=read_numeric_variable(cdf['ena_count_rate_stat_uncert']),
                 latitude=(cdf['latitude'][...]),
+                latitude_delta=(cdf['latitude_delta'][...]),
                 latitude_label=(cdf['latitude_label'][...]),
                 longitude=(cdf['longitude'][...]),
+                longitude_delta=(cdf['longitude_delta'][...]),
                 longitude_label=(cdf['longitude_label'][...]),
                 ena_intensity=read_numeric_variable(cdf['ena_intensity']),
                 ena_intensity_stat_uncert=read_numeric_variable(cdf['ena_intensity_stat_uncert']),
@@ -463,8 +469,10 @@ def to_data_product_variables(self) -> list[DataProductVariable]:
             DataProductVariable(BG_RATE_STAT_UNCERT_VAR_NAME, self.data.isn_rate_map_data.bg_rate_stat_uncert),
             DataProductVariable(BG_RATE_SYS_ERR_VAR_NAME, self.data.isn_rate_map_data.bg_rate_sys_err),
             DataProductVariable(LATITUDE_VAR_NAME, self.data.isn_rate_map_data.latitude),
+            DataProductVariable(LATITUDE_DELTA_VAR_NAME, self.data.isn_rate_map_data.latitude_delta),
             DataProductVariable(LATITUDE_LABEL_VAR_NAME, self.data.isn_rate_map_data.latitude_label),
             DataProductVariable(LONGITUDE_VAR_NAME, self.data.isn_rate_map_data.longitude),
+            DataProductVariable(LONGITUDE_DELTA_VAR_NAME, self.data.isn_rate_map_data.longitude_delta),
             DataProductVariable(LONGITUDE_LABEL_VAR_NAME, self.data.isn_rate_map_data.longitude_label),
             DataProductVariable(ISN_BG_RATE_SUBTRACTED_VAR_NAME,
                                 self.data.isn_rate_map_data.isn_bg_rate_subtracted),

tests/lo/test_lo_processor.py

@@ -203,8 +203,10 @@ def test_isn_background_subtraction(self):
             epoch=sentinel.epoch,
             solid_angle=sentinel.solid_angle,
             latitude=sentinel.latitude,
+            latitude_delta=sentinel.latitude_delta,
             latitude_label=sentinel.latitude_label,
             longitude=sentinel.longitude,
+            longitude_delta=sentinel.longitude_delta,
             longitude_label=sentinel.longitude_label,
             epoch_delta=sentinel.epoch_delta,
             energy=np.array([1, 2, 3, 4, 5, 6, 7]),
@@ -248,7 +250,9 @@ def test_isn_background_subtraction(self):
         self.assertEqual(actual_isn_rate_map_data.epoch, sentinel.epoch)
         self.assertEqual(actual_isn_rate_map_data.solid_angle, sentinel.solid_angle)
         self.assertEqual(actual_isn_rate_map_data.latitude, sentinel.latitude)
+        self.assertEqual(actual_isn_rate_map_data.latitude_delta, sentinel.latitude_delta)
         self.assertEqual(actual_isn_rate_map_data.latitude_label, sentinel.latitude_label)
         self.assertEqual(actual_isn_rate_map_data.longitude, sentinel.longitude)
+        self.assertEqual(actual_isn_rate_map_data.longitude_delta, sentinel.longitude_delta)
         self.assertEqual(actual_isn_rate_map_data.longitude_label, sentinel.longitude_label)
         self.assertEqual(actual_isn_rate_map_data.epoch_delta, sentinel.epoch_delta)

tests/maps/test_map_models.py

@@ -281,8 +281,10 @@ def test_isn_background_subtracted_to_data_product_variables(self):
                     bg_rate_stat_uncert=sentinel.bg_rate_stat_uncert,
                     bg_rate_sys_err=sentinel.bg_rate_sys_err,
                     latitude=sentinel.latitude,
+                    latitude_delta=sentinel.latitude_delta,
                     latitude_label=sentinel.latitude_label,
                     longitude=sentinel.longitude,
+                    longitude_delta=sentinel.longitude_delta,
                     longitude_label=sentinel.longitude_label,
                     isn_bg_rate_subtracted=sentinel.isn_bg_rate_subtracted,
                     isn_bg_rate_subtracted_sys_err=sentinel.isn_bg_rate_subtracted_sys_err,
@@ -311,8 +313,10 @@ def test_isn_background_subtracted_to_data_product_variables(self):
             DataProductVariable(map_models.BG_RATE_STAT_UNCERT_VAR_NAME, sentinel.bg_rate_stat_uncert),
             DataProductVariable(map_models.BG_RATE_SYS_ERR_VAR_NAME, sentinel.bg_rate_sys_err),
             DataProductVariable(map_models.LATITUDE_VAR_NAME, sentinel.latitude),
+            DataProductVariable(map_models.LATITUDE_DELTA_VAR_NAME, sentinel.latitude_delta),
             DataProductVariable(map_models.LATITUDE_LABEL_VAR_NAME, sentinel.latitude_label),
             DataProductVariable(map_models.LONGITUDE_VAR_NAME, sentinel.longitude),
+            DataProductVariable(map_models.LONGITUDE_DELTA_VAR_NAME, sentinel.longitude_delta),
             DataProductVariable(map_models.LONGITUDE_LABEL_VAR_NAME, sentinel.longitude_label),
             DataProductVariable(map_models.ISN_BG_RATE_SUBTRACTED_VAR_NAME,
                                 sentinel.isn_bg_rate_subtracted),
@@ -815,7 +819,9 @@ def test_lo_isn_data_read_from_path(self):
             np.testing.assert_array_equal(actual.energy, expected['energy'][...])
             np.testing.assert_array_equal(actual.exposure_factor,
                                           read_numeric_variable(expected['exposure_factor']))
+            np.testing.assert_array_equal(actual.latitude_delta, expected['latitude_delta'][...])
             np.testing.assert_array_equal(actual.latitude, expected['latitude'][...])
+            np.testing.assert_array_equal(actual.longitude_delta, expected['longitude_delta'][...])
             np.testing.assert_array_equal(actual.longitude, expected['longitude'][...])
             np.testing.assert_array_equal(actual.solid_angle, read_numeric_variable(expected['solid_angle']))