Reduce WavelengthScaledQ instead of ReducedQ so direct-beam iteration works

Author: SimonHeybrock

src/ess/sans/workflow.py

@@ -23,13 +23,13 @@
     NeXusDetectorName,
     Numerator,
     PixelMaskFilename,
-    ReducedQ,
     SampleRun,
     TransformationPath,
     Transmission,
     TransmissionRun,
     WavelengthBands,
     WavelengthMask,
+    WavelengthScaledQ,
 )
 
 
@@ -99,8 +99,8 @@ def _set_runs(
     pipeline = pipeline.copy()
     runs = pd.DataFrame({Filename[key]: runs}).rename_axis(axis_name)
     for part in (Numerator, Denominator):
-        pipeline[ReducedQ[key, part]] = (
-            pipeline[ReducedQ[key, part]]
+        pipeline[WavelengthScaledQ[key, part]] = (
+            pipeline[WavelengthScaledQ[key, part]]
             .map(runs)
             .reduce(index=axis_name, func=merge_contributions)
         )

tests/loki/iofq_test.py

@@ -27,12 +27,12 @@
     QBins,
     QxBins,
     QyBins,
-    ReducedQ,
     ReturnEvents,
     SampleRun,
     UncertaintyBroadcastMode,
     WavelengthBands,
     WavelengthBins,
+    WavelengthScaledQ,
 )
 
 sys.path.insert(0, str(Path(__file__).resolve().parent))
@@ -251,13 +251,22 @@ def test_pipeline_IofQ_merging_events_yields_consistent_results():
     assert sc.identical(iofq1.coords['Q'], iofq3.coords['Q'])
     assert all(sc.variances(iofq1.data) > sc.variances(iofq3.data))
     assert sc.allclose(
-        sc.values(pipeline_single.compute(ReducedQ[SampleRun, Numerator]).hist().data)
+        sc.values(
+            pipeline_single.compute(WavelengthScaledQ[SampleRun, Numerator]).hist().data
+        )
         * N,
-        sc.values(pipeline_triple.compute(ReducedQ[SampleRun, Numerator]).hist().data),
+        sc.values(
+            pipeline_triple.compute(WavelengthScaledQ[SampleRun, Numerator]).hist().data
+        ),
     )
     assert sc.allclose(
-        sc.values(pipeline_single.compute(ReducedQ[SampleRun, Denominator]).data) * N,
-        sc.values(pipeline_triple.compute(ReducedQ[SampleRun, Denominator]).data),
+        sc.values(
+            pipeline_single.compute(WavelengthScaledQ[SampleRun, Denominator]).data
+        )
+        * N,
+        sc.values(
+            pipeline_triple.compute(WavelengthScaledQ[SampleRun, Denominator]).data
+        ),
     )