diff --git a/autogalaxy/analysis/analysis/dataset.py b/autogalaxy/analysis/analysis/dataset.py index 8c9c5f2b..0a535ebd 100644 --- a/autogalaxy/analysis/analysis/dataset.py +++ b/autogalaxy/analysis/analysis/dataset.py @@ -180,12 +180,12 @@ def save_attributes(self, paths: af.DirectoryPaths): ) paths.save_fits( name="over_sampling_size_lp", - hdu=self.dataset.grids.lp.over_sampling_size.native.hdu_for_output, + hdu=self.dataset.grids.lp.over_sample_size.native.hdu_for_output, prefix="dataset", ) paths.save_fits( name="over_sampling_size_pixelization", - hdu=self.dataset.grids.pixelization.over_sampling_size.native.hdu_for_output, + hdu=self.dataset.grids.pixelization.over_sample_size.native.hdu_for_output, prefix="dataset", ) paths.save_json( diff --git a/autogalaxy/galaxy/galaxy.py b/autogalaxy/galaxy/galaxy.py index b6418de6..a714590a 100644 --- a/autogalaxy/galaxy/galaxy.py +++ b/autogalaxy/galaxy/galaxy.py @@ -327,7 +327,7 @@ def traced_grid_2d_from(self, grid: aa.type.Grid2DLike) -> aa.type.Grid2DLike: return aa.Grid2D( values=grid - self.deflections_yx_2d_from(grid=grid), mask=grid.mask, - over_sampling_size=grid.over_sampling_size, + over_sample_size=grid.over_sample_size, over_sampled=grid.over_sampled - self.deflections_yx_2d_from( grid=grid.over_sampled ) diff --git a/test_autogalaxy/aggregator/imaging/test_aggregator_imaging.py b/test_autogalaxy/aggregator/imaging/test_aggregator_imaging.py index 27623220..a0ef7a6c 100644 --- a/test_autogalaxy/aggregator/imaging/test_aggregator_imaging.py +++ b/test_autogalaxy/aggregator/imaging/test_aggregator_imaging.py @@ -34,8 +34,8 @@ def test__dataset_generator_from_aggregator__analysis_has_single_dataset( for dataset_list in dataset_gen: assert (dataset_list[0].data == masked_imaging_7x7.data).all() - assert dataset_list[0].grids.lp.over_sampling_size[0] == 5 - assert dataset_list[0].grids.pixelization.over_sampling_size[0] == 3 + assert dataset_list[0].grids.lp.over_sample_size[0] == 5 + assert dataset_list[0].grids.pixelization.over_sample_size[0] == 3 clean(database_file=database_file) diff --git a/test_autogalaxy/galaxy/test_galaxy.py b/test_autogalaxy/galaxy/test_galaxy.py index 0c9ce4f1..ca087dfa 100644 --- a/test_autogalaxy/galaxy/test_galaxy.py +++ b/test_autogalaxy/galaxy/test_galaxy.py @@ -639,13 +639,13 @@ def test__decorator__oversample_uniform__numerical_values(gal_x1_lp): galaxy = ag.Galaxy(redshift=0.5, light=ag.lp.Sersic(intensity=1.0)) - grid = ag.Grid2D.from_mask(mask=mask, over_sampling_size=1) + grid = ag.Grid2D.from_mask(mask=mask, over_sample_size=1) image = galaxy.image_2d_from(grid=grid) assert image[0] == pytest.approx(0.15987224303572964, 1.0e-6) - grid = ag.Grid2D.from_mask(mask=mask, over_sampling_size=2) + grid = ag.Grid2D.from_mask(mask=mask, over_sample_size=2) image = galaxy.image_2d_from(grid=grid) @@ -656,13 +656,13 @@ def test__decorator__oversample_uniform__numerical_values(gal_x1_lp): redshift=0.5, light=ag.lp.Sersic(centre=(3.0, 3.0), intensity=1.0) ) - grid = ag.Grid2D.from_mask(mask=mask, over_sampling_size=1) + grid = ag.Grid2D.from_mask(mask=mask, over_sample_size=1) image = galaxy.image_2d_from(grid=grid) assert image[0] == pytest.approx(0.006719704400094508, 1.0e-6) - grid = ag.Grid2D.from_mask(mask=mask, over_sampling_size=2) + grid = ag.Grid2D.from_mask(mask=mask, over_sample_size=2) image = galaxy.image_2d_from(grid=grid) diff --git a/test_autogalaxy/imaging/test_simulate_and_fit_imaging.py b/test_autogalaxy/imaging/test_simulate_and_fit_imaging.py index f783de98..fbe91953 100644 --- a/test_autogalaxy/imaging/test_simulate_and_fit_imaging.py +++ b/test_autogalaxy/imaging/test_simulate_and_fit_imaging.py @@ -12,7 +12,7 @@ def test__perfect_fit__chi_squared_0(): grid = ag.Grid2D.uniform( shape_native=(11, 11), pixel_scales=0.2, - over_sampling_size=1, + over_sample_size=1, ) psf = ag.Kernel2D.from_gaussian( @@ -141,7 +141,7 @@ def test__simulate_imaging_data_and_fit__linear_light_profiles_agree_with_standa grid = ag.Grid2D.uniform( shape_native=(11, 11), pixel_scales=0.2, - over_sampling_size=1, + over_sample_size=1, ) psf = ag.Kernel2D.from_gaussian( diff --git a/test_autogalaxy/interferometer/test_simulate_and_fit_interferometer.py b/test_autogalaxy/interferometer/test_simulate_and_fit_interferometer.py index 47a219ce..c89db5e5 100644 --- a/test_autogalaxy/interferometer/test_simulate_and_fit_interferometer.py +++ b/test_autogalaxy/interferometer/test_simulate_and_fit_interferometer.py @@ -12,7 +12,7 @@ def test__perfect_fit__chi_squared_0(): grid = ag.Grid2D.uniform( shape_native=(51, 51), pixel_scales=0.1, - over_sampling_size=1, + over_sample_size=1, ) galaxy_0 = ag.Galaxy( @@ -143,7 +143,7 @@ def test__linear_light_profiles_agree_with_standard_light_profiles(): grid = ag.Grid2D.uniform( shape_native=(51, 51), pixel_scales=0.1, - over_sampling_size=1, + over_sample_size=1, ) galaxy = ag.Galaxy( diff --git a/test_autogalaxy/operate/test_image.py b/test_autogalaxy/operate/test_image.py index c5f871f3..41c48562 100644 --- a/test_autogalaxy/operate/test_image.py +++ b/test_autogalaxy/operate/test_image.py @@ -103,7 +103,7 @@ def test__unmasked_blurred_image_2d_from(): pixel_scales=1.0, ) - grid = ag.Grid2D.from_mask(mask=mask, over_sampling_size=1) + grid = ag.Grid2D.from_mask(mask=mask, over_sample_size=1) lp = ag.lp.Sersic(intensity=0.1) diff --git a/test_autogalaxy/profiles/light/standard/test_abstract.py b/test_autogalaxy/profiles/light/standard/test_abstract.py index 6027c946..f499ebd5 100644 --- a/test_autogalaxy/profiles/light/standard/test_abstract.py +++ b/test_autogalaxy/profiles/light/standard/test_abstract.py @@ -47,7 +47,7 @@ def test__image_1d_from__grid_2d_in__returns_1d_image_via_projected_quantities() grid_2d = ag.Grid2D.uniform( shape_native=(5, 5), pixel_scales=1.0, - over_sampling_size=1, + over_sample_size=1, ) lp = ag.lp.Gaussian( @@ -91,13 +91,13 @@ def test__decorator__oversample_uniform__numerical_values(gal_x1_lp): lp = ag.lp.Sersic(intensity=1.0) - grid = ag.Grid2D.from_mask(mask=mask, over_sampling_size=1) + grid = ag.Grid2D.from_mask(mask=mask, over_sample_size=1) image = lp.image_2d_from(grid=grid) assert image[0] == pytest.approx(0.15987224303572964, 1.0e-6) - grid = ag.Grid2D.from_mask(mask=mask, over_sampling_size=2) + grid = ag.Grid2D.from_mask(mask=mask, over_sample_size=2) image = lp.image_2d_from(grid=grid) @@ -106,13 +106,13 @@ def test__decorator__oversample_uniform__numerical_values(gal_x1_lp): lp = ag.lp.Sersic(centre=(3.0, 3.0), intensity=1.0) - grid = ag.Grid2D.from_mask(mask=mask, over_sampling_size=1) + grid = ag.Grid2D.from_mask(mask=mask, over_sample_size=1) image = lp.image_2d_from(grid=grid) assert image[0] == pytest.approx(0.006719704400094508, 1.0e-6) - grid = ag.Grid2D.from_mask(mask=mask, over_sampling_size=2) + grid = ag.Grid2D.from_mask(mask=mask, over_sample_size=2) image = lp.image_2d_from(grid=grid) diff --git a/test_autogalaxy/profiles/mass/abstract/test_abstract.py b/test_autogalaxy/profiles/mass/abstract/test_abstract.py index e59f36fd..56ef5f25 100644 --- a/test_autogalaxy/profiles/mass/abstract/test_abstract.py +++ b/test_autogalaxy/profiles/mass/abstract/test_abstract.py @@ -206,7 +206,7 @@ def test__decorators__convergence_1d_from__grid_2d_in__returns_1d_image_via_proj grid_2d = ag.Grid2D.uniform( shape_native=(5, 5), pixel_scales=1.0, - over_sampling_size=1, + over_sample_size=1, ) sie = ag.mp.Isothermal(centre=(0.0, 0.0), ell_comps=(0.0, 0.0), einstein_radius=1.0)