Merge pull request #351 from PyAutoLabs/feature/data-typing-simplify

refactor: rename aa.grid_dec to aa.decorators

Author: Jammy2211

autogalaxy/galaxy/galaxies.py

@@ -109,7 +109,7 @@ def image_2d_list_from(
             for galaxy in self
         ]
 
-    @aa.grid_dec.to_array
+    @aa.decorators.to_array
     def image_2d_from(
         self, grid: aa.type.Grid2DLike, xp=np, operated_only: Optional[bool] = None
     ) -> aa.Array2D:
@@ -175,7 +175,7 @@ def galaxy_image_2d_dict_from(
 
         return galaxy_image_2d_dict
 
-    @aa.grid_dec.to_vector_yx
+    @aa.decorators.to_vector_yx
     def deflections_yx_2d_from(
         self, grid: aa.type.Grid2DLike, xp=np, **kwargs
     ) -> np.ndarray:
@@ -201,7 +201,7 @@ def deflections_yx_2d_from(
         """
         return sum(map(lambda g: g.deflections_yx_2d_from(grid=grid, xp=xp), self))
 
-    @aa.grid_dec.to_grid
+    @aa.decorators.to_grid
     def traced_grid_2d_from(
         self, grid: aa.type.Grid2DLike, xp=np
     ) -> aa.type.Grid2DLike:
@@ -210,7 +210,7 @@ def traced_grid_2d_from(
         """
         return grid - self.deflections_yx_2d_from(grid=grid, xp=xp)
 
-    @aa.grid_dec.to_array
+    @aa.decorators.to_array
     def convergence_2d_from(
         self, grid: aa.type.Grid2DLike, xp=np, **kwargs
     ) -> np.ndarray:
@@ -236,7 +236,7 @@ def convergence_2d_from(
         """
         return sum(map(lambda g: g.convergence_2d_from(grid=grid, xp=xp), self))
 
-    @aa.grid_dec.to_array
+    @aa.decorators.to_array
     def potential_2d_from(
         self, grid: aa.type.Grid2DLike, xp=np, **kwargs
     ) -> np.ndarray:

autogalaxy/galaxy/galaxy.py

@@ -210,7 +210,7 @@ def image_2d_list_from(
             )
         ]
 
-    @aa.grid_dec.to_array
+    @aa.decorators.to_array
     def image_2d_from(
         self,
         grid: aa.type.Grid2DLike,
@@ -246,7 +246,7 @@ def image_2d_from(
             )
         return xp.zeros((grid.shape[0],))
 
-    @aa.grid_dec.to_vector_yx
+    @aa.decorators.to_vector_yx
     def deflections_yx_2d_from(
         self, grid: aa.type.Grid2DLike, xp=np, **kwargs
     ) -> np.ndarray:
@@ -277,7 +277,7 @@ def deflections_yx_2d_from(
 
         return xp.zeros((grid.shape[0], 2))
 
-    @aa.grid_dec.to_array
+    @aa.decorators.to_array
     def convergence_2d_from(
         self, grid: aa.type.Grid2DLike, xp=np, **kwargs
     ) -> np.ndarray:
@@ -318,7 +318,7 @@ def half_light_radius(self):
         """
         return None
 
-    @aa.grid_dec.to_grid
+    @aa.decorators.to_grid
     def traced_grid_2d_from(
         self, grid: aa.type.Grid2DLike, xp=np
     ) -> aa.type.Grid2DLike:
@@ -355,7 +355,7 @@ def traced_grid_2d_from(
 
         return grid - self.deflections_yx_2d_from(grid=grid, xp=xp)
 
-    @aa.grid_dec.to_array
+    @aa.decorators.to_array
     def potential_2d_from(
         self, grid: aa.type.Grid2DLike, xp=np, **kwargs
     ) -> np.ndarray:

autogalaxy/galaxy/mock/mock_galaxy.py

@@ -8,18 +8,18 @@ def __init__(self, value, shape=1):
         self.value = value
         self.shape = shape
 
-    @aa.grid_dec.to_array
+    @aa.decorators.to_array
     def image_2d_from(self, grid):
         return np.full(shape=self.shape, fill_value=self.value)
 
-    @aa.grid_dec.to_array
+    @aa.decorators.to_array
     def convergence_2d_from(self, grid):
         return np.full(shape=self.shape, fill_value=self.value)
 
-    @aa.grid_dec.to_array
+    @aa.decorators.to_array
     def potential_2d_from(self, grid):
         return np.full(shape=self.shape, fill_value=self.value)
 
-    @aa.grid_dec.to_vector_yx
+    @aa.decorators.to_vector_yx
     def deflections_yx_2d_from(self, grid):
         return np.full(shape=(self.shape, 2), fill_value=self.value)

autogalaxy/profiles/geometry_profiles.py

@@ -99,7 +99,7 @@ class SphProfile(GeometryProfile):
     def __init__(self, centre: Tuple[float, float] = (0.0, 0.0)):
         super().__init__(centre=centre)
 
-    @aa.grid_dec.to_array
+    @aa.decorators.to_array
     def radial_grid_from(self, grid: aa.type.Grid2DLike, xp=np, **kwargs) -> np.ndarray:
         """
         Convert a grid of (y, x) coordinates, to their radial distances from the profile
@@ -126,7 +126,7 @@ def angle_to_profile_grid_from(
         """
         return xp.cos(grid_angles), xp.sin(grid_angles)
 
-    @aa.grid_dec.to_grid
+    @aa.decorators.to_grid
     def _cartesian_grid_via_radial_from(
         self,
         grid: aa.type.Grid2DLike,
@@ -153,7 +153,7 @@ def _cartesian_grid_via_radial_from(
 
         return xp.multiply(radius[:, None], xp.vstack((sin_theta, cos_theta)).T)
 
-    @aa.grid_dec.to_grid
+    @aa.decorators.to_grid
     def transformed_to_reference_frame_grid_from(self, grid, xp=np, **kwargs):
         """
         Transform a grid of (y,x) coordinates to the reference frame of the profile.
@@ -167,7 +167,7 @@ def transformed_to_reference_frame_grid_from(self, grid, xp=np, **kwargs):
         """
         return xp.subtract(grid.array, xp.array(self.centre))
 
-    @aa.grid_dec.to_grid
+    @aa.decorators.to_grid
     def transformed_from_reference_frame_grid_from(self, grid, xp=np, **kwargs):
         """
         Transform a grid of (y,x) coordinates from the reference frame of the profile to the original observer
@@ -282,7 +282,7 @@ def angle_to_profile_grid_from(self, grid_angles, xp=np, **kwargs):
         theta_coordinate_to_profile = xp.add(grid_angles, -self.angle_radians(xp=xp))
         return xp.cos(theta_coordinate_to_profile), xp.sin(theta_coordinate_to_profile)
 
-    @aa.grid_dec.to_grid
+    @aa.decorators.to_grid
     def rotated_grid_from_reference_frame_from(
         self, grid, xp=np, angle: Optional[float] = None, **kwargs
     ):
@@ -313,7 +313,7 @@ def rotated_grid_from_reference_frame_from(
             grid_2d=grid, centre=(0.0, 0.0), angle=angle, xp=xp
         )
 
-    @aa.grid_dec.to_array
+    @aa.decorators.to_array
     def elliptical_radii_grid_from(
         self, grid: aa.type.Grid2DLike, xp=np, **kwargs
     ) -> np.ndarray:
@@ -332,7 +332,7 @@ def elliptical_radii_grid_from(
             )
         )
 
-    @aa.grid_dec.to_array
+    @aa.decorators.to_array
     def eccentric_radii_grid_from(
         self, grid: aa.type.Grid2DLike, xp=np, **kwargs
     ) -> np.ndarray:
@@ -354,7 +354,7 @@ def eccentric_radii_grid_from(
 
         return xp.multiply(xp.sqrt(self.axis_ratio(xp)), grid_radii.array)
 
-    @aa.grid_dec.to_grid
+    @aa.decorators.to_grid
     def transformed_to_reference_frame_grid_from(
         self, grid: aa.type.Grid2DLike, xp=np, **kwargs
     ) -> np.ndarray:
@@ -374,7 +374,7 @@ def transformed_to_reference_frame_grid_from(
             grid_2d=grid.array, centre=self.centre, angle=self.angle(xp), xp=xp
         )
 
-    @aa.grid_dec.to_grid
+    @aa.decorators.to_grid
     def transformed_from_reference_frame_grid_from(
         self, grid: aa.type.Grid2DLike, xp=np, **kwargs
     ) -> aa.type.Grid2DLike:

autogalaxy/profiles/light/mock/mock_light_profile.py

@@ -27,7 +27,7 @@ def __init__(
         self.value = value
         self.value1 = value1
 
-    @aa.grid_dec.to_array
+    @aa.decorators.to_array
     @check_operated_only
     def image_2d_from(
         self, grid, xp=np, operated_only: Optional[bool] = None, **kwargs

autogalaxy/profiles/light/standard/chameleon.py

@@ -90,9 +90,9 @@ def image_2d_via_radii_from(self, grid_radii: np.ndarray, xp=np) -> np.ndarray:
         )
 
     @aa.over_sample
-    @aa.grid_dec.to_array
+    @aa.decorators.to_array
     @check_operated_only
-    @aa.grid_dec.transform
+    @aa.decorators.transform
     def image_2d_from(
         self,
         grid: aa.type.Grid2DLike,

autogalaxy/profiles/light/standard/eff.py

@@ -58,9 +58,9 @@ def image_2d_via_radii_from(self, grid_radii: np.ndarray, xp=np) -> np.ndarray:
         )
 
     @aa.over_sample
-    @aa.grid_dec.to_array
+    @aa.decorators.to_array
     @check_operated_only
-    @aa.grid_dec.transform
+    @aa.decorators.transform
     def image_2d_from(
         self,
         grid: aa.type.Grid2DLike,

autogalaxy/profiles/light/standard/gaussian.py

@@ -72,9 +72,9 @@ def image_2d_via_radii_from(self, grid_radii: np.ndarray, xp=np) -> np.ndarray:
         )
 
     @aa.over_sample
-    @aa.grid_dec.to_array
+    @aa.decorators.to_array
     @check_operated_only
-    @aa.grid_dec.transform
+    @aa.decorators.transform
     def image_2d_from(
         self,
         grid: aa.type.Grid2DLike,

autogalaxy/profiles/light/standard/moffat.py

@@ -71,9 +71,9 @@ def image_2d_via_radii_from(self, grid_radii: np.ndarray, xp=np) -> np.ndarray:
         )
 
     @aa.over_sample
-    @aa.grid_dec.to_array
+    @aa.decorators.to_array
     @check_operated_only
-    @aa.grid_dec.transform
+    @aa.decorators.transform
     def image_2d_from(
         self,
         grid: aa.type.Grid2DLike,

autogalaxy/profiles/light/standard/sersic.py

@@ -164,9 +164,9 @@ def image_2d_via_radii_from(
         )
 
     @aa.over_sample
-    @aa.grid_dec.to_array
+    @aa.decorators.to_array
     @check_operated_only
-    @aa.grid_dec.transform
+    @aa.decorators.transform
     def image_2d_from(
         self,
         grid: aa.type.Grid2DLike,