From 96e27113736303bb8653c89a320f919c50ca6fd2 Mon Sep 17 00:00:00 2001 From: John Parejko Date: Fri, 12 Apr 2024 13:04:49 -0700 Subject: [PATCH] Remove deprecated getArrays() --- .../afw/image/_maskedImage/_maskedImageContinued.py | 11 ----------- tests/test_maskedImage.py | 13 ------------- tests/test_stacker.py | 5 ++--- 3 files changed, 2 insertions(+), 27 deletions(-) diff --git a/python/lsst/afw/image/_maskedImage/_maskedImageContinued.py b/python/lsst/afw/image/_maskedImage/_maskedImageContinued.py index fb75b8710..2d86edada 100644 --- a/python/lsst/afw/image/_maskedImage/_maskedImageContinued.py +++ b/python/lsst/afw/image/_maskedImage/_maskedImageContinued.py @@ -19,8 +19,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -from deprecated.sphinx import deprecated - import numpy as np from lsst.utils import TemplateMeta @@ -84,15 +82,6 @@ def _get(self, index, origin): self.mask[index, origin], self.variance[index, origin]) - @deprecated(reason=("This method is being removed in favor of the individual properties." - " It will be removed after v26."), - version="v26.0", category=FutureWarning) - def getArrays(self): - """Return a tuple (value, mask, variance) numpy arrays.""" - return (self.image.array if self.image else None, - self.mask.array if self.mask else None, - self.variance.array if self.variance else None) - def convertF(self): return MaskedImageF(self, True) diff --git a/tests/test_maskedImage.py b/tests/test_maskedImage.py index 5f3126fbb..a4ccd3cb6 100644 --- a/tests/test_maskedImage.py +++ b/tests/test_maskedImage.py @@ -113,19 +113,6 @@ def tearDown(self): del self.mimage2 del self.function - # TODO DM-39935: remove this test when you remove getArrays() - def testArrays(self): - """ - This method is testing that ``lsst.afw.image.MaskedImageF.getArrays()`` - returns the proper image, mask, and variance. - """ - image, mask, variance = self.mimage.getArrays() - self.assertFloatsEqual(self.mimage.image.getArray(), image) - self.assertFloatsEqual(self.mimage.mask.getArray(), mask) - self.assertFloatsEqual(self.mimage.variance.getArray(), variance) - mimage2 = afwImage.makeMaskedImageFromArrays(image, mask, variance) - self.assertEqual(type(mimage2), type(self.mimage)) - def testProperties(self): self.assertImagesEqual(self.mimage.image, self.mimage.image) self.assertMasksEqual(self.mimage.mask, self.mimage.mask) diff --git a/tests/test_stacker.py b/tests/test_stacker.py index 0ece82153..e87ae3e6d 100644 --- a/tests/test_stacker.py +++ b/tests/test_stacker.py @@ -334,10 +334,9 @@ def testRejectedMaskPropagation(self): finalImage = np.array([12.0, 12.0, 12.0, 12.0], dtype=np.float32) for i in range(4): mi = afwImage.MaskedImageF(4, 1) - imArr, maskArr, varArr = mi.getArrays() - imArr[:, :] = np.ones((1, 4), dtype=np.float32) + mi.image.array[:, :] = np.ones((1, 4), dtype=np.float32) maskedImageList.append(mi) - partialSum += imArr + partialSum += mi.image.array # add one more image with all permutations of the first two bits set in # different pixels mi = afwImage.MaskedImageF(4, 1)