Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/lib/data/ensure_derived.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ def ensure_derived[D: DataWithAttrs](data: D, key: SubdataKey) -> D:
def get_derivable_keys(data: DataWithAttrs) -> list[SubdataKey]:
_, prefix = split_prepath(data.metadata.prepath)
if isinstance(data, Field):
return list(DERIVED_FIELD_VARIABLES[prefix].keys())
return list(DERIVED_FIELD_VARIABLES.get(prefix, {}).keys())
elif isinstance(data, List):
return list(get_derived_particle_variables(prefix).keys())
else:
Expand Down
14 changes: 12 additions & 2 deletions src/lib/plotting/setup_fig.py
Original file line number Diff line number Diff line change
Expand Up @@ -378,9 +378,10 @@ def setup_data(self):

def setup_fig(plot_infos: list[PlotInfo]) -> tuple[Figure, list[Renderer2]]:
figure = plt.figure(layout="constrained")
renderers = []
renderers: list[Renderer2] = []

for ax, infos in _setup_axes(figure, plot_infos).values():
loc_to_ax = _setup_axes(figure, plot_infos)
for ax, infos in loc_to_ax.values():
manager: AxesManager
if len(infos) == 1:
info = infos[0]
Expand All @@ -407,4 +408,13 @@ def setup_fig(plot_infos: list[PlotInfo]) -> tuple[Figure, list[Renderer2]]:
manager.setup()
renderers += manager.renderers

# lift labels to title
if len(loc_to_ax) > 1:
suptitle_labeler = TreeLabeler(figure.suptitle("").set_text)
for renderer in renderers:
if isinstance(renderer, TreeLabeler):
suptitle_labeler.add_child(renderer)
renderers.append(suptitle_labeler)
suptitle_labeler.update()

return figure, renderers
Binary file added tests/baseline/test_suptitle.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions tests/test_plots.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,12 @@ def test_image_and_cuts():
return make_plot("pfd ey_ec --scale symlog#.001 -v t y --copy ey_ec -i y=0 -v t --copy ey_ec -i y=-1 -v t".split())


@pytest.mark.mpl_image_compare(**MPL_KWARGS)
def test_suptitle():
"""Particle densities for electrons and ions in the same figure."""
return make_plot("prt.i -i t=1: --bin y z -v y z --with prt.e -i t=1: --bin y z -v y z loc=1,2".split())


# --- Cross-dataset plots ---


Expand Down
Loading