fix(make_cat): read the HSM g-type PSF columns the producers write

_save_psf_data still read HSM_E1_PSF/HSM_E2_PSF from the multi-epoch
PSF sqlite, but every producer (psfex_interp._interpolate_me, mccd)
writes HSM_G1_PSF/HSM_G2_PSF since the return to g-type ellipticities
(#761) — a guaranteed KeyError on the first unflagged PSF epoch
whenever SAVE_PSF is enabled. Rename the consumer (and its output
columns) to the g-type grammar.

The frozen-grammar property test encoded the same stale E-type
convention for HSM, rubber-stamping the mismatch: fix the regex and
examples (HSM_E1_PSF is now an explicit invalid example), and align
the stale e-type docstrings in test_psfex_interp with the g-type
behavior the assertions actually pin.

Found by the final integrated review of #741.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01TVYoKzcNwYjuGiFi9CxsYP

Author: cailmdaley

src/shapepipe/modules/make_cat_package/make_cat.py

@@ -692,13 +692,13 @@ def _save_psf_data(self, galaxy_psf_path):
         max_epoch = np.max(self._final_cat_file.get_data()["N_EPOCH"]) + 1
 
         self._output_dict = {
-            f"HSM_E1_PSF_{idx + 1}": np.ones(len(self._obj_id)) * -10.0
+            f"HSM_G1_PSF_{idx + 1}": np.ones(len(self._obj_id)) * -10.0
             for idx in range(max_epoch)
         }
         self._output_dict = {
             **self._output_dict,
             **{
-                f"HSM_E2_PSF_{idx + 1}": np.ones(len(self._obj_id)) * -10.0
+                f"HSM_G2_PSF_{idx + 1}": np.ones(len(self._obj_id)) * -10.0
                 for idx in range(max_epoch)
             },
         }
@@ -732,12 +732,12 @@ def _save_psf_data(self, galaxy_psf_path):
                     continue
 
                 self._add2dict(
-                    f"HSM_E1_PSF_{epoch + 1}",
-                    gpc_data["SHAPES"]["HSM_E1_PSF"], idx
+                    f"HSM_G1_PSF_{epoch + 1}",
+                    gpc_data["SHAPES"]["HSM_G1_PSF"], idx
                 )
                 self._add2dict(
-                    f"HSM_E2_PSF_{epoch + 1}",
-                    gpc_data["SHAPES"]["HSM_E2_PSF"], idx
+                    f"HSM_G2_PSF_{epoch + 1}",
+                    gpc_data["SHAPES"]["HSM_G2_PSF"], idx
                 )
 
                 # HSM_T_PSF already holds T (sigma_to_T applied at the

tests/module/test_psf_grammar_properties.py

@@ -21,9 +21,9 @@
     (``example/cfis/final_cat.param``) names is a column the writer can
     produce — writer/param-file consistency;
 (d) the FULL frozen grammar (shapepipe#761) — ``ESTIMATOR_COMPONENT[_ERR]_
-    OBJECT[_metacaltype]`` — holds across all three estimator families: ngmix
-    and galsim split ellipticity into ``G1``/``G2`` (g-type), HSM into
-    ``E1``/``E2`` (e-type); every family stores exactly one size, ``T``; HSM
+    OBJECT[_metacaltype]`` — holds across all three estimator families: all three
+    families split ellipticity into ``G1``/``G2`` (g-type, HSM included since
+    the return to reduced shear); every family stores exactly one size, ``T``; HSM
     keeps the singular ``FLAG`` token, ngmix/galsim keep plural ``FLAGS``.
     This part is a static example-based check (not writer-driven), so it
     covers galsim/HSM without depending on those producer modules — see
@@ -418,9 +418,9 @@ def test_param_file_ngmix_tokens_are_producible(param_path, obj_ids):
     # data-driven FITS extension name, so left as a generic uppercase token.
     r"|GALSIM_(?:G1|G2|T)(?:_ERR|_UNCORR)?(?:_PSF)?_[A-Z0-9_]+"
     r"|GALSIM_(?:FLUX|FLUX_ERR|MAG|MAG_ERR|FLAGS|RES)_[A-Z0-9_]+"
-    # HSM: e-type, explicit PSF/STAR object, singular FLAG; the multi-epoch
+    # HSM: g-type, explicit PSF/STAR object, singular FLAG; the multi-epoch
     # sink in make_cat._save_psf_data appends a bare epoch index.
-    r"|HSM_(?:E1|E2|T)_(?:PSF|STAR)(?:_\d+)?"
+    r"|HSM_(?:G1|G2|T)_(?:PSF|STAR)(?:_\d+)?"
     r"|HSM_FLAG_(?:PSF|STAR)(?:_\d+)?"
     r")$"
 )
@@ -438,10 +438,10 @@ def test_param_file_ngmix_tokens_are_producible(param_path, obj_ids):
     "GALSIM_G2_UNCORR_NOSHEAR",
     "GALSIM_T_PSF_ORIGINAL_PSF",
     "GALSIM_FLAGS_NOSHEAR",
-    "HSM_E1_PSF",
+    "HSM_G1_PSF",
     "HSM_T_STAR",
     "HSM_FLAG_PSF",
-    "HSM_E1_PSF_3",  # make_cat multi-epoch sink
+    "HSM_G1_PSF_3",  # make_cat multi-epoch sink
     "HSM_T_PSF_2",
     "HSM_FLAG_STAR_1",
 ]
@@ -452,6 +452,7 @@ def test_param_file_ngmix_tokens_are_producible(param_path, obj_ids):
     "NGMIX_G1_GAL_NOSHEAR",  # GAL token regression
     "NGMIX_ELL_NOSHEAR",  # packed ellipticity
     "E1_PSF_HSM",  # pre-rename HSM naming (not HSM_-prefixed)
+    "HSM_E1_PSF",  # e-type leftover: HSM stores g-type G1/G2 since #761
     "SIGMA_PSF_HSM",  # raw sigma, not T
     "HSM_SIGMA_PSF",  # stored sigma instead of T
     "HSM_FLAGS_PSF",  # plural — HSM is singular FLAG

tests/module/test_psfex_interp.py

@@ -121,15 +121,15 @@ def test_get_galaxy_positions_raises_for_missing_column(tmp_path):
 
 @settings(deadline=None, max_examples=25)
 @given(e=_e_complex)
-def test_get_psfshapes_stores_e_type_distortion(psfex_interpolator, e):
-    """The stored HSM PSF shapes are e-type distortion, not g-type shear.
+def test_get_psfshapes_stores_g_type_shear(psfex_interpolator, e):
+    """The stored HSM PSF shapes are g-type reduced shear, not e-type distortion.
 
-    ``_get_psfshapes`` reads ``moms.observed_shape.e1/.e2``; this pins it to the
-    galsim *distortion* accessor and away from the reduced-shear ``.g1/.g2``.
+    ``_get_psfshapes`` reads ``moms.observed_shape.g1/.g2``; this pins it to the
+    galsim *reduced-shear* accessor and away from the distortion ``.e1/.e2``.
     The check is exact against the same image's ``observed_shape`` (independent
     of how well HSM recovers the input), and the magnitude inequality is the
-    tooth: for any non-round shape ``|e| > |g|`` strictly, so storing ``.g``
-    instead (the pre-fix bug) would fail it.
+    tooth: for any non-round shape ``|e| > |g|`` strictly, so storing ``.e``
+    instead would fail it.
     """
     psfex_interpolator.interp_PSFs = _elliptical_psf_stamps([(e.real, e.imag)])
     psfex_interpolator._get_psfshapes()
@@ -144,11 +144,11 @@ def test_get_psfshapes_stores_e_type_distortion(psfex_interpolator, e):
     mag_g = np.hypot(g1, g2)
     assume(mag_e - mag_g > 1e-3)  # ensure a non-degenerate e-vs-g distinction
 
-    # Stored values are exactly the g-type distortion components ...
+    # Stored values are exactly the g-type reduced-shear components ...
     npt.assert_array_equal(psfex_interpolator.psf_shapes[0, 0], g1)
     npt.assert_array_equal(psfex_interpolator.psf_shapes[0, 1], g2)
 
-    # ... whose magnitude strictly subceeds the e-type shear.
+    # ... whose magnitude strictly subceeds the e-type distortion.
     mag_stored = np.hypot(
         psfex_interpolator.psf_shapes[0, 0], psfex_interpolator.psf_shapes[0, 1]
     )