ModelPsfMatchTask: Set output exposure PSF to model PSF used

Remove referenceModelPsf from returned Struct, because it is
now accessible from the psfMatchedExposure.

python/lsst/ip/diffim/modelPsfMatch.py

@@ -300,6 +300,7 @@ def run(self, exposure, referencePsfModel, kernelSum=1.0):
         psfMatchedExposure = afwImage.ExposureF(exposure.getBBox(), exposure.getWcs())
         psfMatchedExposure.setFilter(exposure.getFilter())
         psfMatchedExposure.setCalib(exposure.getCalib())
+        psfMatchedExposure.setPsf(referencePsfModel)
         psfMatchedMaskedImage = psfMatchedExposure.getMaskedImage()
 
         # Normalize the psf-matching kernel while convolving since its magnitude is meaningless
@@ -312,7 +313,6 @@ def run(self, exposure, referencePsfModel, kernelSum=1.0):
                                psfMatchingKernel=psfMatchingKernel,
                                kernelCellSet=kernelCellSet,
                                metadata=self.metadata,
-                               referencePsfModel=referencePsfModel,
                                )
 
     def _diagnostic(self, kernelCellSet, spatialSolution, spatialKernel, spatialBg):

tests/testModelPsfMatch.py

@@ -64,9 +64,9 @@ def testAdjustModelSize(self):
         psfModel = measAlg.DoubleGaussianPsf(self.ksize + 2, self.ksize + 2, self.sigma2)
         psfMatch = ipDiffim.ModelPsfMatchTask(config=self.config)
         results = psfMatch.run(self.exp, psfModel)
-        self.assertEqual(results.referencePsfModel.computeImage().getDimensions(),
+        self.assertEqual(results.psfMatchedExposure.getPsf().computeImage().getDimensions(),
                          self.exp.getPsf().computeImage().getDimensions())
-        self.assertEqual(results.referencePsfModel.getSigma1(), self.sigma2)
+        self.assertEqual(results.psfMatchedExposure.getPsf().getSigma1(), self.sigma2)
 
     def tearDown(self):
         del self.exp