ShapeletPolar with q,phi convention

Author: Hengkai_Pmo_StarB

autogalaxy/profiles/light/linear/shapelets/polar.py

@@ -11,7 +11,8 @@ def __init__(
         n: int,
         m: int,
         centre: Tuple[float, float] = (0.0, 0.0),
-        ell_comps: Tuple[float, float] = (0.0, 0.0),
+        q: float = 1.0,
+        phi: float = 0.0,
         beta: float = 1.0,
     ):
         """
@@ -33,8 +34,11 @@ def __init__(
             The m order of the shapelets basis function in the x-direction.
         centre
             The (y,x) arc-second coordinates of the profile (shapelet) centre.
-        ell_comps
-            The first and second ellipticity components of the elliptical coordinate system.
+        q
+            The axis-ratio of the elliptical coordinate system, where a perfect circle has q=1.0.
+        phi
+            The position angle (in degrees) of the elliptical coordinate system, measured counter-clockwise from the 
+            positive x-axis.
         intensity
             Overall intensity normalisation of the light profile (units are dimensionless and derived from the data
             the light profile's image is compared too, which is expected to be electrons per second).
@@ -43,7 +47,7 @@ def __init__(
         """
 
         super().__init__(
-            n=n, m=m, centre=centre, ell_comps=ell_comps, beta=beta, intensity=1.0
+            n=n, m=m, centre=centre, q=q, phi=phi, beta=beta, intensity=1.0
         )
 
 
@@ -53,6 +57,7 @@ def __init__(
         n: int,
         m: int,
         centre: Tuple[float, float] = (0.0, 0.0),
+        phi: float = 0.0,
         beta: float = 1.0,
     ):
         """
@@ -74,8 +79,11 @@ def __init__(
             The order of the shapelets basis function in the x-direction.
         centre
             The (y,x) arc-second coordinates of the profile (shapelet) centre.
+        phi
+            The position angle (in degrees) of the elliptical coordinate system, measured counter-clockwise from the 
+            positive x-axis.
         beta
             The characteristic length scale of the shapelet basis function, defined in arc-seconds.
         """
 
-        super().__init__(n=n, m=m, centre=centre, ell_comps=(0.0, 0.0), beta=beta)
+        super().__init__(n=n, m=m, centre=centre, q=1.0, phi=phi, beta=beta)

autogalaxy/profiles/light/linear/shapelets/polar_q_phi.py

@@ -2,6 +2,7 @@
 from typing import Optional, Tuple
 
 import autoarray as aa
+import autolens as al
 
 
 from autogalaxy.profiles.light.decorators import (
@@ -126,7 +127,8 @@ def __init__(
         n: int,
         m: int,
         centre: Tuple[float, float] = (0.0, 0.0),
-        ell_comps: Tuple[float, float] = (0.0, 0.0),
+        q: float = 1.0,
+        phi: float = 0.0,
         intensity: float = 1.0,
         beta: float = 1.0,
     ):
@@ -149,8 +151,11 @@ def __init__(
             The m order of the shapelets basis function in the x-direction.
         centre
             The (y,x) arc-second coordinates of the profile (shapelet) centre.
-        ell_comps
-            The first and second ellipticity components of the elliptical coordinate system.
+        q
+            The axis-ratio of the elliptical coordinate system, where a perfect circle has q=1.0.
+        phi
+            The position angle (in degrees) of the elliptical coordinate system, measured counter-clockwise from the 
+            positive x-axis.
         intensity
             Overall intensity normalisation of the light profile (units are dimensionless and derived from the data
             the light profile's image is compared too, which is expected to be electrons per second).
@@ -160,9 +165,11 @@ def __init__(
 
         self.n = int(n)
         self.m = int(m)
+        self.phi = float(phi)
+        self.q = float(q)
 
         super().__init__(
-            centre=centre, ell_comps=ell_comps, beta=beta, intensity=intensity
+            centre=centre, beta=beta, intensity=intensity
         )
 
     @property
@@ -172,7 +179,6 @@ def coefficient_tag(self) -> str:
     @aa.over_sample
     @aa.grid_dec.to_array
     @check_operated_only
-    @aa.grid_dec.transform
     def image_2d_from(
         self,
         grid: aa.type.Grid2DLike,
@@ -200,7 +206,9 @@ def image_2d_from(
         from jax.scipy.special import factorial
 
         # laguerre = genlaguerre(n=(self.n - xp.abs(self.m)) / 2.0, alpha=xp.abs(self.m))
-
+        grid = aa.util.geometry.transform_grid_2d_to_reference_frame(
+            grid_2d=grid.array, centre=self.centre, angle=self.phi, xp=xp
+        )
         const = (
             ((-1) ** ((self.n - xp.abs(self.m)) // 2))
             * xp.sqrt(
@@ -210,8 +218,8 @@ def image_2d_from(
             / self.beta
             / xp.sqrt(xp.pi)
         )
-        rsq = (grid.array[:, 0] ** 2 + (grid.array[:, 1]/self.axis_ratio(xp)) ** 2) / self.beta**2
-        theta = xp.arctan2(grid.array[:, 1], grid.array[:, 0])
+        rsq = (grid[:, 0] ** 2 + (grid[:, 1]/self.q) ** 2) / self.beta**2
+        theta = xp.arctan2(grid[:, 1], grid[:, 0])
 
         m_abs = abs(self.m)
         n_laguerre = (self.n - m_abs) // 2
@@ -235,6 +243,7 @@ def __init__(
         n: int,
         m: int,
         centre: Tuple[float, float] = (0.0, 0.0),
+        phi: float = 0.0,
         intensity: float = 1.0,
         beta: float = 1.0,
     ):
@@ -257,6 +266,9 @@ def __init__(
             The order of the shapelets basis function in the x-direction.
         centre
             The (y,x) arc-second coordinates of the profile (shapelet) centre.
+        phi
+            The position angle (in degrees) of the elliptical coordinate system, measured counter-clockwise from the 
+            positive x-axis.
         intensity
             Overall intensity normalisation of the light profile (units are dimensionless and derived from the data
             the light profile's image is compared too, which is expected to be electrons per second).
@@ -268,7 +280,8 @@ def __init__(
             n=n,
             m=m,
             centre=centre,
-            ell_comps=(0.0, 0.0),
+            q=1.0,
+            phi=phi,
             intensity=intensity,
             beta=beta,
         )