Merge pull request #171 from scipp/simpler-tof-workflow

Update for simplified ess.reduce.GenericTofWorkflow

Author: SimonHeybrock

pyproject.toml

@@ -32,7 +32,7 @@ requires-python = ">=3.10"
 # Make sure to list one dependency per line.
 dependencies = [
   "dask",
-  "essreduce>=25.05.2",
+  "essreduce>=25.05.3",
   "graphviz",
   "numpy",
   "plopp>=25.03.0",

requirements/base.in

@@ -3,7 +3,7 @@
 # --- END OF CUSTOM SECTION ---
 # The following was generated by 'tox -e deps', DO NOT EDIT MANUALLY!
 dask
-essreduce>=25.05.2
+essreduce>=25.05.3
 graphviz
 numpy
 plopp>=25.03.0

requirements/base.txt

@@ -1,4 +1,4 @@
-# SHA1:60cb3370153cfec27ffbe68c100df7aa10faaed0
+# SHA1:b1c1e81e8ad714d967dc65bce97a390ae3880cc6
 #
 # This file was generated by pip-compile-multi.
 # To update, run:
@@ -29,15 +29,15 @@ dnspython==2.7.0
     # via email-validator
 email-validator==2.2.0
     # via scippneutron
-essreduce==25.5.2
+essreduce==25.5.3
     # via -r base.in
 exceptiongroup==1.3.0
     # via ipython
 executing==2.2.0
     # via stack-data
 fonttools==4.58.0
     # via matplotlib
-fsspec==2025.5.0
+fsspec==2025.5.1
     # via dask
 graphviz==0.20.3
     # via -r base.in
@@ -115,7 +115,7 @@ ptyprocess==0.7.0
     # via pexpect
 pure-eval==0.2.3
     # via stack-data
-pydantic==2.11.4
+pydantic==2.11.5
     # via scippneutron
 pydantic-core==2.33.2
     # via pydantic

requirements/ci.txt

@@ -5,7 +5,7 @@
 #
 #    requirements upgrade
 #
-cachetools==5.5.2
+cachetools==6.0.0
     # via tox
 certifi==2025.4.26
     # via requests

requirements/dev.txt

@@ -65,7 +65,7 @@ jupyter-server==2.16.0
     #   notebook-shim
 jupyter-server-terminals==0.5.3
     # via jupyter-server
-jupyterlab==4.4.2
+jupyterlab==4.4.3
     # via -r dev.in
 jupyterlab-server==2.27.3
     # via jupyterlab
@@ -75,7 +75,7 @@ overrides==7.7.0
     # via jupyter-server
 pathspec==0.12.1
     # via copier
-pip-compile-multi==3.0.0
+pip-compile-multi==3.1.0
     # via -r dev.in
 pip-tools==7.4.1
     # via pip-compile-multi

requirements/docs.txt

@@ -62,7 +62,7 @@ jupyter-client==8.6.3
     # via
     #   ipykernel
     #   nbclient
-jupyter-core==5.7.2
+jupyter-core==5.8.0
     # via
     #   ipykernel
     #   jupyter-client
@@ -180,7 +180,7 @@ tinycss2==1.4.0
     # via bleach
 tomli==2.2.1
     # via sphinx
-tornado==6.5
+tornado==6.5.1
     # via
     #   ipykernel
     #   jupyter-client

requirements/nightly.txt

@@ -46,7 +46,7 @@ executing==2.2.0
     # via stack-data
 fonttools==4.58.0
     # via matplotlib
-fsspec==2025.5.0
+fsspec==2025.5.1
     # via dask
 graphviz==0.20.3
     # via -r nightly.in
@@ -139,7 +139,7 @@ ptyprocess==0.7.0
     # via pexpect
 pure-eval==0.2.3
     # via stack-data
-pydantic==2.11.4
+pydantic==2.11.5
     # via scippneutron
 pydantic-core==2.33.2
     # via pydantic
@@ -210,7 +210,7 @@ traitlets==5.14.3
     #   traittypes
 traittypes==0.2.1
     # via ipydatawidgets
-typing-extensions==4.13.2
+typing-extensions==4.14.0rc1
     # via
     #   exceptiongroup
     #   ipython

requirements/static.txt

@@ -11,7 +11,7 @@ distlib==0.3.9
     # via virtualenv
 filelock==3.18.0
     # via virtualenv
-identify==2.6.10
+identify==2.6.12
     # via pre-commit
 nodeenv==1.9.1
     # via pre-commit

src/ess/dream/workflow.py

@@ -12,7 +12,6 @@
 
 from ess.powder import providers as powder_providers
 from ess.powder import with_pixel_mask_filenames
-from ess.powder.conversion import convert_monitor_to_wavelength
 from ess.powder.correction import (
     RunNormalization,
     insert_run_normalization,
@@ -21,23 +20,18 @@
     AccumulatedProtonCharge,
     CaveMonitorPosition,  # Should this be a DREAM-only parameter?
     EmptyCanRun,
-    MonitorType,
     PixelMaskFilename,
     Position,
     ReducerSoftware,
-    ResampledMonitorTofData,
-    RunType,
     SampleRun,
     TimeOfFlightLookupTableFilename,
     TofMask,
     TwoThetaMask,
     VanadiumRun,
     WavelengthMask,
-    WavelengthMonitor,
 )
 from ess.reduce import time_of_flight
 from ess.reduce.parameter import parameter_mappers
-from ess.reduce.time_of_flight import resample_monitor_time_of_flight_data
 from ess.reduce.workflow import register_workflow
 
 from .beamline import InstrumentConfiguration
@@ -107,18 +101,6 @@ def _collect_reducer_software() -> ReducerSoftware:
     )
 
 
-def convert_dream_monitor_to_wavelength(
-    monitor: ResampledMonitorTofData[RunType, MonitorType],
-) -> WavelengthMonitor[RunType, MonitorType]:
-    """
-    We know that DREAM monitors are recording in histogram mode, so we need to use the
-    resampled monitor data to avoid having nans in the time-of-flight coordinates.
-
-    This provider should be inserted in the Dream workflow below.
-    """
-    return convert_monitor_to_wavelength(monitor)
-
-
 def DreamGeant4Workflow(*, run_norm: RunNormalization) -> sciline.Pipeline:
     """
     Workflow with default parameters for the Dream Geant4 simulation.
@@ -136,8 +118,6 @@ def DreamGeant4Workflow(*, run_norm: RunNormalization) -> sciline.Pipeline:
     wf = LoadGeant4Workflow()
     for provider in itertools.chain(powder_providers, _dream_providers):
         wf.insert(provider)
-    wf.insert(convert_dream_monitor_to_wavelength)
-    wf.insert(resample_monitor_time_of_flight_data)
     insert_run_normalization(wf, run_norm)
     for key, value in itertools.chain(
         default_parameters().items(), time_of_flight.default_parameters().items()

src/ess/powder/types.py

@@ -37,7 +37,6 @@
 
 DetectorTofData = tof_t.DetectorTofData
 MonitorTofData = tof_t.MonitorTofData
-ResampledMonitorTofData = tof_t.ResampledMonitorTofData
 PulsePeriod = tof_t.PulsePeriod
 PulseStride = tof_t.PulseStride
 PulseStrideOffset = tof_t.PulseStrideOffset