mix in with Sams code

Author: Jammy2211

autogalaxy/__init__.py

@@ -59,6 +59,7 @@
 from .ellipse.dataset_interp import DatasetInterp
 from .ellipse.ellipse.ellipse import Ellipse
 from .ellipse.ellipse.ellipse_multipole import EllipseMultipole
+from .ellipse.ellipse.ellipse_multipole import EllipseMultipoleRelative
 from .ellipse.fit_ellipse import FitEllipse
 from .ellipse.model.analysis import AnalysisEllipse
 from .operate.image import OperateImage

autogalaxy/config/notation.yaml

@@ -20,6 +20,8 @@ label:
     ell_comps_1: \epsilon_{\rm 2}
     multipole_comps_0: M_{\rm 1}
     multipole_comps_1: M_{\rm 2}
+    input_multipole_comps_0: M_{\rm 1}
+    input_multipole_comps_1: M_{\rm 2}
     flux: F
     gamma: \gamma
     gamma_1: \gamma
@@ -96,6 +98,8 @@ label_format:
     ell_comps_1: '{:.4f}'
     multipole_comps_0: '{:.4f}'
     multipole_comps_1: '{:.4f}'
+    input_multipole_comps_0: '{:.4f}'
+    input_multipole_comps_1: '{:.4f}'
     flux: '{:.4e}'
     gamma: '{:.4f}'
     inner_coefficient: '{:.4f}'

autogalaxy/config/priors/ellipse/ellipse_multipole.yaml

@@ -19,3 +19,25 @@ EllipseMultipole:
     gaussian_limits:
       lower: -inf
       upper: inf
+
+EllipseMultipoleRelative:
+  input_multipole_comps_0:
+    type: Uniform
+    lower_limit: -0.1
+    upper_limit: 0.1
+    width_modifier:
+      type: Absolute
+      value: 0.05
+    gaussian_limits:
+      lower: -inf
+      upper: inf
+  input_multipole_comps_1:
+    type: Uniform
+    lower_limit: -0.1
+    upper_limit: 0.1
+    width_modifier:
+      type: Absolute
+      value: 0.05
+    gaussian_limits:
+      lower: -inf
+      upper: inf

autogalaxy/ellipse/ellipse/ellipse_multipole.py

@@ -1,5 +1,6 @@
 import numpy as np
 from typing import Tuple
+from autogalaxy.convert import multipole_comps_from, multipole_k_m_and_phi_m_from
 
 
 from autogalaxy.ellipse.ellipse.ellipse import Ellipse
@@ -72,3 +73,57 @@ def points_perturbed_from(
         y = points[:, 0] + radial * np.sin(theta)
 
         return np.stack((y, x), axis=-1)
+
+class EllipseMultipoleRelative(EllipseMultipole):
+    def __init__(
+        self,
+        m=4,
+        input_multipole_comps: Tuple[float, float] = (0.0, 0.0),
+        major_axis=1.,
+    ):
+        self.input_multipole_comps = input_multipole_comps
+        k, phi = multipole_k_m_and_phi_m_from(multipole_comps=input_multipole_comps, m=m)
+        k_adjusted = k*major_axis
+
+        adjusted_multipole_comps = multipole_comps_from(k_adjusted, phi, m)
+
+        super().__init__(m, adjusted_multipole_comps)
+
+        self.adjusted_multipole_comps = adjusted_multipole_comps
+        self.m = m
+
+    def points_perturbed_from(
+        self, pixel_scale, points, ellipse: Ellipse, n_i: int = 0
+    ) -> np.ndarray:
+        """
+        Returns the (y,x) coordinates of the input points, which are perturbed by the multipole of the ellipse.
+
+        Parameters
+        ----------
+        pixel_scale
+            The pixel scale of the data that the ellipse is fitted to and interpolated over.
+        points
+            The (y,x) coordinates of the ellipse that are perturbed by the multipole.
+        ellipse
+            The ellipse that is perturbed by the multipole, which is used to compute the angles of the ellipse.
+
+        Returns
+        -------
+        The (y,x) coordinates of the input points, which are perturbed by the multipole.
+        """
+
+        # 1) compute cartesian (polar) angle
+        theta = np.arctan2(points[:,0], points[:,1])  # <- true polar angle
+
+        # 2) multipole in that same frame
+        delta_theta = self.m * (theta - ellipse.angle_radians)
+        radial = (
+                self.adjusted_multipole_comps[1] * np.cos(delta_theta)
+                + self.adjusted_multipole_comps[0] * np.sin(delta_theta)
+        )
+
+        # 3) perturb along the true radial direction
+        x = points[:, 1] + radial * np.cos(theta)
+        y = points[:, 0] + radial * np.sin(theta)
+
+        return np.stack((y, x), axis=-1)

autogalaxy/ellipse/plot/fit_ellipse_plotters.py

@@ -131,6 +131,7 @@ def subplot_fit_ellipse(self):
 
         self.open_subplot_figure(number_subplots=2)
 
+        self.mat_plot_2d.use_log10 = True
         self.figures_2d(data=True)
         self.figures_2d(ellipse_residuals=True, for_subplot=True)
 
@@ -237,7 +238,7 @@ def subplot_ellipse_errors(self):
                 visuals_2d=visuals_2d,
                 auto_labels=aplt.AutoLabels(
                     title=f"Ellipse Fit",
-                    filename=f"subhplot_ellipse_errors",
+                    filename=f"subplot_ellipse_errors",
                 ),
             )
 

autogalaxy/plot/mat_plot/two_d.py

@@ -25,7 +25,6 @@ def __init__(
         output: Optional[aplt.Output] = None,
         array_overlay: Optional[aplt.ArrayOverlay] = None,
         contour: Optional[aplt.Contour] = None,
-        fill: Optional[aplt.Fill] = None,
         grid_scatter: Optional[aplt.GridScatter] = None,
         grid_plot: Optional[aplt.GridPlot] = None,
         vector_yx_quiver: Optional[aplt.VectorYXQuiver] = None,
@@ -194,7 +193,6 @@ def __init__(
             xlabel=xlabel,
             text=text,
             annotate=annotate,
-            fill=fill,
             output=output,
             origin_scatter=origin_scatter,
             mask_scatter=mask_scatter,

autogalaxy/plot/visuals/two_d.py

@@ -17,7 +17,6 @@ def __init__(
         mesh_grid: aa.Grid2D = None,
         vectors: aa.VectorYX2DIrregular = None,
         patches: Union[ptch.Patch] = None,
-        fill_region: Optional[List] = None,
         array_overlay: aa.Array2D = None,
         light_profile_centres: aa.Grid2DIrregular = None,
         mass_profile_centres: aa.Grid2DIrregular = None,
@@ -48,7 +47,6 @@ def __init__(
             mesh_grid=mesh_grid,
             vectors=vectors,
             patches=patches,
-            fill_region=fill_region,
             array_overlay=array_overlay,
             origin=origin,
             border=border,