Add subtractBackground to cutOutDonuts. Needs debugging.

lsst-ts · Jan 20, 2024 · 47ab2ab · 47ab2ab
1 parent 8b1a359
commit 47ab2ab
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 0 deletions.
diff --git a/python/lsst/ts/wep/task/cutOutDonutsBase.py b/python/lsst/ts/wep/task/cutOutDonutsBase.py
@@ -149,6 +149,10 @@ class CutOutDonutsBaseTaskConfig(
         dtype=int,
         default=6,
     )
+    subtractBackground = pexConfig.ConfigurableField(
+        target=lsst.meas.algorithms.SubtractBackgroundTask,
+        doc="Task to perform background subtraction.",
+    )
 
 
 class CutOutDonutsBaseTask(pipeBase.PipelineTask):
@@ -185,6 +189,8 @@ def __init__(self, **kwargs):
         # Parameters for mask multiplication (for deblending)
         self.multiplyMask = self.config.multiplyMask
         self.maskGrowthIter = self.config.maskGrowthIter
+        # Set up background subtraction task
+        self.makeSubtask("subtractBackground")
 
     def _checkAndSetOffset(self, dataOffsetValue):
         """Check offset in instParams dictionary and if it

diff --git a/python/lsst/ts/wep/task/cutOutDonutsCwfsTask.py b/python/lsst/ts/wep/task/cutOutDonutsCwfsTask.py
@@ -163,6 +163,8 @@ def run(
     ) -> pipeBase.Struct:
         cameraName = camera.getName()
         extraCatalog, intraCatalog = donutCatalogs
+        defaultMaskPlaneDict = exposures[0].mask.getMaskPlaneDict()
+        print('-1', defaultMaskPlaneDict)
 
         # Get the donut stamps from extra and intra focal images
         donutStampsExtra = DonutStamps([], use_archive=True)
@@ -171,6 +173,13 @@ def run(
         for exposure in exposures:
             focusZ = exposure.visitInfo.focusZ
             detectorName = exposure.getDetector().getName()
+            # Subtract background
+            print('0', exposure.mask.getMaskPlaneDict())
+            exposure.mask.clearMaskPlaneDict()
+            exposure.mask.conformMaskPlanes(defaultMaskPlaneDict)
+            print('1', exposure.mask.getMaskPlaneDict())
+            print('2', defaultMaskPlaneDict)
+            background = self.subtractBackground.run(exposure=exposure).background
             if detectorName in self.extraFocalNames:
                 # LSST extrafocal chips are offset -1.5 mm
                 # when LSST camera defocus is at 0.

diff --git a/python/lsst/ts/wep/task/cutOutDonutsScienceSensorTask.py b/python/lsst/ts/wep/task/cutOutDonutsScienceSensorTask.py
@@ -194,12 +194,14 @@ def run(
         )
 
         # Get the donut stamps from extra and intra focal images
+        backgroundExtra = self.subtractBackground.run(exposure=exposure[extraExpIdx]).background
         donutStampsExtra = self.cutOutStamps(
             exposures[extraExpIdx],
             donutCatalog[extraExpIdx],
             DefocalType.Extra,
             cameraName,
         )
+        backgroundIntra = self.subtractBackground.run(exposure=exposure[intraExpIdx]).background
         donutStampsIntra = self.cutOutStamps(
             exposures[intraExpIdx],
             donutCatalog[intraExpIdx],

diff --git a/tests/task/test_cutOutDonutsCwfsTask.py b/tests/task/test_cutOutDonutsCwfsTask.py
@@ -87,6 +87,7 @@ def tearDownClass(cls):
         runProgram(cleanUpCmd)
 
     def setUp(self):
+        print('set', lsst.afw.image.Mask().getMaskPlaneDict())
         self.config = CutOutDonutsCwfsTaskConfig()
         self.task = CutOutDonutsCwfsTask(config=self.config)