Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DM-39934: Deprecate afw MaskedImage.getArrays() #37

Merged
merged 2 commits into from
Jul 24, 2023
Merged

DM-39934: Deprecate afw MaskedImage.getArrays() #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
087bb9f
Remove deprecated getArrays() usage
parejkoj Jul 8, 2023
eefcf7d
Use array property instead of getArray
parejkoj Jul 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions tests/test_addToCoadd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,13 +87,13 @@ def referenceAddToCoadd(coadd, weightMap, maskedImage, badPixelMask, weight):
overlapBBox = coadd.getBBox()
overlapBBox.clip(maskedImage.getBBox())

coaddArrayList = tuple(arr.copy() for arr in coadd.getArrays())
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)

maskedImageArrayList = maskedImage.getArrays()
maskedImageArrayList = maskedImage.image.array, maskedImage.mask.array, maskedImage.variance.array
badMaskArr = (maskedImageArrayList[1] & badPixelMask) != 0

coaddSlices = slicesFromBox(overlapBBox, coadd)
Expand Down Expand Up @@ -203,8 +203,8 @@ def referenceTest(self, coadd, weightMap, image, badPixelMask, weight):
afwOverlapBox = coaddUtils.addToCoadd(coadd, weightMap, image, badPixelMask, weight)
self.assertEqual(overlapBBox, afwOverlapBox)

coaddArrayList = coadd.getArrays()
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]):
Expand Down
37 changes: 17 additions & 20 deletions tests/test_copyGoodPixels.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -99,17 +99,16 @@ def referenceCopyGoodPixelsMaskedImage(destImage, srcImage, badPixelMask):
return (destImage, 0)

destImageView = destImage.Factory(destImage, overlapBBox, afwImage.PARENT, False)
destImageArrayList = destImageView.getArrays()

srcImageView = srcImage.Factory(srcImage, overlapBBox, afwImage.PARENT, False)
srcImageArrayList = srcImageView.getArrays()

isBadArray = (srcImageArrayList[1] & badPixelMask) != 0
isBadArray = (srcImageView.mask.array & badPixelMask) != 0

destImageView.image.array = np.where(isBadArray, destImageView.image.array, srcImageView.image.array)
destImageView.mask.array = np.where(isBadArray, destImageView.mask.array, srcImageView.mask.array)
destImageView.variance.array = np.where(isBadArray,
destImageView.variance.array,
srcImageView.variance.array)

for ind in range(3):
destImageView = destImageArrayList[ind]
srcImageView = srcImageArrayList[ind]
destImageView[:] = np.where(isBadArray, destImageView, srcImageView)
numGoodPix = np.sum(np.logical_not(isBadArray))
return destImage, numGoodPix

Expand All @@ -127,11 +126,10 @@ def getSolidMaskedImage(self, bbox, val, badMask=0):

np.random.seed(0)
maskedImage = afwImage.MaskedImageF(bbox)
imageArrays = maskedImage.getArrays()
imageArrays[0][:] = val
imageArrays[2][:] = val * 0.5
imageArrays[1][:, 0:npShape[1]/2] = 0
imageArrays[1][:, npShape[1]/2:] = badMask
maskedImage.image.array[:] = val
maskedImage.variance.array[:] = val * 0.5
maskedImage.mask.array[:, 0:npShape[1]/2] = 0
maskedImage.mask.array[:, npShape[1]/2:] = badMask
return maskedImage

def getRandomMaskedImage(self, bbox, excludeMask=0):
Expand All @@ -145,10 +143,9 @@ def getRandomMaskedImage(self, bbox, excludeMask=0):

np.random.seed(0)
maskedImage = afwImage.MaskedImageF(bbox)
imageArrays = maskedImage.getArrays()
imageArrays[0][:] = np.random.normal(5000, 5000, npShape) # image
imageArrays[2][:] = np.random.normal(3000, 3000, npShape) # variance
imageArrays[1][:] = np.logical_and(np.random.randint(0, 8, npShape), ~excludeMask)
maskedImage.image.array[:] = np.random.normal(5000, 5000, npShape)
maskedImage.variance.array[:] = np.random.normal(3000, 3000, npShape)
maskedImage.mask.array[:] = np.logical_and(np.random.randint(0, 8, npShape), ~excludeMask)
return maskedImage

def getRandomImage(self, bbox, nanSigma=0):
Expand All @@ -159,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
Expand Down
5 changes: 2 additions & 3 deletions tests/test_setCoaddEdgeBits.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down