Cleanup new image method

lsst · Feb 2, 2024 · f167b62 · f167b62
1 parent 6e3365c
commit f167b62
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/python/lsst/afw/display/interface.py b/python/lsst/afw/display/interface.py
@@ -568,8 +568,9 @@ def image(self, data, title="", wcs=None):
         if isinstance(data, afwImage.Exposure):
             if wcs:
                 raise RuntimeError("You may not specify a wcs with an Exposure")
-            data, wcs = data.getMaskedImage(), data.getWcs()
-        elif isinstance(data, afwImage.DecoratedImage):  # it's a DecoratedImage; display it
+            data, wcs = data.getMaskedImage(), data.wcs
+        # it's a DecoratedImage; display it
+        elif isinstance(data, afwImage.DecoratedImage):
             try:
                 wcs = afwGeom.makeSkyWcs(data.getMetadata())
             except TypeError:
@@ -583,15 +584,13 @@ def image(self, data, title="", wcs=None):
         # It's a Mask; display it, bitplane by bitplane.
         elif isinstance(data, afwImage.Mask):
             self.__addMissingMaskPlanes(data)
-            #
-            # Some displays can't display a Mask without an image; so display an Image too,
-            # with pixel values set to the mask
-            #
-            self._impl._mtv(afwImage.ImageI(data.getArray()), data, wcs, title)
-        # it's a MaskedImage; display Image and overlay Mask
+            # Some displays can't display a Mask without an image; so display
+            # an Image too, with pixel values set to the mask.
+            self._impl._mtv(afwImage.ImageI(data.array), data, wcs, title)
+        # It's a MaskedImage; display Image and overlay Mask.
         elif isinstance(data, afwImage.MaskedImage):
             self.__addMissingMaskPlanes(data.mask)
-            self._impl._mtv(data.getImage(), data.getMask(), wcs, title)
+            self._impl._mtv(data.image, data.mask, wcs, title)
         else:
             raise TypeError(f"Unsupported type {data!r}")