DM-14102 have measurePsf use new MakePsfCandidatesTask

bin.src/assembleCoadd.py

@@ -20,7 +20,6 @@
 # the GNU General Public License along with this program.  If not,
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
-from __future__ import print_function
 from lsst.pipe.tasks.assembleCoadd import AssembleCoaddTask, SafeClipAssembleCoaddTask,\
     CompareWarpAssembleCoaddTask
 import sys

bin.src/dumpTaskMetadata.py

@@ -22,8 +22,6 @@
 #
 """Select images and report which tracts and patches they are in
 """
-from __future__ import print_function
-
 import lsst.daf.base as dafBase
 import lsst.pex.config as pexConfig
 import lsst.pipe.base as pipeBase

bin.src/reportImagesInPatch.py

@@ -22,7 +22,6 @@
 #
 """Select images for a given coadd patch
 """
-from __future__ import print_function
 import numpy
 
 import lsst.pex.config as pexConfig

bin.src/reportImagesToCoadd.py

@@ -22,8 +22,6 @@
 #
 """Select images and report which tracts and patches they are in
 """
-from __future__ import print_function
-from builtins import zip
 import numpy
 
 import lsst.pex.config as pexConfig

bin.src/reportPatches.py

@@ -27,8 +27,6 @@
   a proper implementation will report all tracts and patches that overlap each image
 - One must specify a patch and tract even though those arguments are ignored.
 """
-from __future__ import print_function
-
 import lsst.pex.config as pexConfig
 import lsst.afw.geom as afwGeom
 import lsst.pipe.base as pipeBase

bin.src/reportTaskTiming.py

@@ -22,9 +22,6 @@
 #
 """Select images and report which tracts and patches they are in
 """
-from __future__ import print_function
-from builtins import zip
-from builtins import object
 import collections
 import re
 
@@ -41,7 +38,7 @@ class ReportTaskTimingConfig(pexConfig.Config):
     pass
 
 
-class ResourceInfo(object):
+class ResourceInfo:
     # note: UTime, STime and MaxRss were renamed to UserTime, SystemTime and MaxResidentSetSize;
     # list both so the code can report time for both older and newer runs
     _BaseNameList = ("CpuTime", "UserTime", "SystemTime", "MaxResidentSetSize", "UTime", "STime", "MaxRss")

examples/exampleStatsTask.py

@@ -20,7 +20,6 @@
 # the GNU General Public License along with this program.  If not,
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
-from __future__ import print_function
 import os
 import sys
 

examples/measurePsfTask.py

@@ -22,7 +22,6 @@
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
 
-from __future__ import print_function
 import os
 import sys
 import numpy as np

examples/photoCalTask.py

@@ -1,6 +1,4 @@
 #!/usr/bin/env python
-from __future__ import absolute_import, division
-from __future__ import print_function
 #
 # LSST Data Management System
 # Copyright 2008, 2009, 2010 LSST Corporation.

examples/runRepair.py

@@ -21,8 +21,6 @@
 # the GNU General Public License along with this program.  If not,
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
-from __future__ import print_function
-from builtins import zip
 import numpy
 import sys
 

python/lsst/__init__.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import, division, print_function
 import pkgutil
 import lsstimport
 __path__ = pkgutil.extend_path(__path__, __name__)

python/lsst/pipe/__init__.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import, division, print_function
 import pkgutil
 import lsstimport
 __path__ = pkgutil.extend_path(__path__, __name__)

python/lsst/pipe/tasks/__init__.py

@@ -1,2 +1 @@
-from __future__ import absolute_import, division, print_function
 from .version import *

python/lsst/pipe/tasks/assembleCoadd.py

@@ -1,6 +1,3 @@
-from __future__ import absolute_import, division, print_function
-from builtins import zip
-from builtins import range
 #
 # LSST Data Management System
 # Copyright 2008-2016 AURA/LSST.

python/lsst/pipe/tasks/calibrate.py

@@ -19,7 +19,6 @@
 # the GNU General Public License along with this program.  If not,
 # see <https://www.lsstcorp.org/LegalNotices/>.
 #
-from __future__ import absolute_import, division, print_function
 import math
 
 from lsstDebug import getDebugFrame

python/lsst/pipe/tasks/characterizeImage.py

@@ -19,8 +19,6 @@
 # the GNU General Public License along with this program.  If not,
 # see <https://www.lsstcorp.org/LegalNotices/>.
 #
-from __future__ import absolute_import, division, print_function
-from builtins import range
 import numpy as np
 
 from lsstDebug import getDebugFrame

python/lsst/pipe/tasks/coaddBase.py

@@ -19,7 +19,6 @@
 # the GNU General Public License along with this program.  If not,
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
-from __future__ import absolute_import, division, print_function
 import numpy
 
 import lsst.pex.config as pexConfig

python/lsst/pipe/tasks/coaddHelpers.py

@@ -19,9 +19,6 @@
 # the GNU General Public License along with this program.  If not,
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
-
-from __future__ import absolute_import, division, print_function
-from builtins import zip
 from lsst.pipe.base import Struct
 
 """Helper functions for coaddition.

python/lsst/pipe/tasks/coaddInputRecorder.py

@@ -19,8 +19,6 @@
 # the GNU General Public License along with this program.  If not,
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
-from __future__ import absolute_import, division, print_function
-from builtins import object
 import numpy
 
 import lsst.pex.config as pexConfig
@@ -62,7 +60,7 @@ class CoaddInputRecorderConfig(pexConfig.Config):
     )
 
 
-class CoaddTempExpInputRecorder(object):
+class CoaddTempExpInputRecorder:
     """A helper class for CoaddInputRecorderTask, managing the CoaddInputs object for that single
     CoaddTempExp.  This will contain a single 'visit' record for the CoaddTempExp and a number of 'ccd'
     records.

python/lsst/pipe/tasks/colorterms.py

@@ -19,8 +19,6 @@
 # the GNU General Public License along with this program.  If not,
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
-
-from __future__ import absolute_import, division, print_function
 import fnmatch
 
 import numpy as np

python/lsst/pipe/tasks/exampleCmdLineTask.py

@@ -19,7 +19,6 @@
 # the GNU General Public License along with this program.  If not,
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
-from __future__ import absolute_import, division, print_function
 from lsst.afw.display.ds9 import mtv
 import lsst.pex.config as pexConfig
 import lsst.pipe.base as pipeBase

python/lsst/pipe/tasks/exampleStatsTasks.py

@@ -19,7 +19,6 @@
 # the GNU General Public License along with this program.  If not,
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
-from __future__ import absolute_import, division, print_function
 import lsst.afw.image as afwImage
 import lsst.afw.math as afwMath
 import lsst.pex.config as pexConfig

python/lsst/pipe/tasks/fakes.py

@@ -19,14 +19,11 @@
 # the GNU General Public License along with this program.  If not,
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
-
-from __future__ import absolute_import, division, print_function
 import abc
 
 import lsst.pex.config
 import lsst.pipe.base
 import lsst.afw.image
-from future.utils import with_metaclass
 
 
 class BaseFakeSourcesConfig(lsst.pex.config.Config):
@@ -36,7 +33,7 @@ class BaseFakeSourcesConfig(lsst.pex.config.Config):
     )
 
 
-class BaseFakeSourcesTask(with_metaclass(abc.ABCMeta, lsst.pipe.base.Task)):
+class BaseFakeSourcesTask(lsst.pipe.base.Task, metaclass=abc.ABCMeta):
     """An abstract base class for subtasks that inject fake sources into images to test completeness and
     other aspects of the processing.
 

python/lsst/pipe/tasks/getRepositoryData.py

@@ -23,7 +23,6 @@
 
 Use this as a base task for creating graphs and reports for a set of data.
 """
-from __future__ import absolute_import, division, print_function
 import lsst.pex.config as pexConfig
 import lsst.pipe.base as pipeBase
 

python/lsst/pipe/tasks/imageDifference.py

@@ -19,8 +19,6 @@
 # the GNU General Public License along with this program.  If not,
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
-from __future__ import absolute_import, division, print_function
-from builtins import zip
 import math
 import random
 import numpy

python/lsst/pipe/tasks/ingest.py

@@ -1,6 +1,4 @@
-from __future__ import absolute_import, division, print_function
 from past.builtins import basestring
-from builtins import object
 import os
 import shutil
 import tempfile
@@ -198,7 +196,7 @@ class RegisterConfig(Config):
     permissions = Field(dtype=int, default=0o664, doc="Permissions mode for registry; 0o664 = rw-rw-r--")
 
 
-class RegistryContext(object):
+class RegistryContext:
     """Context manager to provide a registry
 
     An existing registry is copied, so that it may continue

python/lsst/pipe/tasks/ingestCalibs.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, division, print_function
-from builtins import zip
 import collections
 import datetime
 import sqlite3

python/lsst/pipe/tasks/ingestPgsql.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, division, print_function
-
 import os
 
 from lsst.pex.config import ConfigurableField

python/lsst/pipe/tasks/interpImage.py

@@ -19,7 +19,6 @@
 # the GNU General Public License along with this program.  If not,
 # see <https://www.lsstcorp.org/LegalNotices/>.
 #
-from __future__ import absolute_import, division, print_function
 import lsst.pex.config as pexConfig
 import lsst.afw.math as afwMath
 import lsst.meas.algorithms as measAlg

python/lsst/pipe/tasks/makeCoaddTempExp.py

@@ -19,8 +19,6 @@
 # the GNU General Public License along with this program.  If not,
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
-
-from __future__ import absolute_import, division, print_function
 import numpy
 
 import lsst.pex.config as pexConfig

python/lsst/pipe/tasks/makeDiscreteSkyMap.py

@@ -19,7 +19,6 @@
 # the GNU General Public License along with this program.  If not,
 # see <https://www.lsstcorp.org/LegalNotices/>.
 #
-from __future__ import absolute_import, division, print_function
 import sys
 import traceback
 import lsst.geom

python/lsst/pipe/tasks/makeSkyMap.py

@@ -19,7 +19,6 @@
 # the GNU General Public License along with this program.  If not,
 # see <https://www.lsstcorp.org/LegalNotices/>.
 #
-from __future__ import absolute_import, division, print_function
 import sys
 import traceback
 

python/lsst/pipe/tasks/matchBackgrounds.py

@@ -18,11 +18,6 @@
 # You should have received a copy of the LSST License Statement and
 # the GNU General Public License along with this program.  If not,
 # see <http://www.lsstcorp.org/LegalNotices/>.
-
-from __future__ import absolute_import, division, print_function
-from builtins import zip
-from builtins import range
-from builtins import object
 import numpy
 import lsst.afw.image as afwImage
 import lsst.afw.math as afwMath
@@ -580,7 +575,7 @@ def _gridImage(self, maskedImage, binsize, statsFlag):
         return numpy.array(bgX), numpy.array(bgY), numpy.array(bgZ), numpy.array(bgdZ)
 
 
-class DataRefMatcher(object):
+class DataRefMatcher:
     """Match data references for a specified dataset type
 
     Note that this is not exact, but should suffice for this task

python/lsst/pipe/tasks/measurePsf.py

@@ -19,10 +19,6 @@
 # the GNU General Public License along with this program.  If not,
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
-from __future__ import absolute_import, division, print_function
-
-from builtins import zip
-
 import lsst.afw.math as afwMath
 import lsst.afw.display.ds9 as ds9
 import lsst.meas.algorithms as measAlg
@@ -32,10 +28,22 @@
 
 
 class MeasurePsfConfig(pexConfig.Config):
-    starSelector = measAlg.starSelectorRegistry.makeField("Star selection algorithm", default="objectSize")
-    psfDeterminer = measAlg.psfDeterminerRegistry.makeField("PSF Determination algorithm", default="pca")
-    reserve = pexConfig.ConfigurableField(target=measAlg.ReserveSourcesTask,
-                                          doc="Reserve sources from fitting")
+    starSelector = measAlg.starSelectorRegistry.makeField(
+        "Star selection algorithm",
+        default="objectSize"
+    )
+    makePsfCandidates = pexConfig.ConfigurableField(
+        target=measAlg.MakePsfCandidatesTask,
+        doc="Task to make psf candidates from selected stars.",
+    )
+    psfDeterminer = measAlg.psfDeterminerRegistry.makeField(
+        "PSF Determination algorithm",
+        default="pca"
+    )
+    reserve = pexConfig.ConfigurableField(
+        target=measAlg.ReserveSourcesTask,
+        doc="Reserve sources from fitting"
+    )
 
 ## \addtogroup LSST_task_documentation
 ## \{
@@ -223,6 +231,7 @@ def __init__(self, schema=None, **kwargs):
             self.candidateKey = None
             self.usedKey = None
         self.makeSubtask("starSelector", schema=schema)
+        self.makeSubtask("makePsfCandidates")
         self.makeSubtask("psfDeterminer", schema=schema)
         self.makeSubtask("reserve", columnName="calib_psf", schema=schema,
                          doc="set if source was reserved from PSF determination")
@@ -262,8 +271,9 @@ def run(self, exposure, sources, expId=0, matches=None):
         #
         # Run star selector
         #
-        selectionResult = self.starSelector.run(exposure=exposure, sourceCat=sources, matches=matches)
-        reserveResult = self.reserve.run(selectionResult.starCat, expId=expId)
+        stars = self.starSelector.run(sourceCat=sources, matches=matches, exposure=exposure)
+        selectionResult = self.makePsfCandidates.run(stars.starCat, exposure=exposure)
+        reserveResult = self.reserve.run(selectionResult.goodStarCat, expId=expId)
         psfCandidateList = [cand for cand, use
                             in zip(selectionResult.psfCandidates, reserveResult.use) if use]
 

python/lsst/pipe/tasks/mocks/__init__.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import, division, print_function
 from .simpleMapper import *
 from .mockCoadd import MockCoaddTask
 from .mockObject import MockObjectTask

python/lsst/pipe/tasks/mocks/mockCoadd.py

@@ -19,9 +19,6 @@
 # the GNU General Public License along with this program.  If not,
 # see <https://www.lsstcorp.org/LegalNotices/>.
 #
-
-from __future__ import absolute_import, division, print_function
-from builtins import range
 import lsst.afw.image
 import lsst.afw.geom
 import lsst.pex.config

python/lsst/pipe/tasks/mocks/mockObject.py

@@ -19,8 +19,6 @@
 # the GNU General Public License along with this program.  If not,
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
-
-from __future__ import absolute_import, division, print_function
 import numpy
 
 import lsst.pex.config