pipe_tasks DM-6078: changes to fix SDSS apcorr

.gitignore

@@ -25,6 +25,7 @@ bin/imageDifference.py
 bin/imageDifferenceWinter2013.py
 bin/ingestCalibs.py
 bin/ingestImages.py
+bin/ingestReferenceCatalog.py
 bin/makeCoaddTempExp.py
 bin/makeDiscreteSkyMap.py
 bin/makeSkyMap.py

python/lsst/pipe/tasks/detectAndMeasure.py

@@ -28,7 +28,8 @@
 from lsst.afw.table import SourceTable, IdFactory
 from lsst.meas.algorithms import SourceDetectionTask
 from lsst.meas.deblender import SourceDeblendTask
-from lsst.meas.base import BasePlugin, SingleFrameMeasurementTask, MeasureApCorrTask
+from lsst.meas.base import BasePlugin, SingleFrameMeasurementTask
+from lsst.meas.algorithms import MeasureApCorrTask
 
 __all__ = ["DetectAndMeasureConfig", "DetectAndMeasureTask"]
 
@@ -239,9 +240,9 @@ def measure(self, exposure, exposureIdInfo, sourceCat, allowApCorr=True):
 
             sourceCat.sort(SourceTable.getParentKey())
 
-            if self.config.doMeasureApCorr:
+            if self.config.doMeasureApCorr and allowApCorr:
                 # measure the aperture correction map
-                apCorrMap = self.measureApCorr.run(bbox=exposure.getBBox(), catalog=sourceCat).apCorrMap
+                apCorrMap = self.measureApCorr.run(exposure=exposure, catalog=sourceCat).apCorrMap
                 exposure.getInfo().setApCorrMap(apCorrMap)
 
             # 2) run APCORR_ORDER only to apply the aperture correction to the measured

python/lsst/pipe/tasks/measurePsf.py

@@ -244,7 +244,7 @@ def __init__(self, schema=None, **kwargs):
         else:
             self.candidateKey = None
             self.usedKey = None
-        self.makeSubtask("starSelector")
+        self.makeSubtask("starSelector", schema=schema)
         self.psfDeterminer = self.config.psfDeterminer.apply()
 
     @pipeBase.timeMethod