Merge branch 'master' into multiple-registration-files

Author: Bert Vandenbroucke

velociraptor/autoplotter/objects.py

@@ -13,7 +13,7 @@
 from unyt import unyt_quantity, unyt_array, matplotlib_support
 from unyt.exceptions import UnitConversionError
 from numpy import log10, linspace, logspace, array, logical_and, ones
-from matplotlib.pyplot import Axes, Figure, close
+from matplotlib.pyplot import Axes, Figure, close, subplots
 from yaml import safe_load
 from typing import Union, List, Dict, Tuple
 from pathlib import Path
@@ -829,7 +829,8 @@ def _make_plot_scatter(
         y = self.get_quantity_from_catalogue_with_mask(self.y, catalogue)
         y.convert_to_units(self.y_units)
 
-        fig, ax = plot.scatter_x_against_y(x, y)
+        fig, ax = subplots()
+        plot.scatter_x_against_y(ax=ax, x=x, y=y)
         self._add_lines_to_axes(ax=ax, x=x, y=y)
 
         return fig, ax

velociraptor/autoplotter/plot.py

@@ -16,15 +16,11 @@
 import velociraptor.tools as tools
 
 
-def scatter_x_against_y(
-    x: unyt.unyt_array, y: unyt.unyt_array
-) -> Tuple[plt.Figure, plt.Axes]:
+def scatter_x_against_y(ax: plt.Axes, x: unyt.unyt_array, y: unyt.unyt_array) -> None:
     """
-    Creates a scatter of x against y (unyt arrays).
+    Plots a scatter of x against y (unyt arrays).
     """
 
-    fig, ax = plt.subplots()
-
     kwargs = dict(edgecolor="none", zorder=-100)
 
     # Need to "intelligently" size the markers
@@ -38,7 +34,7 @@ def scatter_x_against_y(
 
     ax.scatter(x.value, y.value, **kwargs)
 
-    return fig, ax
+    return
 
 
 def histogram_x_against_y(