essreduce 25.5.0__py3-none-any.whl → 25.5.2__py3-none-any.whl

ess/reduce/data.py

@@ -40,6 +40,15 @@ _bifrost_registry = Registry(
 )
 
 
+_dream_registry = Registry(
+    instrument='dream',
+    files={
+        "TEST_977695_00068064.hdf": "md5:9e6ee9ec70d7c5e8c0c93b9e07e8949f",
+    },
+    version='2',
+)
+
+
 _loki_registry = Registry(
     instrument='loki',
     files={
@@ -94,3 +103,11 @@ def loki_tutorial_background_run_60393() -> str:
 def loki_tutorial_sample_transmission_run() -> str:
     """Sample transmission run (sample + sample holder/can + transmission monitor)."""
     return _loki_registry.get_path('60394-2022-02-28_2215.nxs')
+
+
+def dream_coda_test_file() -> str:
+    """CODA file for DREAM where most pulses have been removed.
+
+    See ``tools/shrink_nexus.py``.
+    """
+    return _dream_registry.get_path('TEST_977695_00068064.hdf')

ess/reduce/nexus/types.py

@@ -8,6 +8,7 @@ import sciline
 import scipp as sc
 import scippnexus as snx
 from scippneutron import metadata as scn_meta
+from scippneutron.chopper import DiskChopper
 
 FilePath = NewType('FilePath', Path)
 """Full path to a NeXus file on disk."""
@@ -69,19 +70,13 @@ class TransmissionRun(Generic[ScatteringRunType]):
     """
 
 
-RunType = TypeVar(
-    'RunType',
-    BackgroundRun,
-    EmptyBeamRun,
-    SampleRun,
-    # Note that mypy does not seem to like this nesting, may need to find a workaround
-    TransmissionRun[SampleRun],
-    TransmissionRun[BackgroundRun],
-    VanadiumRun,
-)
+RunType = TypeVar('RunType')
 """TypeVar for specifying what run some data belongs to.
 
-Possible values:
+This type must be constrained when used in a Sciline pipeline.
+E.g., by passing ``run_types`` to :class:`ess.reduce.nexus.GenericNeXusWorkflow`.
+
+ESSreduce provides the following but custom types can be used:
 
 - :class:`BackgroundRun`
 - :class:`EmptyBeamRun`
@@ -92,58 +87,28 @@ Possible values:
 
 
 # 1.2  Monitor types
-Monitor1 = NewType('Monitor1', int)
-"""Identifier for an arbitrary monitor"""
-Monitor2 = NewType('Monitor2', int)
-"""Identifier for an arbitrary monitor"""
-Monitor3 = NewType('Monitor3', int)
-"""Identifier for an arbitrary monitor"""
-Monitor4 = NewType('Monitor4', int)
-"""Identifier for an arbitrary monitor"""
-Monitor5 = NewType('Monitor5', int)
-"""Identifier for an arbitrary monitor"""
-Monitor6 = NewType('Monitor6', int)
-"""Identifier for an arbitrary monitor"""
 IncidentMonitor = NewType('IncidentMonitor', int)
 """Incident monitor"""
 TransmissionMonitor = NewType('TransmissionMonitor', int)
 """Transmission monitor"""
-FrameMonitor0 = NewType('FrameMonitor', int)
+FrameMonitor0 = NewType('FrameMonitor0', int)
 """Frame monitor number 0"""
-FrameMonitor1 = NewType('FrameMonitor', int)
+FrameMonitor1 = NewType('FrameMonitor1', int)
 """Frame monitor number 1"""
-FrameMonitor2 = NewType('FrameMonitor', int)
+FrameMonitor2 = NewType('FrameMonitor2', int)
 """Frame monitor number 2"""
-FrameMonitor3 = NewType('FrameMonitor', int)
+FrameMonitor3 = NewType('FrameMonitor3', int)
 """Frame monitor number 3"""
 CaveMonitor = NewType('CaveMonitor', int)
 """A monitor located in the instrument cave"""
-MonitorType = TypeVar(
-    'MonitorType',
-    Monitor1,
-    Monitor2,
-    Monitor3,
-    Monitor4,
-    Monitor5,
-    Monitor6,
-    IncidentMonitor,
-    TransmissionMonitor,
-    FrameMonitor0,
-    FrameMonitor1,
-    FrameMonitor2,
-    FrameMonitor3,
-    CaveMonitor,
-)
+MonitorType = TypeVar('MonitorType')
 """TypeVar for specifying what monitor some data belongs to.
 
-Possible values:
+This type must be constrained when used in a Sciline pipeline.
+E.g., by passing ``monitor_types`` to :class:`ess.reduce.nexus.GenericNeXusWorkflow`.
+
+ESSreduce provides the following but custom types can be used:
 
-- :class:`Monitor1`
-- :class:`Monitor2`
-- :class:`Monitor3`
-- :class:`Monitor4`
-- :class:`Monitor5`
-- :class:`Monitor6`
 - :class:`IncidentMonitor`
 - :class:`TransmissionMonitor`
 - :class:`FrameMonitor0`
@@ -154,27 +119,20 @@ Possible values:
 """
 
 
-Component = TypeVar(
-    'Component',
+Component = TypeVar('Component')
+"""A beamline component in a neXus file."""
+COMPONENT_CONSTRAINTS = (
     snx.NXdetector,
     snx.NXsample,
     snx.NXsource,
     snx.NXdisk_chopper,
     snx.NXcrystal,
-    Monitor1,
-    Monitor2,
-    Monitor3,
-    Monitor4,
-    Monitor5,
-    Monitor6,
-    IncidentMonitor,
-    TransmissionMonitor,
-    FrameMonitor0,
-    FrameMonitor1,
-    FrameMonitor2,
-    FrameMonitor3,
-    CaveMonitor,
 )
+"""Base constraints for the Component type variable.
+
+This list will be supplemented with monitor types when creating a pipeline.
+"""
+
 UniqueComponent = TypeVar('UniqueComponent', snx.NXsample, snx.NXsource)
 """Components that can be identified by their type as there will only be one."""
 
@@ -336,15 +294,15 @@ class NeXusTransformation(Generic[Component, RunType]):
         return NeXusTransformation(value=transform)
 
 
-class Choppers(
+class RawChoppers(
     sciline.Scope[RunType, sc.DataGroup[sc.DataGroup[Any]]],
     sc.DataGroup[sc.DataGroup[Any]],
 ):
     """All choppers in a NeXus file."""
 
 
-class Analyzers(
-    sciline.Scope[RunType, sc.DataGroup[sc.DataGroup[Any]]],
-    sc.DataGroup[sc.DataGroup[Any]],
+class DiskChoppers(
+    sciline.Scope[RunType, sc.DataGroup[DiskChopper]],
+    sc.DataGroup[DiskChopper],
 ):
-    """All analyzers in a NeXus file."""
+    """All disk choppers parsed from a NeXus file."""

ess/reduce/nexus/workflow.py

@@ -5,7 +5,7 @@
 
 from collections.abc import Iterable
 from copy import deepcopy
-from typing import Any
+from typing import Any, TypeVar
 
 import sciline
 import sciline.typing
@@ -15,16 +15,14 @@ from scipp.constants import g
 from scipp.core import label_based_index_to_positional_index
 from scippneutron.chopper import extract_chopper_from_nexus
 
-from ..utils import prune_type_vars
 from . import _nexus_loader as nexus
 from .types import (
+    COMPONENT_CONSTRAINTS,
     AllNeXusComponents,
-    Analyzers,
     Beamline,
     CalibratedBeamline,
     CalibratedDetector,
     CalibratedMonitor,
-    Choppers,
     Component,
     DetectorBankSizes,
     DetectorData,
@@ -47,6 +45,7 @@ from .types import (
     NeXusTransformationChain,
     Position,
     PreopenNeXusFile,
+    RawChoppers,
     RunType,
     SampleRun,
     TimeInterval,
@@ -514,9 +513,18 @@ def assemble_monitor_data(
 
 def parse_disk_choppers(
     choppers: AllNeXusComponents[snx.NXdisk_chopper, RunType],
-) -> Choppers[RunType]:
-    """Convert the NeXus representation of a chopper to ours."""
-    return Choppers[RunType](
+) -> RawChoppers[RunType]:
+    """Convert the NeXus representation of a chopper to ours.
+
+    Returns
+    -------
+    :
+        A nested data group containing the loaded choppers.
+        The elements may be time-dependent arrays that first need to be processed
+        before they can be passed to other functions as
+        :class:`ess.reduce.nexus.types.DiskChoppers`.
+    """
+    return RawChoppers[RunType](
         choppers.apply(
             lambda chopper: extract_chopper_from_nexus(
                 nexus.compute_component_position(chopper)
@@ -525,13 +533,6 @@ def parse_disk_choppers(
     )
 
 
-def parse_analyzers(
-    analyzers: AllNeXusComponents[snx.NXcrystal, RunType],
-) -> Analyzers[RunType]:
-    """Convert the NeXus representation of an analyzer to ours."""
-    return Analyzers[RunType](analyzers.apply(nexus.compute_component_position))
-
-
 def _drop(
     children: dict[str, snx.Field | snx.Group], classes: tuple[snx.NXobject, ...]
 ) -> dict[str, snx.Field | snx.Group]:
@@ -559,10 +560,10 @@ class _StrippedDetector(snx.NXdetector):
 class _DummyField:
     """Dummy field that can replace snx.Field in NXmonitor."""
 
-    def __init__(self):
+    def __init__(self, dim: str):
         self.attrs = {}
-        self.sizes = {'event_time_zero': 0}
-        self.dims = ('event_time_zero',)
+        self.sizes = {dim: 0}
+        self.dims = (dim,)
         self.shape = (0,)
 
     def __getitem__(self, key: Any) -> sc.Variable:
@@ -572,14 +573,17 @@ class _DummyField:
 class _StrippedMonitor(snx.NXmonitor):
     """Monitor definition without event data for ScippNexus.
 
-    Drops NXevent_data group, data is replaced by a dummy field.
+    Drops NXevent_data and NXdata groups, data is replaced by a dummy field.
     """
 
     def __init__(
         self, attrs: dict[str, Any], children: dict[str, snx.Field | snx.Group]
     ):
-        children = _drop(children, (snx.NXevent_data,))
-        children['data'] = _DummyField()
+        is_dense = snx.NXdata in (
+            getattr(child, 'nx_class', None) for child in children
+        )
+        children = _drop(children, (snx.NXevent_data, snx.NXdata))
+        children['data'] = _DummyField(dim='time' if is_dense else 'event_time_zero')
         super().__init__(attrs=attrs, children=children)
 
 
@@ -587,11 +591,21 @@ def _add_variances(da: sc.DataArray) -> sc.DataArray:
     out = da.copy(deep=False)
     if out.bins is not None:
         content = out.bins.constituents['data']
-        if content.variances is None:
-            content.variances = content.values
+        content.data = _assign_values_as_variances(content.data)
+    elif out.variances is None:
+        out.data = _assign_values_as_variances(out.data)
     return out
 
 
+def _assign_values_as_variances(var: sc.Variable) -> sc.Variable:
+    try:
+        var.variances = var.values
+    except sc.VariancesError:
+        var = var.to(dtype=sc.DType.float64)
+        var.variances = var.values
+    return var
+
+
 def load_beamline_metadata_from_nexus(file_spec: NeXusFileSpec[SampleRun]) -> Beamline:
     """Load beamline metadata from a sample NeXus file."""
     return nexus.load_metadata(file_spec.value, Beamline)
@@ -628,7 +642,6 @@ _common_providers = (
     nx_class_for_source,
     nx_class_for_sample,
     nx_class_for_disk_chopper,
-    nx_class_for_crystal,
 )
 
 _monitor_providers = (
@@ -647,24 +660,40 @@ _detector_providers = (
 
 _chopper_providers = (parse_disk_choppers,)
 
-_analyzer_providers = (parse_analyzers,)
-
 _metadata_providers = (
     load_beamline_metadata_from_nexus,
     load_measurement_metadata_from_nexus,
 )
 
 
-def LoadMonitorWorkflow() -> sciline.Pipeline:
+def LoadMonitorWorkflow(
+    *,
+    run_types: Iterable[sciline.typing.Key],
+    monitor_types: Iterable[sciline.typing.Key],
+) -> sciline.Pipeline:
     """Generic workflow for loading monitor data from a NeXus file."""
-    wf = sciline.Pipeline((*_common_providers, *_monitor_providers))
+    wf = sciline.Pipeline(
+        (*_common_providers, *_monitor_providers),
+        constraints=_gather_constraints(
+            run_types=run_types, monitor_types=monitor_types
+        ),
+    )
     wf[PreopenNeXusFile] = PreopenNeXusFile(False)
     return wf
 
 
-def LoadDetectorWorkflow() -> sciline.Pipeline:
+def LoadDetectorWorkflow(
+    *,
+    run_types: Iterable[sciline.typing.Key],
+    monitor_types: Iterable[sciline.typing.Key],
+) -> sciline.Pipeline:
     """Generic workflow for loading detector data from a NeXus file."""
-    wf = sciline.Pipeline((*_common_providers, *_detector_providers))
+    wf = sciline.Pipeline(
+        (*_common_providers, *_detector_providers),
+        constraints=_gather_constraints(
+            run_types=run_types, monitor_types=monitor_types
+        ),
+    )
     wf[DetectorBankSizes] = DetectorBankSizes({})
     wf[PreopenNeXusFile] = PreopenNeXusFile(False)
     return wf
@@ -672,8 +701,8 @@ def LoadDetectorWorkflow() -> sciline.Pipeline:
 
 def GenericNeXusWorkflow(
     *,
-    run_types: Iterable[sciline.typing.Key] | None = None,
-    monitor_types: Iterable[sciline.typing.Key] | None = None,
+    run_types: Iterable[sciline.typing.Key],
+    monitor_types: Iterable[sciline.typing.Key],
 ) -> sciline.Pipeline:
     """
     Generic workflow for loading detector and monitor data from a NeXus file.
@@ -692,13 +721,12 @@ def GenericNeXusWorkflow(
     Parameters
     ----------
     run_types:
-        List of run types to include in the workflow. If not provided, all run types
-        are included.
-        Must be a possible value of :class:`ess.reduce.nexus.types.RunType`.
+        List of run types to include in the workflow.
+        Constrains the possible values of :class:`ess.reduce.nexus.types.RunType`.
     monitor_types:
-        List of monitor types to include in the workflow. If not provided, all monitor
-        types are included.
-        Must be a possible value of :class:`ess.reduce.nexus.types.MonitorType`.
+        List of monitor types to include in the workflow.
+        Constrains the possible values of :class:`ess.reduce.nexus.types.MonitorType`
+        and :class:`ess.reduce.nexus.types.Component`.
 
     Returns
     -------
@@ -711,14 +739,27 @@ def GenericNeXusWorkflow(
             *_monitor_providers,
             *_detector_providers,
             *_chopper_providers,
-            *_analyzer_providers,
             *_metadata_providers,
-        )
+        ),
+        constraints=_gather_constraints(
+            run_types=run_types, monitor_types=monitor_types
+        ),
     )
     wf[DetectorBankSizes] = DetectorBankSizes({})
     wf[PreopenNeXusFile] = PreopenNeXusFile(False)
 
-    if run_types is not None or monitor_types is not None:
-        prune_type_vars(wf, run_types=run_types, monitor_types=monitor_types)
-
     return wf
+
+
+def _gather_constraints(
+    *,
+    run_types: Iterable[sciline.typing.Key],
+    monitor_types: Iterable[sciline.typing.Key],
+) -> dict[TypeVar, Iterable[type]]:
+    mon = tuple(iter(monitor_types))
+    constraints = {
+        RunType: run_types,
+        MonitorType: mon,
+        Component: (*COMPONENT_CONSTRAINTS, *mon),
+    }
+    return constraints

ess/reduce/streaming.py

@@ -138,6 +138,30 @@ class EternalAccumulator(Accumulator[T]):
         self._value = None
 
 
+class MeanAccumulator(EternalAccumulator[T]):
+    """
+    Accumulator that computes the mean of pushed values.
+
+    Does not support event data.
+    """
+
+    def __init__(self, **kwargs: Any) -> None:
+        super().__init__(**kwargs)
+        self._count = 0
+
+    def _do_push(self, value: T) -> None:
+        super()._do_push(value)
+        self._count += 1
+
+    def _get_value(self) -> T:
+        return super()._get_value() / self._count
+
+    def clear(self) -> None:
+        """Clear the accumulated value and count."""
+        super().clear()
+        self._count = 0
+
+
 class RollingAccumulator(Accumulator[T]):
     """
     Accumulator that adds pushed values to a rolling window.

ess/reduce/time_of_flight/__init__.py

@@ -29,9 +29,10 @@ from .types import (
     ResampledMonitorTofData,
     SimulationResults,
     TimeOfFlightLookupTable,
+    TimeOfFlightLookupTableFilename,
     TimeResolution,
 )
-from .workflow import GenericTofWorkflow
+from .workflow import GenericTofWorkflow, TofLutProvider
 
 __all__ = [
     "DetectorLtotal",
@@ -49,7 +50,9 @@ __all__ = [
     "ResampledMonitorTofData",
     "SimulationResults",
     "TimeOfFlightLookupTable",
+    "TimeOfFlightLookupTableFilename",
     "TimeResolution",
+    "TofLutProvider",
     "default_parameters",
     "providers",
     "resample_detector_time_of_flight_data",

ess/reduce/time_of_flight/eto_to_tof.py

@@ -12,7 +12,6 @@ from collections.abc import Callable
 import numpy as np
 import scipp as sc
 import scippneutron as scn
-from scipp._scipp.core import _bins_no_validate
 from scippneutron._utils import elem_unit
 
 try:
@@ -532,7 +531,7 @@ def _time_of_flight_data_events(
 
     parts = da.bins.constituents
     parts["data"] = tofs
-    return da.bins.assign_coords(tof=_bins_no_validate(**parts))
+    return da.bins.assign_coords(tof=sc.bins(**parts, validate_indices=False))
 
 
 def detector_ltotal_from_straight_line_approximation(

ess/reduce/time_of_flight/simulation.py

@@ -3,9 +3,11 @@
 from collections.abc import Mapping
 
 import scipp as sc
+import scippnexus as snx
 from scippneutron.chopper import DiskChopper
 
-from .types import SimulationResults
+from ..nexus.types import DiskChoppers, Position, SampleRun
+from .types import NumberOfSimulatedNeutrons, SimulationResults
 
 
 def simulate_beamline(
@@ -82,3 +84,25 @@ def simulate_beamline(
         weight=events.data,
         distance=furthest_chopper.distance,
     )
+
+
+def simulate_chopper_cascade_using_tof(
+    choppers: DiskChoppers[SampleRun],
+    neutrons: NumberOfSimulatedNeutrons,
+    source_position: Position[snx.NXsource, SampleRun],
+) -> SimulationResults:
+    """
+    Simulate neutrons traveling through the chopper cascade using the ``tof`` package.
+
+    Parameters
+    ----------
+    choppers:
+        Chopper settings.
+    neutrons:
+        Number of neutrons to simulate.
+    source_position:
+        Position of the source.
+    """
+    return simulate_beamline(
+        choppers=choppers, neutrons=neutrons, source_position=source_position
+    )

ess/reduce/time_of_flight/types.py

@@ -46,6 +46,12 @@ class SimulationResults:
     distance: sc.Variable
 
 
+NumberOfSimulatedNeutrons = NewType("NumberOfSimulatedNeutrons", int)
+"""
+Number of neutrons simulated in the simulation that is used to create the lookup table.
+This is typically a large number, e.g., 1e6 or 1e7.
+"""
+
 LtotalRange = NewType("LtotalRange", tuple[sc.Variable, sc.Variable])
 """
 Range (min, max) of the total length of the flight path from the source to the detector.
@@ -78,6 +84,10 @@ resolution in the lookup table will be at least the supplied value here, but may
 smaller if the pulse period is not an integer multiple of the time resolution.
 """
 
+TimeOfFlightLookupTableFilename = NewType("TimeOfFlightLookupTableFilename", str)
+"""Filename of the time-of-flight lookup table."""
+
+
 TimeOfFlightLookupTable = NewType("TimeOfFlightLookupTable", sc.DataArray)
 """
 Lookup table giving time-of-flight as a function of distance and time of arrival.

ess/reduce/time_of_flight/workflow.py

@@ -1,18 +1,35 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright (c) 2025 Scipp contributors (https://github.com/scipp)
 from collections.abc import Iterable
+from enum import Enum, auto
 
 import sciline
+import scipp as sc
 
 from ..nexus import GenericNeXusWorkflow
-from ..utils import prune_type_vars
-from .eto_to_tof import default_parameters, providers
+from . import eto_to_tof, simulation
+from .types import TimeOfFlightLookupTable, TimeOfFlightLookupTableFilename
+
+
+class TofLutProvider(Enum):
+    """Provider for the time-of-flight lookup table."""
+
+    FILE = auto()  # From file
+    TOF = auto()  # Computed with 'tof' package from chopper settings
+    MCSTAS = auto()  # McStas simulation (not implemented yet)
+
+
+def load_tof_lookup_table(
+    filename: TimeOfFlightLookupTableFilename,
+) -> TimeOfFlightLookupTable:
+    return TimeOfFlightLookupTable(sc.io.load_hdf5(filename))
 
 
 def GenericTofWorkflow(
     *,
-    run_types: Iterable[sciline.typing.Key] | None = None,
-    monitor_types: Iterable[sciline.typing.Key] | None = None,
+    run_types: Iterable[sciline.typing.Key],
+    monitor_types: Iterable[sciline.typing.Key],
+    tof_lut_provider: TofLutProvider = TofLutProvider.FILE,
 ) -> sciline.Pipeline:
     """
     Generic workflow for computing the neutron time-of-flight for detector and monitor
@@ -35,13 +52,17 @@ def GenericTofWorkflow(
     Parameters
     ----------
     run_types:
-        List of run types to include in the workflow. If not provided, all run types
-        are included.
-        Must be a possible value of :class:`ess.reduce.nexus.types.RunType`.
+        List of run types to include in the workflow.
+        Constrains the possible values of :class:`ess.reduce.nexus.types.RunType`.
     monitor_types:
-        List of monitor types to include in the workflow. If not provided, all monitor
-        types are included.
-        Must be a possible value of :class:`ess.reduce.nexus.types.MonitorType`.
+        List of monitor types to include in the workflow.
+        Constrains the possible values of :class:`ess.reduce.nexus.types.MonitorType`
+        and :class:`ess.reduce.nexus.types.Component`.
+    tof_lut_provider:
+        Specifies how the time-of-flight lookup table is provided:
+        - FILE: Read from a file
+        - TOF: Computed from chopper settings using the 'tof' package
+        - MCSTAS: From McStas simulation (not implemented yet)
 
     Returns
     -------
@@ -50,12 +71,19 @@ def GenericTofWorkflow(
     """
     wf = GenericNeXusWorkflow(run_types=run_types, monitor_types=monitor_types)
 
-    for provider in providers():
+    for provider in eto_to_tof.providers():
         wf.insert(provider)
-    for key, value in default_parameters().items():
-        wf[key] = value
 
-    if run_types is not None or monitor_types is not None:
-        prune_type_vars(wf, run_types=run_types, monitor_types=monitor_types)
+    if tof_lut_provider == TofLutProvider.FILE:
+        wf.insert(load_tof_lookup_table)
+    else:
+        wf.insert(eto_to_tof.compute_tof_lookup_table)
+        if tof_lut_provider == TofLutProvider.TOF:
+            wf.insert(simulation.simulate_chopper_cascade_using_tof)
+        if tof_lut_provider == TofLutProvider.MCSTAS:
+            raise NotImplementedError("McStas simulation not implemented yet")
+
+    for key, value in eto_to_tof.default_parameters().items():
+        wf[key] = value
 
     return wf

ess/reduce/workflow.py

@@ -53,12 +53,14 @@ def get_typical_outputs(pipeline: Pipeline) -> tuple[Key, ...]:
     if (typical_outputs := getattr(pipeline, "typical_outputs", None)) is None:
         graph = pipeline.underlying_graph
         sink_nodes = [node for node, degree in graph.out_degree if degree == 0]
-        return sorted(_with_pretty_names(sink_nodes))
+        return sorted(_with_pretty_names(sink_nodes), key=lambda x: x[0])
     return _with_pretty_names(typical_outputs)
 
 
 def get_possible_outputs(pipeline: Pipeline) -> tuple[Key, ...]:
-    return sorted(_with_pretty_names(tuple(pipeline.underlying_graph.nodes)))
+    return sorted(
+        _with_pretty_names(tuple(pipeline.underlying_graph.nodes)), key=lambda x: x[0]
+    )
 
 
 def _with_pretty_names(outputs: Sequence[Key]) -> tuple[tuple[str, Key], ...]:

{essreduce-25.5.0.dist-info → essreduce-25.5.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: essreduce
-Version: 25.5.0
+Version: 25.5.2
 Summary: Common data reduction tools for the ESS facility
 Author: Scipp contributors
 License: BSD 3-Clause License
@@ -51,7 +51,7 @@ Classifier: Typing :: Typed
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: sciline>=25.04.1
+Requires-Dist: sciline>=25.05.1
 Requires-Dist: scipp>=25.01.0
 Requires-Dist: scippneutron>=25.02.0
 Requires-Dist: scippnexus>=24.11.0

{essreduce-25.5.0.dist-info → essreduce-25.5.2.dist-info}/RECORD

@@ -1,13 +1,12 @@
 ess/reduce/__init__.py,sha256=o1pWRP9YGwTukM_k-qlG6KcoXOpMb0PDVH59vod12lw,419
-ess/reduce/data.py,sha256=vaoeAJ6EpK1YghOiAALLdWiW17TgUnnnt0H-RGiGzXk,3756
+ess/reduce/data.py,sha256=0N7iq1363tO16ntMztTNjxkQDFst-Gnp9awpgUOBVdY,4133
 ess/reduce/logging.py,sha256=6n8Czq4LZ3OK9ENlKsWSI1M3KvKv6_HSoUiV4__IUlU,357
 ess/reduce/parameter.py,sha256=4sCfoKOI2HuO_Q7JLH_jAXnEOFANSn5P3NdaOBzhJxc,4635
 ess/reduce/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ess/reduce/streaming.py,sha256=TBttQV5WdSpUKh38J0pdv53seMWtUFswxd6-ltaZb_M,17403
+ess/reduce/streaming.py,sha256=zbqxQz5dASDq4ZVyx-TdbapBXMyBttImCYz_6WOj4pg,17978
 ess/reduce/ui.py,sha256=zmorAbDwX1cU3ygDT--OP58o0qU7OBcmJz03jPeYSLA,10884
 ess/reduce/uncertainty.py,sha256=LR4O6ApB6Z-W9gC_XW0ajupl8yFG-du0eee1AX_R-gk,6990
-ess/reduce/utils.py,sha256=RBAfJRNil6JjVF-jPaxeL0ssEEfPBBQEZ3ObEorpDLo,1132
-ess/reduce/workflow.py,sha256=sL34T_2Cjl_8iFlegujxI9VyOUwo6erVC8pOXnfWgYw,3060
+ess/reduce/workflow.py,sha256=738-lcdgsORYfQ4A0UTk2IgnbVxC3jBdpscpaOFIpdc,3114
 ess/reduce/live/__init__.py,sha256=jPQVhihRVNtEDrE20PoKkclKV2aBF1lS7cCHootgFgI,204
 ess/reduce/live/raw.py,sha256=66qV0G2rP8gK5tXuk-syTlDLE2jT3ehfmSnET7Xzfd0,24392
 ess/reduce/live/roi.py,sha256=Hs-pW98k41WU6Kl3UQ41kQawk80c2QNOQ_WNctLzDPE,3795
@@ -16,18 +15,18 @@ ess/reduce/nexus/__init__.py,sha256=59bxKkNYg8DYcSykNvH6nCa5SYchJC4SbgZEKhkNdYc,
 ess/reduce/nexus/_nexus_loader.py,sha256=5N48AMJx1AaFZb6WZPPbVKUlXyFMVVtZrn7Bae57O3A,19842
 ess/reduce/nexus/json_generator.py,sha256=ME2Xn8L7Oi3uHJk9ZZdCRQTRX-OV_wh9-DJn07Alplk,2529
 ess/reduce/nexus/json_nexus.py,sha256=QrVc0p424nZ5dHX9gebAJppTw6lGZq9404P_OFl1giA,10282
-ess/reduce/nexus/types.py,sha256=vTQD4oQ5JKBHAYy9LWFICSo-dhVi3wX5IinMgjRDtF8,9806
-ess/reduce/nexus/workflow.py,sha256=zrBQGNLUxmvqXewe9uNUg9aP43_glfFD6nh5VGAtBK4,23456
+ess/reduce/nexus/types.py,sha256=DE82JnbgpTlQnt7UN2a2Gur2N9QupV3CDL9j4Iy4lsE,9178
+ess/reduce/nexus/workflow.py,sha256=Ytt80-muk5EiXmip890ahb_m5DQqlTGRQUyaTVXRNzo,24568
 ess/reduce/scripts/grow_nexus.py,sha256=hET3h06M0xlJd62E3palNLFvJMyNax2kK4XyJcOhl-I,3387
-ess/reduce/time_of_flight/__init__.py,sha256=v86c3zNTMMqZoR9eHaK0Q-JnzsbOI6XsBGI3mgy2CiU,1469
-ess/reduce/time_of_flight/eto_to_tof.py,sha256=ckXoSrltXdciYwipyUkF-DVtbsz2_XSLZvX2qJ_d8Bs,28238
+ess/reduce/time_of_flight/__init__.py,sha256=UxMvY4aFkhZQmIbGSo4FBpBGRD2wDJbczLMVqcEhCSg,1583
+ess/reduce/time_of_flight/eto_to_tof.py,sha256=JCu7C3AmJnB7GDJrL76oPjgxGesp67nct9xXRp3O8E4,28204
 ess/reduce/time_of_flight/fakes.py,sha256=0gtbSX3ZQilaM4ZP5dMr3fqbnhpyoVsZX2YEb8GgREE,4489
 ess/reduce/time_of_flight/interpolator_numba.py,sha256=wh2YS3j2rOu30v1Ok3xNHcwS7t8eEtZyZvbfXOCtgrQ,3835
 ess/reduce/time_of_flight/interpolator_scipy.py,sha256=_InoAPuMm2qhJKZQBAHOGRFqtvvuQ8TStoN7j_YgS4M,1853
-ess/reduce/time_of_flight/simulation.py,sha256=cIF_nWkLQlcWUCW2_wvWBU2ocg_8CSfOnfkoqdLdUgs,2923
+ess/reduce/time_of_flight/simulation.py,sha256=vo-zjG6t-PLetv2_nj4dhMSTEyTQ1MsrhlM2XkhOtf8,3632
 ess/reduce/time_of_flight/to_events.py,sha256=w9mHpnWd3vwN2ouob-GK_1NPrTjCaOzPuC2QuEey-m0,4342
-ess/reduce/time_of_flight/types.py,sha256=xhziZQaCB4XAxvVopHHp2DZSBj7PUt-xgPzEDpni05g,6321
-ess/reduce/time_of_flight/workflow.py,sha256=-g9IyAz7sNrgL-5RZLUTlfjTb2YFej1Xig6GiC7c1bI,2156
+ess/reduce/time_of_flight/types.py,sha256=OQeMYNN7QinXs_HDcoE6kkh_xNcyD0dEJWtnHQy5-uA,6675
+ess/reduce/time_of_flight/workflow.py,sha256=mwNEXwvOnm-M8n4G9Cau1Vuyqzo4qMrhCbZ-S5vszW4,3181
 ess/reduce/widgets/__init__.py,sha256=SoSHBv8Dc3QXV9HUvPhjSYWMwKTGYZLpsWwsShIO97Q,5325
 ess/reduce/widgets/_base.py,sha256=_wN3FOlXgx_u0c-A_3yyoIH-SdUvDENGgquh9S-h5GI,4852
 ess/reduce/widgets/_binedges_widget.py,sha256=ZCQsGjYHnJr9GFUn7NjoZc1CdsnAzm_fMzyF-fTKKVY,2785
@@ -40,9 +39,9 @@ ess/reduce/widgets/_spinner.py,sha256=2VY4Fhfa7HMXox2O7UbofcdKsYG-AJGrsgGJB85nDX
 ess/reduce/widgets/_string_widget.py,sha256=iPAdfANyXHf-nkfhgkyH6gQDklia0LebLTmwi3m-iYQ,1482
 ess/reduce/widgets/_switchable_widget.py,sha256=fjKz99SKLhIF1BLgGVBSKKn3Lu_jYBwDYGeAjbJY3Q8,2390
 ess/reduce/widgets/_vector_widget.py,sha256=aTaBqCFHZQhrIoX6-sSqFWCPePEW8HQt5kUio8jP1t8,1203
-essreduce-25.5.0.dist-info/licenses/LICENSE,sha256=nVEiume4Qj6jMYfSRjHTM2jtJ4FGu0g-5Sdh7osfEYw,1553
-essreduce-25.5.0.dist-info/METADATA,sha256=yfoZMb19ayIQyCRk5_WPEuvrWGAYApWIs4Wr-69nwO8,3768
-essreduce-25.5.0.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-essreduce-25.5.0.dist-info/entry_points.txt,sha256=PMZOIYzCifHMTe4pK3HbhxUwxjFaZizYlLD0td4Isb0,66
-essreduce-25.5.0.dist-info/top_level.txt,sha256=0JxTCgMKPLKtp14wb1-RKisQPQWX7i96innZNvHBr-s,4
-essreduce-25.5.0.dist-info/RECORD,,
+essreduce-25.5.2.dist-info/licenses/LICENSE,sha256=nVEiume4Qj6jMYfSRjHTM2jtJ4FGu0g-5Sdh7osfEYw,1553
+essreduce-25.5.2.dist-info/METADATA,sha256=LNEHFWDdswQNdu6s_5_eVHlmkVz35siN2fvirZ0KhFI,3768
+essreduce-25.5.2.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+essreduce-25.5.2.dist-info/entry_points.txt,sha256=PMZOIYzCifHMTe4pK3HbhxUwxjFaZizYlLD0td4Isb0,66
+essreduce-25.5.2.dist-info/top_level.txt,sha256=0JxTCgMKPLKtp14wb1-RKisQPQWX7i96innZNvHBr-s,4
+essreduce-25.5.2.dist-info/RECORD,,

{essreduce-25.5.0.dist-info → essreduce-25.5.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.3.1)
+Generator: setuptools (80.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

ess/reduce/utils.py

@@ -1,36 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright (c) 2025 Scipp contributors (https://github.com/scipp)
-
-from collections.abc import Iterable
-from typing import Any
-
-import sciline
-
-from .nexus.types import MonitorType, RunType
-
-
-def prune_type_vars(
-    workflow: sciline.Pipeline,
-    *,
-    run_types: Iterable[sciline.typing.Key] | None,
-    monitor_types: Iterable[sciline.typing.Key] | None,
-) -> None:
-    # Remove all nodes that use a run type or monitor types that is
-    # not listed in the function arguments.
-    excluded_run_types = excluded_type_args(RunType, run_types)
-    excluded_monitor_types = excluded_type_args(MonitorType, monitor_types)
-    excluded_types = excluded_run_types | excluded_monitor_types
-
-    graph = workflow.underlying_graph
-    to_remove = [
-        node for node in graph if excluded_types & set(getattr(node, "__args__", set()))
-    ]
-    graph.remove_nodes_from(to_remove)
-
-
-def excluded_type_args(
-    type_var: Any, keep: Iterable[sciline.typing.Key] | None
-) -> set[sciline.typing.Key]:
-    if keep is None:
-        return set()
-    return set(type_var.__constraints__) - set(keep)