xp refactor complete

Author: Jammy2211

test_autoarray/geometry/test_geometry_2d.py

@@ -115,7 +115,7 @@ def test__grid_pixels_2d_slim_from():
     )
 
     grid_pixels_util = aa.util.geometry.grid_pixels_2d_slim_from(
-        grid_scaled_2d_slim=np.array(grid_scaled_2d),
+        grid_scaled_2d_slim=grid_scaled_2d,
         shape_native=(2, 2),
         pixel_scales=geometry.pixel_scales,
     )
@@ -134,7 +134,7 @@ def test__grid_pixel_centres_2d_from():
     )
 
     grid_pixels_util = aa.util.geometry.grid_pixel_centres_2d_slim_from(
-        grid_scaled_2d_slim=np.array(grid_scaled_2d),
+        grid_scaled_2d_slim=grid_scaled_2d,
         shape_native=(2, 2),
         pixel_scales=(7.0, 2.0),
     )
@@ -153,7 +153,7 @@ def test__grid_pixel_indexes_2d_from():
     )
 
     grid_pixels_util = aa.util.geometry.grid_pixel_indexes_2d_slim_from(
-        grid_scaled_2d_slim=np.array(grid_scaled_2d),
+        grid_scaled_2d_slim=grid_scaled_2d,
         shape_native=(2, 2),
         pixel_scales=(2.0, 4.0),
     )
@@ -172,7 +172,7 @@ def test__grid_scaled_2d_from():
     )
 
     grid_pixels_util = aa.util.geometry.grid_scaled_2d_slim_from(
-        grid_pixels_2d_slim=np.array(grid_pixels),
+        grid_pixels_2d_slim=grid_pixels,
         shape_native=(2, 2),
         pixel_scales=(2.0, 2.0),
     )

test_autoarray/inversion/inversion/imaging/test_inversion_imaging_util.py

@@ -209,19 +209,17 @@ def test__data_vector_via_w_tilde_data_two_methods_agree():
 
         data_vector = (
             aa.util.inversion_imaging.data_vector_via_blurred_mapping_matrix_from(
-                blurred_mapping_matrix=np.array(blurred_mapping_matrix),
-                image=np.array(image),
-                noise_map=np.array(noise_map),
+                blurred_mapping_matrix=blurred_mapping_matrix,
+                image=image,
+                noise_map=noise_map,
             )
         )
 
         w_tilde_data = aa.util.inversion_imaging.w_tilde_data_imaging_from(
-            image_native=np.array(image.native.array),
-            noise_map_native=np.array(noise_map.native.array),
-            kernel_native=np.array(kernel.native.array),
-            native_index_for_slim_index=np.array(
-                mask.derive_indexes.native_for_slim
-            ).astype("int"),
+            image_native=image.native.array,
+            noise_map_native=noise_map.native.array,
+            kernel_native=kernel.native.array,
+            native_index_for_slim_index=mask.derive_indexes.native_for_slim.astype("int"),
         )
 
         (
@@ -230,20 +228,16 @@ def test__data_vector_via_w_tilde_data_two_methods_agree():
             pix_lengths,
         ) = aa.util.mapper_numba.data_slim_to_pixelization_unique_from(
             data_pixels=w_tilde_data.shape[0],
-            pix_indexes_for_sub_slim_index=np.array(
-                mapper.pix_indexes_for_sub_slim_index
-            ),
-            pix_sizes_for_sub_slim_index=np.array(mapper.pix_sizes_for_sub_slim_index),
-            pix_weights_for_sub_slim_index=np.array(
-                mapper.pix_weights_for_sub_slim_index
-            ),
+            pix_indexes_for_sub_slim_index=mapper.pix_indexes_for_sub_slim_index,
+            pix_sizes_for_sub_slim_index=mapper.pix_sizes_for_sub_slim_index.astype("int"),
+            pix_weights_for_sub_slim_index=mapper.pix_weights_for_sub_slim_index,
             pix_pixels=mapper.params,
-            sub_size=np.array(grid.over_sample_size),
+            sub_size=grid.over_sample_size.array,
         )
 
         data_vector_via_w_tilde = (
             aa.util.inversion_imaging_numba.data_vector_via_w_tilde_data_imaging_from(
-                w_tilde_data=np.array(w_tilde_data),
+                w_tilde_data=w_tilde_data,
                 data_to_pix_unique=data_to_pix_unique.astype("int"),
                 data_weights=data_weights,
                 pix_lengths=pix_lengths.astype("int"),
@@ -279,11 +273,9 @@ def test__curvature_matrix_via_w_tilde_two_methods_agree():
     mapping_matrix = mapper.mapping_matrix
 
     w_tilde = aa.util.inversion_imaging_numba.w_tilde_curvature_imaging_from(
-        noise_map_native=np.array(noise_map.native.array),
-        kernel_native=np.array(kernel.native.array),
-        native_index_for_slim_index=np.array(
-            mask.derive_indexes.native_for_slim
-        ).astype("int"),
+        noise_map_native=noise_map.native.array,
+        kernel_native=kernel.native.array,
+        native_index_for_slim_index=mask.derive_indexes.native_for_slim.astype("int"),
     )
 
     curvature_matrix_via_w_tilde = aa.util.inversion.curvature_matrix_via_w_tilde_from(
@@ -296,7 +288,7 @@ def test__curvature_matrix_via_w_tilde_two_methods_agree():
 
     curvature_matrix = aa.util.inversion.curvature_matrix_via_mapping_matrix_from(
         mapping_matrix=blurred_mapping_matrix,
-        noise_map=np.array(noise_map),
+        noise_map=noise_map,
     )
     assert curvature_matrix_via_w_tilde == pytest.approx(curvature_matrix, abs=1.0e-4)
 
@@ -336,11 +328,9 @@ def test__curvature_matrix_via_w_tilde_preload_two_methods_agree():
             w_tilde_indexes,
             w_tilde_lengths,
         ) = aa.util.inversion_imaging_numba.w_tilde_curvature_preload_imaging_from(
-            noise_map_native=np.array(noise_map.native.array),
-            kernel_native=np.array(kernel.native.array),
-            native_index_for_slim_index=np.array(
-                mask.derive_indexes.native_for_slim
-            ).astype("int"),
+            noise_map_native=noise_map.native.array,
+            kernel_native=kernel.native.array,
+            native_index_for_slim_index=mask.derive_indexes.native_for_slim.astype("int"),
         )
 
         (
@@ -349,15 +339,11 @@ def test__curvature_matrix_via_w_tilde_preload_two_methods_agree():
             pix_lengths,
         ) = aa.util.mapper_numba.data_slim_to_pixelization_unique_from(
             data_pixels=w_tilde_lengths.shape[0],
-            pix_indexes_for_sub_slim_index=np.array(
-                mapper.pix_indexes_for_sub_slim_index
-            ),
-            pix_sizes_for_sub_slim_index=np.array(mapper.pix_sizes_for_sub_slim_index),
-            pix_weights_for_sub_slim_index=np.array(
-                mapper.pix_weights_for_sub_slim_index
-            ),
+            pix_indexes_for_sub_slim_index=mapper.pix_indexes_for_sub_slim_index,
+            pix_sizes_for_sub_slim_index=mapper.pix_sizes_for_sub_slim_index,
+            pix_weights_for_sub_slim_index=mapper.pix_weights_for_sub_slim_index,
             pix_pixels=mapper.params,
-            sub_size=np.array(grid.over_sample_size),
+            sub_size=grid.over_sample_size.array,
         )
 
         curvature_matrix_via_w_tilde = aa.util.inversion_imaging_numba.curvature_matrix_via_w_tilde_curvature_preload_imaging_from(

test_autoarray/inversion/inversion/interferometer/test_inversion_interferometer_util.py

@@ -75,9 +75,9 @@ def test__w_tilde_curvature_interferometer_from():
     grid = aa.Grid2D.uniform(shape_native=(2, 2), pixel_scales=0.0005)
 
     w_tilde = aa.util.inversion_interferometer.w_tilde_curvature_interferometer_from(
-        noise_map_real=np.array(noise_map),
-        uv_wavelengths=np.array(uv_wavelengths),
-        grid_radians_slim=np.array(grid),
+        noise_map_real=noise_map,
+        uv_wavelengths=uv_wavelengths,
+        grid_radians_slim=grid.array,
     )
 
     assert w_tilde == pytest.approx(
@@ -102,9 +102,9 @@ def test__curvature_matrix_via_w_tilde_preload_from():
     grid = aa.Grid2D.uniform(shape_native=(3, 3), pixel_scales=0.0005)
 
     w_tilde = aa.util.inversion_interferometer.w_tilde_curvature_interferometer_from(
-        noise_map_real=np.array(noise_map),
-        uv_wavelengths=np.array(uv_wavelengths),
-        grid_radians_slim=np.array(grid),
+        noise_map_real=noise_map,
+        uv_wavelengths=uv_wavelengths,
+        grid_radians_slim=grid.array,
     )
 
     mapping_matrix = np.array(
@@ -127,8 +127,8 @@ def test__curvature_matrix_via_w_tilde_preload_from():
 
     w_tilde_preload = (
         aa.util.inversion_interferometer.w_tilde_curvature_preload_interferometer_from(
-            noise_map_real=np.array(noise_map),
-            uv_wavelengths=np.array(uv_wavelengths),
+            noise_map_real=noise_map,
+            uv_wavelengths=uv_wavelengths,
             shape_masked_pixels_2d=(3, 3),
             grid_radians_2d=np.array(grid.native),
         )
@@ -168,9 +168,9 @@ def test__curvature_matrix_via_w_tilde_two_methods_agree():
     grid = aa.Grid2D.uniform(shape_native=(3, 3), pixel_scales=0.0005)
 
     w_tilde = aa.util.inversion_interferometer.w_tilde_curvature_interferometer_from(
-        noise_map_real=np.array(noise_map),
-        uv_wavelengths=np.array(uv_wavelengths),
-        grid_radians_slim=np.array(grid),
+        noise_map_real=noise_map,
+        uv_wavelengths=uv_wavelengths,
+        grid_radians_slim=grid.array,
     )
 
     w_tilde_preload = (

test_autoarray/inversion/inversion/test_mapper_valued.py

@@ -125,7 +125,7 @@ def test__magnification_via_mesh_from():
         mapping_matrix=np.ones((12, 10)),
     )
 
-    mapper_valued = aa.MapperValued(values=np.array(magnification), mapper=mapper)
+    mapper_valued = aa.MapperValued(values=magnification, mapper=mapper)
 
     magnification = mapper_valued.magnification_via_mesh_from()
 

test_autoarray/inversion/pixelization/mappers/test_delaunay.py

@@ -29,7 +29,7 @@ def test__pix_indexes_for_sub_slim_index__matches_util(grid_2d_sub_1_7x7):
         pix_indexes_for_sub_slim_index_util,
         sizes,
     ) = aa.util.mapper_numba.pix_indexes_for_sub_slim_index_delaunay_from(
-        source_plane_data_grid=np.array(mapper.source_plane_data_grid),
+        source_plane_data_grid=mapper.source_plane_data_grid.array,
         simplex_index_for_sub_slim_index=simplex_index_for_sub_slim_index,
         pix_indexes_for_simplex_index=pix_indexes_for_simplex_index,
         delaunay_points=mapper.delaunay.points,

test_autoarray/mask/derive/test_grid_2d.py

@@ -237,7 +237,7 @@ def test__masked_grid():
     derive_grid = aa.DeriveGrid2D(mask=mask)
 
     masked_grid_util = aa.util.grid_2d.grid_2d_slim_via_mask_from(
-        mask_2d=np.array(mask),
+        mask_2d=mask,
         pixel_scales=(1.0, 1.0),
         origin=(3.0, -2.0),
     )

test_autoarray/mask/derive/test_indexes_2d.py

@@ -27,7 +27,7 @@ def make_indexes_2d_9x9():
 def test__native_index_for_slim_index(indexes_2d_9x9):
     native_index_for_slim_index_2d = (
         aa.util.mask_2d.native_index_for_slim_index_2d_from(
-            mask_2d=np.array(indexes_2d_9x9.mask),
+            mask_2d=indexes_2d_9x9.mask,
         )
     )
 
@@ -38,23 +38,23 @@ def test__native_index_for_slim_index(indexes_2d_9x9):
 
 def test__unmasked_1d_indexes(indexes_2d_9x9):
     unmasked_pixels_util = aa.util.mask_2d.mask_slim_indexes_from(
-        mask_2d=np.array(indexes_2d_9x9.mask), return_masked_indexes=False
+        mask_2d=indexes_2d_9x9.mask, return_masked_indexes=False
     )
 
     assert indexes_2d_9x9.unmasked_slim == pytest.approx(unmasked_pixels_util, 1e-4)
 
 
 def test__masked_1d_indexes(indexes_2d_9x9):
     masked_pixels_util = aa.util.mask_2d.mask_slim_indexes_from(
-        mask_2d=np.array(indexes_2d_9x9.mask), return_masked_indexes=True
+        mask_2d=indexes_2d_9x9.mask, return_masked_indexes=True
     )
 
     assert indexes_2d_9x9.masked_slim == pytest.approx(masked_pixels_util, 1e-4)
 
 
 def test__edge_1d_indexes(indexes_2d_9x9):
     edge_1d_indexes_util = aa.util.mask_2d.edge_1d_indexes_from(
-        mask_2d=np.array(indexes_2d_9x9.mask)
+        mask_2d=indexes_2d_9x9.mask
     )
 
     assert indexes_2d_9x9.edge_slim == pytest.approx(edge_1d_indexes_util, 1e-4)
@@ -68,7 +68,7 @@ def test__edge_2d_indexes(indexes_2d_9x9):
 
 def test__border_1d_indexes(indexes_2d_9x9):
     border_pixels_util = aa.util.mask_2d.border_slim_indexes_from(
-        mask_2d=np.array(indexes_2d_9x9.mask)
+        mask_2d=indexes_2d_9x9.mask
     )
 
     assert indexes_2d_9x9.border_slim == pytest.approx(border_pixels_util, 1e-4)

test_autoarray/mask/derive/test_mask_2d.py

@@ -32,7 +32,7 @@ def test__unmasked_mask(derive_mask_2d_9x9):
 
 def test__blurring_mask_from(derive_mask_2d_9x9):
     blurring_mask_via_util = aa.util.mask_2d.blurring_mask_2d_from(
-        mask_2d=np.array(derive_mask_2d_9x9.mask),
+        mask_2d=derive_mask_2d_9x9.mask,
         kernel_shape_native=(3, 3),
     )
 
@@ -67,7 +67,7 @@ def test__edge_buffed_mask():
     derive_mask_2d = aa.DeriveMask2D(mask=mask)
 
     edge_buffed_mask_manual = aa.util.mask_2d.buffed_mask_2d_from(
-        mask_2d=np.array(mask),
+        mask_2d=mask,
     ).astype("bool")
 
     assert (derive_mask_2d.edge_buffed == edge_buffed_mask_manual).all()