Squash into afd61b0

afd61b didn't write out successful diffIms
or partial outputs when algo error raised

Author: yalsayyad

python/lsst/ip/diffim/subtractImages.py

@@ -405,22 +405,17 @@ def _applyExternalCalibrations(self, exposure, visitSummary):
     def runQuantum(self, butlerQC, inputRefs, outputRefs):
         inputs = butlerQC.get(inputRefs)
 
-        subtractResults = lsst.pipe.base.Struct()
         try:
-            self.run(**inputs, subtractResults=subtractResults)
+            results = self.run(**inputs)
         except lsst.pipe.base.AlgorithmError as e:
-            error = lsst.pipe.base.AnnotatedPartialOutputsError.annotate(
-                e,
-                self,
-                log=self.log
-            )
-            butlerQC.put(subtractResults, outputRefs)
+            error = lsst.pipe.base.AnnotatedPartialOutputsError.annotate(e, self, log=self.log)
+            # No partial outputs for butler to put
             raise error from e
 
-        butlerQC.put(subtractResults, outputRefs)
+        butlerQC.put(results, outputRefs)
 
     @timeMethod
-    def run(self, template, science, sources, visitSummary=None, subtractResults=None):
+    def run(self, template, science, sources, visitSummary=None):
         """PSF match, subtract, and decorrelate two images.
 
         Parameters
@@ -437,10 +432,6 @@ def run(self, template, science, sources, visitSummary=None, subtractResults=Non
             Exposure catalog with external calibrations to be applied. Catalog
             uses the detector id for the catalog id, sorted on id for fast
             lookup.
-        subtractResults : `lsst.pipe.base.Struct`, optional
-            Result struct that is modified to allow saving of partial outputs
-            for some failure conditions. If the task completes successfully,
-            this is also returned.
 
         Returns
         -------
@@ -458,8 +449,6 @@ def run(self, template, science, sources, visitSummary=None, subtractResults=Non
                 Sources from the input catalog that were used to construct the
                 PSF-matching kernel.
         """
-        if subtractResults is None:
-            subtractResults = lsst.pipe.base.Struct()
         self._prepareInputs(template, science, visitSummary=visitSummary)
 
         convolveTemplate = self.chooseConvolutionMethod(template, science)