same rules for grids

Author: Jammy2211

autoarray/structures/arrays/array_1d_util.py

@@ -44,8 +44,6 @@ def convert_array_1d(
 
     is_native = array_1d.shape[0] == mask_1d.shape_native[0]
 
-    mask_1d = jnp.array(mask_1d.array)
-
     if is_native == store_native:
         array_1d = array_1d
     elif not store_native:
@@ -124,7 +122,7 @@ def array_1d_native_from(
     ).astype("int")
 
     return array_1d_via_indexes_1d_from(
-        array_1d_slim=np.array(array_1d_slim),
+        array_1d_slim=array_1d_slim,
         shape=shape,
         native_index_for_slim_index_1d=native_index_for_slim_index_1d,
     )

autoarray/structures/arrays/array_2d_util.py

@@ -129,7 +129,7 @@ def convert_array_2d(
     is_native = len(array_2d.shape) == 2
 
     if is_native and not skip_mask:
-        array_2d *= np.invert(mask_2d)
+        array_2d *= ~mask_2d
 
     if is_native == store_native:
         array_2d = array_2d

autoarray/structures/grids/grid_1d_util.py

@@ -171,7 +171,7 @@ def grid_1d_slim_from(
     """
 
     return array_1d_util.array_1d_slim_from(
-        array_1d_native=np.array(grid_1d_native),
+        array_1d_native=grid_1d_native,
         mask_1d=mask_1d,
     )
 

autoarray/structures/grids/grid_2d_util.py

@@ -120,11 +120,11 @@ def convert_grid_2d(
 
     if is_native:
         if not is_numpy:
-            grid_2d = grid_2d.at[:, :, 0].multiply(jnp.invert(mask_2d))
-            grid_2d = grid_2d.at[:, :, 1].multiply(jnp.invert(mask_2d))
+            grid_2d = grid_2d.at[:, :, 0].multiply(~mask_2d)
+            grid_2d = grid_2d.at[:, :, 1].multiply(~mask_2d)
         else:
-            grid_2d[:, :, 0] *= np.invert(mask_2d)
-            grid_2d[:, :, 1] *= np.invert(mask_2d)
+            grid_2d[:, :, 0] *= ~mask_2d
+            grid_2d[:, :, 1] *= ~mask_2d
 
     if is_native == store_native:
         grid_2d = grid_2d
@@ -682,16 +682,16 @@ def grid_2d_slim_from(
     """
 
     grid_1d_slim_y = array_2d_util.array_2d_slim_from(
-        array_2d_native=np.array(grid_2d_native[:, :, 0]),
-        mask_2d=np.array(mask),
+        array_2d_native=grid_2d_native[:, :, 0],
+        mask_2d=mask,
     )
 
     grid_1d_slim_x = array_2d_util.array_2d_slim_from(
-        array_2d_native=np.array(grid_2d_native[:, :, 1]),
-        mask_2d=np.array(mask),
+        array_2d_native=grid_2d_native[:, :, 1],
+        mask_2d=mask,
     )
 
-    return np.stack((grid_1d_slim_y, grid_1d_slim_x), axis=-1)
+    return jnp.stack((grid_1d_slim_y, grid_1d_slim_x), axis=-1)
 
 
 def grid_2d_native_from(