From c08502e86c9b83805204cd84475d9f4783776ed6 Mon Sep 17 00:00:00 2001 From: Jan-Lukas Wynen Date: Tue, 17 Nov 2026 13:25:13 +0100 Subject: [PATCH 1/2] Add beer.diagnostics module --- packages/essdiffraction/src/ess/beer/__init__.py | 11 ++++++++++- .../src/ess/beer/diagnostics/__init__.py | 10 ++++++++++ .../src/ess/beer/diagnostics/load_nexus.py | 7 +++++++ 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 packages/essdiffraction/src/ess/beer/diagnostics/__init__.py create mode 100644 packages/essdiffraction/src/ess/beer/diagnostics/load_nexus.py diff --git a/packages/essdiffraction/src/ess/beer/__init__.py b/packages/essdiffraction/src/ess/beer/__init__.py index a25c2f104..dc9bb7c0d 100644 --- a/packages/essdiffraction/src/ess/beer/__init__.py +++ b/packages/essdiffraction/src/ess/beer/__init__.py @@ -7,6 +7,8 @@ import importlib.metadata +import lazy_loader as lazy + from .mcstas import load_beer_mcstas from .peakfinding import dhkl_peaks_from_cif from .workflow import ( @@ -26,7 +28,14 @@ except importlib.metadata.PackageNotFoundError: __version__ = "0.0.0" -del importlib +# The diagnostics subpackage needs ipywidgets, which is optional. Import it only on +# first access so that the workflows can be used without ipywidgets. +__getattr__, _, _ = lazy.attach( + __name__, + submodules=['diagnostics'], +) + +del _, importlib, lazy __all__ = [ 'BeerMcStasWorkflowPulseShaping', diff --git a/packages/essdiffraction/src/ess/beer/diagnostics/__init__.py b/packages/essdiffraction/src/ess/beer/diagnostics/__init__.py new file mode 100644 index 000000000..5e5959def --- /dev/null +++ b/packages/essdiffraction/src/ess/beer/diagnostics/__init__.py @@ -0,0 +1,10 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright (c) 2026 Scipp contributors (https://github.com/scipp) +"""Instrument diagnostics for BEER.""" + +from .load_nexus import load_detectors, load_monitors + +__all__ = [ + 'load_detectors', + 'load_monitors', +] diff --git a/packages/essdiffraction/src/ess/beer/diagnostics/load_nexus.py b/packages/essdiffraction/src/ess/beer/diagnostics/load_nexus.py new file mode 100644 index 000000000..da2b55179 --- /dev/null +++ b/packages/essdiffraction/src/ess/beer/diagnostics/load_nexus.py @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright (c) 2026 Scipp contributors (https://github.com/scipp) + +from ess.reduce.diagnostics import load_nexus + +load_detectors = load_nexus.load_detectors +load_monitors = load_nexus.load_monitors From b3be56d45ae4a4cd32526fb9147236a8e62e46d2 Mon Sep 17 00:00:00 2001 From: Jan-Lukas Wynen Date: Wed, 18 Nov 2026 13:35:05 +0100 Subject: [PATCH 2/2] Add BIFROST failsafe loaders --- .../src/ess/bifrost/diagnostics/__init__.py | 10 ++++++ .../src/ess/bifrost/diagnostics/load_nexus.py | 31 +++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 packages/essspectroscopy/src/ess/bifrost/diagnostics/__init__.py create mode 100644 packages/essspectroscopy/src/ess/bifrost/diagnostics/load_nexus.py diff --git a/packages/essspectroscopy/src/ess/bifrost/diagnostics/__init__.py b/packages/essspectroscopy/src/ess/bifrost/diagnostics/__init__.py new file mode 100644 index 000000000..8b0aa65ca --- /dev/null +++ b/packages/essspectroscopy/src/ess/bifrost/diagnostics/__init__.py @@ -0,0 +1,10 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright (c) 2026 Scipp contributors (https://github.com/scipp) +"""Instrument diagnostics for BIFROST.""" + +from .load_nexus import load_detectors, load_monitors + +__all__ = [ + 'load_detectors', + 'load_monitors', +] diff --git a/packages/essspectroscopy/src/ess/bifrost/diagnostics/load_nexus.py b/packages/essspectroscopy/src/ess/bifrost/diagnostics/load_nexus.py new file mode 100644 index 000000000..f43f1544e --- /dev/null +++ b/packages/essspectroscopy/src/ess/bifrost/diagnostics/load_nexus.py @@ -0,0 +1,31 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright (c) 2026 Scipp contributors (https://github.com/scipp) + +from pathlib import Path +from typing import Any + +import scipp as sc + +from ess.reduce.diagnostics import load_nexus + +load_monitors = load_nexus.load_monitors + + +def load_detectors( + filename: str | Path, + *, + detectors: list[str] | str | None = None, +) -> sc.DataGroup[Any]: + """Load detector data from a NeXus file. + + See :func:`ess.reduce.diagnostics.load_nexus.load_detectors`. + """ + detectors = load_nexus.load_detectors(filename, detectors=detectors) + return detectors.apply(_rename_detector_dims) + + +def _rename_detector_dims(da: sc.DataArray) -> sc.DataArray: + for old, new in (('dim_0', 'tube'), ('dim_1', 'length')): + if old in da.dims: + da = da.rename({old: new}) + return da