Updated all autolens workspace / pipelines / howtolens to new autofit API

Author: Jammy2211

autoarray/operators/inversion/pixelizations.py

@@ -24,24 +24,24 @@ def __repr__(self):
 
 
 class Rectangular(Pixelization):
-    def __init__(self, shape=(3, 3)):
+    def __init__(self, shp=(3, 3)):
         """A rectangular pixelization, where pixels are defined on a Cartesian and uniform grid of shape \ 
         (rows, columns).
 
         Like structures, the indexing of the rectangular grid begins in the top-left corner and goes right and down.
 
         Parameters
         -----------
-        shape : (int, int)
+        shp : (int, int)
             The dimensions of the rectangular grid of pixels (y_pixels, x_pixel)
         """
 
-        if shape[0] <= 2 or shape[1] <= 2:
+        if shp[0] <= 2 or shp[1] <= 2:
             raise exc.PixelizationException(
                 "The rectangular pixelization must be at least dimensions 3x3"
             )
 
-        self.shape = (int(shape[0]), int(shape[1]))
+        self.shape = (int(shp[0]), int(shp[1]))
         self.pixels = self.shape[0] * self.shape[1]
         super(Rectangular, self).__init__()
 
@@ -140,18 +140,18 @@ def mapper_from_grid_and_sparse_grid(
 
 
 class VoronoiMagnification(Voronoi):
-    def __init__(self, shape=(3, 3)):
+    def __init__(self, shp=(3, 3)):
         """A pixelization which adapts to the magnification pattern of a lens's mass model and uses a Voronoi \
         pixelization to discretize the grid into pixels.
 
         Parameters
         ----------
-        shape : (int, int)
+        shp : (int, int)
             The shape of the unmasked sparse-grid which is laid over the masked image, in order to derive the \
             adaptive-magnification pixelization (see *ImagePlanePixelization*)
         """
         super(VoronoiMagnification, self).__init__()
-        self.shape = (int(shape[0]), int(shape[1]))
+        self.shape = (int(shp[0]), int(shp[1]))
         self.pixels = self.shape[0] * self.shape[1]
 
     def sparse_grid_from_grid(self, grid, hyper_image=None, seed=1):

autoarray/plotters/plotter_util.py

@@ -231,9 +231,7 @@ def quantity_and_annuli_radii_from_minimum_and_maximum_radii_and_radii_points(
     return quantity_radii, annuli_radii
 
 
-def get_critical_curve_and_caustic(
-    obj, include_critical_curves, include_caustics
-):
+def get_critical_curve_and_caustic(obj, include_critical_curves, include_caustics):
 
     if include_critical_curves:
         critical_curves = obj.critical_curves

autoarray/structures/grids.py

@@ -511,7 +511,10 @@ def bounding_box(cls, bounding_box, shape_2d, sub_size=1):
 
         y_max, y_min, x_max, x_min = bounding_box
 
-        pixel_scales = ((y_max - y_min) / (shape_2d[0] - 1), (x_max - x_min) / (shape_2d[1] - 1))
+        pixel_scales = (
+            (y_max - y_min) / (shape_2d[0] - 1),
+            (x_max - x_min) / (shape_2d[1] - 1),
+        )
         origin = ((y_max + y_min) / 2.0, (x_max + x_min) / 2.0)
 
         return cls.uniform(

test_autoarray/unit/operators/inversion/test_integration.py

@@ -34,7 +34,7 @@ def test__5_simple_grid__no_sub_grid(self):
         # There is no sub-grid, so our grid are just the masked_image grid (note the NumPy weighted_data structure
         # ensures this has no sub-gridding)
 
-        pix = aa.pix.Rectangular(shape=(3, 3))
+        pix = aa.pix.Rectangular(shp=(3, 3))
 
         mapper = pix.mapper_from_grid_and_sparse_grid(
             grid=grid,
@@ -139,7 +139,7 @@ def test__15_grid__no_sub_grid(self):
             mask=mask,
         )
 
-        pix = aa.pix.Rectangular(shape=(3, 3))
+        pix = aa.pix.Rectangular(shp=(3, 3))
 
         mapper = pix.mapper_from_grid_and_sparse_grid(
             grid=grid, sparse_grid=None, inversion_uses_border=False
@@ -261,7 +261,7 @@ def test__5_simple_grid__include_sub_grid(self):
             mask=mask,
         )
 
-        pix = aa.pix.Rectangular(shape=(3, 3))
+        pix = aa.pix.Rectangular(shp=(3, 3))
 
         mapper = pix.mapper_from_grid_and_sparse_grid(
             grid=grid, sparse_grid=None, inversion_uses_border=False
@@ -346,7 +346,7 @@ def test__grid__requires_border_relocation(self):
             mask=mask,
         )
 
-        pix = aa.pix.Rectangular(shape=(3, 3))
+        pix = aa.pix.Rectangular(shp=(3, 3))
 
         mapper = pix.mapper_from_grid_and_sparse_grid(
             grid=grid, sparse_grid=None, inversion_uses_border=False
@@ -426,7 +426,7 @@ def test__interferometer(self):
 
         grid = aa.masked.grid.from_mask(mask=mask)
 
-        pix = aa.pix.Rectangular(shape=(7, 7))
+        pix = aa.pix.Rectangular(shp=(7, 7))
 
         mapper = pix.mapper_from_grid_and_sparse_grid(
             grid=grid, sparse_grid=None, inversion_uses_border=False
@@ -503,7 +503,7 @@ def test__3x3_simple_grid(self):
 
         grid = aa.masked.grid.manual_1d(grid=grid, mask=mask)
 
-        pix = aa.pix.VoronoiMagnification(shape=(3, 3))
+        pix = aa.pix.VoronoiMagnification(shp=(3, 3))
         sparse_grid = grids.SparseGrid.from_grid_and_unmasked_2d_grid_shape(
             grid=grid, unmasked_sparse_shape=pix.shape
         )
@@ -603,7 +603,7 @@ def test__3x3_simple_grid__include_mask(self):
 
         grid = aa.masked.grid.manual_1d(grid=grid, mask=mask)
 
-        pix = aa.pix.VoronoiMagnification(shape=(3, 3))
+        pix = aa.pix.VoronoiMagnification(shp=(3, 3))
         sparse_grid = grids.SparseGrid.from_grid_and_unmasked_2d_grid_shape(
             grid=grid, unmasked_sparse_shape=pix.shape
         )
@@ -714,7 +714,7 @@ def test__3x3_simple_grid__include_mask_and_sub_grid(self):
 
         grid = aa.masked.grid.manual_1d(grid=grid, mask=mask)
 
-        pix = aa.pix.VoronoiMagnification(shape=(3, 3))
+        pix = aa.pix.VoronoiMagnification(shp=(3, 3))
         sparse_grid = grids.SparseGrid.from_grid_and_unmasked_2d_grid_shape(
             grid=grid, unmasked_sparse_shape=pix.shape
         )
@@ -802,7 +802,7 @@ def test__3x3_simple_grid__include_mask_with_offset_centre(self):
 
         grid = aa.masked.grid.manual_1d(grid=grid, mask=mask)
 
-        pix = aa.pix.VoronoiMagnification(shape=(3, 3))
+        pix = aa.pix.VoronoiMagnification(shp=(3, 3))
         sparse_grid = grids.SparseGrid.from_grid_and_unmasked_2d_grid_shape(
             grid=grid, unmasked_sparse_shape=pix.shape
         )
@@ -888,7 +888,7 @@ def test__interferometer(self):
 
         grid = aa.masked.grid.from_mask(mask=mask)
 
-        pix = aa.pix.VoronoiMagnification(shape=(7, 7))
+        pix = aa.pix.VoronoiMagnification(shp=(7, 7))
 
         sparse_grid = pix.sparse_grid_from_grid(grid=grid)
 

test_autoarray/unit/operators/inversion/test_pixelizations.py

@@ -7,23 +7,23 @@ class TestRectangular:
     class TestGridIrregular:
         def test__pixelization_grid_returns_none_as_not_used(self, sub_grid_7x7):
 
-            pix = aa.pix.Rectangular(shape=(3, 3))
+            pix = aa.pix.Rectangular(shp=(3, 3))
 
             assert pix.sparse_grid_from_grid(grid=sub_grid_7x7) == None
 
 
 class TestVoronoiMagnification:
     def test__number_of_pixels_setup_correct(self):
 
-        pix = aa.pix.VoronoiMagnification(shape=(3, 3))
+        pix = aa.pix.VoronoiMagnification(shp=(3, 3))
 
         assert pix.shape == (3, 3)
 
     def test__pixelization_grid_returns_same_as_computed_from_grids_module(
         self, sub_grid_7x7
     ):
 
-        pix = aa.pix.VoronoiMagnification(shape=(3, 3))
+        pix = aa.pix.VoronoiMagnification(shp=(3, 3))
 
         pixelization_grid = pix.sparse_grid_from_grid(grid=sub_grid_7x7)
 

test_autoarray/unit/plotters/test_mapper_plotters.py

@@ -33,7 +33,7 @@ def make_grid():
 
 @pytest.fixture(name="rectangular_pixelization")
 def make_rectangular_pixelization():
-    return aa.pix.Rectangular(shape=(25, 25))
+    return aa.pix.Rectangular(shp=(25, 25))
 
 
 @pytest.fixture(name="rectangular_mapper")

test_autoarray/unit/structures/test_grids.py

@@ -241,31 +241,77 @@ def test__grid__makes_scaled_sub_grid_with_pixel_scale_and_sub_size(self):
             assert grid.sub_size == 2
 
     class TestGridBoundingBox:
-        def test__grid_bounding_box__uniform_box__makes_grid_with_correct_pixel_scales_and_origin(self):
+        def test__grid_bounding_box__uniform_box__makes_grid_with_correct_pixel_scales_and_origin(
+            self
+        ):
 
-            grid = aa.grid.bounding_box(bounding_box=[2.0, -2.0, 2.0, -2.0], shape_2d=(3, 3))
+            grid = aa.grid.bounding_box(
+                bounding_box=[2.0, -2.0, 2.0, -2.0], shape_2d=(3, 3)
+            )
 
-            assert (grid.in_1d == np.array([[2.0, -2.0], [2.0, 0.0], [2.0, 2.0],
-                                            [0.0, -2.0], [0.0, 0.0], [0.0, 2.0],
-                                            [-2.0, -2.0], [-2.0, 0.0], [-2.0, 2.0]])).all()
+            assert (
+                grid.in_1d
+                == np.array(
+                    [
+                        [2.0, -2.0],
+                        [2.0, 0.0],
+                        [2.0, 2.0],
+                        [0.0, -2.0],
+                        [0.0, 0.0],
+                        [0.0, 2.0],
+                        [-2.0, -2.0],
+                        [-2.0, 0.0],
+                        [-2.0, 2.0],
+                    ]
+                )
+            ).all()
             assert grid.pixel_scales == (2.0, 2.0)
             assert grid.origin == (0.0, 0.0)
 
-            grid = aa.grid.bounding_box(bounding_box=[2.0, -2.0, 2.0, -2.0], shape_2d=(2, 3))
+            grid = aa.grid.bounding_box(
+                bounding_box=[2.0, -2.0, 2.0, -2.0], shape_2d=(2, 3)
+            )
 
-            assert (grid.in_1d == np.array([[2.0, -2.0], [2.0, 0.0], [2.0, 2.0],
-                                            [-2.0, -2.0], [-2.0, 0.0], [-2.0, 2.0]])).all()
+            assert (
+                grid.in_1d
+                == np.array(
+                    [
+                        [2.0, -2.0],
+                        [2.0, 0.0],
+                        [2.0, 2.0],
+                        [-2.0, -2.0],
+                        [-2.0, 0.0],
+                        [-2.0, 2.0],
+                    ]
+                )
+            ).all()
             assert grid.pixel_scales == (4.0, 2.0)
             assert grid.origin == (0.0, 0.0)
 
-            grid = aa.grid.bounding_box(bounding_box=[10.0, 8.0, 3.0, -2.0], shape_2d=(3, 3))
+            grid = aa.grid.bounding_box(
+                bounding_box=[10.0, 8.0, 3.0, -2.0], shape_2d=(3, 3)
+            )
 
-            assert grid.in_1d == pytest.approx(np.array([[10.0, -2.0], [10.0, 0.5], [10.0, 3.0],
-                                            [9.0, -2.0], [9.0, 0.5], [9.0, 3.0],
-                                            [8.0, -2.0], [8.0, 0.5], [8.0, 3.0]]), 1.0e-4)
+            assert grid.in_1d == pytest.approx(
+                np.array(
+                    [
+                        [10.0, -2.0],
+                        [10.0, 0.5],
+                        [10.0, 3.0],
+                        [9.0, -2.0],
+                        [9.0, 0.5],
+                        [9.0, 3.0],
+                        [8.0, -2.0],
+                        [8.0, 0.5],
+                        [8.0, 3.0],
+                    ]
+                ),
+                1.0e-4,
+            )
             assert grid.pixel_scales == (1.0, 2.5)
             assert grid.origin == (9.0, 0.5)
 
+
 class TestGridMaskedAPI:
     class TestManual:
         def test__grid__makes_scaled_grid_with_pixel_scale(self):

test_autoarray/unit/test_files/config/general.ini

@@ -17,9 +17,8 @@ cache = True
 parallel = False
 
 [calculation_grid]
-shape_2d = (101, 101)
-pixel_scales = 0.05
-sub_size = 4
+convergence_threshold = 0.05
+pixels = 401
 
 [inversion]
 inversion_pixel_limit_overall = 3000

test_autoarray/unit/test_files/config/priors/default/pixelizations.ini

@@ -1,11 +1,10 @@
 [Rectangular]
-shape_0 = u,20,45
-shape_1 = u,20,45
+shp_0 = u,20,45
+shp_1 = u,20,45
 
 [VoronoiMagnification]
-shape_0 = u,20,45
-shape_1 = u,20,45
-
+shp_0 = u,20,45
+shp_1 = u,20,45
 [VoronoiBrightnessImage]
 pixels = u,50,1500
 weight_floor = u,0.0,1.0