Revert changes to use subtasks from DM-24731

lsst · Feb 9, 2021 · f0dacf0 · f0dacf0
1 parent 778a6a5
commit f0dacf0
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 21 deletions.
diff --git a/python/lsst/pipe/tasks/assembleCoadd.py b/python/lsst/pipe/tasks/assembleCoadd.py
@@ -1234,14 +1234,6 @@ def countMaskFromFootprint(mask, footprint, bitmask, ignoreMask):
 class SafeClipAssembleCoaddConfig(AssembleCoaddConfig, pipelineConnections=AssembleCoaddConnections):
     """Configuration parameters for the SafeClipAssembleCoaddTask.
     """
-    assembleMeanCoadd = pexConfig.ConfigurableField(
-        target=AssembleCoaddTask,
-        doc="Task to assemble an initial Coadd using the MEAN statistic.",
-    )
-    assembleMeanClipCoadd = pexConfig.ConfigurableField(
-        target=AssembleCoaddTask,
-        doc="Task to assemble an initial Coadd using the MEANCLIP statistic.",
-    )
     clipDetection = pexConfig.ConfigurableField(
         target=SourceDetectionTask,
         doc="Detect sources on difference between unclipped and clipped coadd")
@@ -1296,10 +1288,6 @@ def setDefaults(self):
         self.sigmaClip = 1.5
         self.clipIter = 3
         self.statistic = "MEAN"
-        self.assembleMeanCoadd.statistic = 'MEAN'
-        self.assembleMeanClipCoadd.statistic = 'MEANCLIP'
-        self.assembleMeanCoadd.doWrite = False
-        self.assembleMeanClipCoadd.doWrite = False
 
     def validate(self):
         if self.doSigmaClip:
@@ -1429,8 +1417,6 @@ def __init__(self, *args, **kwargs):
         AssembleCoaddTask.__init__(self, *args, **kwargs)
         schema = afwTable.SourceTable.makeMinimalSchema()
         self.makeSubtask("clipDetection", schema=schema)
-        self.makeSubtask("assembleMeanClipCoadd")
-        self.makeSubtask("assembleMeanCoadd")
 
     @utils.inheritDoc(AssembleCoaddTask)
     @pipeBase.timeMethod
@@ -1514,11 +1500,24 @@ def buildDifferenceImage(self, skyInfo, tempExpRefList, imageScalerList, weightL
         exp : `lsst.afw.image.Exposure`
             Difference image of unclipped and clipped coadd wrapped in an Exposure
         """
-        coaddMean = self.assembleMeanCoadd.run(skyInfo, tempExpRefList,
-                                               imageScalerList, weightList).coaddExposure
-
-        coaddClip = self.assembleMeanClipCoadd.run(skyInfo, tempExpRefList,
-                                                   imageScalerList, weightList).coaddExposure
+        config = AssembleCoaddConfig()
+        # getattr necessary because subtasks do not survive Config.toDict()
+        # exclude connections because the class of self.config.connections is not
+        # the same as AssembleCoaddConfig.connections, and the connections are not
+        # needed to run this task anyway.
+        configIntersection = {k: getattr(self.config, k)
+                              for k, v in self.config.toDict().items()
+                              if (k in config.keys() and k != "connections")}
+        config.update(**configIntersection)
+
+        # statistic MEAN copied from self.config.statistic, but for clarity explicitly assign
+        config.statistic = 'MEAN'
+        task = AssembleCoaddTask(config=config)
+        coaddMean = task.run(skyInfo, tempExpRefList, imageScalerList, weightList).coaddExposure
+
+        config.statistic = 'MEANCLIP'
+        task = AssembleCoaddTask(config=config)
+        coaddClip = task.run(skyInfo, tempExpRefList, imageScalerList, weightList).coaddExposure
 
         coaddDiff = coaddMean.getMaskedImage().Factory(coaddMean.getMaskedImage())
         coaddDiff -= coaddClip.getMaskedImage()

diff --git a/tests/test_assembleCoadd.py b/tests/test_assembleCoadd.py
@@ -131,8 +131,6 @@ class MockSafeClipAssembleCoaddConfig(SafeClipAssembleCoaddConfig):
 
     def setDefaults(self):
         super().setDefaults()
-        self.assembleMeanCoadd.retarget(MockAssembleCoaddTask)
-        self.assembleMeanClipCoadd.retarget(MockAssembleCoaddTask)
         self.doWrite = False