Merge pull request #347 from PyAutoLabs/feature/transform-decorator

refactor: use auto back-rotation in deflection methods

Author: Jammy2211

autogalaxy/profiles/mass/abstract/cse.py

@@ -192,4 +192,4 @@ def _deflections_2d_via_cse_from(self, grid: np.ndarray, **kwargs) -> np.ndarray
             for amplitude, core_radius in zip(amplitude_list, core_radius_list)
         )
 
-        return self.rotated_grid_from_reference_frame_from(deflections_2d.T)
+        return deflections_2d.T

autogalaxy/profiles/mass/dark/nfw.py

@@ -46,7 +46,7 @@ def deflections_yx_2d_from(self, grid: aa.type.Grid2DLike, xp=np, **kwargs):
         return self.deflections_2d_via_analytic_from(grid=grid, xp=xp, **kwargs)
 
     @aa.grid_dec.to_vector_yx
-    @aa.grid_dec.transform
+    @aa.grid_dec.transform(rotate_back=True)
     def deflections_2d_via_analytic_from(
         self, grid: aa.type.Grid2DLike, xp=np, **kwargs
     ):
@@ -103,14 +103,10 @@ def deflections_2d_via_analytic_from(
         )
         deflection_y *= prefactor
 
-        return self.rotated_grid_from_reference_frame_from(
-            xp.multiply(self.scale_radius, xp.vstack((deflection_y, deflection_x)).T),
-            xp=xp,
-            **kwargs,
-        )
+        return xp.multiply(self.scale_radius, xp.vstack((deflection_y, deflection_x)).T)
 
     @aa.grid_dec.to_vector_yx
-    @aa.grid_dec.transform
+    @aa.grid_dec.transform(rotate_back=True)
     def deflections_2d_via_cse_from(self, grid: aa.type.Grid2DLike, xp=np, **kwargs):
         return self._deflections_2d_via_cse_from(grid=grid, **kwargs)
 

autogalaxy/profiles/mass/sheets/external_shear.py

@@ -57,7 +57,7 @@ def potential_2d_from(self, grid: aa.type.Grid2DLike, xp=np, **kwargs):
         return -0.5 * shear_amp * rcoord**2 * xp.cos(2 * (phicoord - phig))
 
     @aa.grid_dec.to_vector_yx
-    @aa.grid_dec.transform
+    @aa.grid_dec.transform(rotate_back=True)
     def deflections_yx_2d_from(self, grid: aa.type.Grid2DLike, xp=np, **kwargs):
         """
         Calculate the deflection angles at a given set of arc-second gridded coordinates.
@@ -70,7 +70,4 @@ def deflections_yx_2d_from(self, grid: aa.type.Grid2DLike, xp=np, **kwargs):
         """
         deflection_y = -xp.multiply(self.magnitude(xp=xp), grid.array[:, 0])
         deflection_x = xp.multiply(self.magnitude(xp=xp), grid.array[:, 1])
-        return self.rotated_grid_from_reference_frame_from(
-            grid=xp.vstack((deflection_y, deflection_x)).T,
-            xp=xp,
-        )
+        return xp.vstack((deflection_y, deflection_x)).T

autogalaxy/profiles/mass/stellar/chameleon.py

@@ -51,7 +51,7 @@ def deflections_yx_2d_from(self, grid: aa.type.Grid2DLike, xp=np, **kwargs):
         return self.deflections_2d_via_analytic_from(grid=grid, xp=xp, **kwargs)
 
     @aa.grid_dec.to_vector_yx
-    @aa.grid_dec.transform
+    @aa.grid_dec.transform(rotate_back=True)
     def deflections_2d_via_analytic_from(
         self, grid: aa.type.Grid2DLike, xp=np, **kwargs
     ):
@@ -128,9 +128,7 @@ def deflections_2d_via_analytic_from(
         deflection_y = xp.subtract(deflection_y0, deflection_y1)
         deflection_x = xp.subtract(deflection_x0, deflection_x1)
 
-        return self.rotated_grid_from_reference_frame_from(
-            xp.multiply(factor, xp.vstack((deflection_y, deflection_x)).T), xp=xp
-        )
+        return xp.multiply(factor, xp.vstack((deflection_y, deflection_x)).T)
 
     @aa.over_sample
     @aa.grid_dec.to_array

autogalaxy/profiles/mass/stellar/gaussian.py

@@ -51,7 +51,7 @@ def deflections_yx_2d_from(self, grid: aa.type.Grid2DLike, xp=np, **kwargs):
         return self.deflections_2d_via_analytic_from(grid=grid, xp=xp, **kwargs)
 
     @aa.grid_dec.to_vector_yx
-    @aa.grid_dec.transform
+    @aa.grid_dec.transform(rotate_back=True)
     def deflections_2d_via_analytic_from(
         self, grid: aa.type.Grid2DLike, xp=np, **kwargs
     ):
@@ -73,12 +73,7 @@ def deflections_2d_via_analytic_from(
             * self.zeta_from(grid=grid, xp=xp)
         )
 
-        return self.rotated_grid_from_reference_frame_from(
-            xp.multiply(
-                1.0, xp.vstack((-1.0 * xp.imag(deflections), xp.real(deflections))).T
-            ),
-            xp=xp,
-        )
+        return xp.vstack((-1.0 * xp.imag(deflections), xp.real(deflections))).T
 
     @aa.over_sample
     @aa.grid_dec.to_array

autogalaxy/profiles/mass/stellar/sersic.py

@@ -123,7 +123,7 @@ def deflections_yx_2d_from(self, grid: aa.type.Grid2DLike, xp=np, **kwargs):
         return self.deflections_2d_via_cse_from(grid=grid, xp=xp, **kwargs)
 
     @aa.grid_dec.to_vector_yx
-    @aa.grid_dec.transform
+    @aa.grid_dec.transform(rotate_back=True)
     def deflections_2d_via_cse_from(self, grid: aa.type.Grid2DLike, xp=np, **kwargs):
         """
         Calculate the projected 2D deflection angles from a grid of (y,x) arc second coordinates, by computing and

autogalaxy/profiles/mass/total/dual_pseudo_isothermal_mass.py

@@ -263,7 +263,7 @@ def _ellip(self, xp=np):
         return xp.min(xp.array([ellip, MAX_ELLIP]))
 
     @aa.grid_dec.to_vector_yx
-    @aa.grid_dec.transform
+    @aa.grid_dec.transform(rotate_back=True)
     def deflections_yx_2d_from(self, grid: aa.type.Grid2DLike, xp=np, **kwargs):
         """
         Calculate the deflection angles on a grid of (y,x) arc-second coordinates.
@@ -283,12 +283,7 @@ def deflections_yx_2d_from(self, grid: aa.type.Grid2DLike, xp=np, **kwargs):
         deflection_x = zis.real
         deflection_y = zis.imag
 
-        # And here we convert back to the real axes
-        return self.rotated_grid_from_reference_frame_from(
-            grid=xp.multiply(factor, xp.vstack((deflection_y, deflection_x)).T),
-            xp=xp,
-            **kwargs,
-        )
+        return xp.multiply(factor, xp.vstack((deflection_y, deflection_x)).T)
 
     def _convergence(self, radii, xp=np):
 
@@ -418,7 +413,7 @@ def _ellip(self, xp=np):
         return xp.min(xp.array([ellip, MAX_ELLIP]))
 
     @aa.grid_dec.to_vector_yx
-    @aa.grid_dec.transform
+    @aa.grid_dec.transform(rotate_back=True)
     def deflections_yx_2d_from(self, grid: aa.type.Grid2DLike, xp=np, **kwargs):
         """
         Calculate the deflection angles on a grid of (y,x) arc-second coordinates.
@@ -443,12 +438,7 @@ def deflections_yx_2d_from(self, grid: aa.type.Grid2DLike, xp=np, **kwargs):
         deflection_x = zis.real
         deflection_y = zis.imag
 
-        # And here we convert back to the real axes
-        return self.rotated_grid_from_reference_frame_from(
-            grid=xp.multiply(factor, xp.vstack((deflection_y, deflection_x)).T),
-            xp=xp,
-            **kwargs,
-        )
+        return xp.multiply(factor, xp.vstack((deflection_y, deflection_x)).T)
 
     def _convergence(self, radii, xp=np):
 
@@ -594,7 +584,7 @@ def __init__(
         self.b0 = b0
 
     @aa.grid_dec.to_vector_yx
-    @aa.grid_dec.transform
+    @aa.grid_dec.transform(rotate_back=True)
     def deflections_yx_2d_from(self, grid: aa.type.Grid2DLike, xp=np, **kwargs):
         """
         Calculate the deflection angles on a grid of (y,x) arc-second coordinates.
@@ -627,12 +617,7 @@ def deflections_yx_2d_from(self, grid: aa.type.Grid2DLike, xp=np, **kwargs):
         deflection_x = grid.array[:, 1] * factor
         deflection_y = grid.array[:, 0] * factor
 
-        # And here we convert back to the real axes
-        return self.rotated_grid_from_reference_frame_from(
-            grid=xp.multiply(1.0, xp.vstack((deflection_y, deflection_x)).T),
-            xp=xp,
-            **kwargs,
-        )
+        return xp.vstack((deflection_y, deflection_x)).T
 
     @aa.grid_dec.to_array
     @aa.grid_dec.transform

autogalaxy/profiles/mass/total/dual_pseudo_isothermal_potential.py

@@ -94,7 +94,7 @@ def _convergence(self, radii, xp=np):
         )
 
     @aa.grid_dec.to_vector_yx
-    @aa.grid_dec.transform
+    @aa.grid_dec.transform(rotate_back=True)
     def deflections_yx_2d_from(self, grid: aa.type.Grid2DLike, xp=np, **kwargs):
         """
         Calculate the deflection angles on a grid of (y,x) arc-second coordinates.
@@ -116,12 +116,7 @@ def deflections_yx_2d_from(self, grid: aa.type.Grid2DLike, xp=np, **kwargs):
         deflection_y = alpha_circ * xp.sqrt(1 + ellip) * (grid.array[:, 0] / grid_radii)
         deflection_x = alpha_circ * xp.sqrt(1 - ellip) * (grid.array[:, 1] / grid_radii)
 
-        # And here we convert back to the real axes
-        return self.rotated_grid_from_reference_frame_from(
-            grid=xp.multiply(1.0, xp.vstack((deflection_y, deflection_x)).T),
-            xp=xp,
-            **kwargs,
-        )
+        return xp.vstack((deflection_y, deflection_x)).T
 
     @aa.grid_dec.to_vector_yx
     @aa.grid_dec.transform

autogalaxy/profiles/mass/total/isothermal.py

@@ -71,7 +71,7 @@ def axis_ratio(self, xp=np):
         return xp.minimum(axis_ratio, 0.99999)
 
     @aa.grid_dec.to_vector_yx
-    @aa.grid_dec.transform
+    @aa.grid_dec.transform(rotate_back=True)
     def deflections_yx_2d_from(self, grid: aa.type.Grid2DLike, xp=np, **kwargs):
         """
         Calculate the deflection angles on a grid of (y,x) arc-second coordinates.
@@ -105,11 +105,7 @@ def deflections_yx_2d_from(self, grid: aa.type.Grid2DLike, xp=np, **kwargs):
                 psi,
             )
         )
-        return self.rotated_grid_from_reference_frame_from(
-            grid=xp.multiply(factor, xp.vstack((deflection_y, deflection_x)).T),
-            xp=xp,
-            **kwargs,
-        )
+        return xp.multiply(factor, xp.vstack((deflection_y, deflection_x)).T)
 
     @aa.grid_dec.to_vector_yx
     @aa.grid_dec.transform

autogalaxy/profiles/mass/total/power_law.py

@@ -53,7 +53,7 @@ def potential_2d_from(self, grid: aa.type.Grid2DLike, xp=np, **kwargs):
         return (x * alpha_x + y * alpha_y) / (3 - self.slope)
 
     @aa.grid_dec.to_vector_yx
-    @aa.grid_dec.transform
+    @aa.grid_dec.transform(rotate_back=True)
     def deflections_yx_2d_from(self, grid: aa.type.Grid2DLike, xp=np, **kwargs):
         """
         Calculate the deflection angles on a grid of (y,x) arc-second coordinates.
@@ -119,9 +119,7 @@ def deflections_yx_2d_from(self, grid: aa.type.Grid2DLike, xp=np, **kwargs):
         deflection_y *= rescale_factor
         deflection_x *= rescale_factor
 
-        return self.rotated_grid_from_reference_frame_from(
-            grid=xp.vstack((deflection_y, deflection_x)).T, xp=xp
-        )
+        return xp.vstack((deflection_y, deflection_x)).T
 
     def convergence_func(self, grid_radius: float, xp=np) -> float:
         return self.einstein_radius_rescaled(xp) * grid_radius.array ** (