fixes to plotting

Author: Jammy2211

autoarray/dataset/plot/__init__.py

@@ -1,6 +1,5 @@
 from autoarray.dataset.plot.imaging_plots import (
     subplot_imaging_dataset,
-    subplot_imaging,
     subplot_imaging_dataset_list,
 )
 from autoarray.dataset.plot.interferometer_plots import (

autoarray/dataset/plot/imaging_plots.py

@@ -46,6 +46,9 @@ def subplot_imaging_dataset(
     grid, positions, lines
         Optional overlays forwarded to every panel.
     """
+    if isinstance(output_format, (list, tuple)):
+        output_format = output_format[0]
+
     from autoarray.plot.array import plot_array
 
     fig, axes = plt.subplots(3, 3, figsize=(21, 21))
@@ -133,51 +136,6 @@ def subplot_imaging_dataset(
     subplot_save(fig, output_path, output_filename, output_format)
 
 
-def subplot_imaging(
-    dataset,
-    output_path=None,
-    output_filename: str = "subplot_dataset",
-    output_format="png",
-):
-    """
-    1×n subplot of core ``Imaging`` dataset components.
-
-    Panels: Data | Noise Map | Signal-To-Noise Map | PSF (if present)
-
-    Parameters
-    ----------
-    dataset
-        An ``Imaging`` dataset instance.
-    output_path
-        Directory to save the figure.  ``None`` calls ``plt.show()``.
-    output_filename
-        Base filename without extension.
-    output_format
-        File format string or list, e.g. ``"png"`` or ``["png"]``.
-    """
-    if isinstance(output_format, (list, tuple)):
-        output_format = output_format[0]
-
-    panels = [
-        (dataset.data, "Data"),
-        (dataset.noise_map, "Noise Map"),
-        (dataset.signal_to_noise_map, "Signal-To-Noise Map"),
-    ]
-    try:
-        panels.append((dataset.psf.kernel, "PSF"))
-    except Exception:
-        pass
-
-    from autoarray.plot.array import plot_array
-
-    n = len(panels)
-    fig, axes = plt.subplots(1, n, figsize=(7 * n, 7))
-    axes_flat = list(axes.flatten()) if n > 1 else [axes]
-    for i, (array, title) in enumerate(panels):
-        plot_array(array, ax=axes_flat[i], title=title)
-    plt.tight_layout()
-    subplot_save(fig, output_path, output_filename, output_format)
-
 
 def subplot_imaging_dataset_list(
     dataset_list,

autoarray/plot/array.py

@@ -45,8 +45,8 @@ def plot_array(
     contours: Optional[int] = None,
     # --- cosmetics --------------------------------------------------------------
     title: str = "",
-    xlabel: str = 'x (")',
-    ylabel: str = 'y (")',
+    xlabel: str = "",
+    ylabel: str = "",
     colormap: str = "jet",
     vmin: Optional[float] = None,
     vmax: Optional[float] = None,

autoarray/plot/utils.py

@@ -494,6 +494,11 @@ def plot_visibilities_1d(vis, ax: plt.Axes, title: str = "") -> None:
     ax.legend(fontsize=8)
 
 
+def _arcsec_labels(ticks) -> List[str]:
+    """Format tick values as arcsecond strings, e.g. ``-1``, ``0``, ``1"``."""
+    return [f'{v:g}"' for v in ticks]
+
+
 def apply_extent(
     ax: plt.Axes,
     extent: Tuple[float, float, float, float],
@@ -515,5 +520,9 @@ def apply_extent(
     xmin, xmax, ymin, ymax = extent
     ax.set_xlim(xmin, xmax)
     ax.set_ylim(ymin, ymax)
-    ax.set_xticks(np.linspace(xmin, xmax, n_ticks))
-    ax.set_yticks(np.linspace(ymin, ymax, n_ticks))
+    xticks = np.linspace(xmin, xmax, n_ticks)
+    yticks = np.linspace(ymin, ymax, n_ticks)
+    ax.set_xticks(xticks)
+    ax.set_yticks(yticks)
+    ax.set_xticklabels(_arcsec_labels(xticks))
+    ax.set_yticklabels(_arcsec_labels(yticks))