Merge pull request #198 from lsst/tickets/DM-32226

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

python/lsst/meas/base/catalogCalculation.py

@@ -24,6 +24,7 @@
 import lsst.pipe.base
 import lsst.pex.config
 import lsst.daf.base
+from lsst.utils.timer import timeMethod
 
 from .pluginsBase import BasePlugin, BasePluginConfig
 from .pluginRegistry import PluginRegistry, PluginMap
@@ -226,7 +227,7 @@ def initializePlugins(self):
                 raise ValueError("{} has an execution order less than the minimum for an catalogCalculation "
                                  "plugin. Value {} : Minimum {}".format(*errorTuple))
 
-    @lsst.pipe.base.timeMethod
+    @timeMethod
     def run(self, measCat):
         """The entry point for the catalog calculation task.
 

python/lsst/meas/base/diaCalculation.py

@@ -31,6 +31,7 @@
 from .pluginsBase import BasePlugin
 from .pluginRegistry import (PluginRegistry, PluginMap)
 import lsst.pipe.base
+from lsst.utils.timer import timeMethod
 
 # Enforce an error for unsafe column/array value setting in pandas.
 pd.options.mode.chained_assignment = 'raise'
@@ -273,7 +274,7 @@ def _validatePluginCols(self, plug):
             else:
                 self.outputCols.append(outputName)
 
-    @lsst.pipe.base.timeMethod
+    @timeMethod
     def run(self,
             diaObjectCat,
             diaSourceCat,
@@ -341,7 +342,7 @@ def run(self,
                                 updatedDiaObjectIds,
                                 filterNames)
 
-    @lsst.pipe.base.timeMethod
+    @timeMethod
     def callCompute(self,
                     diaObjectCat,
                     diaSourceCat,

python/lsst/meas/base/sfm.py

@@ -31,9 +31,9 @@
 indicated in the field documentation).
 """
 
-import lsst.pipe.base as pipeBase
 import lsst.pex.config
 import time
+from lsst.utils.timer import timeMethod
 
 from .pluginRegistry import PluginRegistry
 from .baseMeasurement import (BaseMeasurementPluginConfig, BaseMeasurementPlugin,
@@ -210,7 +210,7 @@ def __init__(self, schema, algMetadata=None, **kwds):
         else:
             self.doBlendedness = False
 
-    @pipeBase.timeMethod
+    @timeMethod
     def run(self, measCat, exposure, noiseImage=None, exposureId=None, beginOrder=None, endOrder=None):
         r"""Run single frame measurement over an exposure and source catalog.