Renaming PsfMatch to PsfMatchTask within ip_diffim; PsfMatch=PsfMatch…

…Task makes this change transparent for other packages
lsst · Jul 29, 2014 · ea0a71c · ea0a71c
1 parent f37d459
commit ea0a71c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/python/lsst/ip/diffim/imagePsfMatch.py b/python/lsst/ip/diffim/imagePsfMatch.py
@@ -70,7 +70,7 @@ def setDefaults(self):
         self.selectMeasurement.slots.modelFlux = None
         self.selectMeasurement.slots.apFlux = None
 
-class ImagePsfMatchTask(PsfMatch):
+class ImagePsfMatchTask(PsfMatchTask):
     """PSF-match images to reference images
 
     Fits the following model:
@@ -84,7 +84,7 @@ def __init__(self, *args, **kwargs):
         @param config: see lsst.ip.diffim.PsfMatchConfig
         @param logName: name by which messages are logged
         """
-        PsfMatch.__init__(self, *args, **kwargs)
+        PsfMatchTask.__init__(self, *args, **kwargs)
         self.kConfig = self.config.kernel.active
         self._warper = afwMath.Warper.fromConfig(self.kConfig.warpingConfig)
         self.selectSchema = afwTable.SourceTable.makeMinimalSchema()

diff --git a/python/lsst/ip/diffim/modelPsfMatch.py b/python/lsst/ip/diffim/modelPsfMatch.py
@@ -58,7 +58,7 @@ def setDefaults(self):
         self.kernel.active.kernelSize = 11
 
 
-class ModelPsfMatchTask(PsfMatch):
+class ModelPsfMatchTask(PsfMatchTask):
     """PSF-match PSF models to reference PSF models
     """
     ConfigClass = ModelPsfMatchConfig

diff --git a/python/lsst/ip/diffim/psfMatch.py b/python/lsst/ip/diffim/psfMatch.py
@@ -542,7 +542,7 @@ def setDefaults(self):
     )
 
 
-class PsfMatch(pipeBase.Task):
+class PsfMatchTask(pipeBase.Task):
     """Base class for PSF matching task.  Has no run method; hence should not be called!
     """
     ConfigClass = PsfMatchConfig
@@ -892,3 +892,4 @@ def _solve(self, kernelCellSet, basisList, returnOnExcept=False):
 
         return spatialSolution, spatialKernel, spatialBackground
 
+PsfMatch=PsfMatchTask