Use array property instead of getArray

lsst · Jul 8, 2023 · f846b4a · f846b4a
1 parent a33893c
commit f846b4a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/tests/test_addToCoadd.py b/tests/test_addToCoadd.py
@@ -87,8 +87,8 @@ def referenceAddToCoadd(coadd, weightMap, maskedImage, badPixelMask, weight):
     overlapBBox = coadd.getBBox()
     overlapBBox.clip(maskedImage.getBBox())
 
-    weightMapArray = weightMap.getArray().copy()
     coaddArrayList = coadd.image.array.copy(), coadd.mask.array.copy(), coadd.variance.array.copy()
+    weightMapArray = weightMap.array.copy()
 
     if overlapBBox.isEmpty():
         return (overlapBBox, coaddArrayList, weightMapArray)
@@ -203,8 +203,8 @@ def referenceTest(self, coadd, weightMap, image, badPixelMask, weight):
         afwOverlapBox = coaddUtils.addToCoadd(coadd, weightMap, image, badPixelMask, weight)
         self.assertEqual(overlapBBox, afwOverlapBox)
 
-        weightMapArray = weightMap.getArray()
         coaddArrayList = coadd.image.array, coadd.mask.array, coadd.variance.array
+        weightMapArray = weightMap.array
 
         for name, ind in (("image", 0), ("mask", 1), ("variance", 2)):
             if not np.allclose(coaddArrayList[ind], refCoaddArrayList[ind]):

diff --git a/tests/test_copyGoodPixels.py b/tests/test_copyGoodPixels.py
@@ -64,10 +64,10 @@ def referenceCopyGoodPixelsImage(destImage, srcImage):
         return (destImage, 0)
 
     destImageView = destImage.Factory(destImage, overlapBBox, afwImage.PARENT, False)
-    destImageArray = destImageView.getArray()
+    destImageArray = destImageView.array
 
     srcImageView = srcImage.Factory(srcImage, overlapBBox, afwImage.PARENT, False)
-    srcImageArray = srcImageView.getArray()
+    srcImageArray = srcImageView.array
 
     isBadArray = np.isnan(srcImageArray)
 
@@ -156,7 +156,7 @@ def getRandomImage(self, bbox, nanSigma=0):
 
         np.random.seed(0)
         image = afwImage.ImageF(bbox)
-        imageArray = image.getArray()
+        imageArray = image.array
         imageArray[:] = np.random.normal(5000, 5000, npShape)
         if nanSigma > 0:
             # add NaNs at nanSigma above mean of a test array

diff --git a/tests/test_setCoaddEdgeBits.py b/tests/test_setCoaddEdgeBits.py
@@ -50,10 +50,9 @@ def testRandomMap(self):
         depthMap = afwImage.makeImageFromArray(depthMapArray)
 
         refCoaddMask = afwImage.Mask(imDim)
-        refCoaddMaskArray = refCoaddMask.getArray()
         edgeMask = afwImage.Mask.getPlaneBitMask("NO_DATA")
-        refCoaddMaskArray |= np.array(np.where(depthMapArray > 0, 0, edgeMask),
-                                      dtype=refCoaddMaskArray.dtype)
+        refCoaddMask.array |= np.array(np.where(depthMapArray > 0, 0, edgeMask),
+                                       dtype=refCoaddMask.array.dtype)
 
         coaddUtils.setCoaddEdgeBits(coaddMask, depthMap)
         self.assertMasksEqual(coaddMask, refCoaddMask)