essreduce 25.4.1__py3-none-any.whl → 25.5.1__py3-none-any.whl

ess/reduce/nexus/types.py

@@ -341,10 +341,3 @@ class Choppers(
     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]],
-):
-    """All analyzers in a NeXus file."""

ess/reduce/nexus/workflow.py

@@ -15,10 +15,10 @@ 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,
-    Analyzers,
     Beamline,
     CalibratedBeamline,
     CalibratedDetector,
@@ -524,13 +524,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]:
@@ -627,7 +620,6 @@ _common_providers = (
     nx_class_for_source,
     nx_class_for_sample,
     nx_class_for_disk_chopper,
-    nx_class_for_crystal,
 )
 
 _monitor_providers = (
@@ -646,8 +638,6 @@ _detector_providers = (
 
 _chopper_providers = (parse_disk_choppers,)
 
-_analyzer_providers = (parse_analyzers,)
-
 _metadata_providers = (
     load_beamline_metadata_from_nexus,
     load_measurement_metadata_from_nexus,
@@ -710,7 +700,6 @@ def GenericNeXusWorkflow(
             *_monitor_providers,
             *_detector_providers,
             *_chopper_providers,
-            *_analyzer_providers,
             *_metadata_providers,
         )
     )
@@ -718,33 +707,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,57 @@ 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,
+    TimeOfFlightLookupTableFilename,
     TimeResolution,
-    TofData,
 )
+from .workflow import GenericTofWorkflow, TofLutProvider
 
 __all__ = [
+    "DetectorLtotal",
+    "DetectorTofData",
     "DistanceResolution",
+    "GenericTofWorkflow",
     "LookupTableRelativeErrorThreshold",
-    "Ltotal",
     "LtotalRange",
+    "MonitorLtotal",
+    "MonitorTofData",
     "PulsePeriod",
     "PulseStride",
     "PulseStrideOffset",
-    "RawData",
-    "ResampledTofData",
+    "ResampledDetectorTofData",
+    "ResampledMonitorTofData",
     "SimulationResults",
     "TimeOfFlightLookupTable",
+    "TimeOfFlightLookupTableFilename",
     "TimeResolution",
-    "TofData",
+    "TofLutProvider",
     "default_parameters",
     "providers",
-    "resample_tof_data",
+    "resample_detector_time_of_flight_data",
+    "resample_monitor_time_of_flight_data",
     "simulate_beamline",
     "to_events",
 ]