scipp · jokasimr · Dec 15, 2025 · Dec 2, 2025 · Dec 3, 2025 · Dec 4, 2025
diff --git a/docs/user-guide/estia/estia-advanced-mcstas-reduction.ipynb b/docs/user-guide/estia/estia-advanced-mcstas-reduction.ipynb
@@ -76,7 +76,7 @@
     "\n",
     "# If you want to use the ground truth wavelengths from the McStas simulation\n",
     "# instead of the wavelengths from the frame unwrapping, uncomment the lines below:\n",
-    "#from ess.estia.conversions import mcstas_wavelength_coordinate_transformation_graph\n",
+    "#from ess.estia.mcstas import mcstas_wavelength_coordinate_transformation_graph\n",
     "#wf.insert( mcstas_wavelength_coordinate_transformation_graph )\n",
     "\n",
     "wf[TimeOfFlightLookupTableFilename] = estia_tof_lookup_table()\n",
@@ -448,7 +448,7 @@
     "\n",
     "# If you want to use the ground truth wavelengths from the McStas simulation\n",
     "# instead of the wavelengths from the frame unwrapping, uncomment the lines below:\n",
-    "#from ess.estia.conversions import mcstas_wavelength_coordinate_transformation_graph\n",
+    "#from ess.estia.mcstas import mcstas_wavelength_coordinate_transformation_graph\n",
     "#wf.insert( mcstas_wavelength_coordinate_transformation_graph )\n",
     "\n",
     "wf[TimeOfFlightLookupTableFilename] = estia_tof_lookup_table()\n",

diff --git a/docs/user-guide/estia/simulated-spin-flip-sample.ipynb b/docs/user-guide/estia/simulated-spin-flip-sample.ipynb
@@ -53,7 +53,7 @@
     "    estia_tof_lookup_table,\n",
     ")\n",
     "from ess.reflectometry.figures import wavelength_z_figure\n",
-    "from ess.estia.conversions import mcstas_wavelength_coordinate_transformation_graph\n",
+    "from ess.estia.mcstas import mcstas_wavelength_coordinate_transformation_graph\n",
     "\n",
     "from ess.polarization import (  # noqa: F401\n",
     "    Up, Down, ReducedSampleDataBySpinChannel, SupermirrorEfficiencyFunction, Polarizer, Analyzer, PolarizationAnalysisWorkflow,\n",
@@ -353,6 +353,8 @@
     "mask = sc.isnan(I0).sum(('blade', 'wire')) > sc.scalar(0, unit=None)\n",
     "wf[ReducedReference] = I0.assign_masks(nopolcal=mask.data).assign_coords(wavelength=wf.compute(WavelengthBins))\n",
     "\n",
+    "# Required to read sample rotation / similar parameters associated with the reference measurement\n",
+    "wf[RawDetector] = sc.io.load_hdf5(estia_mcstas_spin_flip_example('supermirror', 'offoff'))\n",
     "\n",
     "sample_name = 'spin_flip_sample'\n",
     "\n",

diff --git a/src/ess/amor/conversions.py b/src/ess/amor/conversions.py
@@ -6,13 +6,24 @@
 from ..reflectometry.conversions import reflectometry_q
 from ..reflectometry.types import (
     BeamDivergenceLimits,
+    BeamSize,
     CoordTransformationGraph,
+    DetectorRotation,
+    RunType,
+    SampleRotation,
+    SampleSize,
     WavelengthBins,
     YIndexLimits,
     ZIndexLimits,
 )
 from .geometry import Detector
-from .types import GravityToggle
+from .types import (
+    ChopperDistance,
+    ChopperFrequency,
+    ChopperPhase,
+    ChopperSeparation,
+    GravityToggle,
+)
 
 
 def theta(wavelength, pixel_divergence_angle, L2, sample_rotation, detector_rotation):
@@ -135,17 +146,68 @@ def wavelength(
     return out.to(unit='angstrom', copy=False)
 
 
-def coordinate_transformation_graph(gravity: GravityToggle) -> CoordTransformationGraph:
+def coordinate_transformation_graph(
+    gravity: GravityToggle,
+    detector_rotation: DetectorRotation[RunType],
+    sample_rotation: SampleRotation[RunType],
+    chopper_phase: ChopperPhase[RunType],
+    chopper_frequency: ChopperFrequency[RunType],
+    chopper_distance: ChopperDistance[RunType],
+    chopper_separation: ChopperSeparation[RunType],
+    sample_size: SampleSize[RunType],
+    beam_size: BeamSize[RunType],
+) -> CoordTransformationGraph[RunType]:
     return {
         "wavelength": wavelength,
         "theta": theta if gravity else theta_no_gravity,
         "divergence_angle": divergence_angle,
         "Q": reflectometry_q,
         "L1": lambda chopper_distance: sc.abs(chopper_distance),
         "L2": lambda distance_in_detector: distance_in_detector + Detector.distance,
+        "sample_rotation": lambda: sample_rotation.to(unit='rad'),
+        "detector_rotation": lambda: detector_rotation.to(unit='rad'),
+        "chopper_phase": lambda: chopper_phase,
+        "chopper_frequency": lambda: chopper_frequency,
+        "chopper_separation": lambda: chopper_separation,
+        "chopper_distance": lambda: chopper_distance,
+        "sample_size": lambda: sample_size,
+        "beam_size": lambda: beam_size,
     }
 
 
+def add_coords(
+    da: sc.DataArray,
+    graph: dict,
+) -> sc.DataArray:
+    "Adds scattering coordinates to the raw detector data."
+    return da.transform_coords(
+        (
+            "wavelength",
+            "theta",
+            "divergence_angle",
+            "Q",
+            "L1",
+            "L2",
+            "blade",
+            "wire",
+            "strip",
+            "z_index",
+            "sample_rotation",
+            "detector_rotation",
+            "sample_size",
+            "beam_size",
+            "chopper_phase",
+            "chopper_frequency",
+            "chopper_separation",
+            "chopper_distance",
+        ),
+        graph,
+        rename_dims=False,
+        keep_intermediate=False,
+        keep_aliases=False,
+    )
+
+
 def _not_between(v, a, b):
     return (v < a) | (v > b)
 

diff --git a/src/ess/amor/load.py b/src/ess/amor/load.py
@@ -9,7 +9,6 @@
 from ..reflectometry.load import load_nx
 from ..reflectometry.types import (
     Beamline,
-    BeamSize,
     DetectorRotation,
     Filename,
     Measurement,
@@ -20,9 +19,7 @@
     RawDetector,
     RawSampleRotation,
     RunType,
-    SampleRotation,
     SampleRun,
-    SampleSize,
 )
 from .geometry import pixel_coordinates_in_detector_system
 from .types import (
@@ -41,14 +38,6 @@ def load_detector(
 
 def load_events(
     detector: NeXusComponent[snx.NXdetector, RunType],
-    detector_rotation: DetectorRotation[RunType],
-    sample_rotation: SampleRotation[RunType],
-    chopper_phase: ChopperPhase[RunType],
-    chopper_frequency: ChopperFrequency[RunType],
-    chopper_distance: ChopperDistance[RunType],
-    chopper_separation: ChopperSeparation[RunType],
-    sample_size: SampleSize[RunType],
-    beam_size: BeamSize[RunType],
 ) -> RawDetector[RunType]:
     event_data = detector["data"]
     if 'event_time_zero' in event_data.coords:
@@ -69,14 +58,6 @@ def load_events(
             "data"
         ].data.values
 
-    data.coords["sample_rotation"] = sample_rotation.to(unit='rad')
-    data.coords["detector_rotation"] = detector_rotation.to(unit='rad')
-    data.coords["chopper_phase"] = chopper_phase
-    data.coords["chopper_frequency"] = chopper_frequency
-    data.coords["chopper_separation"] = chopper_separation
-    data.coords["chopper_distance"] = chopper_distance
-    data.coords["sample_size"] = sample_size
-    data.coords["beam_size"] = beam_size
     return RawDetector[RunType](data)
 
 

diff --git a/src/ess/amor/normalization.py b/src/ess/amor/normalization.py
@@ -14,6 +14,7 @@
     ReducedReference,
     ReducibleData,
     Reference,
+    ReferenceRun,
     Sample,
     SampleRun,
 )
@@ -71,7 +72,7 @@ def evaluate_reference_at_sample_coords(
     reference: ReducedReference,
     sample: ReducibleData[SampleRun],
     detector_spatial_resolution: DetectorSpatialResolution[SampleRun],
-    graph: CoordTransformationGraph,
+    graph: CoordTransformationGraph[ReferenceRun],
 ) -> Reference:
     """
     Adds a :math:`Q` and :math:`Q`-resolution coordinate to each bin of the ideal

diff --git a/src/ess/amor/workflow.py b/src/ess/amor/workflow.py
@@ -1,6 +1,5 @@
 # Copyright (c) 2025 Scipp contributors (https://github.com/scipp)
 from ..reflectometry.conversions import (
-    add_coords,
     add_proton_current_coord,
     add_proton_current_mask,
 )
@@ -16,7 +15,7 @@
     YIndexLimits,
     ZIndexLimits,
 )
-from .conversions import add_masks
+from .conversions import add_coords, add_masks
 
 
 def add_coords_masks_and_apply_corrections(
@@ -26,7 +25,7 @@ def add_coords_masks_and_apply_corrections(
     bdlim: BeamDivergenceLimits,
     wbins: WavelengthBins,
     proton_current: ProtonCurrent[RunType],
-    graph: CoordTransformationGraph,
+    graph: CoordTransformationGraph[RunType],
 ) -> ReducibleData[RunType]:
     """
     Computes coordinates, masks and corrections that are

diff --git a/src/ess/estia/beamline.py b/src/ess/estia/beamline.py
@@ -6,9 +6,9 @@
 
 DETECTOR_BANK_SIZES = {
     "multiblade_detector": {
+        "strip": 64,
         "blade": 48,
         "wire": 32,
-        "strip": 64,
     },
 }
 

diff --git a/src/ess/estia/conversions.py b/src/ess/estia/conversions.py
@@ -2,13 +2,16 @@
 # Copyright (c) 2025 Scipp contributors (https://github.com/scipp)
 import scipp as sc
 from scippneutron.conversion.tof import wavelength_from_tof
+from scippnexus import NXsample, NXsource
+
+from ess.reduce.nexus.types import DetectorBankSizes, Position
 
 from ..reflectometry.conversions import reflectometry_q
 from ..reflectometry.types import (
     CoordTransformationGraph,
-    DetectorLtotal,
-    RawDetector,
+    DetectorRotation,
     RunType,
+    SampleRotation,
 )
 
 
@@ -62,34 +65,64 @@ def divergence_angle(
     return sc.atan2(y=p.fields.x, x=p.fields.z) - detector_rotation.to(unit='rad')
 
 
-def detector_ltotal_from_raw(
-    da: RawDetector[RunType], graph: CoordTransformationGraph
-) -> DetectorLtotal[RunType]:
-    return da.transform_coords(['Ltotal'], graph=graph).coords['Ltotal']
-
-
-def coordinate_transformation_graph() -> CoordTransformationGraph:
+def coordinate_transformation_graph(
+    source_position: Position[NXsource, RunType],
+    sample_position: Position[NXsample, RunType],
+    sample_rotation: SampleRotation[RunType],
+    detector_rotation: DetectorRotation[RunType],
+    detector_bank_sizes: DetectorBankSizes,
+) -> CoordTransformationGraph[RunType]:
+    bank = detector_bank_sizes['multiblade_detector']
     return {
-        "wavelength": wavelength_from_tof,
         "theta": theta,
         "divergence_angle": divergence_angle,
         "Q": reflectometry_q,
         "L1": lambda source_position, sample_position: sc.norm(
-            sample_position - source_position
+            sample_position - source_position.to(unit=sample_position.unit)
         ),  # + extra correction for guides?
-        "L2": lambda position, sample_position: sc.norm(position - sample_position),
-        "Ltotal": lambda L1, L2: L1 + L2,
-    }
-
-
-def mcstas_wavelength_coordinate_transformation_graph() -> CoordTransformationGraph:
-    return {
-        **coordinate_transformation_graph(),
-        "wavelength": lambda wavelength_from_mcstas: wavelength_from_mcstas,
+        "L2": lambda position, sample_position: sc.norm(
+            position - sample_position.to(unit=position.unit)
+        ),
+        "Ltotal": lambda L1, L2: L1.to(unit=L2.unit) + L2,
+        'sample_size': lambda: sc.scalar(20.0, unit='mm'),
+        'blade': lambda: sc.arange('blade', bank['blade'] - 1, -1, -1),
+        'wire': lambda: sc.arange('wire', bank['wire'] - 1, -1, -1),
+        'strip': lambda: sc.arange('strip', bank['strip'] - 1, -1, -1),
+        'z_index': lambda blade, wire: blade * wire,
+        "wavelength": wavelength_from_tof,
+        'sample_rotation': lambda: sample_rotation,
+        'detector_rotation': lambda: detector_rotation,
+        'source_position': lambda: source_position,
+        'sample_position': lambda: sample_position,
     }
 
 
-providers = (
-    coordinate_transformation_graph,
-    detector_ltotal_from_raw,
-)
+def add_coords(
+    da: sc.DataArray,
+    graph: dict,
+) -> sc.DataArray:
+    "Adds scattering coordinates to the raw detector data."
+    return da.transform_coords(
+        (
+            "wavelength",
+            "theta",
+            "divergence_angle",
+            "Q",
+            "L1",
+            "L2",
+            "blade",
+            "wire",
+            "strip",
+            "z_index",
+            "sample_rotation",
+            "detector_rotation",
+            "sample_size",
+        ),
+        graph,
+        rename_dims=False,
+        keep_intermediate=False,
+        keep_aliases=False,
+    )
+
+
+providers = (coordinate_transformation_graph,)
diff --git a/src/ess/estia/corrections.py b/src/ess/estia/corrections.py
@@ -3,7 +3,6 @@
 import scipp as sc
 
 from ..reflectometry.conversions import (
-    add_coords,
     add_proton_current_coord,
     add_proton_current_mask,
 )
@@ -19,6 +18,7 @@
     YIndexLimits,
     ZIndexLimits,
 )
+from .conversions import add_coords
 from .maskings import add_masks
 
 
@@ -29,7 +29,7 @@ def add_coords_masks_and_apply_corrections(
     bdlim: BeamDivergenceLimits,
     wbins: WavelengthBins,
     proton_current: ProtonCurrent[RunType],
-    graph: CoordTransformationGraph,
+    graph: CoordTransformationGraph[RunType],
 ) -> ReducibleData[RunType]:
     """
     Computes coordinates, masks and corrections that are