address code-review findings on ngmix v2.0

- make_cat: read ngmix_mcal_flags/ngmix_id outside the moments branch;
  they were assigned only in the non-moments (else) branch but used
  unconditionally, so _save_ngmix_data(moments=True) raised NameError.
- make_cat: remove a leftover debug print loop over the ELL columns.
- runners (mccd_interp, read_ext_sexcat, psfex_interp, vignetmaker):
  the WCS log / exp-numbers files are positional inputs supplied via the
  config FILE_PATTERN in MULTI-EPOCH / post-process modes, but the
  @module_runner decorators only declare the base inputs (the optional
  ones cannot be encoded statically without breaking CLASSIC/base mode).
  Replace the bare input_file_list[1]/[2] reads with a clear ValueError
  naming the missing FILE_PATTERN entry instead of a cryptic IndexError.
- ngmix compile_results: tie the hardcoded metacal-type list to
  METACAL_TYPES via a divergence check (order kept stable for
  byte-reproducible output).
- ngmix: drop a stray marker comment and a dead commented-out vignet-path
  block; fold two debug prints into the ValueError message and fix a
  missing f-string prefix in an adjacent error message.

Author: claude

src/shapepipe/modules/make_cat_package/make_cat.py

@@ -356,6 +356,10 @@ def _save_ngmix_data(self, ngmix_cat_path, moments=False):
             #return err_msg
 
         ngmix_mcal_types_fail = ngmix_cat_file.get_data()["mcal_types_fail"]
+        # Needed in both moments and non-moments modes (used unconditionally
+        # below), so read them outside the branch.
+        ngmix_mcal_flags = ngmix_cat_file.get_data()["mcal_flags"]
+        ngmix_id = ngmix_cat_file.get_data()["id"]
 
         n_obj = len(self._obj_id)
         self._w_log.info(f"writing ngmix info for {n_obj} objects")
@@ -365,9 +369,6 @@ def _save_ngmix_data(self, ngmix_cat_path, moments=False):
         else:
             m = ""
 
-            ngmix_mcal_flags = ngmix_cat_file.get_data()["mcal_flags"]
-            ngmix_id = ngmix_cat_file.get_data()["id"]
-
             self._add2dict("NGMIX_N_EPOCH", np.zeros(n_obj))
             self._add2dict("NGMIX_MCAL_TYPES_FAIL", np.zeros(n_obj))
 
@@ -397,12 +398,6 @@ def _save_ngmix_data(self, ngmix_cat_path, moments=False):
         )
         self._add2dict(f"NGMIX{m}_MCAL_FLAGS", np.zeros(len(self._obj_id)))
 
-        for idx, _ in enumerate(self._obj_id):
-            for key in self._key_ends:
-                x = self._output_dict[f"NGMIX{m}_ELL_{key}"][idx]
-                if np.all(x != np.array([-10.0, -10.0])):
-                    print(x)
-
         for idx, id_tmp in enumerate(self._obj_id):
             ind = np.where(id_tmp == ngmix_id)[0]
             if len(ind) > 0:

src/shapepipe/modules/mccd_interp_runner.py

@@ -91,6 +91,14 @@ def mccd_interp_runner(
         psf_model_dir = get_last_dir(run_dirs["run_log"], module)
         psf_model_pattern = config.get(module_config_sec, "PSF_MODEL_PATTERN")
         galcat_path = input_file_list[0]
+        # The WCS log is supplied as a positional input (via FILE_PATTERN)
+        # in MULTI-EPOCH mode, not by the decorator default.
+        if len(input_file_list) < 2:
+            raise ValueError(
+                "MULTI-EPOCH mode requires the WCS log file as a second"
+                + " input; add 'log_exp_headers' to FILE_PATTERN and"
+                + f" FILE_EXT in the [{module_config_sec}] config section."
+            )
         f_wcs_path = input_file_list[1]
 
         inst = mccd_interp.MCCDinterpolator(

src/shapepipe/modules/ngmix_package/ngmix.py

@@ -88,7 +88,6 @@ def get_prior(pixel_scale, rng, T_range=None, F_range=None):
     )
 
 
-# I still don't know how to handle this
 class Tile_cat():
     """Tile_cat.
 
@@ -282,13 +281,6 @@ def __init__(
             f_wcs_path,
             input_file_list[6] if len(input_file_list) == 7 else None,
         )
-        #self._gal_vignet_path = input_file_list[1]
-        #self._bkg_vignet_path = input_file_list[2]
-        #self._psf_vignet_path = input_file_list[3]
-        #self._weight_vignet_path = input_file_list[4]
-        #self._flag_vignet_path = input_file_list[5]
-
-      
 
         self._output_dir = output_dir
         self._file_number_string = file_number_string
@@ -372,7 +364,15 @@ def compile_results(self, results):
             If SNR key not found
 
         """
+        # Output HDU order. Same set as METACAL_TYPES, but kept in this
+        # fixed order so output catalogues stay byte-reproducible; the check
+        # below guards against the two lists silently diverging.
         names = ["1m", "1p", "2m", "2p", "noshear"]
+        if set(names) != set(METACAL_TYPES):
+            raise ValueError(
+                "compile_results metacal type list is out of sync with"
+                + " METACAL_TYPES"
+            )
         names2 = [
             'id',
             'n_epoch_model',
@@ -552,8 +552,8 @@ def save_results(self, output_dict):
                     ext_name = hdu.name.lower()
                     if ext_name not in output_dict:
                         raise ValueError(
-                            "HDU extension {ext_name} from existing FITS file"
-                            + f" not found in data"
+                            f"HDU extension {ext_name} from existing FITS"
+                            + " file not found in data"
                         )
 
                     # Existing data
@@ -569,10 +569,10 @@ def save_results(self, output_dict):
                         colname in new_data
                         for colname in existing_dtype.names
                     ):
-                        print("output_dict", [col for col in new_data])
-                        print("existing_da", existing_data.dtype.names)
                         raise ValueError(
-                            "Mismatch between existing columns and new data columns."
+                            "Mismatch between existing columns"
+                            + f" ({existing_dtype.names}) and new data"
+                            + f" columns ({list(new_data)})."
                         )
 
                     # New data to be appended

src/shapepipe/modules/psfex_interp_runner.py

@@ -68,6 +68,13 @@ def psfex_interp_runner(
             exp_base_dir = config.getexpanded(
                 module_config_sec, "ME_DOT_PSF_EXP_DIR"
             )
+            if len(input_file_list) < 3:
+                raise ValueError(
+                    "ME_DOT_PSF_EXP_DIR requires the exposure-numbers file"
+                    + " as a third input; add 'exp_numbers' to FILE_PATTERN"
+                    + f" and FILE_EXT in the [{module_config_sec}] config"
+                    + " section."
+                )
             exp_numbers_file = input_file_list[2]
             dot_psf_dirs = get_exp_output_dirs(
                 exp_base_dir, exp_numbers_file, "psfex_runner", w_log
@@ -92,8 +99,15 @@ def psfex_interp_runner(
             module_config_sec,
             "ME_DOT_PSF_PATTERN",
         )
-        # Set input paths
+        # Set input paths. The WCS log is a positional input (via
+        # FILE_PATTERN) in MULTI-EPOCH mode, not a decorator default.
         galcat_path = input_file_list[0]
+        if len(input_file_list) < 2:
+            raise ValueError(
+                "MULTI-EPOCH mode requires the WCS log file as a second"
+                + " input; add 'log_exp_headers' to FILE_PATTERN and"
+                + f" FILE_EXT in the [{module_config_sec}] config section."
+            )
         f_wcs_path = input_file_list[1]
 
         # Create instance of PSFExInterpolator

src/shapepipe/modules/read_ext_sexcat_runner.py

@@ -61,6 +61,14 @@ def read_ext_sexcat_runner(
     )
 
     if config.getboolean(module_config_sec, "MAKE_POST_PROCESS"):
+        # The WCS log is supplied as a positional input (via FILE_PATTERN)
+        # when post-processing is enabled, not by the decorator default.
+        if len(input_file_list) < 3:
+            raise ValueError(
+                "MAKE_POST_PROCESS requires the WCS log file as a third"
+                + " input; add 'log_exp_headers' to FILE_PATTERN and"
+                + f" FILE_EXT in the [{module_config_sec}] config section."
+            )
         f_wcs_path = input_file_list[2]
         pos_params = config.getlist(module_config_sec, "WORLD_POSITION")
         ccd_size = config.getlist(module_config_sec, "CCD_SIZE")

src/shapepipe/modules/vignetmaker_runner.py

@@ -110,6 +110,13 @@ def vignetmaker_runner(
                 exp_base_dir = config.getexpanded(
                     module_config_sec, "ME_IMAGE_EXP_DIR"
                 )
+                if len(input_file_list) < 3:
+                    raise ValueError(
+                        "ME_IMAGE_EXP_DIR requires the exposure-numbers"
+                        + " file as a third input; add 'exp_numbers' to"
+                        + " FILE_PATTERN and FILE_EXT in the"
+                        + f" [{module_config_sec}] config section."
+                    )
                 exp_numbers_file = input_file_list[2]
                 exp_runner_names = config.getlist(
                     module_config_sec, "ME_IMAGE_EXP_RUNNERS"
@@ -142,7 +149,15 @@ def vignetmaker_runner(
                 "ME_IMAGE_PATTERN",
             )
 
-            # Get WCS log file path
+            # Get WCS log file path. The WCS log is a positional input (via
+            # FILE_PATTERN) in MULTI-EPOCH mode, not a decorator default.
+            if len(input_file_list) < 2:
+                raise ValueError(
+                    "MULTI-EPOCH mode requires the WCS log file as a second"
+                    + " input; add 'log_exp_headers' to FILE_PATTERN and"
+                    + f" FILE_EXT in the [{module_config_sec}] config"
+                    + " section."
+                )
             f_wcs_path = input_file_list[1]
 
             # Process inputs