fix regtest failures

jwst/tweakreg/tweakreg_step.py

@@ -136,22 +136,6 @@ def _set_skip_step(self, images, err_msg, level=logging.WARNING, skip=True, kind
     def process(self, input):
         use_custom_catalogs = self.use_custom_catalogs
 
-        if self.separation <= _SQRT2 * self.tolerance:
-            return self._set_skip_step(
-                input,
-                "Parameter 'separation' must be larger than 'tolerance' by at "
-                "least a factor of sqrt(2) to avoid source confusion.",
-                logging.ERROR,
-            )
-
-        if self.abs_separation <= _SQRT2 * self.abs_tolerance:
-            return self._set_skip_step(
-                input,
-                "Parameter 'abs_separation' must be larger than 'abs_tolerance' "
-                "by at least a factor of sqrt(2) to avoid source confusion.",
-                logging.ERROR,
-            )
-
         if use_custom_catalogs:
             catdict = _parse_catfile(self.catfile)
             # if user requested the use of custom catalogs and provided a
@@ -203,6 +187,22 @@ def process(self, input):
                       "containing one or more DataModels.", ) + e.args[1:]
             raise e
 
+        if self.separation <= _SQRT2 * self.tolerance:
+            return self._set_skip_step(
+                input,
+                "Parameter 'separation' must be larger than 'tolerance' by at "
+                "least a factor of sqrt(2) to avoid source confusion.",
+                logging.ERROR,
+            )
+
+        if self.abs_separation <= _SQRT2 * self.abs_tolerance:
+            return self._set_skip_step(
+                input,
+                "Parameter 'abs_separation' must be larger than 'abs_tolerance' "
+                "by at least a factor of sqrt(2) to avoid source confusion.",
+                logging.ERROR,
+            )
+
         if self.abs_refcat is not None and self.abs_refcat.strip():
             align_to_abs_refcat = True
             # Set expand_refcat to True to eliminate possibility of duplicate
@@ -533,52 +533,42 @@ def process(self, input):
                     msg = e.args[0]
                     if (msg == "Too few input images (or groups of images) with "
                             "non-empty catalogs."):
-                        # we need at least two exposures to perform image alignment
-                        self.log.warning(msg)
-                        self.log.warning(
-                            "At least one exposure is required to align images "
-                            "to an absolute reference catalog. Alignment to an "
-                            "absolute reference catalog will not be performed."
-                        )
-                        if not rel_ok:
-                            self.log.warning("Nothing to do. Skipping 'TweakRegStep'...")
-                            for model in images:
-                                model.meta.cal_step.tweakreg = "SKIPPED"
-                            self.skip = True
-                            return images
-
+                        # we need at least one exposure (group) to perform
+                        # absolute image alignment
                         self._set_skip_step(
                             images,
                             err_msg=[
                                 msg,
-                                "At least two exposures are required for relative "
-                                "image alignment."
+                                "At least one exposure is required to align images "
+                                "to an absolute reference catalog. Alignment to an "
+                                "absolute reference catalog will not be performed."
                             ],
-                            skip=not align_to_abs_refcat,
-                            kind='relative',
-                            level=logging.WARNING if align_to_abs_refcat else logging.ERROR
+                            skip=not rel_ok,
+                            kind='absolute' if rel_ok else '',
                         )
-
+                        if not rel_ok:
+                            return images
                     else:
                         raise e
 
                 except RuntimeError as e:
                     msg = e.args[0]
                     if msg.startswith("Number of output coordinates exceeded allocation"):
                         # we need at least two exposures to perform image alignment
-                        self.log.error(msg)
-                        self.log.error(
-                            "Multiple sources within specified tolerance "
-                            "matched to a single reference source. Try to "
-                            "adjust 'tolerance' and/or 'separation' parameters."
-                            "Alignment to an absolute reference catalog will "
-                            "not be performed."
+                        self._set_skip_step(
+                            images,
+                            err_msg=[
+                                msg,
+                                "Multiple sources within specified tolerance "
+                                "matched to a single reference source. Try to "
+                                "adjust 'tolerance' and/or 'separation' parameters."
+                                "Alignment to an absolute reference catalog will "
+                                "not be performed."
+                            ],
+                            skip=not rel_ok,
+                            kind='absolute' if rel_ok else '',
                         )
                         if not rel_ok:
-                            self.log.warning("Skipping 'TweakRegStep'...")
-                            self.skip = True
-                            for model in images:
-                                model.meta.cal_step.tweakreg = "SKIPPED"
                             return images
                     else:
                         raise e