DM-32226: Replace pipe.base.timeMethod with utils.timer

python/lsst/meas/astrom/astrometry.py

@@ -28,6 +28,7 @@
 
 import lsst.pex.config as pexConfig
 import lsst.pipe.base as pipeBase
+from lsst.utils.timer import timeMethod
 from .ref_match import RefMatchTask, RefMatchConfig
 from .fitTanSipWcs import FitTanSipWcsTask
 from .display import displayAstrometry
@@ -128,7 +129,7 @@ def __init__(self, refObjLoader, schema=None, **kwargs):
 
         self.makeSubtask("wcsFitter")
 
-    @pipeBase.timeMethod
+    @timeMethod
     def run(self, sourceCat, exposure):
         """Load reference objects, match sources and optionally fit a WCS.
 
@@ -178,7 +179,7 @@ def run(self, sourceCat, exposure):
             res = self.solve(exposure=exposure, sourceCat=sourceCat)
         return res
 
-    @pipeBase.timeMethod
+    @timeMethod
     def solve(self, exposure, sourceCat):
         """Load reference objects overlapping an exposure, match to sources and
         fit a WCS
@@ -321,7 +322,7 @@ def solve(self, exposure, sourceCat):
             matchMeta=matchMeta,
         )
 
-    @pipeBase.timeMethod
+    @timeMethod
     def _matchAndFitWcs(self, refCat, sourceCat, goodSourceCat, refFluxField, bbox, wcs, match_tolerance,
                         exposure=None):
         """Match sources to reference objects and fit a WCS.

python/lsst/meas/astrom/fitAffineWcs.py

@@ -31,6 +31,7 @@
 from lsst.geom import Point2D, degrees, arcseconds, radians
 import lsst.pex.config as pexConfig
 import lsst.pipe.base as pipeBase
+from lsst.utils.timer import timeMethod
 
 from .makeMatchStatistics import makeMatchStatisticsInRadians
 from .setMatchDistance import setMatchDistance
@@ -101,7 +102,7 @@ class FitAffineWcsTask(pipeBase.Task):
     ConfigClass = FitAffineWcsConfig
     _DefaultName = "fitAffineWcs"
 
-    @pipeBase.timeMethod
+    @timeMethod
     def fitWcs(self,
                matches,
                initWcs,

python/lsst/meas/astrom/fitSipDistortion.py

@@ -28,6 +28,7 @@
 import lsst.afw.image
 import lsst.afw.geom
 import lsst.afw.display
+from lsst.utils.timer import timeMethod
 
 from .scaledPolynomialTransformFitter import ScaledPolynomialTransformFitter, OutlierRejectionControl
 from .sipTransform import SipForwardTransform, SipReverseTransform, makeWcs
@@ -111,7 +112,7 @@ def __init__(self, **kwargs):
         self.outlierRejectionCtrl.nClipMax = self.config.nClipMax
         self.outlierRejectionCtrl.nSigma = self.config.rejSigma
 
-    @lsst.pipe.base.timeMethod
+    @timeMethod
     def fitWcs(self, matches, initWcs, bbox=None, refCat=None, sourceCat=None, exposure=None):
         """Fit a TAN-SIP WCS from a list of reference object/source matches.
 

python/lsst/meas/astrom/fitTanSipWcs.py

@@ -30,6 +30,7 @@
 import lsst.afw.table as afwTable
 import lsst.pex.config as pexConfig
 import lsst.pipe.base as pipeBase
+from lsst.utils.timer import timeMethod
 from .setMatchDistance import setMatchDistance
 from .sip import makeCreateWcsWithSip
 
@@ -76,7 +77,7 @@ class FitTanSipWcsTask(pipeBase.Task):
     ConfigClass = FitTanSipWcsConfig
     _DefaultName = "fitWcs"
 
-    @pipeBase.timeMethod
+    @timeMethod
     def fitWcs(self, matches, initWcs, bbox=None, refCat=None, sourceCat=None, exposure=None):
         """Fit a TAN-SIP WCS from a list of reference object/source matches
 

python/lsst/meas/astrom/matchOptimisticBTask.py

@@ -6,6 +6,7 @@
 
 import lsst.pex.config as pexConfig
 import lsst.pipe.base as pipeBase
+from lsst.utils.timer import timeMethod
 
 from .setMatchDistance import setMatchDistance
 from .matchOptimisticB import matchOptimisticB, MatchOptimisticBControl
@@ -126,7 +127,7 @@ def filterStars(self, refCat):
         """
         return refCat
 
-    @pipeBase.timeMethod
+    @timeMethod
     def matchObjectsToSources(self, refCat, sourceCat, wcs, sourceFluxField, refFluxField,
                               match_tolerance=None):
         """Match sources to position reference stars.
@@ -257,7 +258,7 @@ class that used to be part of this class.
                 and not source.get(self.interpolatedCenterKey)
                 and not source.get(self.saturatedKey))
 
-    @pipeBase.timeMethod
+    @timeMethod
     def _doMatch(self, refCat, sourceCat, wcs, refFluxField, numUsableSources, minMatchedPairs,
                  maxMatchDist, sourceFluxField, verbose):
         """Implementation of matching sources to position reference stars.

python/lsst/meas/astrom/matchPessimisticB.py

@@ -6,6 +6,7 @@
 import lsst.pipe.base as pipeBase
 import lsst.geom as geom
 import lsst.afw.table as afwTable
+from lsst.utils.timer import timeMethod
 
 from .matchOptimisticBTask import MatchTolerance
 
@@ -184,7 +185,7 @@ class MatchPessimisticBTask(pipeBase.Task):
     def __init__(self, **kwargs):
         pipeBase.Task.__init__(self, **kwargs)
 
-    @pipeBase.timeMethod
+    @timeMethod
     def matchObjectsToSources(self, refCat, sourceCat, wcs, sourceFluxField, refFluxField,
                               match_tolerance=None):
         """Match sources to position reference stars
@@ -314,7 +315,7 @@ def _filterRefCat(self, refCat, refFluxField):
 
         return outCat
 
-    @pipeBase.timeMethod
+    @timeMethod
     def _doMatch(self, refCat, sourceCat, wcs, refFluxField, numUsableSources,
                  minMatchedPairs, match_tolerance, sourceFluxField, verbose):
         """Implementation of matching sources to position reference objects

python/lsst/meas/astrom/ref_match.py

@@ -31,6 +31,7 @@
 import lsst.pipe.base as pipeBase
 from lsst.meas.algorithms import ReferenceSourceSelectorTask
 from lsst.meas.algorithms.sourceSelector import sourceSelectorRegistry
+from lsst.utils.timer import timeMethod
 from .matchPessimisticB import MatchPessimisticBTask
 from .display import displayAstrometry
 from . import makeMatchStatistics
@@ -112,7 +113,7 @@ def setRefObjLoader(self, refObjLoader):
         """
         self.refObjLoader = refObjLoader
 
-    @pipeBase.timeMethod
+    @timeMethod
     def loadAndMatch(self, exposure, sourceCat):
         """Load reference objects overlapping an exposure and match to sources
         detected on that exposure.