array 1d now use convert rules

Author: Jammy2211

autoarray/structures/arrays/array_1d_util.py

@@ -40,22 +40,25 @@ def convert_array_1d(
     """
     array_1d = array_2d_util.convert_array(array=array_1d)
 
+    is_numpy = True if isinstance(array_1d, np.ndarray) else False
+
     is_native = array_1d.shape[0] == mask_1d.shape_native[0]
 
     mask_1d = jnp.array(mask_1d.array)
 
     if is_native == store_native:
-        return array_1d
+        array_1d = array_1d
     elif not store_native:
-        return array_1d_slim_from(
+        array_1d = array_1d_slim_from(
             array_1d_native=array_1d,
             mask_1d=mask_1d,
         )
-
-    return array_1d_native_from(
-        array_1d_slim=array_1d,
-        mask_1d=mask_1d,
-    )
+    else:
+        array_1d = array_1d_native_from(
+            array_1d_slim=array_1d,
+            mask_1d=mask_1d,
+        )
+    return np.array(array_1d) if is_numpy else jnp.array(array_1d)
 
 
 def array_1d_slim_from(

autoarray/structures/arrays/array_2d_util.py

@@ -122,10 +122,7 @@ def convert_array_2d(
     """
     array_2d = convert_array(array=array_2d).copy()
 
-    if isinstance(array_2d, np.ndarray):
-        is_numpy = True
-    else:
-        is_numpy = False
+    is_numpy = True if isinstance(array_2d, np.ndarray) else False
 
     check_array_2d_and_mask_2d(array_2d=array_2d, mask_2d=mask_2d)
 
@@ -135,17 +132,17 @@ def convert_array_2d(
         array_2d *= np.invert(mask_2d)
 
     if is_native == store_native:
-        return np.array(array_2d) if is_numpy else jnp.array(array_2d)
+        array_2d = array_2d
     elif not store_native:
         array_2d = array_2d_slim_from(
             array_2d_native=array_2d,
             mask_2d=mask_2d,
         )
-        return np.array(array_2d) if is_numpy else jnp.array(array_2d)
-    array_2d = array_2d_native_from(
-        array_2d_slim=array_2d,
-        mask_2d=mask_2d,
-    )
+    else:
+        array_2d = array_2d_native_from(
+            array_2d_slim=array_2d,
+            mask_2d=mask_2d,
+        )
     return np.array(array_2d) if is_numpy else jnp.array(array_2d)