clean up zoom in Array2D

Author: Jammy2211

autoarray/plot/mat_plot/two_d.py

@@ -262,11 +262,8 @@ def plot_array(
             buffer = 0 if array.mask.is_all_false else 1
 
             array = array.zoomed_around_mask(buffer=buffer)
-            extent = array.extent_of_zoomed_array(buffer=buffer)
 
-        else:
-
-            extent = array.geometry.extent
+        extent = array.geometry.extent
 
         ax = None
 

autoarray/plot/wrap/two_d/array_overlay.py

@@ -1,6 +1,7 @@
 import matplotlib.pyplot as plt
 
 from autoarray.plot.wrap.two_d.abstract import AbstractMatWrap2D
+from autoarray.mask.derive.zoom_2d import Zoom2D
 
 
 class ArrayOverlay(AbstractMatWrap2D):
@@ -17,6 +18,8 @@ class ArrayOverlay(AbstractMatWrap2D):
 
     def overlay_array(self, array, figure):
         aspect = figure.aspect_from(shape_native=array.shape_native)
-        extent = array.extent_of_zoomed_array(buffer=0)
+
+        array_zoom = array.zoomed_around_mask(buffer=0)
+        extent = array_zoom.geometry.extent
 
         plt.imshow(X=array.native, aspect=aspect, extent=extent, **self.config_dict)

autoarray/structures/arrays/uniform_2d.py

@@ -486,36 +486,6 @@ def zoomed_around_mask(self, buffer: int = 1) -> "Array2D":
 
         return Array2D(values=array, mask=mask, header=self.header)
 
-    def extent_of_zoomed_array(self, buffer: int = 1) -> np.ndarray:
-        """
-        For an extracted zoomed array computed from the method *zoomed_around_mask* compute its extent in scaled
-        coordinates.
-
-        The extent of the grid in scaled units returned as an ``ndarray`` of the form [x_min, x_max, y_min, y_max].
-
-        This is used visualize zoomed and extracted arrays via the imshow() method.
-
-        Parameters
-        ----------
-        buffer
-            The number pixels around the extracted array used as a buffer.
-        """
-        extracted_array_2d = array_2d_util.extracted_array_2d_from(
-            array_2d=np.array(self.native),
-            y0=self.mask.zoom_region[0] - buffer,
-            y1=self.mask.zoom_region[1] + buffer,
-            x0=self.mask.zoom_region[2] - buffer,
-            x1=self.mask.zoom_region[3] + buffer,
-        )
-
-        mask = Mask2D.all_false(
-            shape_native=extracted_array_2d.shape,
-            pixel_scales=self.pixel_scales,
-            origin=self.mask.mask_centre,
-        )
-
-        return mask.geometry.extent
-
     def resized_from(
         self, new_shape: Tuple[int, int], mask_pad_value: int = 0.0
     ) -> "Array2D":

test_autoarray/structures/arrays/test_uniform_2d.py

@@ -479,7 +479,9 @@ def test__extent_of_zoomed_array():
 
     arr_masked = aa.Array2D(values=array_2d, mask=mask)
 
-    extent = arr_masked.extent_of_zoomed_array(buffer=1)
+    arr_zoom = arr_masked.zoomed_around_mask(buffer=1)
+
+    extent = arr_zoom.geometry.extent
 
     assert extent == pytest.approx(np.array([-4.0, 6.0, -2.0, 3.0]), 1.0e-4)