Skip to content

Plot improvements batch 2 #406

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Jammy2211 merged 1 commit into from
Mar 26, 2026
+63 −52
Merged

Plot improvements batch 2 #406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions autolens/analysis/plotter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

from autolens.lens.tracer import Tracer
from autolens.lens.plot.tracer_plots import (
subplot_tracer,
subplot_galaxies_images,
save_tracer_fits,
save_source_plane_images_fits,
Expand Down Expand Up @@ -54,6 +55,14 @@ def should_plot(name):
output_path = str(self.image_path)
fmt = self.fmt

if should_plot("subplot_tracer"):
subplot_tracer(
tracer=tracer,
grid=grid,
output_path=output_path,
output_format=fmt,
)

if should_plot("subplot_galaxies_images"):
subplot_galaxies_images(
tracer=tracer,
Expand Down Expand Up @@ -95,6 +104,7 @@ def should_plot(name):
plot_array(
array=image,
positions=[pos_arr],
title="Image With Positions",
output_path=str(self.image_path),
output_filename="image_with_positions",
output_format=fmt,
Expand Down
60 changes: 30 additions & 30 deletions autolens/imaging/plot/fit_imaging_plots.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import autogalaxy as ag

from autoarray.plot.array import plot_array, _zoom_array_2d
from autoarray.plot.utils import save_figure, hide_unused_axes
from autoarray.plot.utils import save_figure, hide_unused_axes, conf_subplot_figsize
from autoarray.plot.utils import numpy_lines as _to_lines
from autogalaxy.plot.plot_utils import _critical_curves_from, _caustics_from

Expand Down Expand Up @@ -144,7 +144,7 @@ def subplot_fit(

source_vmax = _get_source_vmax(fit)

fig, axes = plt.subplots(3, 4, figsize=(28, 21))
fig, axes = plt.subplots(3, 4, figsize=conf_subplot_figsize(3, 4))
axes_flat = list(axes.flatten())

plot_array(array=fit.data, ax=axes_flat[0], title="Data", colormap=colormap)
Expand Down Expand Up @@ -200,23 +200,23 @@ def subplot_fit(
norm_resid = fit.normalized_residual_map
_abs_max = _symmetric_vmax(norm_resid)
plot_array(array=norm_resid, ax=axes_flat[8], title="Normalized Residual Map",
colormap=colormap, vmin=-_abs_max, vmax=_abs_max)
colormap=colormap, vmin=-_abs_max, vmax=_abs_max, cb_unit=r"$\sigma$")

# Normalized residual map clipped to [-1, 1]
plot_array(array=norm_resid, ax=axes_flat[9],
title=r"Normalized Residual Map $1\sigma$",
colormap=colormap, vmin=-1.0, vmax=1.0)
colormap=colormap, vmin=-1.0, vmax=1.0, cb_unit=r"$\sigma$")

plot_array(array=fit.chi_squared_map, ax=axes_flat[10],
title="Chi-Squared Map", colormap=colormap)
title="Chi-Squared Map", colormap=colormap, cb_unit=r"$\chi^2$")

# Source plane not zoomed
_plot_source_plane(fit, axes_flat[11], final_plane_index, zoom_to_brightest=False,
colormap=colormap)

hide_unused_axes(axes_flat)
plt.tight_layout()
save_figure(fig, path=output_path, filename=f"subplot_fit{plane_index_tag}", format=output_format)
save_figure(fig, path=output_path, filename=f"fit{plane_index_tag}", format=output_format)


def subplot_fit_x1_plane(
Expand Down Expand Up @@ -252,7 +252,7 @@ def subplot_fit_x1_plane(
colormap : str, optional
Matplotlib colormap name applied to all image panels.
"""
fig, axes = plt.subplots(2, 3, figsize=(21, 14))
fig, axes = plt.subplots(2, 3, figsize=conf_subplot_figsize(2, 3))
axes_flat = list(axes.flatten())

try:
Expand All @@ -270,17 +270,17 @@ def subplot_fit_x1_plane(

norm_resid = fit.normalized_residual_map
plot_array(array=norm_resid, ax=axes_flat[3], title="Lens Light Subtracted",
colormap=colormap)
colormap=colormap, cb_unit=r"$\sigma$")

plot_array(array=norm_resid, ax=axes_flat[4], title="Subtracted Image Zero Minimum",
colormap=colormap, vmin=0.0)
colormap=colormap, vmin=0.0, cb_unit=r"$\sigma$")

_abs_max = _symmetric_vmax(norm_resid)
plot_array(array=norm_resid, ax=axes_flat[5], title="Normalized Residual Map",
colormap=colormap, vmin=-_abs_max, vmax=_abs_max)
colormap=colormap, vmin=-_abs_max, vmax=_abs_max, cb_unit=r"$\sigma$")

plt.tight_layout()
save_figure(fig, path=output_path, filename="subplot_fit_x1_plane", format=output_format)
save_figure(fig, path=output_path, filename="fit_x1_plane", format=output_format)


def subplot_fit_log10(
Expand Down Expand Up @@ -328,7 +328,7 @@ def subplot_fit_log10(

source_vmax = _get_source_vmax(fit)

fig, axes = plt.subplots(3, 4, figsize=(28, 21))
fig, axes = plt.subplots(3, 4, figsize=conf_subplot_figsize(3, 4))
axes_flat = list(axes.flatten())

plot_array(array=fit.data, ax=axes_flat[0], title="Data", colormap=colormap,
Expand Down Expand Up @@ -376,20 +376,20 @@ def subplot_fit_log10(
norm_resid = fit.normalized_residual_map
_abs_max = _symmetric_vmax(norm_resid)
plot_array(array=norm_resid, ax=axes_flat[8], title="Normalized Residual Map",
colormap=colormap, vmin=-_abs_max, vmax=_abs_max)
colormap=colormap, vmin=-_abs_max, vmax=_abs_max, cb_unit=r"$\sigma$")

plot_array(array=norm_resid, ax=axes_flat[9],
title=r"Normalized Residual Map $1\sigma$",
colormap=colormap, vmin=-1.0, vmax=1.0)
colormap=colormap, vmin=-1.0, vmax=1.0, cb_unit=r"$\sigma$")

plot_array(array=fit.chi_squared_map, ax=axes_flat[10], title="Chi-Squared Map",
colormap=colormap, use_log10=True)
colormap=colormap, use_log10=True, cb_unit=r"$\chi^2$")

_plot_source_plane(fit, axes_flat[11], final_plane_index, zoom_to_brightest=False,
colormap=colormap, use_log10=True)

plt.tight_layout()
save_figure(fig, path=output_path, filename=f"subplot_fit_log10{plane_index_tag}", format=output_format)
save_figure(fig, path=output_path, filename=f"fit_log10{plane_index_tag}", format=output_format)


def subplot_fit_log10_x1_plane(
Expand Down Expand Up @@ -420,7 +420,7 @@ def subplot_fit_log10_x1_plane(
colormap : str, optional
Matplotlib colormap name applied to all image panels.
"""
fig, axes = plt.subplots(2, 3, figsize=(21, 14))
fig, axes = plt.subplots(2, 3, figsize=conf_subplot_figsize(2, 3))
axes_flat = list(axes.flatten())

try:
Expand All @@ -442,15 +442,15 @@ def subplot_fit_log10_x1_plane(

norm_resid = fit.normalized_residual_map
plot_array(array=norm_resid, ax=axes_flat[3], title="Lens Light Subtracted",
colormap=colormap)
colormap=colormap, cb_unit=r"$\sigma$")
_abs_max = _symmetric_vmax(norm_resid)
plot_array(array=norm_resid, ax=axes_flat[4], title="Normalized Residual Map",
colormap=colormap, vmin=-_abs_max, vmax=_abs_max)
colormap=colormap, vmin=-_abs_max, vmax=_abs_max, cb_unit=r"$\sigma$")
plot_array(array=fit.chi_squared_map, ax=axes_flat[5], title="Chi-Squared Map",
colormap=colormap, use_log10=True)
colormap=colormap, use_log10=True, cb_unit=r"$\chi^2$")

plt.tight_layout()
save_figure(fig, path=output_path, filename="subplot_fit_log10", format=output_format)
save_figure(fig, path=output_path, filename="fit_log10", format=output_format)


def subplot_of_planes(
Expand Down Expand Up @@ -496,7 +496,7 @@ def subplot_of_planes(
plane_indexes = [plane_index]

for pidx in plane_indexes:
fig, axes = plt.subplots(1, 4, figsize=(28, 7))
fig, axes = plt.subplots(1, 4, figsize=conf_subplot_figsize(1, 4))
axes_flat = list(axes.flatten())

plot_array(array=fit.data, ax=axes_flat[0], title="Data", colormap=colormap)
Expand All @@ -518,7 +518,7 @@ def subplot_of_planes(
_plot_source_plane(fit, axes_flat[3], pidx, colormap=colormap)

plt.tight_layout()
save_figure(fig, path=output_path, filename=f"subplot_of_plane_{pidx}", format=output_format)
save_figure(fig, path=output_path, filename=f"of_plane_{pidx}", format=output_format)


def subplot_tracer_from_fit(
Expand Down Expand Up @@ -556,7 +556,7 @@ def subplot_tracer_from_fit(
"""
final_plane_index = len(fit.tracer.planes) - 1

fig, axes = plt.subplots(3, 3, figsize=(21, 21))
fig, axes = plt.subplots(3, 3, figsize=conf_subplot_figsize(3, 3))
axes_flat = list(axes.flatten())

tracer = fit.tracer_linear_light_profiles_to_light_profiles
Expand Down Expand Up @@ -594,7 +594,7 @@ def subplot_tracer_from_fit(
axes_flat[i].axis("off")

plt.tight_layout()
save_figure(fig, path=output_path, filename="subplot_tracer", format=output_format)
save_figure(fig, path=output_path, filename="tracer", format=output_format)


def subplot_fit_combined(
Expand Down Expand Up @@ -633,7 +633,7 @@ def subplot_fit_combined(
"""
n_fits = len(fit_list)
n_cols = 6
fig, axes = plt.subplots(n_fits, n_cols, figsize=(7 * n_cols, 7 * n_fits))
fig, axes = plt.subplots(n_fits, n_cols, figsize=conf_subplot_figsize(n_fits, n_cols))
if n_fits == 1:
all_axes = [list(axes)]
else:
Expand Down Expand Up @@ -673,10 +673,10 @@ def subplot_fit_combined(
row_axes[4].axis("off")

plot_array(array=fit.normalized_residual_map, ax=row_axes[5],
title="Normalized Residual Map", colormap=colormap)
title="Normalized Residual Map", colormap=colormap, cb_unit=r"$\sigma$")

plt.tight_layout()
save_figure(fig, path=output_path, filename="subplot_fit_combined", format=output_format)
save_figure(fig, path=output_path, filename="fit_combined", format=output_format)


def subplot_fit_combined_log10(
Expand Down Expand Up @@ -707,7 +707,7 @@ def subplot_fit_combined_log10(
"""
n_fits = len(fit_list)
n_cols = 6
fig, axes = plt.subplots(n_fits, n_cols, figsize=(7 * n_cols, 7 * n_fits))
fig, axes = plt.subplots(n_fits, n_cols, figsize=conf_subplot_figsize(n_fits, n_cols))
if n_fits == 1:
all_axes = [list(axes)]
else:
Expand Down Expand Up @@ -749,7 +749,7 @@ def subplot_fit_combined_log10(
row_axes[4].axis("off")

plot_array(array=fit.normalized_residual_map, ax=row_axes[5],
title="Normalized Residual Map", colormap=colormap)
title="Normalized Residual Map", colormap=colormap, cb_unit=r"$\sigma$")

plt.tight_layout()
save_figure(fig, path=output_path, filename="fit_combined_log10", format=output_format)
Expand Down
11 changes: 6 additions & 5 deletions autolens/interferometer/plot/fit_interferometer_plots.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ def subplot_fit(
_plot_source_plane(fit, axes_flat[7], final_plane_index, colormap=colormap)

plot_array(array=fit.dirty_normalized_residual_map, ax=axes_flat[8],
title="Dirty Normalized Residual Map", colormap=colormap)
title="Dirty Normalized Residual Map", colormap=colormap, cb_unit=r"$\sigma$")

# Panel 9: clipped to [-1, 1]
plot_array(
Expand All @@ -179,18 +179,19 @@ def subplot_fit(
title=r"Normalized Residual Map $1\sigma$",
colormap=colormap,
use_log10=False,
vmin=-1.0, vmax=1.0
vmin=-1.0, vmax=1.0,
cb_unit=r"$\sigma$",
)

plot_array(array=fit.dirty_chi_squared_map, ax=axes_flat[10],
title="Dirty Chi-Squared Map", colormap=colormap)
title="Dirty Chi-Squared Map", colormap=colormap, cb_unit=r"$\chi^2$")

# Panel 11: source plane not zoomed
_plot_source_plane(fit, axes_flat[11], final_plane_index,
zoom_to_brightest=False, colormap=colormap)

plt.tight_layout()
save_figure(fig, path=output_path, filename="subplot_fit", format=output_format)
save_figure(fig, path=output_path, filename="fit", format=output_format)


def subplot_fit_real_space(
Expand Down Expand Up @@ -257,4 +258,4 @@ def subplot_fit_real_space(
axes_flat[1].set_title("Source Reconstruction")

plt.tight_layout()
save_figure(fig, path=output_path, filename="subplot_fit_real_space", format=output_format)
save_figure(fig, path=output_path, filename="fit_real_space", format=output_format)
4 changes: 2 additions & 2 deletions autolens/lens/plot/sensitivity_plots.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ def subplot_tracer_images(
colormap=colormap, use_log10=use_log10, lines=no_perturb_cc_lines)

plt.tight_layout()
save_figure(fig, path=output_path, filename="subplot_lensed_images", format=output_format)
save_figure(fig, path=output_path, filename="lensed_images", format=output_format)


def subplot_sensitivity(
Expand Down Expand Up @@ -241,7 +241,7 @@ def subplot_sensitivity(
pass

plt.tight_layout()
save_figure(fig, path=output_path, filename="subplot_sensitivity", format=output_format)
save_figure(fig, path=output_path, filename="sensitivity", format=output_format)


def subplot_figures_of_merit_grid(
Expand Down
4 changes: 2 additions & 2 deletions autolens/lens/plot/subhalo_plots.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ def subplot_detection_imaging(
)

plt.tight_layout()
save_figure(fig, path=output_path, filename="subplot_detection_imaging", format=output_format)
save_figure(fig, path=output_path, filename="detection_imaging", format=output_format)


def subplot_detection_fits(
Expand Down Expand Up @@ -174,4 +174,4 @@ def subplot_detection_fits(
colormap=colormap)

plt.tight_layout()
save_figure(fig, path=output_path, filename="subplot_detection_fits", format=output_format)
save_figure(fig, path=output_path, filename="detection_fits", format=output_format)
14 changes: 7 additions & 7 deletions autolens/lens/plot/tracer_plots.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import autogalaxy as ag

from autoarray.plot.array import plot_array
from autoarray.plot.utils import save_figure, hide_unused_axes
from autoarray.plot.utils import save_figure, hide_unused_axes, conf_subplot_figsize
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

Expand Down Expand Up @@ -62,7 +62,7 @@ def subplot_tracer(

magnification = LensCalc.from_mass_obj(tracer).magnification_2d_from(grid=grid)

fig, axes = plt.subplots(3, 3, figsize=(21, 21))
fig, axes = plt.subplots(3, 3, figsize=conf_subplot_figsize(3, 3))
axes_flat = list(axes.flatten())

plot_array(array=image, ax=axes_flat[0], title="Image",
Expand All @@ -87,7 +87,7 @@ def subplot_tracer(

hide_unused_axes(axes_flat)
plt.tight_layout()
save_figure(fig, path=output_path, filename="subplot_tracer", format=output_format)
save_figure(fig, path=output_path, filename="tracer", format=output_format)


def subplot_lensed_images(
Expand Down Expand Up @@ -126,7 +126,7 @@ def subplot_lensed_images(
traced_grids = tracer.traced_grid_2d_list_from(grid=grid)
n = tracer.total_planes

fig, axes = plt.subplots(1, n, figsize=(7 * n, 7))
fig, axes = plt.subplots(1, n, figsize=conf_subplot_figsize(1, n))
axes_flat = [axes] if n == 1 else list(np.array(axes).flatten())

for plane_index in range(n):
Expand All @@ -141,7 +141,7 @@ def subplot_lensed_images(
)

plt.tight_layout()
save_figure(fig, path=output_path, filename="subplot_lensed_images", format=output_format)
save_figure(fig, path=output_path, filename="lensed_images", format=output_format)


def subplot_galaxies_images(
Expand Down Expand Up @@ -186,7 +186,7 @@ def subplot_galaxies_images(
traced_grids = tracer.traced_grid_2d_list_from(grid=grid)
n = 2 * tracer.total_planes - 1

fig, axes = plt.subplots(1, n, figsize=(7 * n, 7))
fig, axes = plt.subplots(1, n, figsize=conf_subplot_figsize(1, n))
axes_flat = [axes] if n == 1 else list(np.array(axes).flatten())

idx = 0
Expand Down Expand Up @@ -228,7 +228,7 @@ def subplot_galaxies_images(
idx += 1

plt.tight_layout()
save_figure(fig, path=output_path, filename="subplot_galaxies_images", format=output_format)
save_figure(fig, path=output_path, filename="galaxies_images", format=output_format)


def save_tracer_fits(
Expand Down
Loading
Loading