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

ess/reduce/nexus/types.py

@@ -198,19 +198,15 @@ NeXusDetectorName = NeXusName[snx.NXdetector]
 """Name of a detector (bank) in a NeXus file."""
 
 
-class NeXusComponent(
-    sciline.ScopeTwoParams[Component, RunType, sc.DataGroup], sc.DataGroup
-):
+class NeXusComponent(sciline.Scope[Component, RunType, sc.DataGroup], sc.DataGroup):
     """Raw data from a NeXus component."""
 
 
-class AllNeXusComponents(
-    sciline.ScopeTwoParams[Component, RunType, sc.DataGroup], sc.DataGroup
-):
+class AllNeXusComponents(sciline.Scope[Component, RunType, sc.DataGroup], sc.DataGroup):
     """Raw data from all NeXus components of one class."""
 
 
-class NeXusData(sciline.ScopeTwoParams[Component, RunType, sc.DataArray], sc.DataArray):
+class NeXusData(sciline.Scope[Component, RunType, sc.DataArray], sc.DataArray):
     """
     Data array loaded from an NXevent_data or NXdata group.
 
@@ -218,7 +214,7 @@ class NeXusData(sciline.ScopeTwoParams[Component, RunType, sc.DataArray], sc.Dat
     """
 
 
-class Position(sciline.ScopeTwoParams[Component, RunType, sc.Variable], sc.Variable):
+class Position(sciline.Scope[Component, RunType, sc.Variable], sc.Variable):
     """Position of a component such as source, sample, monitor, or detector."""
 
 
@@ -227,7 +223,7 @@ class DetectorPositionOffset(sciline.Scope[RunType, sc.Variable], sc.Variable):
 
 
 class MonitorPositionOffset(
-    sciline.ScopeTwoParams[RunType, MonitorType, sc.Variable], sc.Variable
+    sciline.Scope[RunType, MonitorType, sc.Variable], sc.Variable
 ):
     """Offset for the monitor position, added to base position."""
 
@@ -241,7 +237,7 @@ class CalibratedBeamline(sciline.Scope[RunType, sc.DataArray], sc.DataArray):
 
 
 class CalibratedMonitor(
-    sciline.ScopeTwoParams[RunType, MonitorType, sc.DataArray], sc.DataArray
+    sciline.Scope[RunType, MonitorType, sc.DataArray], sc.DataArray
 ):
     """Calibrated data from a monitor."""
 
@@ -250,9 +246,7 @@ class DetectorData(sciline.Scope[RunType, sc.DataArray], sc.DataArray):
     """Calibrated detector merged with neutron event or histogram data."""
 
 
-class MonitorData(
-    sciline.ScopeTwoParams[RunType, MonitorType, sc.DataArray], sc.DataArray
-):
+class MonitorData(sciline.Scope[RunType, MonitorType, sc.DataArray], sc.DataArray):
     """Calibrated monitor merged with neutron event or histogram data."""
 
 
@@ -314,7 +308,7 @@ class NeXusDataLocationSpec(NeXusLocationSpec, Generic[Component, RunType]):
 
 
 class NeXusTransformationChain(
-    sciline.ScopeTwoParams[Component, RunType, snx.TransformationChain],
+    sciline.Scope[Component, RunType, snx.TransformationChain],
     snx.TransformationChain,
 ): ...
 

ess/reduce/nexus/workflow.py

@@ -15,6 +15,7 @@ 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 (
     AllNeXusComponents,
@@ -718,33 +719,6 @@ def GenericNeXusWorkflow(
     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)
+        prune_type_vars(wf, run_types=run_types, monitor_types=monitor_types)
 
     return wf
-
-
-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)

ess/reduce/time_of_flight/__init__.py

@@ -6,42 +6,54 @@ Utilities for computing real neutron time-of-flight from chopper settings and
 neutron time-of-arrival at the detectors.
 """
 
-from .eto_to_tof import default_parameters, providers, resample_tof_data
+from .eto_to_tof import (
+    default_parameters,
+    providers,
+    resample_detector_time_of_flight_data,
+    resample_monitor_time_of_flight_data,
+)
 from .simulation import simulate_beamline
 from .to_events import to_events
 from .types import (
+    DetectorLtotal,
+    DetectorTofData,
     DistanceResolution,
     LookupTableRelativeErrorThreshold,
-    Ltotal,
     LtotalRange,
+    MonitorLtotal,
+    MonitorTofData,
     PulsePeriod,
     PulseStride,
     PulseStrideOffset,
-    RawData,
-    ResampledTofData,
+    ResampledDetectorTofData,
+    ResampledMonitorTofData,
     SimulationResults,
     TimeOfFlightLookupTable,
     TimeResolution,
-    TofData,
 )
+from .workflow import GenericTofWorkflow
 
 __all__ = [
+    "DetectorLtotal",
+    "DetectorTofData",
     "DistanceResolution",
+    "GenericTofWorkflow",
     "LookupTableRelativeErrorThreshold",
-    "Ltotal",
     "LtotalRange",
+    "MonitorLtotal",
+    "MonitorTofData",
     "PulsePeriod",
     "PulseStride",
     "PulseStrideOffset",
-    "RawData",
-    "ResampledTofData",
+    "ResampledDetectorTofData",
+    "ResampledMonitorTofData",
     "SimulationResults",
     "TimeOfFlightLookupTable",
     "TimeResolution",
-    "TofData",
     "default_parameters",
     "providers",
-    "resample_tof_data",
+    "resample_detector_time_of_flight_data",
+    "resample_monitor_time_of_flight_data",
     "simulate_beamline",
     "to_events",
 ]