move areas factor

Author: Jammy2211

autoarray/inversion/pixelization/interpolator/delaunay.py

@@ -9,7 +9,6 @@
     split_points_from,
 )
 
-
 def scipy_delaunay(points_np, query_points_np, areas_factor):
     """Compute Delaunay simplices (simplices_padded) and Voronoi areas in one call."""
 
@@ -427,12 +426,10 @@ def delaunay(self) -> "scipy.spatial.Delaunay":
 
         if self.preloads is not None:
 
-            areas_factor = self.preloads.areas_factor
             skip_areas = self.preloads.skip_areas
 
         else:
 
-            areas_factor = 0.5
             skip_areas = False
 
         if not skip_areas:
@@ -445,7 +442,7 @@ def delaunay(self) -> "scipy.spatial.Delaunay":
                     jax_delaunay(
                         points=self.mesh_grid_xy,
                         query_points=self.data_grid.over_sampled,
-                        areas_factor=areas_factor,
+                        areas_factor=self.mesh.areas_factor,
                     )
                 )
 
@@ -455,7 +452,7 @@ def delaunay(self) -> "scipy.spatial.Delaunay":
                     scipy_delaunay(
                         points_np=self.mesh_grid_xy,
                         query_points_np=self.data_grid.over_sampled,
-                        areas_factor=areas_factor,
+                        areas_factor=self.mesh.areas_factor,
                     )
                 )
 

autoarray/inversion/pixelization/mesh/delaunay.py

@@ -10,7 +10,7 @@
 
 
 class Delaunay(AbstractMesh):
-    def __init__(self):
+    def __init__(self, areas_factor: float = 0.5):
         """
         An irregular mesh of Delaunay triangle pixels, which using linear barycentric interpolation are paired with
         a 2D grid of (y,x) coordinates.
@@ -35,6 +35,7 @@ def __init__(self):
         triangle corners they are a closer distance to.
         """
         super().__init__()
+        self.areas_factor = areas_factor
 
     @property
     def mapper_cls(self):

autoarray/preloads.py

@@ -24,7 +24,6 @@ def __init__(
         source_pixel_zeroed_indices: np.ndarray = None,
         image_plane_mesh_grid_list: np.ndarray = None,
         linear_light_profile_blurred_mapping_matrix=None,
-        areas_factor: float = 0.5,
         skip_areas: bool = False,
     ):
         """
@@ -81,8 +80,6 @@ def __init__(
             inversion, with the other component being the pixelization's pixels. These are fixed when the lens light
             is fixed to the maximum likelihood solution, allowing the blurred mapping matrix to be preloaded, but
             the intensity values will still be solved for during the inversion.
-        areas_factor
-            Factor used to scale the Voronoi areas during split point computation. Default is 0.5.
         skip_areas
             Whether to skip Voronoi area calculations and split point computations during Delaunay triangulation.
             When True, the Delaunay interface returns only the minimal set of outputs (points, simplices, mappings)
@@ -128,5 +125,4 @@ def __init__(
                 linear_light_profile_blurred_mapping_matrix
             )
 
-        self.areas_factor = areas_factor
         self.skip_areas = skip_areas