fix: remove 'return_scaling_factors'

Author: jokasimr

docs/user-guide/amor/amor-reduction.ipynb

@@ -161,7 +161,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "amor.data.amor_sample_run(608)"
+    "amor.data.amor_sample_run('608')"
    ]
   },
   {
@@ -178,18 +178,24 @@
    "outputs": [],
    "source": [
     "runs = {\n",
-    "    run_number: {\n",
+    "    '608': {\n",
     "        # The sample rotation values in the files are slightly off, so we replace\n",
     "        # them with corrected values.\n",
-    "        SampleRotation[SampleRun]: sc.scalar(sample_rotation_angle, unit='deg'),\n",
-    "        Filename[SampleRun]: amor.data.amor_sample_run(run_number),\n",
-    "    }\n",
-    "    for run_number, sample_rotation_angle in (\n",
-    "        ('608', 0.85),\n",
-    "        ('609', 2.25),\n",
-    "        ('610', 3.65),\n",
-    "        ('611', 5.05),\n",
-    "    )\n",
+    "        SampleRotation[SampleRun]: sc.scalar(0.85, unit='deg'),\n",
+    "        Filename[SampleRun]: amor.data.amor_sample_run('608'),\n",
+    "    },\n",
+    "    '609': {\n",
+    "        SampleRotation[SampleRun]: sc.scalar(2.25, unit='deg'),\n",
+    "        Filename[SampleRun]: amor.data.amor_sample_run('609'),\n",
+    "    },\n",
+    "    '610': {\n",
+    "        SampleRotation[SampleRun]: sc.scalar(3.65, unit='deg'),\n",
+    "        Filename[SampleRun]: amor.data.amor_sample_run('610'),\n",
+    "    },\n",
+    "    '611': {\n",
+    "        SampleRotation[SampleRun]: sc.scalar(5.05, unit='deg'),\n",
+    "        Filename[SampleRun]: amor.data.amor_sample_run('611'),\n",
+    "    },\n",
     "}\n",
     "\n",
     "reflectivity = {}\n",
@@ -218,7 +224,12 @@
    "source": [
     "from ess.reflectometry.tools import scale_reflectivity_curves_to_overlap\n",
     "\n",
-    "scaled_reflectivity_curves, scale_factors = scale_reflectivity_curves_to_overlap(reflectivity.values(), critical_edge_interval=(sc.scalar(0.01, unit='1/angstrom'), sc.scalar(0.014, unit='1/angstrom')))\n",
+    "scaled_reflectivity_curves, scale_factors = scale_reflectivity_curves_to_overlap(\n",
+    "    reflectivity.values(),\n",
+    "    # Optionally specify a Q-interval where the reflectivity is known to be 1.0\n",
+    "    critical_edge_interval=(sc.scalar(0.01, unit='1/angstrom'), sc.scalar(0.014, unit='1/angstrom'))\n",
+    ")\n",
+    "\n",
     "sc.plot(dict(zip(reflectivity.keys(), scaled_reflectivity_curves, strict=True)), norm='log', vmin=1e-5)"
    ]
   },
@@ -350,8 +361,8 @@
    "source": [
     "from ess.amor.figures import wavelength_z_figure\n",
     "\n",
-    "workflow[Filename[SampleRun]] = amor.data.amor_sample_run('608')\n",
-    "workflow[SampleRotation[SampleRun]] = runs['608']\n",
+    "workflow[Filename[SampleRun]] = runs['608'][Filename[SampleRun]]\n",
+    "workflow[SampleRotation[SampleRun]] = runs['608'][SampleRotation[SampleRun]]\n",
     "wavelength_z_figure(\n",
     "    workflow.compute(FootprintCorrectedData[SampleRun]),\n",
     "    wavelength_bins=workflow.compute(WavelengthBins),\n",

src/ess/reflectometry/tools.py

@@ -333,9 +333,7 @@ def orso_datasets_from_measurements(
         reflectivity_curves.append(wf.compute(ReflectivityOverQ))
 
     scale_factors = (
-        scale_reflectivity_curves_to_overlap(
-            [r.hist() for r in reflectivity_curves], return_scaling_factors=True
-        )
+        scale_reflectivity_curves_to_overlap([r.hist() for r in reflectivity_curves])[1]
         if scale_to_overlap
         else (1,) * len(runs)
     )

tests/tools_test.py

@@ -4,17 +4,16 @@
 import pytest
 import sciline as sl
 import scipp as sc
-
 from numpy.testing import assert_allclose as np_assert_allclose
 from orsopy.fileio import Orso, OrsoDataset
 from scipp.testing import assert_allclose
 
 from ess.reflectometry.orso import OrsoIofQDataset
 from ess.reflectometry.tools import (
     combine_curves,
+    linlogspace,
     orso_datasets_from_measurements,
     scale_reflectivity_curves_to_overlap,
-    linlogspace,
 )
 from ess.reflectometry.types import Filename, ReflectivityOverQ, SampleRun
 
@@ -147,7 +146,6 @@ def test_combined_curves():
     )
 
 
-<<<<<<< HEAD
 def test_linlogspace_linear():
     q_lin = linlogspace(
         dim='qz', edges=[0.008, 0.08], scale='linear', num=50, unit='1/angstrom'