Merge pull request #67 from lsst/tickets/DM-6580

lsst · Jul 26, 2016 · 221e009 · 221e009
2 parents 423b56c + b144d67
commit 221e009
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/python/lsst/pipe/tasks/imageDifference.py b/python/lsst/pipe/tasks/imageDifference.py
@@ -527,7 +527,7 @@ def run(self, sensorRef, templateIdList=None):
         # If doSubtract is False, then subtractedExposure was fetched from disk (above), thus it may have
         # already been decorrelated. Thus, we do not do decorrelation if doSubtract is False.
         if self.config.doDecorrelation and self.config.doSubtract:
-            decorrResult = self.decorrelate.run(templateExposure, exposure,
+            decorrResult = self.decorrelate.run(exposure, templateExposure,
                                                 subtractedExposure,
                                                 subtractRes.psfMatchingKernel)
             subtractedExposure = decorrResult.correctedExposure
@@ -561,7 +561,11 @@ def run(self, sensorRef, templateIdList=None):
                 if not self.config.doDipoleFitting:
                     self.measurement.run(diaSources, subtractedExposure)
                 else:
-                    self.measurement.run(diaSources, subtractedExposure, exposure, templateExposure)
+                    if self.config.doSubtract:
+                        self.measurement.run(diaSources, subtractedExposure, exposure,
+                                             subtractRes.matchedExposure)
+                    else:
+                        self.measurement.run(diaSources, subtractedExposure, exposure)
 
             # Match with the calexp sources if possible
             if self.config.doMatchSources: