Added flagging of sources near the INJECTED mask plane

lsst · Jan 16, 2024 · 3724b0a · 3724b0a
1 parent 2b38363
commit 3724b0a
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 13 deletions.
diff --git a/python/lsst/ip/diffim/detectAndMeasure.py b/python/lsst/ip/diffim/detectAndMeasure.py
@@ -156,12 +156,12 @@ def setDefaults(self):
         self.detection.excludeMaskPlanes = ["EDGE"]
 
         # Add filtered flux measurement, the correct measurement for pre-convolved images.
-        self.measurement.algorithms.names.add('base_PeakLikelihoodFlux')
-        self.measurement.plugins.names |= ['ext_trailedSources_Naive',
-                                           'base_LocalPhotoCalib',
-                                           'base_LocalWcs',
-                                           'ext_shapeHSM_HsmSourceMoments',
-                                           'ext_shapeHSM_HsmPsfMoments',
+        self.measurement.algorithms.names.add("base_PeakLikelihoodFlux")
+        self.measurement.plugins.names |= ["ext_trailedSources_Naive",
+                                           "base_LocalPhotoCalib",
+                                           "base_LocalWcs",
+                                           "ext_shapeHSM_HsmSourceMoments",
+                                           "ext_shapeHSM_HsmPsfMoments",
                                            ]
         self.measurement.slots.psfShape = "ext_shapeHSM_HsmPsfMoments"
         self.measurement.slots.shape = "ext_shapeHSM_HsmSourceMoments"
@@ -174,8 +174,10 @@ def setDefaults(self):
         self.forcedMeasurement.slots.shape = None
 
         # Keep track of which footprints contain streaks
-        self.measurement.plugins['base_PixelFlags'].masksFpAnywhere = ['STREAK']
-        self.measurement.plugins['base_PixelFlags'].masksFpCenter = ['STREAK']
+        self.measurement.plugins["base_PixelFlags"].masksFpAnywhere = [
+            "STREAK", "INJECTED", "INJECTED_TEMPLATE"]
+        self.measurement.plugins["base_PixelFlags"].masksFpCenter = [
+            "STREAK", "INJECTED", "INJECTED_TEMPLATE"]
 
 
 class DetectAndMeasureTask(lsst.pipe.base.PipelineTask):

diff --git a/python/lsst/ip/diffim/subtractImages.py b/python/lsst/ip/diffim/subtractImages.py
@@ -628,16 +628,15 @@ def updateMasks(self, template, science, difference):
         mask = difference.mask
         mask &= ~(mask.getPlaneBitMask("DETECTED") | mask.getPlaneBitMask("DETECTED_NEGATIVE"))
 
+        self.log.info("Adding injected mask planes")
+        mask.addMaskPlane("INJECTED")
+        mask.addMaskPlane("INJECTED_TEMPLATE")
+
         if "FAKE" in science.mask.getMaskPlaneDict().keys():
             # propagate the mask plane related to Fake source injection
             # NOTE: the fake source injection sets FAKE plane, but it should be INJECTED
             # NOTE: This can be removed in DM-40796
-
-            self.log.info("Adding injected mask planes")
-            mask.addMaskPlane("INJECTED")
             diffInjectedBitMask = mask.getPlaneBitMask("INJECTED")
-
-            mask.addMaskPlane("INJECTED_TEMPLATE")
             diffInjTmpltBitMask = mask.getPlaneBitMask("INJECTED_TEMPLATE")
 
             scienceFakeBitMask = science.mask.getPlaneBitMask('FAKE')

diff --git a/python/lsst/ip/diffim/utils.py b/python/lsst/ip/diffim/utils.py
@@ -1266,6 +1266,9 @@ def detectTestSources(exposure):
         doSmooth=True
     )
     exposure.mask.addMaskPlane("STREAK")  # add empty streak mask plane in lieu of maskStreaksTask
+    exposure.mask.addMaskPlane("INJECTED")  # add empty injected mask plane
+    exposure.mask.addMaskPlane("INJECTED_TEMPLATE")  # add empty injected template mask plane
+
     selectSources = detRet.sources
     selectMeasurement.run(measCat=selectSources, exposure=exposure)