Replace pipe.base.timeMethod with utils.timer (DM-32226)

lsst · Oct 20, 2021 · 730b8a8 · 730b8a8
1 parent bfd0ea7
commit 730b8a8
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 15 deletions.
diff --git a/python/lsst/ap/association/association.py b/python/lsst/ap/association/association.py
@@ -31,6 +31,7 @@
 import lsst.geom as geom
 import lsst.pex.config as pexConfig
 import lsst.pipe.base as pipeBase
+from lsst.utils.timer import timeMethod
 
 # Enforce an error for unsafe column/array value setting in pandas.
 pd.options.mode.chained_assignment = 'raise'
@@ -59,7 +60,7 @@ class AssociationTask(pipeBase.Task):
     ConfigClass = AssociationConfig
     _DefaultName = "association"
 
-    @pipeBase.timeMethod
+    @timeMethod
     def run(self,
             diaSources,
             diaObjects):
@@ -137,7 +138,7 @@ def check_dia_source_radec(self, dia_sources):
             dia_sources = dia_sources[~nan_mask]
         return dia_sources
 
-    @pipeBase.timeMethod
+    @timeMethod
     def associate_sources(self, dia_objects, dia_sources):
         """Associate the input DIASources with the catalog of DIAObjects.
 
@@ -170,7 +171,7 @@ def associate_sources(self, dia_objects, dia_sources):
 
         return match_result
 
-    @pipeBase.timeMethod
+    @timeMethod
     def score(self, dia_objects, dia_sources, max_dist):
         """Compute a quality score for each dia_source/dia_object pair
         between this catalog of DIAObjects and the input DIASource catalog.
@@ -273,7 +274,7 @@ def _radec_to_xyz(self, catalog):
 
         return vectors
 
-    @pipeBase.timeMethod
+    @timeMethod
     def match(self, dia_objects, dia_sources, score_struct):
         """Match DIAsources to DiaObjects given a score.
 

diff --git a/python/lsst/ap/association/diaForcedSource.py b/python/lsst/ap/association/diaForcedSource.py
@@ -33,6 +33,7 @@
 from lsst.meas.base import ForcedMeasurementTask
 import lsst.pex.config as pexConfig
 import lsst.pipe.base as pipeBase
+from lsst.utils.timer import timeMethod
 
 
 class DiaForcedSourcedConfig(pexConfig.Config):
@@ -87,7 +88,7 @@ def __init__(self, **kwargs):
         self.makeSubtask("forcedMeasurement",
                          refSchema=afwTable.SourceTable.makeMinimalSchema())
 
-    @pipeBase.timeMethod
+    @timeMethod
     def run(self,
             dia_objects,
             updatedDiaObjectIds,

diff --git a/python/lsst/ap/association/diaPipe.py b/python/lsst/ap/association/diaPipe.py
@@ -36,6 +36,7 @@
 import lsst.pex.config as pexConfig
 import lsst.pipe.base as pipeBase
 import lsst.pipe.base.connectionTypes as connTypes
+from lsst.utils.timer import timeMethod
 
 from lsst.ap.association import (
     AssociationTask,
@@ -299,7 +300,7 @@ def runQuantum(self, butlerQC, inputRefs, outputRefs):
 
         butlerQC.put(outputs, outputRefs)
 
-    @pipeBase.timeMethod
+    @timeMethod
     def run(self,
             diaSourceTable,
             solarSystemObjectTable,

diff --git a/python/lsst/ap/association/loadDiaCatalogs.py b/python/lsst/ap/association/loadDiaCatalogs.py
@@ -29,6 +29,7 @@
 import lsst.pex.config as pexConfig
 import lsst.pipe.base as pipeBase
 import lsst.sphgeom as sphgeom
+from lsst.utils.timer import timeMethod
 
 __all__ = ("LoadDiaCatalogsTask", "LoadDiaCatalogsConfig")
 
@@ -54,7 +55,7 @@ class LoadDiaCatalogsTask(pipeBase.Task):
     def __init__(self, **kwargs):
         pipeBase.Task.__init__(self, **kwargs)
 
-    @pipeBase.timeMethod
+    @timeMethod
     def run(self, exposure, apdb):
         """Preload all DiaObjects and DiaSources from the Apdb given the
         current exposure.
@@ -108,7 +109,7 @@ def run(self, exposure, apdb):
             diaSources=diaSources,
             diaForcedSources=diaForcedSources)
 
-    @pipeBase.timeMethod
+    @timeMethod
     def loadDiaObjects(self, region, apdb):
         """Load DiaObjects from the Apdb based on their HTM location.
 
@@ -142,7 +143,7 @@ def loadDiaObjects(self, region, apdb):
 
         return diaObjects.replace(to_replace=[None], value=np.nan)
 
-    @pipeBase.timeMethod
+    @timeMethod
     def loadDiaSources(self, diaObjects, region, dateTime, apdb):
         """Load DiaSources from the Apdb based on their diaObjectId or
         location.
@@ -192,7 +193,7 @@ def loadDiaSources(self, diaObjects, region, dateTime, apdb):
 
         return diaSources.replace(to_replace=[None], value=np.nan)
 
-    @pipeBase.timeMethod
+    @timeMethod
     def loadDiaForcedSources(self, diaObjects, region, dateTime, apdb):
         """Load DiaObjects from the Apdb based on their HTM location.
 
@@ -241,7 +242,7 @@ def loadDiaForcedSources(self, diaObjects, region, dateTime, apdb):
 
         return diaForcedSources.replace(to_replace=[None], value=np.nan)
 
-    @pipeBase.timeMethod
+    @timeMethod
     def _getRegion(self, exposure):
         """Calculate an enveloping region for an exposure.
 

diff --git a/python/lsst/ap/association/packageAlerts.py b/python/lsst/ap/association/packageAlerts.py
@@ -35,6 +35,7 @@
 import lsst.pex.config as pexConfig
 from lsst.pex.exceptions import InvalidParameterError
 import lsst.pipe.base as pipeBase
+from lsst.utils.timer import timeMethod
 
 
 """Methods for packaging Apdb and Pipelines data into Avro alerts.
@@ -76,7 +77,7 @@ def __init__(self, **kwargs):
         self.alertSchema = alertPack.Schema.from_file(self.config.schemaFile)
         os.makedirs(self.config.alertWriteLocation, exist_ok=True)
 
-    @pipeBase.timeMethod
+    @timeMethod
     def run(self,
             diaSourceCat,
             diaObjectCat,

diff --git a/python/lsst/ap/association/skyBotEphemerisQuery.py b/python/lsst/ap/association/skyBotEphemerisQuery.py
@@ -39,6 +39,7 @@
 from lsst.daf.base import DateTime
 import lsst.pex.config as pexConfig
 import lsst.pipe.base as pipeBase
+from lsst.utils.timer import timeMethod
 
 from lsst.pipe.base import PipelineTask, PipelineTaskConfig, PipelineTaskConnections
 import lsst.pipe.base.connectionTypes as connTypes
@@ -99,7 +100,7 @@ def runQuantum(self, butlerQC, inputRefs, outputRefs):
 
         butlerQC.put(outputs, outputRefs)
 
-    @pipeBase.timeMethod
+    @timeMethod
     def run(self, visitInfos, visit):
         """Parse the information on the current visit and retrieve the
         observable solar system objects from SkyBot.

diff --git a/python/lsst/ap/association/ssoAssociation.py b/python/lsst/ap/association/ssoAssociation.py
@@ -30,6 +30,7 @@
 import lsst.geom as geom
 import lsst.pex.config as pexConfig
 import lsst.pipe.base as pipeBase
+from lsst.utils.timer import timeMethod
 
 
 class SolarSystemAssociationConfig(pexConfig.Config):
@@ -61,7 +62,7 @@ class SolarSystemAssociationTask(pipeBase.Task):
     ConfigClass = SolarSystemAssociationConfig
     _DefaultName = "ssoAssociation"
 
-    @pipeBase.timeMethod
+    @timeMethod
     def run(self, diaSourceCatalog, solarSystemObjects, exposure):
         """Create a searchable tree of unassociated DiaSources and match
         to the nearest ssoObject.

diff --git a/python/lsst/ap/association/transformDiaSourceCatalog.py b/python/lsst/ap/association/transformDiaSourceCatalog.py
@@ -35,6 +35,7 @@
 from lsst.pipe.tasks.postprocess import TransformCatalogBaseTask, TransformCatalogBaseConfig
 from lsst.pipe.tasks.parquetTable import ParquetTable
 from lsst.pipe.tasks.functors import Column
+from lsst.utils.timer import timeMethod
 
 
 class TransformDiaSourceCatalogConnections(pipeBase.PipelineTaskConnections,
@@ -169,7 +170,7 @@ def runQuantum(self, butlerQC, inputRefs, outputRefs):
 
         butlerQC.put(outputs, outputRefs)
 
-    @pipeBase.timeMethod
+    @timeMethod
     def run(self,
             diaSourceCat,
             diffIm,