moved sub_slim_indexes_for_pix_index to inversion_interferometer_util

Author: Jammy2211

autoarray/inversion/inversion/interferometer/inversion_interferometer_util.py

@@ -1833,3 +1833,42 @@ def curvature_matrix_via_w_tilde_curvature_preload_interferometer_para_from(
     )
     print("finished 3rd loop.")
     return curvature_matrix
+
+
+@numba_util.jit()
+def sub_slim_indexes_for_pix_index(
+    pix_indexes_for_sub_slim_index: np.ndarray,
+    pix_weights_for_sub_slim_index: np.ndarray,
+    pix_pixels: int,
+) -> Tuple[np.ndarray, np.ndarray, np.ndarray]:
+    sub_slim_sizes_for_pix_index = np.zeros(pix_pixels)
+
+    for pix_indexes in pix_indexes_for_sub_slim_index:
+        for pix_index in pix_indexes:
+            sub_slim_sizes_for_pix_index[pix_index] += 1
+
+    max_pix_size = np.max(sub_slim_sizes_for_pix_index)
+
+    sub_slim_indexes_for_pix_index = -1 * np.ones(shape=(pix_pixels, int(max_pix_size)))
+    sub_slim_weights_for_pix_index = -1 * np.ones(shape=(pix_pixels, int(max_pix_size)))
+    sub_slim_sizes_for_pix_index = np.zeros(pix_pixels)
+
+    for slim_index, pix_indexes in enumerate(pix_indexes_for_sub_slim_index):
+        pix_weights = pix_weights_for_sub_slim_index[slim_index]
+
+        for pix_index, pix_weight in zip(pix_indexes, pix_weights):
+            sub_slim_indexes_for_pix_index[
+                pix_index, int(sub_slim_sizes_for_pix_index[pix_index])
+            ] = slim_index
+
+            sub_slim_weights_for_pix_index[
+                pix_index, int(sub_slim_sizes_for_pix_index[pix_index])
+            ] = pix_weight
+
+            sub_slim_sizes_for_pix_index[pix_index] += 1
+
+    return (
+        sub_slim_indexes_for_pix_index,
+        sub_slim_sizes_for_pix_index,
+        sub_slim_weights_for_pix_index,
+    )

autoarray/inversion/inversion/interferometer/w_tilde.py

@@ -130,7 +130,11 @@ def curvature_matrix_diag(self) -> np.ndarray:
             sub_slim_indexes_for_pix_index,
             sub_slim_sizes_for_pix_index,
             sub_slim_weights_for_pix_index,
-        ) = mapper.sub_slim_indexes_for_pix_index_arr
+        ) =  inversion_interferometer_util.sub_slim_indexes_for_pix_index(
+            pix_indexes_for_sub_slim_index=self.pix_indexes_for_sub_slim_index,
+            pix_weights_for_sub_slim_index=self.pix_weights_for_sub_slim_index,
+            pix_pixels=self.pixels,
+        )
 
         return inversion_interferometer_util.curvature_matrix_via_w_tilde_curvature_preload_interferometer_from_2(
             curvature_preload=self.w_tilde.curvature_preload,

autoarray/inversion/pixelization/mappers/abstract.py

@@ -207,28 +207,6 @@ def sub_slim_indexes_for_pix_index(self) -> List[List]:
 
         return sub_slim_indexes_for_pix_index
 
-    @property
-    def sub_slim_indexes_for_pix_index_arr(
-        self,
-    ) -> Tuple[np.ndarray, np.ndarray, np.ndarray]:
-        """
-        Returns the index mappings between each of the pixelization's pixels and the masked data's sub-pixels.
-
-        Given that even pixelization pixel maps to multiple data sub-pixels, index mappings are returned as a list of
-        lists where the first entries are the pixelization index and second entries store the data sub-pixel indexes.
-
-        For example, if `sub_slim_indexes_for_pix_index[2][4] = 10`, the pixelization pixel with index 2
-        (e.g. `mesh_grid[2,:]`) has a mapping to a data sub-pixel with index 10 (e.g. `grid_slim[10, :]).
-
-        This is effectively a reversal of the array `pix_indexes_for_sub_slim_index`.
-        """
-
-        return mapper_util.sub_slim_indexes_for_pix_index(
-            pix_indexes_for_sub_slim_index=self.pix_indexes_for_sub_slim_index,
-            pix_weights_for_sub_slim_index=self.pix_weights_for_sub_slim_index,
-            pix_pixels=self.pixels,
-        )
-
     @cached_property
     def unique_mappings(self) -> UniqueMappings:
         """

autoarray/inversion/pixelization/mappers/mapper_util.py

@@ -9,45 +9,6 @@
 from autoarray.inversion.pixelization.mesh import mesh_util
 
 
-@numba_util.jit()
-def sub_slim_indexes_for_pix_index(
-    pix_indexes_for_sub_slim_index: np.ndarray,
-    pix_weights_for_sub_slim_index: np.ndarray,
-    pix_pixels: int,
-) -> Tuple[np.ndarray, np.ndarray, np.ndarray]:
-    sub_slim_sizes_for_pix_index = np.zeros(pix_pixels)
-
-    for pix_indexes in pix_indexes_for_sub_slim_index:
-        for pix_index in pix_indexes:
-            sub_slim_sizes_for_pix_index[pix_index] += 1
-
-    max_pix_size = np.max(sub_slim_sizes_for_pix_index)
-
-    sub_slim_indexes_for_pix_index = -1 * np.ones(shape=(pix_pixels, int(max_pix_size)))
-    sub_slim_weights_for_pix_index = -1 * np.ones(shape=(pix_pixels, int(max_pix_size)))
-    sub_slim_sizes_for_pix_index = np.zeros(pix_pixels)
-
-    for slim_index, pix_indexes in enumerate(pix_indexes_for_sub_slim_index):
-        pix_weights = pix_weights_for_sub_slim_index[slim_index]
-
-        for pix_index, pix_weight in zip(pix_indexes, pix_weights):
-            sub_slim_indexes_for_pix_index[
-                pix_index, int(sub_slim_sizes_for_pix_index[pix_index])
-            ] = slim_index
-
-            sub_slim_weights_for_pix_index[
-                pix_index, int(sub_slim_sizes_for_pix_index[pix_index])
-            ] = pix_weight
-
-            sub_slim_sizes_for_pix_index[pix_index] += 1
-
-    return (
-        sub_slim_indexes_for_pix_index,
-        sub_slim_sizes_for_pix_index,
-        sub_slim_weights_for_pix_index,
-    )
-
-
 @numba_util.jit()
 def data_slim_to_pixelization_unique_from(
     data_pixels,

test_autoarray/inversion/pixelization/mappers/test_abstract.py

@@ -69,39 +69,6 @@ def test__sub_slim_indexes_for_pix_index():
         [0, 1, 2, 3, 4, 5, 6, 7],
     ]
 
-    (
-        sub_slim_indexes_for_pix_index,
-        sub_slim_sizes_for_pix_index,
-        sub_slim_weights_for_pix_index,
-    ) = mapper.sub_slim_indexes_for_pix_index_arr
-
-    assert (
-        sub_slim_indexes_for_pix_index
-        == np.array(
-            [
-                [0, 3, 6, -1, -1, -1, -1, -1],
-                [1, 4, -1, -1, -1, -1, -1, -1],
-                [2, -1, -1, -1, -1, -1, -1, -1],
-                [5, 7, -1, -1, -1, -1, -1, -1],
-                [0, 1, 2, 3, 4, 5, 6, 7],
-            ]
-        )
-    ).all()
-    assert (sub_slim_sizes_for_pix_index == np.array([3, 2, 1, 2, 8])).all()
-    assert (
-        sub_slim_weights_for_pix_index
-        == np.array(
-            [
-                [0.1, 0.4, 0.7, -1, -1, -1, -1, -1],
-                [0.2, 0.5, -1, -1, -1, -1, -1, -1],
-                [0.3, -1, -1, -1, -1, -1, -1, -1],
-                [0.6, 0.8, -1, -1, -1, -1, -1, -1],
-                [0.9, 0.8, 0.7, 0.6, 0.5, 0.4, 0.3, 0.2],
-            ]
-        )
-    ).all()
-
-
 def test__data_weight_total_for_pix_from():
     mapper = aa.m.MockMapper(
         pix_sub_weights=PixSubWeights(