fix: move workflow from init + use NeXusMonitorName domain type

Author: jokasimr

src/ess/offspec/__init__.py

@@ -1,32 +1,15 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright (c) 2025 Scipp contributors (https://github.com/scipp)
-import sciline
-
-from ..reflectometry import providers as reflectometry_providers
 from . import conversions, data, load, maskings, normalization, types, workflow
-
-providers = (
-    *reflectometry_providers,
-    *load.providers,
-    *conversions.providers,
-    *maskings.providers,
-    *workflow.providers,
-    *normalization.providers,
-)
-
-
-def OffspecWorkflow() -> sciline.Pipeline:
-    """
-    Workflow with default parameters for the Estia instrument.
-    """
-    return sciline.Pipeline(providers=providers)
-
+from .workflow import OffspecWorkflow
 
 __all__ = (
+    "OffspecWorkflow",
     "conversions",
     "data",
     "load",
     "maskings",
+    "normalization",
     "types",
     "workflow",
 )

src/ess/offspec/load.py

@@ -3,7 +3,7 @@
 import scipp as sc
 
 from ..reflectometry.types import Filename, RawDetectorData, ReferenceRun, RunType
-from .types import CoordTransformationGraph, MonitorData
+from .types import CoordTransformationGraph, MonitorData, NeXusMonitorName
 
 
 def load_offspec_events(
@@ -19,9 +19,10 @@ def load_offspec_events(
 def load_offspec_monitor(
     filename: Filename[RunType],
     graph: CoordTransformationGraph[ReferenceRun],
+    monitor_name: NeXusMonitorName,
 ) -> MonitorData[RunType]:
     full = sc.io.load_hdf5(filename)
-    mon = full["monitors"]["monitor2"]["data"].transform_coords(
+    mon = full["monitors"][monitor_name]["data"].transform_coords(
         "wavelength", graph=graph
     )
     return mon

src/ess/offspec/types.py

@@ -5,6 +5,8 @@
 import sciline
 import scipp as sc
 
+from ess.reduce.nexus import types as reduce_t
+
 from ..reflectometry.types import RunType
 
 SpectrumLimits = NewType("SpectrumLimits", tuple[sc.Variable, sc.Variable])
@@ -17,3 +19,6 @@ class CoordTransformationGraph(sciline.Scope[RunType, dict], dict):
 
 class MonitorData(sciline.Scope[RunType, sc.DataArray], sc.DataArray):
     """ "Monitor data from the run file, with background subtracted"""
+
+
+NeXusMonitorName = reduce_t.NeXusName

src/ess/offspec/workflow.py

@@ -1,22 +1,42 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright (c) 2025 Scipp contributors (https://github.com/scipp)
+import sciline
+
+from ..reflectometry import providers as reflectometry_providers
 from ..reflectometry.types import (
     RawDetectorData,
     ReducibleData,
     RunType,
     WavelengthBins,
 )
+from . import conversions, load, maskings, normalization
 from .corrections import correct_by_monitor
 from .maskings import add_masks
 from .types import (
     BackgroundMinWavelength,
     CoordTransformationGraph,
     MonitorData,
+    NeXusMonitorName,
     SpectrumLimits,
 )
 
 
-def add_coords_masks_and_apply_corrections_direct_beam(
+def OffspecWorkflow() -> sciline.Pipeline:
+    """
+    Workflow with default parameters for the Offspec instrument.
+    """
+    ps = (
+        *providers,
+        *reflectometry_providers,
+        *load.providers,
+        *conversions.providers,
+        *maskings.providers,
+        *normalization.providers,
+    )
+    return sciline.Pipeline(providers=ps, params={NeXusMonitorName: 'monitor2'})
+
+
+def add_coords_masks_and_apply_corrections(
     da: RawDetectorData[RunType],
     spectrum_limits: SpectrumLimits,
     wlims: WavelengthBins,
@@ -34,4 +54,4 @@ def add_coords_masks_and_apply_corrections_direct_beam(
     return da
 
 
-providers = (add_coords_masks_and_apply_corrections_direct_beam,)
+providers = (add_coords_masks_and_apply_corrections,)