Implement deblender API changes

lsst · Jan 3, 2017 · d8756b0 · d8756b0
1 parent 2c5498d
commit d8756b0
Showing 1 changed file with 6 additions and 11 deletions.
diff --git a/python/lsst/ip/diffim/dipoleMeasurement.py b/python/lsst/ip/diffim/dipoleMeasurement.py
@@ -28,6 +28,7 @@
 import lsst.pex.config as pexConfig
 from lsst.log import Log
 import lsst.meas.deblender.baseline as deblendBaseline
+import lsst.meas.deblender.plugins as deblendPlugins
 from lsst.meas.base.pluginRegistry import register
 from lsst.meas.base import SingleFrameMeasurementTask, SingleFrameMeasurementConfig, \
     SingleFramePluginConfig, SingleFramePlugin
@@ -472,7 +473,7 @@ def __call__(self, source, exposure):
         psfSigPix = psf.computeShape().getDeterminantRadius()
         psfFwhmPix = psfSigPix * self.sigma2fwhm
         subimage = afwImage.ExposureF(exposure, fbb, True)
-        cpsf = deblendBaseline.CachingPsf(psf)
+        cpsf = deblendPlugins.CachingPsf(psf)
 
         # if fewer than 2 peaks, just return a copy of the source
         if len(peaks) < 2:
@@ -499,15 +500,9 @@ def __call__(self, source, exposure):
             # Call lower-level _fit_psf task
 
             # Prepare results structure
-            fpres = deblendBaseline.PerFootprint()
-            fpres.peaks = []
-            for pki, pk in enumerate(dpeaks):
-                pkres = deblendBaseline.PerPeak()
-                pkres.peak = pk
-                pkres.pki = pki
-                fpres.peaks.append(pkres)
-
-            for pki, (pk, pkres, pkF) in enumerate(zip(dpeaks, fpres.peaks, peaksF)):
+            fpres = deblendBaseline.DeblenderResult(fp, exposure.getMaskedImage(), psf, psfFwhmPix, self.log)
+
+            for pki, (pk, pkres, pkF) in enumerate(zip(dpeaks, fpres.deblendedParents[0].peaks, peaksF)):
                 self.log.debug('Peak %i', pki)
                 deblendBaseline._fitPsf(fp, fmask, pk, pkF, pkres, fbb, dpeaks, peaksF, self.log,
                                         cpsf, psfFwhmPix,
@@ -520,7 +515,7 @@ def __call__(self, source, exposure):
         peakList = deblendedSource.getFootprint().getPeaks()
         peakList.clear()
 
-        for i, peak in enumerate(fpres.peaks):
+        for i, peak in enumerate(fpres.deblendedParents[0].peaks):
             if peak.psfFitFlux > 0:
                 suffix = "pos"
             else: