Use custom run and monitor types

Author: jl-wynen

src/ess/dream/io/geant4.py

@@ -8,7 +8,6 @@
 from scippneutron.metadata import ESS_SOURCE
 
 from ess.powder.types import (
-    BackgroundRun,
     Beamline,
     CalibratedBeamline,
     CalibratedDetector,
@@ -18,6 +17,7 @@
     CaveMonitor,
     CaveMonitorPosition,
     DetectorData,
+    EmptyCanRun,
     Filename,
     MonitorData,
     MonitorFilename,
@@ -321,7 +321,7 @@ def LoadGeant4Workflow() -> sciline.Pipeline:
     Workflow for loading NeXus data.
     """
     wf = GenericTofWorkflow(
-        run_types=[SampleRun, VanadiumRun, BackgroundRun], monitor_types=[CaveMonitor]
+        run_types=[SampleRun, VanadiumRun, EmptyCanRun], monitor_types=[CaveMonitor]
     )
     wf.insert(extract_geant4_detector)
     wf.insert(load_geant4_csv)

src/ess/dream/io/nexus.py

@@ -15,7 +15,13 @@
 
 import sciline
 
-from ess.powder.types import BunkerMonitor, CaveMonitor
+from ess.powder.types import (
+    BunkerMonitor,
+    CaveMonitor,
+    EmptyCanRun,
+    SampleRun,
+    VanadiumRun,
+)
 from ess.reduce.nexus.types import DetectorBankSizes, NeXusName
 from ess.reduce.nexus.workflow import GenericNeXusWorkflow
 
@@ -50,7 +56,10 @@ def LoadNeXusWorkflow() -> sciline.Pipeline:
     """
     Workflow for loading NeXus data.
     """
-    wf = GenericNeXusWorkflow()
+    wf = GenericNeXusWorkflow(
+        run_types=(SampleRun, VanadiumRun, EmptyCanRun),
+        monitor_types=(BunkerMonitor, CaveMonitor),
+    )
     wf[DetectorBankSizes] = DETECTOR_BANK_SIZES
     wf[NeXusName[BunkerMonitor]] = "monitor_bunker"
     wf[NeXusName[CaveMonitor]] = "monitor_cave"

src/ess/dream/parameters.py

@@ -5,9 +5,9 @@
 from __future__ import annotations
 
 from ess.powder.types import (
-    BackgroundRun,
     CalibrationFilename,
     DspacingBins,
+    EmptyCanRun,
     Filename,
     IofDspacingTwoTheta,
     IofTof,
@@ -36,8 +36,8 @@
 parameter_registry[Filename[VanadiumRun]] = FilenameParameter.from_type(
     Filename[VanadiumRun]
 )
-parameter_registry[Filename[BackgroundRun]] = FilenameParameter.from_type(
-    Filename[BackgroundRun]
+parameter_registry[Filename[EmptyCanRun]] = FilenameParameter.from_type(
+    Filename[EmptyCanRun]
 )
 parameter_registry[CalibrationFilename] = FilenameParameter.from_type(
     CalibrationFilename

src/ess/dream/workflow.py

@@ -20,8 +20,8 @@
 )
 from ess.powder.types import (
     AccumulatedProtonCharge,
-    BackgroundRun,
     CaveMonitorPosition,  # Should this be a DREAM-only parameter?
+    EmptyCanRun,
     MonitorType,
     PixelMaskFilename,
     Position,
@@ -77,13 +77,13 @@ def default_parameters() -> dict:
     return {
         Position[snx.NXsample, SampleRun]: sample_position,
         Position[snx.NXsample, VanadiumRun]: sample_position,
-        Position[snx.NXsample, BackgroundRun]: sample_position,
+        Position[snx.NXsample, EmptyCanRun]: sample_position,
         Position[snx.NXsource, SampleRun]: source_position,
         Position[snx.NXsource, VanadiumRun]: source_position,
-        Position[snx.NXsource, BackgroundRun]: source_position,
+        Position[snx.NXsource, EmptyCanRun]: source_position,
         AccumulatedProtonCharge[SampleRun]: charge,
         AccumulatedProtonCharge[VanadiumRun]: charge,
-        AccumulatedProtonCharge[BackgroundRun]: charge,
+        AccumulatedProtonCharge[EmptyCanRun]: charge,
         TofMask: None,
         WavelengthMask: None,
         TwoThetaMask: None,

src/ess/powder/correction.py

@@ -12,11 +12,11 @@
 from ._util import event_or_outer_coord
 from .types import (
     AccumulatedProtonCharge,
-    BackgroundRun,
     BackgroundSubtractedData,
     BackgroundSubtractedDataTwoTheta,
     CaveMonitor,
     DataWithScatteringCoordinates,
+    EmptyCanRun,
     FocussedDataDspacing,
     FocussedDataDspacingTwoTheta,
     IofDspacing,
@@ -425,14 +425,14 @@ def _shallow_copy(da: sc.DataArray) -> sc.DataArray:
 
 def subtract_background(
     data: FocussedDataDspacing[SampleRun],
-    background: FocussedDataDspacing[BackgroundRun],
+    background: FocussedDataDspacing[EmptyCanRun],
 ) -> BackgroundSubtractedData[SampleRun]:
     return BackgroundSubtractedData[SampleRun](data.bins.concatenate(-background))
 
 
 def subtract_background_two_theta(
     data: FocussedDataDspacingTwoTheta[SampleRun],
-    background: FocussedDataDspacingTwoTheta[BackgroundRun],
+    background: FocussedDataDspacingTwoTheta[EmptyCanRun],
 ) -> BackgroundSubtractedDataTwoTheta[SampleRun]:
     return BackgroundSubtractedDataTwoTheta[SampleRun](
         data.bins.concatenate(-background)

src/ess/powder/types.py

@@ -20,27 +20,18 @@
 from ess.reduce.time_of_flight import types as tof_t
 from ess.reduce.uncertainty import UncertaintyBroadcastMode as _UncertaintyBroadcastMode
 
-# 1 TypeVars used to parametrize the generic parts of the workflow
-
-BackgroundRun = reduce_t.BackgroundRun
-BunkerMonitor = reduce_t.Monitor2
 CalibratedBeamline = reduce_t.CalibratedBeamline
 CalibratedDetector = reduce_t.CalibratedDetector
-CalibratedBeamline = reduce_t.CalibratedBeamline
 CalibratedMonitor = reduce_t.CalibratedMonitor
 DetectorData = reduce_t.DetectorData
 DetectorPositionOffset = reduce_t.DetectorPositionOffset
-EmptyBeamRun = reduce_t.EmptyBeamRun
 Filename = reduce_t.Filename
-CaveMonitor = reduce_t.Monitor1
 MonitorData = reduce_t.MonitorData
 MonitorPositionOffset = reduce_t.MonitorPositionOffset
 NeXusDetectorName = reduce_t.NeXusDetectorName
 NeXusMonitorName = reduce_t.NeXusName
 NeXusComponent = reduce_t.NeXusComponent
-SampleRun = reduce_t.SampleRun
 Position = reduce_t.Position
-VanadiumRun = reduce_t.VanadiumRun
 
 DetectorBankSizes = reduce_t.DetectorBankSizes
 
@@ -58,20 +49,23 @@
 TimeOfFlightLookupTableFilename = tof_t.TimeOfFlightLookupTableFilename
 SimulationResults = tof_t.SimulationResults
 
-RunType = TypeVar("RunType", SampleRun, VanadiumRun, BackgroundRun)
-MonitorType = TypeVar("MonitorType", CaveMonitor, BunkerMonitor)
+SampleRun = reduce_t.SampleRun
+VanadiumRun = reduce_t.VanadiumRun
+EmptyCanRun = NewType("EmptyCanRun", int)
+
+CaveMonitor = reduce_t.CaveMonitor
+BunkerMonitor = NewType("BunkerMonitor", int)
 
+RunType = TypeVar("RunType", SampleRun, VanadiumRun, EmptyCanRun)
+MonitorType = TypeVar("MonitorType", CaveMonitor, BunkerMonitor)
 
-# 2 Workflow parameters
 
 CalibrationFilename = NewType("CalibrationFilename", str | None)
 """Filename of the instrument calibration file."""
 
-
 DspacingBins = NewType("DspacingBins", sc.Variable)
 """Bin edges for d-spacing."""
 
-
 OutFilename = NewType("OutFilename", str)
 """Filename of the output."""
 

tests/dream/geant4_reduction_test.py

@@ -21,13 +21,13 @@
 )
 from ess.powder.types import (
     AccumulatedProtonCharge,
-    BackgroundRun,
     CalibrationFilename,
     CaveMonitorPosition,
     CIFAuthors,
     DistanceResolution,
     DspacingBins,
     DspacingData,
+    EmptyCanRun,
     Filename,
     IofDspacing,
     IofDspacingTwoTheta,
@@ -62,10 +62,10 @@
 params = {
     Filename[SampleRun]: dream.data.simulated_diamond_sample(small=True),
     Filename[VanadiumRun]: dream.data.simulated_vanadium_sample(small=True),
-    Filename[BackgroundRun]: dream.data.simulated_empty_can(small=True),
+    Filename[EmptyCanRun]: dream.data.simulated_empty_can(small=True),
     MonitorFilename[SampleRun]: dream.data.simulated_monitor_diamond_sample(),
     MonitorFilename[VanadiumRun]: dream.data.simulated_monitor_vanadium_sample(),
-    MonitorFilename[BackgroundRun]: dream.data.simulated_monitor_empty_can(),
+    MonitorFilename[EmptyCanRun]: dream.data.simulated_monitor_empty_can(),
     dream.InstrumentConfiguration: dream.beamline.InstrumentConfiguration.high_flux,
     CalibrationFilename: None,
     UncertaintyBroadcastMode: UncertaintyBroadcastMode.drop,
@@ -126,8 +126,8 @@ def test_pipeline_can_compute_dspacing_result(workflow):
 
 
 def test_pipeline_can_compute_dspacing_result_without_empty_can(workflow_no_empy_can):
-    workflow_no_empy_can[Filename[BackgroundRun]] = None
-    workflow_no_empy_can[MonitorFilename[BackgroundRun]] = None
+    workflow_no_empy_can[Filename[EmptyCanRun]] = None
+    workflow_no_empy_can[MonitorFilename[EmptyCanRun]] = None
     workflow_no_empy_can = powder.with_pixel_mask_filenames(workflow_no_empy_can, [])
     result = workflow_no_empy_can.compute(IofDspacing)
     assert result.sizes == {'dspacing': len(params[DspacingBins]) - 1}
@@ -333,4 +333,4 @@ def test_dream_workflow_parameters_returns_filtered_params():
     wf = DreamGeant4ProtonChargeWorkflow()
     parameters = reduce_workflow.get_parameters(wf, (DspacingData[SampleRun],))
     assert Filename[SampleRun] in parameters
-    assert Filename[BackgroundRun] not in parameters
+    assert Filename[EmptyCanRun] not in parameters

tests/dream/io/nexus_test.py

@@ -9,10 +9,10 @@
 from ess.reduce.nexus.types import (
     CalibratedDetector,
     CalibratedMonitor,
+    CaveMonitor,
     DetectorBankSizes,
     DetectorData,
     Filename,
-    Monitor1,
     NeXusDetectorName,
     SampleRun,
 )
@@ -95,8 +95,8 @@ def test_can_load_nexus_monitor_data(nexus_workflow):
     nexus_workflow[Filename[SampleRun]] = dream.data.get_path(
         'TEST_DREAM_nexus_sorted-2023-12-07.nxs'
     )
-    nexus_workflow[NeXusMonitorName[Monitor1]] = 'monitor_cave'
-    result = nexus_workflow.compute(CalibratedMonitor[SampleRun, Monitor1])
+    nexus_workflow[NeXusMonitorName[CaveMonitor]] = 'monitor_cave'
+    result = nexus_workflow.compute(CalibratedMonitor[SampleRun, CaveMonitor])
     assert result.sizes == {'event_time_zero': 0}