rename moments_fail column to mcal_types_fail

The v1 `moments_fail` column counted moments-initial-guess (get_guess)
failures. get_guess no longer exists in the v2.0 fitter; the column now
holds the count (0-5) of metacal fit types with nonzero fit flags, and it
reaches the catalogue (NGMIX_MOM_FAIL). The old name no longer matches the
meaning, so rename through ngmix + make_cat to mcal_types_fail /
NGMIX_MCAL_TYPES_FAIL. Tests updated in lockstep.

Author: claude

src/shapepipe/modules/make_cat_package/make_cat.py

@@ -355,7 +355,7 @@ def _save_ngmix_data(self, ngmix_cat_path, moments=False):
             #ngmix_cat_file.close()
             #return err_msg
 
-        ngmix_mom_fail = ngmix_cat_file.get_data()["moments_fail"]
+        ngmix_mcal_types_fail = ngmix_cat_file.get_data()["mcal_types_fail"]
 
         n_obj = len(self._obj_id)
         self._w_log.info(f"writing ngmix info for {n_obj} objects")
@@ -369,7 +369,7 @@ def _save_ngmix_data(self, ngmix_cat_path, moments=False):
             ngmix_id = ngmix_cat_file.get_data()["id"]
 
             self._add2dict("NGMIX_N_EPOCH", np.zeros(n_obj))
-            self._add2dict("NGMIX_MOM_FAIL", np.zeros(n_obj))
+            self._add2dict("NGMIX_MCAL_TYPES_FAIL", np.zeros(n_obj))
 
         prefix = f"NGMIX{m}"
 
@@ -465,8 +465,8 @@ def _save_ngmix_data(self, ngmix_cat_path, moments=False):
                         idx,
                     )
                     self._add2dict(
-                        f"NGMIX{m}_MOM_FAIL",
-                        ngmix_mom_fail[ind[0]],
+                        f"NGMIX{m}_MCAL_TYPES_FAIL",
+                        ngmix_mcal_types_fail[ind[0]],
                         idx,
                     )
 

src/shapepipe/modules/ngmix_package/ngmix.py

@@ -376,7 +376,7 @@ def compile_results(self, results):
         names2 = [
             'id',
             'n_epoch_model',
-            'moments_fail',
+            'mcal_types_fail',
             'nfev_fit',
             'g1_psfo_ngmix',
             'g2_psfo_ngmix',
@@ -430,8 +430,8 @@ def compile_results(self, results):
                 output_dict[name]["n_epoch_model"].append(
                     results[idx]["n_epoch_model"]
                 )
-                output_dict[name]["moments_fail"].append(
-                    results[idx]["moments_fail"]
+                output_dict[name]["mcal_types_fail"].append(
+                    results[idx]["mcal_types_fail"]
                 )
                 # ngmix 2.x reports the solver's function-evaluation count
                 # (nfev, ~tens-hundreds; -1 on some failures), not the v1
@@ -680,7 +680,11 @@ def process(self):
             # epochs that survived the PSF fit and entered the model,
             # not the number of epochs submitted (v1 contract)
             res['n_epoch_model'] = psf_res['n_epoch']
-            res['moments_fail'] = sum(
+            # Count of metacal fit types (0-5) with nonzero fit flags.
+            # (In ngmix v1 the same-named column counted moments-initial-guess
+            # failures from get_guess, which no longer exists — hence the
+            # rename to mcal_types_fail / NGMIX_MCAL_TYPES_FAIL.)
+            res['mcal_types_fail'] = sum(
                 1 for k in METACAL_TYPES
                 if res.get(k, {}).get('flags', 0) != 0
             )

tests/module/test_ngmix.py

@@ -158,7 +158,7 @@ def _fake_metacal_result(T, T_err, T_psf, T_psf_err):
     res = {
         "obj_id": 1,
         "n_epoch_model": 1,
-        "moments_fail": 0,
+        "mcal_types_fail": 0,
         "g_PSFo": [0.001, 0.002],
         "g_err_PSFo": [1e-5, 1e-5],
         "T_PSFo": T_psf,
@@ -244,7 +244,7 @@ def test_compile_results_nan_fills_failed_fit_types():
 
     res = _fake_metacal_result(0.18, 0.02, 0.09, 0.001)
     res["1p"] = {"flags": 0x8, "nfev": 5}  # failed fit: only flags/nfev
-    res["moments_fail"] = 1
+    res["mcal_types_fail"] = 1
     res["mcal_flags"] = get_mcal_flags(res)
 
     inst = object.__new__(Ngmix)