horrible refactor nearly done

Jammy2211 · Dec 15, 2024 · 8598e8e · 8598e8e
1 parent e4a20aa
commit 8598e8e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/autolens/analysis/preloads.py b/autolens/analysis/preloads.py
@@ -158,14 +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_sampler.uniform_over_sampled
-
         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:

diff --git a/autolens/lens/to_inversion.py b/autolens/lens/to_inversion.py
@@ -462,7 +462,7 @@ def mapper_galaxy_dict(self) -> Dict[aa.AbstractMapper, ag.Galaxy]:
                         ].regularization,
                         source_plane_data_grid=traced_grids_of_planes_list[
                             plane_index
-                        ].grid_over_sampled,
+                        ],
                         source_plane_mesh_grid=traced_mesh_grids_list_of_planes[
                             plane_index
                         ][mapper_index],

diff --git a/test_autolens/analysis/analysis/test_analysis_dataset.py b/test_autolens/analysis/analysis/test_analysis_dataset.py
@@ -15,6 +15,7 @@
 def test__modify_before_fit__inversion_no_positions_likelihood__raises_exception(
     masked_imaging_7x7,
 ):
+
     lens = al.Galaxy(redshift=0.5, mass=al.mp.IsothermalSph())
 
     pixelization = al.Pixelization(

diff --git a/test_autolens/analysis/test_analysis.py b/test_autolens/analysis/test_analysis.py
@@ -95,7 +95,7 @@ def test__use_border_relocator__determines_if_border_pixel_relocation_is_used(
         )
     )
 
-    masked_imaging_7x7.grids.uniform[4] = np.array([300.0, 0.0])
+    masked_imaging_7x7.grids.uniform.grid_over_sampled[4] = np.array([300.0, 0.0])
 
     analysis = al.AnalysisImaging(
         dataset=masked_imaging_7x7,
@@ -105,7 +105,7 @@ def test__use_border_relocator__determines_if_border_pixel_relocation_is_used(
     instance = model.instance_from_unit_vector([])
     fit = analysis.fit_from(instance=instance)
 
-    grid = fit.inversion.linear_obj_list[0].source_plane_data_grid
+    grid = fit.inversion.linear_obj_list[0].source_plane_data_grid.grid_over_sampled
 
     assert grid[2] == pytest.approx([-82.99114877, 52.81254922], 1.0e-4)
 
@@ -117,7 +117,7 @@ def test__use_border_relocator__determines_if_border_pixel_relocation_is_used(
     instance = model.instance_from_unit_vector([])
     fit = analysis.fit_from(instance=instance)
 
-    grid = fit.inversion.linear_obj_list[0].source_plane_data_grid
+    grid = fit.inversion.linear_obj_list[0].source_plane_data_grid.grid_over_sampled
 
     assert grid[2] == pytest.approx([-82.89544515, 52.7491249], 1.0e-4)