Merge pull request #116 from scipp/prune-unused-domain-types-v2

Prune unused domain types in dream workflows v2

Author: jl-wynen

pyproject.toml

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

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>=24.11.3
+essreduce>=24.12.0
 graphviz
 numpy
 plopp

requirements/base.txt

@@ -1,4 +1,4 @@
-# SHA1:6b89155439eb051cb7a3ca3e31678c9fa96a6f5a
+# SHA1:1c545a5dfb8b66d23509534f3ddf41f94ead839c
 #
 # This file is autogenerated by pip-compile-multi
 # To update, run:

src/ess/dream/io/geant4.py

@@ -22,6 +22,8 @@
     NeXusDetectorName,
     Position,
     RunType,
+    SampleRun,
+    VanadiumRun,
 )
 from ess.reduce.nexus.types import CalibratedBeamline
 from ess.reduce.nexus.workflow import GenericNeXusWorkflow
@@ -271,7 +273,9 @@ def LoadGeant4Workflow() -> sciline.Pipeline:
     """
     Workflow for loading NeXus data.
     """
-    wf = GenericNeXusWorkflow()
+    wf = GenericNeXusWorkflow(
+        run_types=[SampleRun, VanadiumRun], monitor_types=[CaveMonitor]
+    )
     wf.insert(extract_geant4_detector)
     wf.insert(load_geant4_csv)
     wf.insert(load_mcstas_monitor)

src/ess/powder/types.py

@@ -30,17 +30,20 @@
 CaveMonitor = reduce_t.Monitor1
 MonitorData = reduce_t.MonitorData
 MonitorPositionOffset = reduce_t.MonitorPositionOffset
-MonitorType = reduce_t.MonitorType
 NeXusDetectorName = reduce_t.NeXusDetectorName
 NeXusMonitorName = reduce_t.NeXusName
 NeXusComponent = reduce_t.NeXusComponent
-RunType = reduce_t.RunType
 SampleRun = reduce_t.SampleRun
 Position = reduce_t.Position
 VanadiumRun = reduce_t.VanadiumRun
 
 DetectorBankSizes = reduce_t.DetectorBankSizes
 
+RunType = TypeVar("RunType", SampleRun, VanadiumRun)
+# Include Monitor2 because a single constraint is not allowed.
+# We will eventually have more than one...
+MonitorType = TypeVar("MonitorType", CaveMonitor, reduce_t.Monitor2)
+
 
 # 2 Workflow parameters