diff --git a/src/ess/dream/io/nexus.py b/src/ess/dream/io/nexus.py index 1445b7bb..1b5a61ea 100644 --- a/src/ess/dream/io/nexus.py +++ b/src/ess/dream/io/nexus.py @@ -15,7 +15,8 @@ import sciline -from ess.reduce.nexus.types import DetectorBankSizes +from ess.powder.types import BunkerMonitor, CaveMonitor +from ess.reduce.nexus.types import DetectorBankSizes, NeXusName from ess.reduce.nexus.workflow import GenericNeXusWorkflow DETECTOR_BANK_SIZES = { @@ -51,4 +52,6 @@ def LoadNeXusWorkflow() -> sciline.Pipeline: """ wf = GenericNeXusWorkflow() wf[DetectorBankSizes] = DETECTOR_BANK_SIZES + wf[NeXusName[BunkerMonitor]] = "monitor_bunker" + wf[NeXusName[CaveMonitor]] = "monitor_cave" return wf diff --git a/src/ess/powder/types.py b/src/ess/powder/types.py index 0132b818..ea5471f0 100644 --- a/src/ess/powder/types.py +++ b/src/ess/powder/types.py @@ -21,6 +21,7 @@ # 1 TypeVars used to parametrize the generic parts of the workflow BackgroundRun = reduce_t.BackgroundRun +BunkerMonitor = reduce_t.Monitor2 CalibratedDetector = reduce_t.CalibratedDetector CalibratedMonitor = reduce_t.CalibratedMonitor DetectorData = reduce_t.DetectorData @@ -40,9 +41,7 @@ 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) +MonitorType = TypeVar("MonitorType", CaveMonitor, BunkerMonitor) # 2 Workflow parameters