DM-38546: fixes while implementing new CalibrateImageTask

python/lsst/meas/astrom/astrometry.py

@@ -108,18 +108,19 @@ class AstrometryTask(RefMatchTask):
     Parameters
     ----------
     refObjLoader : `lsst.meas.algorithms.ReferenceLoader`
-        A reference object loader object
+        A reference object loader object; gen3 pipeline tasks will pass `None`
+        and call `setRefObjLoader` in `runQuantum`.
     schema : `lsst.afw.table.Schema`
         Used to set "calib_astrometry_used" flag in output source catalog.
     **kwargs
-        additional keyword arguments for pipe_base
-        `lsst.pipe.base.Task.__init__`
+        Additional keyword arguments for pipe_base
+        `lsst.pipe.base.Task.__init__`.
     """
     ConfigClass = AstrometryConfig
     _DefaultName = "astrometricSolver"
 
-    def __init__(self, refObjLoader, schema=None, **kwargs):
-        RefMatchTask.__init__(self, refObjLoader, **kwargs)
+    def __init__(self, refObjLoader=None, schema=None, **kwargs):
+        RefMatchTask.__init__(self, refObjLoader=refObjLoader, **kwargs)
 
         if schema is not None:
             self.usedKey = schema.addField("calib_astrometry_used", type="Flag",

python/lsst/meas/astrom/directMatch.py

@@ -1,8 +1,6 @@
 
 __all__ = ["DirectMatchConfig", "DirectMatchTask", "DirectMatchConfigWithoutLoader"]
 
-import warnings
-
 from lsst.pex.config import Config, Field, ConfigurableField, ConfigField
 from lsst.pipe.base import Task, Struct
 from lsst.meas.algorithms import (LoadReferenceObjectsConfig, ScienceSourceSelectorTask,
@@ -37,23 +35,17 @@ class DirectMatchTask(Task):
     butler : `None`
         Compatibility parameter. Should not be used.
     refObjLoader : `lsst.meas.algorithms.ReferenceObjectLoader` or `None`
-        For loading reference objects.
+        A reference object loader object; gen3 pipeline tasks will pass `None`
+        and call `setRefObjLoader` in `runQuantum`.
     **kwargs
         Other keyword arguments required for instantiating a Task (such as
         ``config``).
     """
     ConfigClass = DirectMatchConfig
     _DefaultName = "directMatch"
 
-    def __init__(self, butler=None, refObjLoader=None, **kwargs):
+    def __init__(self, refObjLoader=None, **kwargs):
         Task.__init__(self, **kwargs)
-        if not refObjLoader:
-            if butler:
-                if not isinstance(self.config, DirectMatchConfig):
-                    raise RuntimeError("DirectMatchTask must be initialized with DirectMatchConfig "
-                                       "if a refObjLoader is not supplied at initialization")
-                warnings.warn("The 'butler' parameter is no longer used and can be safely removed.",
-                              category=FutureWarning, stacklevel=2)
         self.refObjLoader = refObjLoader
         self.makeSubtask("sourceSelection")
         self.makeSubtask("referenceSelection")

python/lsst/meas/astrom/matchPessimisticB.py

@@ -267,6 +267,15 @@ def matchObjectsToSources(self, refCat, sourceCat, wcs, sourceFluxField, refFlux
                               int(self.config.minFracMatchedPairs
                                   * min([len(refCat), len(goodSourceCat)])))
 
+        if len(goodSourceCat) <= self.config.numPointsForShape:
+            msg = (f"Not enough catalog objects ({len(goodSourceCat)}) to make a "
+                   f"shape for the matcher (need {self.config.numPointsForShape}).")
+            raise RuntimeError(msg)
+        if len(refCat) <= self.config.numPointsForShape:
+            msg = (f"Not enough refcat objects ({len(refCat)}) to make a "
+                   f"shape for the matcher (need {self.config.numPointsForShape}).")
+            raise RuntimeError(msg)
+
         if len(refCat) > self.config.maxRefObjects:
             self.log.warning(
                 "WARNING: Reference catalog larger that maximum allowed. "

python/lsst/meas/astrom/ref_match.py

@@ -65,7 +65,6 @@ class RefMatchConfig(pexConfig.Config):
     )
 
     def setDefaults(self):
-        self.sourceSelector.name = "science"
         self.sourceSelector['science'].fluxLimit.fluxField = \
             'slot_%sFlux_instFlux' % (self.sourceFluxType)
         self.sourceSelector['science'].signalToNoise.fluxField = \
@@ -80,14 +79,15 @@ class RefMatchTask(pipeBase.Task):
     Parameters
     ----------
     refObjLoader : `lsst.meas.algorithms.ReferenceLoader`
-        A reference object loader object
+        A reference object loader object; gen3 pipeline tasks will pass `None`
+        and call `setRefObjLoader` in `runQuantum`.
     **kwargs
-        additional keyword arguments for pipe_base `lsst.pipe.base.Task`
+        Additional keyword arguments for pipe_base `lsst.pipe.base.Task`.
     """
     ConfigClass = RefMatchConfig
     _DefaultName = "calibrationBaseClass"
 
-    def __init__(self, refObjLoader, **kwargs):
+    def __init__(self, refObjLoader=None, **kwargs):
         pipeBase.Task.__init__(self, **kwargs)
         if refObjLoader:
             self.refObjLoader = refObjLoader
@@ -104,12 +104,12 @@ def __init__(self, refObjLoader, **kwargs):
         self.makeSubtask("referenceSelector")
 
     def setRefObjLoader(self, refObjLoader):
-        """Sets the reference object loader for the task
+        """Sets the reference object loader for the task.
 
         Parameters
         ----------
         refObjLoader
-            An instance of a reference object loader task or class
+            An instance of a reference object loader task or class.
         """
         self.refObjLoader = refObjLoader