mask now also follows strictire typing rules

Author: Jammy2211

autoarray/dataset/interferometer/dataset.py

@@ -205,7 +205,7 @@ def w_tilde(self):
         return WTildeInterferometer(
             w_matrix=w_matrix,
             curvature_preload=curvature_preload,
-            dirty_image=dirty_image,
+            dirty_image=np.array(dirty_image.array),
             real_space_mask=self.real_space_mask,
             noise_map_value=self.noise_map[0],
         )

autoarray/geometry/geometry_util.py

@@ -119,7 +119,6 @@ def central_scaled_coordinate_1d_from(
     return (x_pixel,)
 
 
-@numba_util.jit()
 def pixel_coordinates_1d_from(
     scaled_coordinates_1d: Tuple[float],
     shape_slim: Tuple[int],
@@ -137,7 +136,6 @@ def pixel_coordinates_1d_from(
     return (x_pixel,)
 
 
-@numba_util.jit()
 def scaled_coordinates_1d_from(
     pixel_coordinates_1d: Tuple[float],
     shape_slim: Tuple[int],

autoarray/mask/mask_1d.py

@@ -59,7 +59,7 @@ def __init__(
             mask = np.asarray(mask).astype("bool")
 
         if invert:
-            mask = np.invert(mask)
+            mask = ~mask
 
         if type(pixel_scales) is float:
             pixel_scales = (pixel_scales,)
@@ -153,7 +153,7 @@ def from_fits(
         """
 
         return cls(
-            array_1d_util.numpy_array_1d_via_fits_from(file_path=file_path, hdu=hdu),
+            mask=np.array(array_1d_util.numpy_array_1d_via_fits_from(file_path=file_path, hdu=hdu)),
             pixel_scales=pixel_scales,
             origin=origin,
         )

autoarray/mask/mask_2d.py

@@ -200,11 +200,8 @@ def __init__(
         if type(mask) is list:
             mask = np.asarray(mask).astype("bool")
 
-        if not isinstance(mask, np.ndarray):
-            mask = mask._array
-
         if invert:
-            mask = np.invert(mask)
+            mask = ~mask
 
         pixel_scales = geometry_util.convert_pixel_scales_2d(pixel_scales=pixel_scales)
 
@@ -327,7 +324,7 @@ def circular(
         )
 
         return cls(
-            mask=mask,
+            mask=np.array(mask),
             pixel_scales=pixel_scales,
             origin=origin,
             invert=invert,
@@ -381,7 +378,7 @@ def circular_annular(
         )
 
         return cls(
-            mask=mask,
+            mask=np.array(mask),
             pixel_scales=pixel_scales,
             origin=origin,
             invert=invert,
@@ -438,7 +435,7 @@ def elliptical(
         )
 
         return cls(
-            mask=mask,
+            mask=np.array(mask),
             pixel_scales=pixel_scales,
             origin=origin,
             invert=invert,
@@ -508,7 +505,7 @@ def elliptical_annular(
         )
 
         return cls(
-            mask=mask,
+            mask=np.array(mask),
             pixel_scales=pixel_scales,
             origin=origin,
             invert=invert,
@@ -556,7 +553,7 @@ def from_pixel_coordinates(
         )
 
         return cls(
-            mask=mask,
+            mask=np.array(mask),
             pixel_scales=pixel_scales,
             origin=origin,
             invert=invert,
@@ -594,7 +591,7 @@ def from_fits(
             mask = np.invert(mask.astype("bool"))
 
         mask = Mask2D(
-            mask=mask,
+            mask=np.array(mask),
             pixel_scales=pixel_scales,
             origin=origin,
         )
@@ -743,7 +740,7 @@ def rescaled_from(self, rescale_factor) -> Mask2D:
         from autoarray.mask.mask_2d import Mask2D
 
         rescaled_mask = mask_2d_util.rescaled_mask_2d_from(
-            mask_2d=np.array(self),
+            mask_2d=self.array,
             rescale_factor=rescale_factor,
         )
 
@@ -802,7 +799,7 @@ def resized_from(self, new_shape, pad_value: int = 0.0) -> Mask2D:
         """
 
         resized_mask = array_2d_util.resized_array_2d_from(
-            array_2d=np.array(self._array),
+            array_2d=self.array,
             resized_shape=new_shape,
             pad_value=pad_value,
         ).astype("bool")

autoarray/plot/visuals/two_d.py

@@ -64,7 +64,7 @@ def plot_via_plotter(self, plotter, grid_indexes=None, mapper=None, geometry=Non
             plotter.grid_scatter.scatter_grid(grid=self.grid.array)
 
         if self.mesh_grid is not None:
-            plotter.mesh_grid_scatter.scatter_grid(grid=self.mesh_grid)
+            plotter.mesh_grid_scatter.scatter_grid(grid=self.mesh_grid.array)
 
         if self.positions is not None:
             plotter.positions_scatter.scatter_grid(grid=self.positions)

autoarray/plot/wrap/base/figure.py

@@ -82,10 +82,12 @@ def open(self):
         """
         Wraps the Matplotlib method 'plt.figure' for opening a figure.
         """
-        config_dict = self.config_dict
-        config_dict.pop("aspect")
-        fig = plt.figure(**config_dict)
-        return fig, plt.gca()
+        if not plt.fignum_exists(num=1):
+            config_dict = self.config_dict
+            config_dict.pop("aspect")
+            fig = plt.figure(**config_dict)
+            return fig, plt.gca()
+        return None, None
 
     def close(self):
         """

test_autoarray/layout/test_region.py

@@ -31,15 +31,15 @@ def test__slice_1d__addition():
 
     region = aa.Region1D(region=(0, 1))
 
-    arr_1d = arr_1d.array.at[region.slice].add(image[region.slice])
+    arr_1d[region.slice] += image[region.slice]
 
     assert (arr_1d == np.array([2.0, 2.0, 3.0, 4.0])).all()
 
     arr_1d = aa.Array1D.no_mask(values=np.array([1.0, 2.0, 3.0, 4.0]), pixel_scales=1.0)
 
     region = aa.Region1D(region=(2, 4))
 
-    arr_1d = arr_1d.array.at[region.slice].add(image[region.slice])
+    arr_1d[region.slice] += image[region.slice]
 
     assert (arr_1d == np.array([1.0, 2.0, 4.0, 5.0])).all()
 
@@ -152,7 +152,7 @@ def test__slice_2d__addition():
     image = np.ones((2, 2))
     region = aa.Region2D(region=(0, 1, 0, 1))
 
-    array = array.at[region.slice].add(image[region.slice])
+    array[region.slice] += image[region.slice]
 
     assert (array == np.array([[1.0, 0.0], [0.0, 0.0]])).all()
 
@@ -161,7 +161,7 @@ def test__slice_2d__addition():
     image = np.ones((2, 2))
     region = aa.Region2D(region=(0, 1, 0, 1))
 
-    array = array.at[region.slice].add(image[region.slice])
+    array[region.slice] += image[region.slice]
 
     assert (array == np.array([[2.0, 1.0], [1.0, 1.0]])).all()
 
@@ -170,7 +170,7 @@ def test__slice_2d__addition():
     image = np.ones((3, 3))
     region = aa.Region2D(region=(1, 3, 2, 3))
 
-    array = array.at[region.slice].add(image[region.slice])
+    array[region.slice] += image[region.slice]
 
     assert (
         array == np.array([[1.0, 1.0, 1.0], [1.0, 1.0, 2.0], [1.0, 1.0, 2.0]])
@@ -183,7 +183,7 @@ def test__slice_2d__set_to_zerose():
 
     region = aa.Region2D(region=(0, 1, 0, 1))
 
-    array = array.at[region.slice].set(0)
+    array[region.slice] = 0
 
     assert (array == np.array([[0.0, 1.0], [1.0, 1.0]])).all()
 
@@ -192,7 +192,7 @@ def test__slice_2d__set_to_zerose():
 
     region = aa.Region2D(region=(1, 3, 2, 3))
 
-    array = array.at[region.slice].set(0)
+    array[region.slice] = 0
 
     assert (
         array == np.array([[1.0, 1.0, 1.0], [1.0, 1.0, 0.0], [1.0, 1.0, 0.0]])
@@ -362,4 +362,4 @@ def test__exception__negative_coordinates_2d():
         aa.Region2D(region=(0, 0, -1, 2))
 
     with pytest.raises(exc.RegionException):
-        aa.Region2D(region=(0, 1, 2, -1))
+        aa.Region2D(region=(0, 1, 2, -1))