DM-14102 Use new makePsfCandidatesTask in test

bin.src/psfex.py

@@ -1,6 +1,4 @@
 #!/usr/bin/env python
-from __future__ import absolute_import, division, print_function
-from builtins import range
 import argparse
 import os
 import sys

config/psfex.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import, division, print_function
 import sys
 from lsst.meas.extensions.psfex import PsfExStarSelectorTask
 

python/lsst/meas/extensions/psfex/__init__.py

@@ -22,7 +22,6 @@
 
 """lsst.meas.extensions.psfex
 """
-from __future__ import absolute_import, division, print_function
 from .version import *
 from .field import *
 from .prefs import *

python/lsst/meas/extensions/psfex/psfex.py

@@ -1,10 +1,3 @@
-#!/usr/bin/env python
-from __future__ import absolute_import, division, print_function
-from builtins import zip
-from builtins import input
-from builtins import str
-from builtins import range
-from builtins import object
 import os
 import re
 import sys
@@ -367,10 +360,10 @@ def select_candidates(set, prefs, frmin, frmax,
 try:
     _dataType
 except NameError:
-    class _SExtractor(object):
+    class _SExtractor():
         pass
 
-    class _LSST(object):
+    class _LSST():
         pass
 
     _dataTypes = dict(LSST=_LSST,

python/lsst/meas/extensions/psfex/psfexPsfDeterminer.py

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

python/lsst/meas/extensions/psfex/psfexStarSelector.py

@@ -1,7 +1,3 @@
-from __future__ import absolute_import, division, print_function
-from builtins import zip
-from builtins import input
-from builtins import object
 #
 # LSST Data Management System
 # Copyright 2008, 2009, 2010 LSST Corporation.
@@ -118,7 +114,7 @@ def setDefaults(self):
         ]
 
 
-class EventHandler(object):
+class EventHandler():
     """A class to handle key strokes with matplotlib displays"""
 
     def __init__(self, axes, xs, ys, x, y, frames=[0]):

python/lsst/meas/extensions/psfex/utils.py

@@ -1,6 +1,3 @@
-from __future__ import absolute_import, division, print_function
-from builtins import input
-from builtins import range
 import re
 import numpy as np
 import pyfits

tests/testPsfexPsf.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #
 # LSST Data Management System
 #
@@ -21,9 +20,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 zip
-from builtins import range
 import math
 import numpy as np
 import unittest
@@ -217,7 +213,9 @@ def setupDeterminer(self, exposure):
                                        ]
         starSelectorConfig.widthStdAllowed = 0.5  # Set to match when the tolerance of the test was set
 
-        starSelector = starSelectorClass(schema=self.schema, config=starSelectorConfig)
+        self.starSelector = starSelectorClass(schema=self.schema, config=starSelectorConfig)
+
+        self.makePsfCandidates = measAlg.MakePsfCandidatesTask()
 
         psfDeterminerClass = measAlg.psfDeterminerRegistry["psfex"]
         psfDeterminerConfig = psfDeterminerClass.ConfigClass()
@@ -226,9 +224,7 @@ def setupDeterminer(self, exposure):
         psfDeterminerConfig.sizeCellY = height//3
         psfDeterminerConfig.spatialOrder = 1
 
-        psfDeterminer = psfDeterminerClass(psfDeterminerConfig)
-
-        return starSelector, psfDeterminer
+        self.psfDeterminer = psfDeterminerClass(psfDeterminerConfig)
 
     def subtractStars(self, exposure, catalog, chi_lim=-1):
         """Subtract the exposure's PSF from all the sources in catalog"""
@@ -265,11 +261,12 @@ def subtractStars(self, exposure, catalog, chi_lim=-1):
     def testPsfexDeterminer(self):
         """Test the (Psfex) psfDeterminer on subImages"""
 
-        starSelector, psfDeterminer = self.setupDeterminer(self.exposure)
+        self.setupDeterminer(self.exposure)
         metadata = dafBase.PropertyList()
 
-        psfCandidateList = starSelector.run(self.exposure, self.catalog).psfCandidates
-        psf, cellSet = psfDeterminer.determinePsf(self.exposure, psfCandidateList, metadata)
+        stars = self.starSelector.run(self.exposure, self.catalog)
+        psfCandidateList = self.makePsfCandidates.run(stars.starCat, exposure=self.exposure).psfCandidates
+        psf, cellSet = self.psfDeterminer.determinePsf(self.exposure, psfCandidateList, metadata)
         self.exposure.setPsf(psf)
 
         # Test how well we can subtract the PSF model