black

Author: Jammy2211

autoarray/dataset/grids.py

@@ -65,13 +65,11 @@ def __init__(
             mask=self.mask,
             over_sample_size=self.over_sample_size_lp,
         )
-        self.lp.over_sampled
 
         self.pixelization = Grid2D.from_mask(
             mask=self.mask,
             over_sample_size=self.over_sample_size_pixelization,
         )
-        self.pixelization.over_sampled
 
         if self.psf is None:
             self.blurring = None
@@ -80,13 +78,13 @@ def __init__(
                 self.blurring = self.lp.blurring_grid_via_kernel_shape_from(
                     kernel_shape_native=self.psf.shape_native,
                 )
-                self.blurring.over_sampled
             except exc.MaskException:
                 self.blurring = None
 
-
         self.border_relocator = BorderRelocator(
-            mask=self.mask, sub_size=self.over_sample_size_pixelization, use_w_tilde=use_w_tilde
+            mask=self.mask,
+            sub_size=self.over_sample_size_pixelization,
+            use_w_tilde=use_w_tilde,
         )
 
 

autoarray/dataset/imaging/dataset.py

@@ -198,7 +198,7 @@ def __init__(
             over_sample_size_lp=self.over_sample_size_lp,
             over_sample_size_pixelization=self.over_sample_size_pixelization,
             psf=self.psf,
-            use_w_tilde=use_w_tilde
+            use_w_tilde=use_w_tilde,
         )
 
         self.w_tilde = w_tilde

autoarray/dataset/interferometer/dataset.py

@@ -106,7 +106,7 @@ def __init__(
             mask=self.real_space_mask,
             over_sample_size_lp=self.over_sample_size_lp,
             over_sample_size_pixelization=self.over_sample_size_pixelization,
-            use_w_tilde=use_w_tilde
+            use_w_tilde=use_w_tilde,
         )
 
         self.w_tilde = w_tilde

autoarray/inversion/inversion/imaging/inversion_imaging_numba_util.py

@@ -924,4 +924,4 @@ def relocated_grid_via_jit_from(grid, border_grid):
                     + border_origin[:]
                 )
 
-    return grid_relocated
+    return grid_relocated

autoarray/inversion/pixelization/border_relocator.py

@@ -267,9 +267,10 @@ def relocated_grid_from(grid, border_grid, xp=np):
     return relocated_grid
 
 
-
 class BorderRelocator:
-    def __init__(self, mask: Mask2D, sub_size: Union[int, Array2D], use_w_tilde : bool = False):
+    def __init__(
+        self, mask: Mask2D, sub_size: Union[int, Array2D], use_w_tilde: bool = False
+    ):
         """
         Relocates source plane coordinates that trace outside the mask’s border in the source-plane back onto the
         border.
@@ -361,7 +362,6 @@ def relocated_grid_from(self, grid: Grid2D, xp=np) -> Grid2D:
                 grid=grid.array, border_grid=grid.array[self.border_slim], xp=xp
             )
 
-
             over_sampled = relocated_grid_from(
                 grid=grid.over_sampled.array,
                 border_grid=grid.over_sampled.array[self.sub_border_slim],
@@ -370,11 +370,12 @@ def relocated_grid_from(self, grid: Grid2D, xp=np) -> Grid2D:
 
         else:
 
-            from autoarray.inversion.inversion.imaging import inversion_imaging_numba_util
+            from autoarray.inversion.inversion.imaging import (
+                inversion_imaging_numba_util,
+            )
 
             values = inversion_imaging_numba_util.relocated_grid_via_jit_from(
-                grid=grid.array,
-                border_grid=grid[self.border_slim]
+                grid=grid.array, border_grid=grid[self.border_slim]
             )
 
             over_sampled = inversion_imaging_numba_util.relocated_grid_via_jit_from(
@@ -387,6 +388,7 @@ def relocated_grid_from(self, grid: Grid2D, xp=np) -> Grid2D:
             mask=grid.mask,
             over_sample_size=self.sub_size,
             over_sampled=over_sampled,
+            over_sampler=grid.over_sampler,
             xp=xp,
         )
 
@@ -416,11 +418,13 @@ def relocated_mesh_grid_from(
 
         else:
 
-            from autoarray.inversion.inversion.imaging import inversion_imaging_numba_util
+            from autoarray.inversion.inversion.imaging import (
+                inversion_imaging_numba_util,
+            )
 
             relocated_grid = inversion_imaging_numba_util.relocated_grid_via_jit_from(
                 grid=mesh_grid.array,
-                border_grid=grid[self.border_slim],
+                border_grid=grid[self.sub_border_slim],
             )
 
         return Grid2DIrregular(

autoarray/inversion/pixelization/mesh/abstract.py

@@ -47,6 +47,7 @@ def relocated_grid_from(
             mask=source_plane_data_grid.mask,
             over_sample_size=source_plane_data_grid.over_sampler.sub_size,
             over_sampled=source_plane_data_grid.over_sampled.array,
+            over_sampler=source_plane_data_grid.over_sampler,
             xp=xp,
         )
 

autoarray/structures/decorators/to_grid.py

@@ -26,26 +26,37 @@ def via_grid_2d(self, result) -> Union[Grid2D, List[Grid2D]]:
             except AttributeError:
                 over_sampled = None
 
+            try:
+                over_sampler = result.over_sampler
+            except AttributeError:
+                over_sampler = None
+
             return Grid2D(
                 values=result,
                 mask=self.mask,
                 over_sample_size=self.over_sample_size,
                 over_sampled=over_sampled,
+                over_sampler=over_sampler,
             )
 
         try:
             grid_over_sampled_list = [res.over_sampled for res in result]
+            grid_over_sampler_list = [res.over_sampler for res in result]
         except AttributeError:
             grid_over_sampled_list = [None] * len(result)
+            grid_over_sampler_list = [None] * len(result)
 
         return [
             Grid2D(
                 values=res,
                 mask=self.mask,
                 over_sample_size=self.over_sample_size,
                 over_sampled=over_sampled,
+                over_sampler=over_sampler,
+            )
+            for res, over_sampled, over_sampler in zip(
+                result, grid_over_sampled_list, grid_over_sampler_list
             )
-            for res, over_sampled in zip(result, grid_over_sampled_list)
         ]
 
     def via_grid_2d_irr(self, result) -> Union[Grid2DIrregular, List[Grid2DIrregular]]:

autoarray/structures/grids/uniform_2d.py

@@ -27,6 +27,7 @@ def __init__(
         store_native: bool = False,
         over_sample_size: Union[int, Array2D] = 4,
         over_sampled: Optional[Grid2D] = None,
+        over_sampler=None,
         xp=np,
         *args,
         **kwargs,
@@ -169,15 +170,36 @@ def __init__(
 
         grid_2d_util.check_grid_2d(grid_2d=values)
 
-        over_sample_size = over_sample_util.over_sample_size_convert_to_array_2d_from(
-            over_sample_size=over_sample_size, mask=mask
+        self._over_sample_size = over_sample_size
+
+        self._over_sampler = over_sampler
+        self._over_sampled = over_sampled
+
+    @property
+    def over_sample_size(self):
+
+        if isinstance(self._over_sample_size, Array2D):
+            return self._over_sample_size
+
+        self._over_sample_size = (
+            over_sample_util.over_sample_size_convert_to_array_2d_from(
+                over_sample_size=self._over_sample_size, mask=self.mask
+            )
         )
 
+        return self._over_sample_size
+
+    @property
+    def over_sampler(self):
+
+        if self._over_sampler is not None:
+            return self._over_sampler
+
         from autoarray.operators.over_sampling.over_sampler import OverSampler
 
-        self.over_sampler = OverSampler(sub_size=over_sample_size, mask=mask)
+        self._over_sampler = OverSampler(sub_size=self.over_sample_size, mask=self.mask)
 
-        self._over_sampled = over_sampled
+        return self._over_sampler
 
     @property
     def over_sampled(self):
@@ -188,7 +210,7 @@ def over_sampled(self):
         over_sampled = over_sample_util.grid_2d_slim_over_sampled_via_mask_from(
             mask_2d=np.array(self.mask),
             pixel_scales=self.mask.pixel_scales,
-            sub_size=self.over_sampler.sub_size.array.astype("int"),
+            sub_size=self.over_sample_size.array.astype("int"),
             origin=self.mask.origin,
         )
 
@@ -700,12 +722,9 @@ def subtracted_from(
             mask=mask,
             over_sample_size=self.over_sample_size,
             over_sampled=self.over_sampled - xp.array(offset),
+            over_sampler=self.over_sampler,
         )
 
-    @property
-    def over_sample_size(self):
-        return self.over_sampler.sub_size
-
     @property
     def slim(self) -> "Grid2D":
         """