Remove need for unique map global attributes based on reference frame (IMAP-Science-Operations-Center#2238)

* Remove need for unique map global attributes based on reference frame

* Fix test with expected change

Author: tmplummer

imap_processing/cdf/config/imap_hi_global_cdf_attrs.yaml

@@ -54,8 +54,7 @@ imap_hi_l1c_pset_attrs:
     Logical_source: imap_hi_l1c_{sensor}-pset
     Logical_source_description: IMAP-Hi Instrument Level-1C Pointing Set Data.
 
-# TODO: Finalize these global attributes
-imap_hi_l2_enamap-sf:
+imap_hi_l2_enamap:
     Data_type: L2_{descriptor}>Level-2 ENA Intensity Map for Hi{sensor}
     Logical_source: imap_hi_l2_{descriptor}
     Logical_source_description: IMAP-Hi Instrument Level-2 ENA Intensity Map Data for Hi{sensor} on rectangular tiling.

imap_processing/ena_maps/ena_maps.py

@@ -1222,7 +1222,6 @@ def build_cdf_dataset(
         self,
         instrument: str,
         level: str,
-        frame: str,
         descriptor: str,
         sensor: str | None = None,
     ) -> xr.Dataset:
@@ -1235,8 +1234,6 @@ def build_cdf_dataset(
             Instrument name. "hi", "lo", "ultra".
         level : str
             Product level. "l2" or "l3".
-        frame : str
-            Map frame. "sf", "hf" or "hk".
         descriptor : str
             Descriptor for filename.
         sensor : str, optional
@@ -1318,16 +1315,14 @@ def build_cdf_dataset(
         )
 
         # Now set global attributes
-        map_attrs = cdf_attrs.get_global_attributes(
-            f"imap_{instrument}_{level}_enamap-{frame}"
-        )
+        map_attrs = cdf_attrs.get_global_attributes(f"imap_{instrument}_{level}_enamap")
         map_attrs["Spacing_degrees"] = str(self.spacing_deg)
         for key in ["Data_type", "Logical_source", "Logical_source_description"]:
             map_attrs[key] = map_attrs[key].format(
                 descriptor=descriptor,
                 sensor=sensor,
             )
-            # Always add the following attributes to the map
+        # Always add the following attributes to the map
         map_attrs.update(
             {
                 "Sky_tiling_type": self.tiling_type.value,

imap_processing/hi/hi_l2.py

@@ -66,7 +66,6 @@ def hi_l2(
     l2_ds = sky_map.build_cdf_dataset(
         "hi",
         "l2",
-        map_descriptor.frame_descriptor,
         descriptor,
         sensor=map_descriptor.sensor,
     )

imap_processing/tests/ena_maps/test_ena_maps.py

@@ -642,7 +642,7 @@ def test_build_cdf_dataset(self, mock_to_dataset, mock_data_for_build_cdf_datase
         skymap.min_epoch = 10
         skymap.max_epoch = 15
         cdf_dataset = skymap.build_cdf_dataset(
-            "hi", "l2", "sf", "foo_descriptor", sensor="45"
+            "hi", "l2", "foo_descriptor", sensor="45"
         )
 
         # Check that expected var gets removed
@@ -694,9 +694,7 @@ def test_build_cdf_dataset_key_error(
         with pytest.raises(
             KeyError, match="Attributes for variable no_attrs_var not found"
         ):
-            _ = skymap.build_cdf_dataset(
-                "hi", "l2", "sf", "foo_descriptor", sensor="45"
-            )
+            _ = skymap.build_cdf_dataset("hi", "l2", "foo_descriptor", sensor="45")
 
         # Test that missing energy delta variable raise KeyError
         # Test for missing energy_delta_plus
@@ -706,19 +704,15 @@ def test_build_cdf_dataset_key_error(
             KeyError,
             match="Required variable 'energy_delta_plus' not found in cdf Dataset.",
         ):
-            _ = skymap.build_cdf_dataset(
-                "hi", "l2", "sf", "foo_descriptor", sensor="45"
-            )
+            _ = skymap.build_cdf_dataset("hi", "l2", "foo_descriptor", sensor="45")
         # Test for missing energy_delta_minus
         mock_dataset = mock_dataset.drop(["energy_delta_minus"])
         mock_to_dataset.return_value = mock_dataset
         with pytest.raises(
             KeyError,
             match="Required variable 'energy_delta_minus' not found in cdf Dataset.",
         ):
-            _ = skymap.build_cdf_dataset(
-                "hi", "l2", "sf", "foo_descriptor", sensor="45"
-            )
+            _ = skymap.build_cdf_dataset("hi", "l2", "foo_descriptor", sensor="45")
 
 
 class TestHealpixSkyMap:

imap_processing/tests/hi/test_hi_l2.py

@@ -152,13 +152,20 @@ def test_hi_l2(
 ):
     """Integration type test for hi_l2()"""
     pset_path = hi_l1_test_data_path / "imap_hi_l1c_45sensor-pset_20250415_v999.cdf"
+    descriptor = "h90-ena-h-sf-nsp-full-hae-4deg-3mo"
 
     l2_dataset = hi_l2(
         [pset_path],
         anc_path_dict,
         "h90-ena-h-sf-nsp-full-hae-4deg-3mo",
     )[0]
     assert isinstance(l2_dataset, xr.Dataset)
+
+    # Check some global attributes
+    assert l2_dataset.attrs["Data_type"].startswith(f"L2_{descriptor}")
+    assert l2_dataset.attrs["Logical_source"] == f"imap_hi_l2_{descriptor}"
+    assert "Hi90" in l2_dataset.attrs["Logical_source_description"]
+
     assert len(l2_dataset.data_vars) == 15
     np.testing.assert_array_equal(
         l2_dataset["ena_intensity"].dims, ["epoch", "energy", "longitude", "latitude"]
@@ -190,7 +197,7 @@ def test_hi_l2_uses_descriptor_to_setup_map(
     assert rect_map.spacing_deg == 2.0
 
     mock_map_build_cdf_dataset.assert_called_with(
-        rect_map, "hi", "l2", "sf", descriptor_str, sensor="90"
+        rect_map, "hi", "l2", descriptor_str, sensor="90"
     )