2350 - BUG - ena_maps pixel masking broken for push projection (#2352)

* Add debug statements to help find pixel mask binning issue
Fix pixel mask bug
Add test that catches bug

* Scale back overly verbose logging messages

* Fix log messages

Author: subagonsouth

imap_processing/ena_maps/ena_maps.py

@@ -845,6 +845,7 @@ def project_pset_values_to_map(  # noqa: PLR0912
             raise KeyError(f"Value keys not found in pointing set: {missing_keys}")
 
         if pset_valid_mask is None:
+            logger.debug("No pset_valid_mask provided, using all pixels as valid.")
             pset_valid_mask = np.ones(pointing_set.num_points, dtype=bool)
 
         if index_match_method is IndexMatchMethod.PUSH:
@@ -906,7 +907,7 @@ def project_pset_values_to_map(  # noqa: PLR0912
                     stacked_valid_mask = pset_valid_mask.stack(
                         {CoordNames.GENERIC_PIXEL.value: pointing_set.spatial_coords}
                     )
-                    pset_valid_mask_bc, _ = xr.broadcast(data_bc, stacked_valid_mask)
+                    _, pset_valid_mask_bc = xr.broadcast(data_bc, stacked_valid_mask)
                     pset_valid_mask_values = pset_valid_mask_bc.values
                 else:
                     pset_valid_mask_values = pset_valid_mask

imap_processing/hi/hi_l2.py

@@ -156,8 +156,18 @@ def generate_hi_map(
         pset_valid_mask = None  # Default to no mask (full spin)
         if descriptor.spin_phase == "ram":
             pset_valid_mask = pset.data["ram_mask"]
+            logger.debug(
+                f"Using ram mask with shape: {pset_valid_mask.shape} "
+                f"containing {np.prod(pset_valid_mask.shape)} pixels,"
+                f"{np.sum(pset_valid_mask.values)} of which are True."
+            )
         elif descriptor.spin_phase == "anti":
             pset_valid_mask = ~pset.data["ram_mask"]
+            logger.debug(
+                f"Using anti-ram mask with shape: {pset_valid_mask.shape} "
+                f"containing {np.prod(pset_valid_mask.shape)} pixels,"
+                f"{np.sum(pset_valid_mask.values)} of which are True."
+            )
 
         # Project (bin) the PSET variables into the map pixels
         output_map.project_pset_values_to_map(

imap_processing/tests/ena_maps/test_ena_maps.py

@@ -704,6 +704,11 @@ def test_project_pset_with_dataarray_mask_push(self, mock_frame_transform_az_el)
 
         rect_pset = self.rectangular_psets[0]
 
+        # Set all counts to a uniform non-zero value
+        rect_pset.data["counts"] = xr.full_like(
+            rect_pset.data["counts"], fill_value=10.0
+        )
+
         # Create a DataArray mask matching the pset spatial dimensions
         valid_mask = xr.DataArray(
             np.ones(rect_pset.data["counts"].shape[2:], dtype=bool),
@@ -713,7 +718,8 @@ def test_project_pset_with_dataarray_mask_push(self, mock_frame_transform_az_el)
             },
         )
         # Mask out one quadrant
-        valid_mask[:90, :90] = False
+        valid_mask_shape = valid_mask.shape
+        valid_mask[: valid_mask_shape[0] // 2, : valid_mask_shape[1] // 2] = False
 
         # Project with DataArray mask
         rectangular_map.project_pset_values_to_map(
@@ -727,6 +733,17 @@ def test_project_pset_with_dataarray_mask_push(self, mock_frame_transform_az_el)
         assert "counts" in rectangular_map.data_1d
         assert rectangular_map.data_1d["counts"].sum() > 0
 
+        # Check that pixel mask reduces total map counts to ~3/4 of pset counts
+        total_pset_counts = rect_pset.data["counts"].sum()
+        expected_map_counts = total_pset_counts * 3 / 4  # Only half should be included
+        actual_map_counts = rectangular_map.data_1d["counts"].sum()
+        np.testing.assert_allclose(
+            actual_map_counts,
+            expected_map_counts,
+            rtol=0.1,
+            err_msg=("Mask filtering failed"),
+        )
+
     @pytest.mark.usefixtures("_setup_rectangular_l1c_pset_products")
     @mock.patch("imap_processing.spice.geometry.frame_transform_az_el")
     def test_project_pset_with_valid_mask_pull(self, mock_frame_transform_az_el):