edge area diff code

Author: Jammy2211

autoarray/inversion/pixelization/image_mesh/overlay.py

@@ -201,9 +201,6 @@ def image_plane_mesh_grid_from(
         adapt_data
             Not used by this image mesh.
         """
-
-        print(mask.pixels_in_mask)
-
         pixel_scales = mask.pixel_scales
 
         grid = mask.derive_grid.unmasked

autoarray/inversion/pixelization/mappers/abstract.py

@@ -25,6 +25,7 @@ def __init__(
         mapper_grids: MapperGrids,
         regularization: Optional[AbstractRegularization],
         border_relocator: BorderRelocator,
+        preloads=None,
         xp=np,
     ):
         """
@@ -88,6 +89,7 @@ def __init__(
 
         self.border_relocator = border_relocator
         self.mapper_grids = mapper_grids
+        self.preloads = preloads
 
     @property
     def params(self) -> int:

autoarray/inversion/pixelization/mappers/factory.py

@@ -13,6 +13,7 @@ def mapper_from(
     mapper_grids: MapperGrids,
     regularization: Optional[AbstractRegularization],
     border_relocator: Optional[BorderRelocator] = None,
+    preloads=None,
     xp=np,
 ):
     """
@@ -66,5 +67,6 @@ def mapper_from(
             mapper_grids=mapper_grids,
             border_relocator=border_relocator,
             regularization=regularization,
+            preloads=preloads,
             xp=xp,
         )

autoarray/inversion/pixelization/mesh/delaunay.py

@@ -40,6 +40,7 @@ def mesh_grid_from(
         self,
         source_plane_data_grid=None,
         source_plane_mesh_grid=None,
+        preloads=None,
         xp=np,
     ):
         """
@@ -62,6 +63,7 @@ def mesh_grid_from(
         return Mesh2DDelaunay(
             values=source_plane_mesh_grid,
             source_plane_data_grid_over_sampled=source_plane_data_grid,
+            preloads=preloads,
             _xp=xp,
         )
 
@@ -73,6 +75,7 @@ def mapper_grids_from(
         source_plane_mesh_grid: Optional[Grid2DIrregular] = None,
         image_plane_mesh_grid: Optional[Grid2DIrregular] = None,
         adapt_data: np.ndarray = None,
+        preloads=None,
         xp=np,
     ) -> MapperGrids:
         """
@@ -132,6 +135,7 @@ def mapper_grids_from(
             source_plane_mesh_grid = self.mesh_grid_from(
                 source_plane_data_grid=relocated_grid.over_sampled,
                 source_plane_mesh_grid=relocated_mesh_grid,
+                preloads=preloads,
                 xp=xp,
             )
         except ValueError as e:

autoarray/inversion/pixelization/mesh/rectangular.py

@@ -73,6 +73,7 @@ def mapper_grids_from(
         source_plane_mesh_grid: Grid2D = None,
         image_plane_mesh_grid: Grid2D = None,
         adapt_data: np.ndarray = None,
+        preloads=None,
         xp=np,
     ) -> MapperGrids:
         """

autoarray/structures/mesh/delaunay_2d.py

@@ -14,7 +14,7 @@
 from autoarray.inversion.pixelization.mesh import mesh_numba_util
 
 
-def scipy_delaunay(points_np, query_points_np, max_simplices):
+def scipy_delaunay(points_np, query_points_np, source_pixel_zeroed_indices, max_simplices=None):
     """Compute Delaunay simplices (simplices_padded) and Voronoi areas in one call."""
 
     # --- Delaunay mesh using source plane data grid ---
@@ -44,6 +44,12 @@ def scipy_delaunay(points_np, query_points_np, max_simplices):
         xp=np,
     )
 
+    # max_area = np.percentile(barycentric_dual_areas, 90.0)
+    # barycentric_dual_areas[source_pixel_zeroed_indices] = max_area
+
+    max_area = 100.0 * np.max(barycentric_dual_areas)
+    barycentric_dual_areas[source_pixel_zeroed_indices] = max_area
+
     # ---------- Areas used to weight split points ----------
     split_point_areas = 0.5 * np.sqrt(barycentric_dual_areas)
 
@@ -66,7 +72,7 @@ def scipy_delaunay(points_np, query_points_np, max_simplices):
     return points, simplices_padded, mappings, split_points, splitted_mappings
 
 
-def jax_delaunay(points, query_points):
+def jax_delaunay(points, query_points, source_pixel_zeroed_indices):
     import jax
     import jax.numpy as jnp
 
@@ -81,8 +87,8 @@ def jax_delaunay(points, query_points):
     splitted_mappings_shape = jax.ShapeDtypeStruct((N * 4, 3), jnp.int32)
 
     return jax.pure_callback(
-        lambda points, qpts: scipy_delaunay(
-            np.asarray(points), np.asarray(qpts), max_simplices
+        lambda points, qpts, spzi: scipy_delaunay(
+            np.asarray(points), np.asarray(qpts), np.asarray(spzi), max_simplices
         ),
         (
             points_shape,
@@ -93,6 +99,7 @@ def jax_delaunay(points, query_points):
         ),
         points,
         query_points,
+        source_pixel_zeroed_indices
     )
 
 
@@ -272,6 +279,7 @@ def __init__(
         self,
         values: Union[np.ndarray, List],
         source_plane_data_grid_over_sampled=None,
+        preloads=None,
         _xp=np,
     ):
         """
@@ -307,6 +315,7 @@ def __init__(
         super().__init__(values, xp=_xp)
 
         self._source_plane_data_grid_over_sampled = source_plane_data_grid_over_sampled
+        self.preloads = preloads
 
     @property
     def geometry(self):
@@ -361,14 +370,16 @@ def delaunay(self) -> "scipy.spatial.Delaunay":
 
             points, simplices, mappings, split_points, splitted_mappings = jax_delaunay(
                 points=self.mesh_grid_xy,
-                query_points=self._source_plane_data_grid_over_sampled
+                query_points=self._source_plane_data_grid_over_sampled,
+                source_pixel_zeroed_indices=self.preloads.source_pixel_zeroed_indices
             )
 
         else:
 
             points, simplices, mappings, split_points, splitted_mappings = scipy_delaunay(
                 points=self.mesh_grid_xy,
-                query_points_np=self.source_plane_data_grid_over_sampled
+                query_points_np=self.source_plane_data_grid_over_sampled,
+                source_pixel_zeroed_indices=self.preloads.source_pixel_zeroed_indices
             )
 
         return DelaunayInterface(