Add NO_DATA and EDGE mask plane where needed

lsst · Aug 19, 2015 · 8300293 · 8300293
1 parent e4bd6b3
commit 8300293
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/python/lsst/ip/diffim/diaSourceAnalysis.py b/python/lsst/ip/diffim/diaSourceAnalysis.py
@@ -64,7 +64,7 @@ class DiaSourceAnalystConfig(pexConfig.Config):
         doc = """Mask planes that lead to an invalid detection.
                  Options: NO_DATA EDGE SAT BAD CR INTRP
                  E.g. : NO_DATA SAT BAD allows CR-masked and interpolated pixels""",
-        default = ("NO_DATA", "SAT", "BAD")
+        default = ("NO_DATA", "EDGE", "SAT", "BAD")
     )
     fBadPixels = pexConfig.Field(
         dtype = float,

diff --git a/python/lsst/ip/diffim/kernelCandidateQa.py b/python/lsst/ip/diffim/kernelCandidateQa.py
@@ -133,8 +133,8 @@ def _calculateStats(self, di, dof=0.):
         mask = di.getMask()
         maskArr = di.getMask().getArray()
 
-        # Create a mask using BAD,SAT,EDGE pixels.  Keep detections
-        maskArr &= (mask.getPlaneBitMask("BAD")|mask.getPlaneBitMask("SAT")|mask.getPlaneBitMask("EDGE"))
+        # Create a mask using BAD, SAT, NO_DATA, EDGE bits.  Keep detections
+        maskArr &= mask.getPlaneBitMask(["BAD", "SAT", "NO_DATA", "EDGE"])
 
         # Mask out values based on maskArr
         diArr = ma.array(di.getImage().getArray(), mask=maskArr)

diff --git a/python/lsst/ip/diffim/psfMatch.py b/python/lsst/ip/diffim/psfMatch.py
@@ -66,7 +66,7 @@ class DetectionConfig(pexConfig.Config):
         dtype = str,
         doc = """Mask planes that lead to an invalid detection.
                  Options: NO_DATA EDGE SAT BAD CR INTRP""",
-        default = ("NO_DATA", "SAT")
+        default = ("NO_DATA", "EDGE", "SAT")
     )
     fpNpixMin = pexConfig.Field(
         dtype = int,
@@ -273,7 +273,7 @@ class PsfMatchConfig(pexConfig.Config):
         dtype = str,
         doc = """Mask planes to ignore when calculating diffim statistics
                  Options: NO_DATA EDGE SAT BAD CR INTRP""",
-        default = ("NO_DATA", "SAT")
+        default = ("NO_DATA", "EDGE", "SAT")
     )
     candidateResidualMeanMax = pexConfig.Field(
         dtype = float,

diff --git a/src/KernelSolution.cc b/src/KernelSolution.cc
@@ -536,6 +536,7 @@ namespace diffim {
         afwImage::MaskPixel bitMask = 
             (afwImage::Mask<afwImage::MaskPixel>::getPlaneBitMask("BAD") | 
              afwImage::Mask<afwImage::MaskPixel>::getPlaneBitMask("SAT") |
+             afwImage::Mask<afwImage::MaskPixel>::getPlaneBitMask("NO_DATA") |
              afwImage::Mask<afwImage::MaskPixel>::getPlaneBitMask("EDGE"));
 
         /* Create a Footprint that contains all the masked pixels set above */