Merge pull request #332 from Jammy2211/feature/over_sampling_refactor

Feature/over sampling refactor

Author: Jammy2211

autolens/__init__.py

@@ -5,16 +5,12 @@
 from autoarray.dataset.interferometer.dataset import (
     Interferometer,
 )
-from autoarray.dataset.over_sampling import OverSamplingDataset
 from autoarray.dataset.grids import GridsInterface
 from autoarray.dataset.dataset_model import DatasetModel
 from autoarray.mask.mask_1d import Mask1D
 from autoarray.mask.mask_2d import Mask2D
 from autoarray.operators.convolver import Convolver
-from autoarray.operators.over_sampling.uniform import OverSamplingUniform  # noqa
-from autoarray.operators.over_sampling.uniform import OverSamplerUniform  # noqa
-from autoarray.operators.over_sampling.iterate import OverSamplingIterate
-from autoarray.operators.over_sampling.iterate import OverSamplerIterate
+from autoarray.operators.over_sampling.over_sampler import OverSampler  # noqa
 from autoarray.inversion.inversion.dataset_interface import DatasetInterface
 from autoarray.inversion.inversion.mapper_valued import MapperValued
 from autoarray.inversion.pixelization import image_mesh
@@ -30,7 +26,6 @@
 from autoarray.inversion.pixelization.mappers.mapper_grids import MapperGrids
 from autoarray.inversion.pixelization.mappers.factory import mapper_from as Mapper
 from autoarray.inversion.pixelization.border_relocator import BorderRelocator
-from autoarray.operators.over_sampling.grid_oversampled import Grid2DOverSampled
 from autoarray.operators.transformer import TransformerDFT
 from autoarray.operators.transformer import TransformerNUFFT
 from autoarray.structures.arrays.uniform_1d import Array1D
@@ -39,8 +34,6 @@
 from autoarray.structures.grids.uniform_1d import Grid1D
 from autoarray.structures.grids.uniform_2d import Grid2D
 from autoarray.structures.grids.irregular_2d import Grid2DIrregular
-from autoarray.structures.grids.irregular_2d import Grid2DIrregularUniform
-from autoarray.operators.over_sampling.iterate import OverSamplingIterate
 from autoarray.structures.mesh.rectangular_2d import Mesh2DRectangular
 from autoarray.structures.mesh.voronoi_2d import Mesh2DVoronoi
 from autoarray.structures.mesh.delaunay_2d import Mesh2DDelaunay

autolens/analysis/preloads.py

@@ -158,16 +158,12 @@ def set_traced_grids_of_planes_for_inversion(self, fit_0, fit_1):
 
         self.traced_grids_of_planes_for_inversion = None
 
-        over_sampled_grid = fit_0.grids.pixelization.over_sampling.over_sampler_from(
-            mask=fit_0.grids.pixelization.mask
-        ).over_sampled_grid
-
         traced_grids_of_planes_0 = fit_0.tracer.traced_grid_2d_list_from(
-            grid=over_sampled_grid
+            grid=fit_0.grids.pixelization
         )
 
         traced_grids_of_planes_1 = fit_1.tracer.traced_grid_2d_list_from(
-            grid=over_sampled_grid
+            grid=fit_0.grids.pixelization
         )
 
         if traced_grids_of_planes_0[-1] is not None:

autolens/fixtures.py

@@ -3,6 +3,10 @@
 from autogalaxy.fixtures import *
 
 
+def make_grid_2d_7x7():
+    return aa.Grid2D.from_mask(mask=make_mask_2d_7x7(), over_sample_size=1)
+
+
 def make_positions_x2():
     return al.Grid2DIrregular(values=[(1.0, 1.0), (2.0, 2.0)])
 

autolens/imaging/fit_imaging.py

@@ -84,29 +84,6 @@ def __init__(
 
         self.preloads = preloads
 
-    @cached_property
-    def grids(self) -> aa.GridsInterface:
-
-        grids = super().grids
-
-        if grids.non_uniform is None:
-            return grids
-
-        uniform = aa.Grid2D(
-            values=grids.non_uniform,
-            mask=self.dataset.mask,
-            over_sampling=self.dataset.over_sampling.non_uniform,
-            over_sampling_non_uniform=self.dataset.over_sampling.non_uniform
-        )
-
-        return aa.GridsInterface(
-            uniform=uniform,
-            non_uniform=grids.non_uniform,
-            pixelization=grids.pixelization,
-            blurring=grids.blurring,
-            border_relocator=grids.border_relocator
-        )
-
     @property
     def blurred_image(self) -> aa.Array2D:
         """
@@ -119,7 +96,7 @@ def blurred_image(self) -> aa.Array2D:
         if self.preloads.blurred_image is None:
 
             return self.tracer.blurred_image_2d_from(
-                grid=self.grids.uniform,
+                grid=self.grids.lp,
                 convolver=self.dataset.convolver,
                 blurring_grid=self.grids.blurring,
             )
@@ -201,7 +178,7 @@ def galaxy_model_image_dict(self) -> Dict[ag.Galaxy, np.ndarray]:
         """
 
         galaxy_blurred_image_2d_dict = self.tracer.galaxy_blurred_image_2d_dict_from(
-            grid=self.grids.uniform,
+            grid=self.grids.lp,
             convolver=self.dataset.convolver,
             blurring_grid=self.grids.blurring,
         )
@@ -272,7 +249,7 @@ def model_images_of_planes_list(self) -> List[aa.Array2D]:
 
         model_images_of_planes_list = [
             aa.Array2D(
-            values=np.zeros(self.grids.uniform.shape_slim), mask=self.dataset.mask
+            values=np.zeros(self.grids.lp.shape_slim), mask=self.dataset.mask
             )
             for i in range(self.tracer.total_planes)
         ]
@@ -328,7 +305,7 @@ def unmasked_blurred_image(self) -> aa.Array2D:
             exc.raise_linear_light_profile_in_unmasked()
 
         return self.tracer.unmasked_blurred_image_2d_from(
-            grid=self.grids.uniform, psf=self.dataset.psf
+            grid=self.grids.lp, psf=self.dataset.psf
         )
 
     @property
@@ -344,7 +321,7 @@ def unmasked_blurred_image_of_planes_list(self) -> List[aa.Array2D]:
             exc.raise_linear_light_profile_in_unmasked()
 
         return self.tracer.unmasked_blurred_image_2d_list_from(
-            grid=self.grids.uniform, psf=self.dataset.psf
+            grid=self.grids.lp, psf=self.dataset.psf
         )
 
     @property

autolens/imaging/mock/mock_fit_imaging.py

@@ -30,13 +30,13 @@ def grid(self):
         if self._grid is not None:
             return self._grid
 
-        return super().grids.uniform
+        return super().grids.lp
 
     @property
     def grids(self) -> aa.GridsInterface:
 
         return aa.GridsInterface(
-            uniform=self.grid,
+            lp=self.grid,
             pixelization=self.grid,
         )
 

autolens/imaging/model/visualizer.py

@@ -115,7 +115,7 @@ def visualize(
         )
         plotter_interface.galaxies(
             galaxies=tracer.galaxies,
-            grid=fit.grids.uniform,
+            grid=fit.grids.lp,
             during_analysis=during_analysis,
         )
         if fit.inversion is not None:

autolens/imaging/simulator.py

@@ -110,9 +110,15 @@ def via_deflections_and_galaxies_from(self, deflections : aa.VectorYX2D, galaxie
         grid = aa.Grid2D.uniform(
             shape_native=deflections.shape_native,
             pixel_scales=deflections.pixel_scales,
+            over_sample_size=1
         )
 
-        deflected_grid = grid - deflections
+        deflected_grid = aa.Grid2D(
+            values=grid - deflections,
+            mask=grid.mask,
+            over_sample_size=1,
+            over_sampled=grid - deflections
+        )
 
         image = sum(map(lambda g: g.image_2d_from(grid=deflected_grid), galaxies))
 

autolens/interferometer/fit_interferometer.py

@@ -99,7 +99,7 @@ def profile_visibilities(self) -> aa.Visibilities:
         transform to the sum of light profile images.
         """
         return self.tracer.visibilities_from(
-            grid=self.grids.uniform, transformer=self.dataset.transformer
+            grid=self.grids.lp, transformer=self.dataset.transformer
         )
 
     @property
@@ -172,7 +172,7 @@ def galaxy_model_image_dict(self) -> Dict[ag.Galaxy, np.ndarray]:
         data being fitted.
         """
         galaxy_model_image_dict = self.tracer.galaxy_image_2d_dict_from(
-            grid=self.grids.uniform
+            grid=self.grids.lp
         )
 
         galaxy_linear_obj_image_dict = self.galaxy_linear_obj_data_dict_from(
@@ -194,7 +194,7 @@ def galaxy_model_visibilities_dict(self) -> Dict[ag.Galaxy, np.ndarray]:
           are solved for first via the inversion.
         """
         galaxy_model_visibilities_dict = self.tracer.galaxy_visibilities_dict_from(
-            grid=self.grids.uniform, transformer=self.dataset.transformer
+            grid=self.grids.lp, transformer=self.dataset.transformer
         )
 
         galaxy_linear_obj_visibilities_dict = self.galaxy_linear_obj_data_dict_from(

autolens/interferometer/model/visualizer.py

@@ -109,11 +109,11 @@ def visualize(
         tracer = fit.tracer_linear_light_profiles_to_light_profiles
 
         plotter_interface.tracer(
-            tracer=tracer, grid=fit.grids.uniform, during_analysis=during_analysis
+            tracer=tracer, grid=fit.grids.lp, during_analysis=during_analysis
         )
         plotter_interface.galaxies(
             galaxies=tracer.galaxies,
-            grid=fit.grids.uniform,
+            grid=fit.grids.lp,
             during_analysis=during_analysis,
         )
         if fit.inversion is not None:

autolens/interferometer/plot/fit_interferometer_plotters.py

@@ -120,7 +120,7 @@ def tracer_plotter(self) -> TracerPlotter:
         """
         return TracerPlotter(
             tracer=self.tracer,
-            grid=self.fit.grids.uniform,
+            grid=self.fit.grids.lp,
             mat_plot_2d=self.mat_plot_2d,
             visuals_2d=self.visuals_2d,
             include_2d=self.include_2d,