Skip to content

Feature/jax simplify visualization #184

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 2 commits into from
Jul 22, 2025
Merged

Feature/jax simplify visualization #184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6e7be6e
removed all reference to include in plotting
Jul 14, 2025
0cb75eb
visual clean up complete
Jul 21, 2025
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
20 changes: 0 additions & 20 deletions autoarray/config/visualize/include.yaml
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions autoarray/dataset/grids.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,9 @@
from autoarray.mask.mask_2d import Mask2D
from autoarray.structures.arrays.uniform_2d import Array2D
from autoarray.structures.arrays.kernel_2d import Kernel2D
from autoarray.structures.grids.uniform_1d import Grid1D
from autoarray.structures.grids.uniform_2d import Grid2D

from autoarray.inversion.pixelization.border_relocator import BorderRelocator
from autoconf import cached_property

from autoarray import exc

Expand Down
48 changes: 13 additions & 35 deletions autoarray/dataset/plot/imaging_plotters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,18 @@
from typing import Callable, Optional

from autoarray.plot.visuals.two_d import Visuals2D
from autoarray.plot.include.two_d import Include2D
from autoarray.plot.mat_plot.two_d import MatPlot2D
from autoarray.plot.auto_labels import AutoLabels
from autoarray.plot.abstract_plotters import Plotter
from autoarray.plot.abstract_plotters import AbstractPlotter
from autoarray.dataset.imaging.dataset import Imaging


class ImagingPlotterMeta(Plotter):
class ImagingPlotterMeta(AbstractPlotter):
def __init__(
self,
dataset: Imaging,
get_visuals_2d: Callable,
mat_plot_2d: MatPlot2D = None,
visuals_2d: Visuals2D = None,
include_2d: Include2D = None,
):
"""
Plots the attributes of `Imaging` objects using the matplotlib method `imshow()` and many other matplotlib
Expand All @@ -27,29 +24,21 @@ def __init__(
but a user can manually input values into `MatPlot2d` to customize the figure's appearance.

Overlaid on the figure are visuals, contained in the `Visuals2D` object. Attributes may be extracted from
the `Imaging` and plotted via the visuals object, if the corresponding entry is `True` in the `Include2D`
object or the `config/visualize/include.ini` file.
the `Imaging` and plotted via the visuals object.

Parameters
----------
dataset
The imaging dataset the plotter plots.
get_visuals_2d
A function which extracts from the `Imaging` the 2D visuals which are plotted on figures.
mat_plot_2d
Contains objects which wrap the matplotlib function calls that make 2D plots.
visuals_2d
Contains 2D visuals that can be overlaid on 2D plots.
include_2d
Specifies which attributes of the `Imaging` are extracted and plotted as visuals for 2D plots.
"""

super().__init__(
mat_plot_2d=mat_plot_2d, include_2d=include_2d, visuals_2d=visuals_2d
)
super().__init__(mat_plot_2d=mat_plot_2d, visuals_2d=visuals_2d)

self.dataset = dataset
self.get_visuals_2d = get_visuals_2d

@property
def imaging(self):
Expand Down Expand Up @@ -91,21 +80,21 @@ def figures_2d(
if data:
self.mat_plot_2d.plot_array(
array=self.dataset.data,
visuals_2d=self.get_visuals_2d(),
visuals_2d=self.visuals_2d,
auto_labels=AutoLabels(title=title_str or f" Data", filename="data"),
)

if noise_map:
self.mat_plot_2d.plot_array(
array=self.dataset.noise_map,
visuals_2d=self.get_visuals_2d(),
visuals_2d=self.visuals_2d,
auto_labels=AutoLabels(title_str or f"Noise-Map", filename="noise_map"),
)

if psf:
self.mat_plot_2d.plot_array(
array=self.dataset.psf,
visuals_2d=self.get_visuals_2d(),
visuals_2d=self.visuals_2d,
auto_labels=AutoLabels(
title=title_str or f"Point Spread Function",
filename="psf",
Expand All @@ -116,7 +105,7 @@ def figures_2d(
if signal_to_noise_map:
self.mat_plot_2d.plot_array(
array=self.dataset.signal_to_noise_map,
visuals_2d=self.get_visuals_2d(),
visuals_2d=self.visuals_2d,
auto_labels=AutoLabels(
title=title_str or f"Signal-To-Noise Map",
filename="signal_to_noise_map",
Expand All @@ -127,7 +116,7 @@ def figures_2d(
if over_sample_size_lp:
self.mat_plot_2d.plot_array(
array=self.dataset.grids.over_sample_size_lp,
visuals_2d=self.get_visuals_2d(),
visuals_2d=self.visuals_2d,
auto_labels=AutoLabels(
title=title_str or f"Over Sample Size (Light Profiles)",
filename="over_sample_size_lp",
Expand All @@ -138,7 +127,7 @@ def figures_2d(
if over_sample_size_pixelization:
self.mat_plot_2d.plot_array(
array=self.dataset.grids.over_sample_size_pixelization,
visuals_2d=self.get_visuals_2d(),
visuals_2d=self.visuals_2d,
auto_labels=AutoLabels(
title=title_str or f"Over Sample Size (Pixelization)",
filename="over_sample_size_pixelization",
Expand Down Expand Up @@ -227,13 +216,12 @@ def subplot_dataset(self):
self.mat_plot_2d.use_log10 = use_log10_original


class ImagingPlotter(Plotter):
class ImagingPlotter(AbstractPlotter):
def __init__(
self,
dataset: Imaging,
mat_plot_2d: MatPlot2D = None,
visuals_2d: Visuals2D = None,
include_2d: Include2D = None,
):
"""
Plots the attributes of `Imaging` objects using the matplotlib method `imshow()` and many other matplotlib
Expand All @@ -244,8 +232,7 @@ def __init__(
but a user can manually input values into `MatPlot2d` to customize the figure's appearance.

Overlaid on the figure are visuals, contained in the `Visuals2D` object. Attributes may be extracted from
the `Imaging` and plotted via the visuals object, if the corresponding entry is `True` in the `Include2D`
object or the `config/visualize/include.ini` file.
the `Imaging` and plotted via the visuals object.

Parameters
----------
Expand All @@ -255,27 +242,18 @@ def __init__(
Contains objects which wrap the matplotlib function calls that make 2D plots.
visuals_2d
Contains 2D visuals that can be overlaid on 2D plots.
include_2d
Specifies which attributes of the `Imaging` are extracted and plotted as visuals for 2D plots.
"""

super().__init__(
mat_plot_2d=mat_plot_2d, include_2d=include_2d, visuals_2d=visuals_2d
)
super().__init__(mat_plot_2d=mat_plot_2d, visuals_2d=visuals_2d)

self.dataset = dataset

self._imaging_meta_plotter = ImagingPlotterMeta(
dataset=self.dataset,
get_visuals_2d=self.get_visuals_2d,
mat_plot_2d=self.mat_plot_2d,
include_2d=self.include_2d,
visuals_2d=self.visuals_2d,
)

self.figures_2d = self._imaging_meta_plotter.figures_2d
self.subplot = self._imaging_meta_plotter.subplot
self.subplot_dataset = self._imaging_meta_plotter.subplot_dataset

def get_visuals_2d(self):
return self.get_2d.via_mask_from(mask=self.dataset.mask)
Loading
Loading