Merge pull request #81 from scipp/add-more-run-types

Minor fixes needed for ESSdiffraction
scipp · Aug 26, 2024 · f8f0a41 · f8f0a41
2 parents 4f3f73d + 3e78391
commit f8f0a41
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/ess/reduce/nexus/generic_types.py b/src/ess/reduce/nexus/generic_types.py
@@ -23,11 +23,14 @@
 """
 SampleRun = NewType('SampleRun', int)
 """Sample run."""
+VanadiumRun = NewType('VanadiumRun', int)
+"""Vanadium run."""
 
 ScatteringRunType = TypeVar(
     'ScatteringRunType',
-    SampleRun,
     BackgroundRun,
+    SampleRun,
+    VanadiumRun,
 )
 
 
@@ -48,6 +51,7 @@ class TransmissionRun(Generic[ScatteringRunType]):
     # Note that mypy does not seem to like this nesting, may need to find a workaround
     TransmissionRun[SampleRun],
     TransmissionRun[BackgroundRun],
+    VanadiumRun,
 )
 """TypeVar used for specifying BackgroundRun, EmptyBeamRun or SampleRun"""
 

diff --git a/src/ess/reduce/nexus/workflow.py b/src/ess/reduce/nexus/workflow.py
@@ -334,7 +334,7 @@ def get_calibrated_detector(
     # the detector array from the raw loader NeXus group, to prevent a source of bugs.
     return AnyRunCalibratedDetector(
         da.assign_coords(
-            position=da.coords['position'] + offset,
+            position=da.coords['position'] + offset.to(unit=da.coords['position'].unit),
             source_position=source_position,
             sample_position=sample_position,
             gravity=gravity,
@@ -389,7 +389,7 @@ def get_calibrated_monitor(
     """
     return AnyRunAnyCalibratedMonitor(
         nexus.extract_monitor_data(monitor).assign_coords(
-            position=monitor['position'] + offset,
+            position=monitor['position'] + offset.to(unit=monitor['position'].unit),
             source_position=source_position,
         )
     )