Remove duplicated critical curve/caustic helpers from autolens

- Delete tracer_util.critical_curves_from, caustics_from, lines_of_planes_from
  (all unused outside plot code; duplicated LensCalc logic)
- Collapse autolens/plot/plot_utils.py to a re-export from autogalaxy
- Update all callers to import _critical_curves_from/_caustics_from from
  autogalaxy.plot.plot_utils and numpy_lines from autoarray.plot.utils

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: 2 people

autolens/imaging/plot/fit_imaging_plots.py

@@ -7,11 +7,8 @@
 
 from autoarray.plot.array import plot_array, _zoom_array_2d
 from autoarray.plot.utils import save_figure
-from autolens.plot.plot_utils import (
-    _to_lines,
-    _critical_curves_from,
-    _caustics_from,
-)
+from autoarray.plot.utils import numpy_lines as _to_lines
+from autogalaxy.plot.plot_utils import _critical_curves_from, _caustics_from
 
 
 def _get_source_vmax(fit):

autolens/interferometer/plot/fit_interferometer_plots.py

@@ -7,10 +7,8 @@
 
 from autoarray.plot.array import plot_array
 from autoarray.plot.utils import save_figure
-from autolens.plot.plot_utils import (
-    _to_lines,
-    _critical_curves_from,
-)
+from autoarray.plot.utils import numpy_lines as _to_lines
+from autogalaxy.plot.plot_utils import _critical_curves_from
 
 
 def _plot_yx(y, x, ax, title, xlabel="", ylabel=""):

autolens/lens/plot/sensitivity_plots.py

@@ -20,8 +20,8 @@ def subplot_tracer_images(
     use_log10: bool = False,
 ):
     """6-panel subplot showing lensed images and residuals from a perturbed tracer."""
-    from autolens.lens.tracer_util import critical_curves_from, caustics_from
-    from autolens.plot.plot_utils import _to_lines
+    from autogalaxy.plot.plot_utils import _critical_curves_from, _caustics_from
+    from autoarray.plot.utils import numpy_lines as _to_lines
 
     grid = aa.Grid2D.from_mask(mask=mask)
 
@@ -36,13 +36,13 @@ def subplot_tracer_images(
     unmasked_grid = mask.derive_grid.unmasked
 
     try:
-        tan_cc_p, rad_cc_p = critical_curves_from(tracer=tracer_perturb, grid=unmasked_grid)
+        tan_cc_p, rad_cc_p = _critical_curves_from(tracer_perturb, unmasked_grid)
         perturb_cc_lines = _to_lines(list(tan_cc_p), list(rad_cc_p))
     except Exception:
         perturb_cc_lines = None
 
     try:
-        tan_ca_p, rad_ca_p = caustics_from(tracer=tracer_perturb, grid=unmasked_grid)
+        tan_ca_p, rad_ca_p = _caustics_from(tracer_perturb, unmasked_grid)
         perturb_ca_lines = _to_lines(list(tan_ca_p), list(rad_ca_p))
     except Exception:
         perturb_ca_lines = None

autolens/lens/plot/tracer_plots.py

@@ -7,12 +7,8 @@
 
 from autoarray.plot.array import plot_array
 from autoarray.plot.utils import save_figure
-from autolens.plot.plot_utils import (
-    _to_lines,
-    _to_positions,
-    _critical_curves_from,
-    _caustics_from,
-)
+from autoarray.plot.utils import numpy_lines as _to_lines, numpy_positions as _to_positions
+from autogalaxy.plot.plot_utils import _critical_curves_from, _caustics_from
 
 
 def subplot_tracer(

autolens/lens/tracer_util.py

@@ -374,7 +374,7 @@ def time_delays_from(
     )
 
     # Final time delay in days
-    return (D_dt_m / c) * fermat_potential * factor
+    return (D_dt_m / c) * fermat_potential * factor11
 
 
 def ordered_plane_redshifts_with_slicing_from(
@@ -436,80 +436,4 @@ def ordered_plane_redshifts_with_slicing_from(
     return plane_redshifts[0:-1]
 
 
-def critical_curves_from(tracer, grid):
-    """
-    Compute tangential and radial critical curves for the tracer via LensCalc and
-    return them as plain lists of numpy arrays.
-
-    Returns
-    -------
-    tuple[list, list]
-        ``(tangential_critical_curves, radial_critical_curves)`` where each element
-        is a list of (N, 2) numpy arrays.  *radial_critical_curves* may be an empty
-        list when the radial curve area is below the pixel-scale threshold.
-    """
-    from autogalaxy.operate.lens_calc import LensCalc
-    import numpy as np
-
-    od = LensCalc.from_mass_obj(tracer)
-
-    tangential_critical_curves = od.tangential_critical_curve_list_from(grid=grid)
-
-    radial_critical_curve_area_list = od.radial_critical_curve_area_list_from(grid=grid)
-    if any(area > grid.pixel_scale for area in radial_critical_curve_area_list):
-        radial_critical_curves = od.radial_critical_curve_list_from(grid=grid)
-    else:
-        radial_critical_curves = []
-
-    return tangential_critical_curves, radial_critical_curves
-
-
-def caustics_from(tracer, grid):
-    """
-    Compute tangential and radial caustics for the tracer via LensCalc and
-    return them as plain lists of numpy arrays.
-
-    Returns
-    -------
-    tuple[list, list]
-        ``(tangential_caustics, radial_caustics)`` where each element is a list
-        of (N, 2) numpy arrays.
-    """
-    from autogalaxy.operate.lens_calc import LensCalc
-
-    od = LensCalc.from_mass_obj(tracer)
-
-    tangential_caustics = od.tangential_caustic_list_from(grid=grid)
-    radial_caustics = od.radial_caustic_list_from(grid=grid)
-
-    return tangential_caustics, radial_caustics
-
-
-def lines_of_planes_from(tracer, grid):
-    """
-    For each plane in the tracer return the appropriate line overlays:
-      - plane 0 (image plane): critical curves
-      - plane 1+ (source planes): caustics
-
-    Returns
-    -------
-    list[list[np.ndarray]]
-        One entry per plane; each entry is a (possibly empty) list of (N, 2) numpy
-        arrays suitable for passing as ``lines=`` to ``_plot_array``.
-    """
-    tan_cc, rad_cc = critical_curves_from(tracer=tracer, grid=grid)
-    tan_ca, rad_ca = caustics_from(tracer=tracer, grid=grid)
-
-    critical_curve_lines = list(tan_cc) + list(rad_cc)
-    caustic_lines = list(tan_ca) + list(rad_ca)
-
-    lines_of_planes = []
-    for plane_index in range(len(tracer.planes)):
-        if plane_index == 0:
-            lines_of_planes.append(critical_curve_lines)
-        else:
-            lines_of_planes.append(caustic_lines)
-
-    return lines_of_planes
-
 

autolens/plot/plot_utils.py

@@ -1,52 +1 @@
-import numpy as np
-
-
-def _to_lines(*items):
-    """Convert multiple line sources into a flat list of (N, 2) numpy arrays."""
-    result = []
-    for item in items:
-        if item is None:
-            continue
-        if isinstance(item, list):
-            for sub in item:
-                try:
-                    arr = np.array(sub.array if hasattr(sub, "array") else sub)
-                    if arr.ndim == 2 and arr.shape[1] == 2 and len(arr) > 0:
-                        result.append(arr)
-                except Exception:
-                    pass
-        else:
-            try:
-                arr = np.array(item.array if hasattr(item, "array") else item)
-                if arr.ndim == 2 and arr.shape[1] == 2 and len(arr) > 0:
-                    result.append(arr)
-            except Exception:
-                pass
-    return result or None
-
-
-def _to_positions(*items):
-    """Convert multiple position sources into a flat list of (N, 2) numpy arrays."""
-    return _to_lines(*items)
-
-
-def _critical_curves_from(tracer, grid):
-    """Return (tangential_critical_curves, radial_critical_curves) as lists of arrays."""
-    from autolens.lens import tracer_util
-
-    try:
-        tan_cc, rad_cc = tracer_util.critical_curves_from(tracer=tracer, grid=grid)
-        return list(tan_cc), list(rad_cc)
-    except Exception:
-        return [], []
-
-
-def _caustics_from(tracer, grid):
-    """Return (tangential_caustics, radial_caustics) as lists of arrays."""
-    from autolens.lens import tracer_util
-
-    try:
-        tan_ca, rad_ca = tracer_util.caustics_from(tracer=tracer, grid=grid)
-        return list(tan_ca), list(rad_ca)
-    except Exception:
-        return [], []
+from autogalaxy.plot.plot_utils import _critical_curves_from, _caustics_from