Merge pull request #171 from lsst/tickets/DM-13082

DM-13082: fix test failure from merge of DM-12968
lsst · Dec 19, 2017 · d046a3e · d046a3e
2 parents 8e15011 + c1b2af9
commit d046a3e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/python/lsst/pipe/tasks/assembleCoadd.py b/python/lsst/pipe/tasks/assembleCoadd.py
@@ -133,11 +133,10 @@ class AssembleCoaddConfig(CoaddBaseTask.ConfigClass):
         doc="Configuration for CoaddPsf",
         dtype=measAlg.CoaddPsfConfig,
     )
-    badMaskPlanes = pexConfig.ListField(
-        dtype=str,
-        doc="Mask planes that, if set, the associated pixel should not be included in coadd.",
-        default=("NO_DATA", "BAD", "EDGE", "SAT"),
-    )
+
+    def setDefaults(self):
+        CoaddBaseTask.ConfigClass.setDefaults(self)
+        self.badMaskPlanes = ["NO_DATA", "BAD", "SAT", "EDGE"]
 
     def validate(self):
         CoaddBaseTask.ConfigClass.validate(self)

diff --git a/python/lsst/pipe/tasks/coaddBase.py b/python/lsst/pipe/tasks/coaddBase.py
@@ -57,6 +57,11 @@ class CoaddBaseConfig(pexConfig.Config):
         doc="Image selection subtask.",
         target=WcsSelectImagesTask,
     )
+    badMaskPlanes = pexConfig.ListField(
+        dtype=str,
+        doc="Mask planes that, if set, the associated pixel should not be included in the coaddTempExp.",
+        default=("NO_DATA",),
+    )
     inputRecorder = pexConfig.ConfigurableField(
         doc="Subtask that helps fill CoaddInputs catalogs added to the final Exposure",
         target=CoaddInputRecorderTask