Transition to int32 for Masks

The transition to int32 for Masks triggered a name change for masks. Update to the new api.
lsst · Jul 12, 2017 · a7dfcb7 · a7dfcb7
1 parent f5c5ced
commit a7dfcb7
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/python/lsst/coadd/utils/coadd.py b/python/lsst/coadd/utils/coadd.py
@@ -65,7 +65,7 @@ def __init__(self, bbox, wcs, badMaskPlanes, logName="coadd.utils.Coadd"):
         self._log = Log.getLogger(logName)
         self._bbox = bbox
         self._wcs = wcs
-        self._badPixelMask = afwImage.MaskU.getPlaneBitMask(badMaskPlanes)
+        self._badPixelMask = afwImage.Mask.getPlaneBitMask(badMaskPlanes)
         self._coadd = afwImage.ExposureF(bbox, wcs)
         self._weightMap = afwImage.ImageF(bbox)
         self._filterDict = dict()  # dict of filter name: filter object for all filters seen so far

diff --git a/python/lsst/coadd/utils/makeBitMask.py b/python/lsst/coadd/utils/makeBitMask.py
@@ -28,14 +28,14 @@
 def makeBitMask(maskPlaneNameList, doInvert=False):
     """Generate a bit mask consisting of ORed together Mask bit planes
 
-    @deprecated use afwImage.MaskU.getPlaneBitMask(maskPlaneNameList) instead.
+    @deprecated use afwImage.Mask.getPlaneBitMask(maskPlaneNameList) instead.
 
     @input[in] maskPlaneNameList: list of mask plane names
     @input[in] doInvert: if True then invert the result
 
     @return a bit mask consisting of the named bit planes ORed together (with the result possibly inverted)
     """
-    bitMask = afwImage.MaskU.getPlaneBitMask(maskPlaneNameList)
+    bitMask = afwImage.Mask.getPlaneBitMask(maskPlaneNameList)
     if doInvert:
-        bitMask = (2**afwImage.MaskU.getNumPlanesMax() - 1) - bitMask
+        bitMask = (2**afwImage.Mask.getNumPlanesMax() - 1) - bitMask
     return bitMask
diff --git a/tests/testCoadd.py b/tests/testCoadd.py
@@ -123,7 +123,7 @@ def testGetters(self):
             )
             badPixelMask = 0
             for maskPlaneName in badMaskPlanes:
-                badPixelMask += afwImage.MaskU.getPlaneBitMask(maskPlaneName)
+                badPixelMask += afwImage.Mask.getPlaneBitMask(maskPlaneName)
             self.assertEqual(bbox, coadd.getBBox())
             self.assertEqual(badPixelMask, coadd.getBadPixelMask())
             self.assertWcsSame(wcs, coadd.getWcs())

diff --git a/tests/testSetCoaddEdgeBits.py b/tests/testSetCoaddEdgeBits.py
@@ -45,15 +45,15 @@ def testRandomMap(self):
         """Test setCoaddEdgeBits using a random depth map
         """
         imDim = afwGeom.Extent2I(50, 55)
-        coaddMask = afwImage.MaskU(imDim)
+        coaddMask = afwImage.Mask(imDim)
 
         numpy.random.seed(12345)
         depthMapArray = numpy.random.randint(0, 3, list((imDim[1], imDim[0]))).astype(numpy.uint16)
         depthMap = afwImage.makeImageFromArray(depthMapArray)
 
-        refCoaddMask = afwImage.MaskU(imDim)
+        refCoaddMask = afwImage.Mask(imDim)
         refCoaddMaskArray = refCoaddMask.getArray()
-        edgeMask = afwImage.MaskU.getPlaneBitMask("NO_DATA")
+        edgeMask = afwImage.Mask.getPlaneBitMask("NO_DATA")
         refCoaddMaskArray |= numpy.array(numpy.where(depthMapArray > 0, 0, edgeMask),
                                          dtype=refCoaddMaskArray.dtype)
 

diff --git a/tests/testSetMaskBits.py b/tests/testSetMaskBits.py
@@ -44,9 +44,9 @@ def countBits(val):
         val >>= 1
     return nBits
 
-MaxBitMask = (2**afwImage.MaskU.getNumPlanesMax() - 1)
+MaxBitMask = (2**afwImage.Mask().getNumPlanesMax() - 1)
 
-MaskPlaneNameIDDict = dict(afwImage.MaskU().getMaskPlaneDict())
+MaskPlaneNameIDDict = dict(afwImage.Mask().getMaskPlaneDict())
 
 
 class AddToCoaddTestCase(unittest.TestCase):