docs: use sample rotation offset parameters

Author: jokasimr

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

@@ -100,7 +100,7 @@
    "source": [
     "workflow[Filename[ReferenceRun]] = amor.data.amor_run(614)\n",
     "# The sample rotation value in the file is slightly off, so we set it manually\n",
-    "workflow[SampleRotation[ReferenceRun]] = sc.scalar(0.65, unit='deg')\n",
+    "workflow[SampleRotationOffset[ReferenceRun]] = sc.scalar(0.05, unit='deg')\n",
     "\n",
     "reference_result = workflow.compute(ReducedReference)\n",
     "# Set the result back onto the pipeline to cache it\n",
@@ -167,29 +167,30 @@
     "    '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(0.85, unit='deg'),\n",
+    "        SampleRotationOffset[SampleRun]: sc.scalar(0.05, unit='deg'),\n",
     "        Filename[SampleRun]: amor.data.amor_run(608),\n",
     "    },\n",
     "    '609': {\n",
-    "        SampleRotation[SampleRun]: sc.scalar(2.25, unit='deg'),\n",
+    "        SampleRotationOffset[SampleRun]: sc.scalar(0.05, unit='deg'),\n",
     "        Filename[SampleRun]: amor.data.amor_run(609),\n",
     "    },\n",
     "    '610': {\n",
-    "        SampleRotation[SampleRun]: sc.scalar(3.65, unit='deg'),\n",
+    "        SampleRotationOffset[SampleRun]: sc.scalar(0.05, unit='deg'),\n",
     "        Filename[SampleRun]: amor.data.amor_run(610),\n",
     "    },\n",
     "    '611': {\n",
-    "        SampleRotation[SampleRun]: sc.scalar(5.05, unit='deg'),\n",
+    "        SampleRotationOffset[SampleRun]: sc.scalar(0.05, unit='deg'),\n",
     "        Filename[SampleRun]: amor.data.amor_run(611),\n",
     "    },\n",
     "}\n",
     "\n",
     "\n",
     "reflectivity = {}\n",
     "for run_number, params in runs.items():\n",
-    "    workflow[Filename[SampleRun]] = params[Filename[SampleRun]]\n",
-    "    workflow[SampleRotation[SampleRun]] = params[SampleRotation[SampleRun]]\n",
-    "    reflectivity[run_number] = workflow.compute(ReflectivityOverQ).hist()\n",
+    "    wf = workflow.copy()\n",
+    "    for key, value in params.items():\n",
+    "        wf[key] = value\n",
+    "    reflectivity[run_number] = wf.compute(ReflectivityOverQ).hist()\n",
     "\n",
     "sc.plot(reflectivity, norm='log', vmin=1e-4)"
    ]
@@ -267,9 +268,10 @@
     "# Start by computing the `ReflectivityData` for each of the files\n",
     "diagnostics = {}\n",
     "for run_number, params in runs.items():\n",
-    "    workflow[Filename[SampleRun]] = params[Filename[SampleRun]]\n",
-    "    workflow[SampleRotation[SampleRun]] = params[SampleRotation[SampleRun]]\n",
-    "    diagnostics[run_number] = workflow.compute((ReflectivityOverZW, ThetaBins[SampleRun]))\n",
+    "    wf = workflow.copy()\n",
+    "    for key, value in params.items():\n",
+    "        wf[key] = value\n",
+    "    diagnostics[run_number] = wf.compute((ReflectivityOverZW, ThetaBins[SampleRun]))\n",
     "\n",
     "# Scale the results using the scale factors computed earlier\n",
     "for run_number, scale_factor in zip(reflectivity.keys(), scale_factors, strict=True):\n",
@@ -358,7 +360,7 @@
     "from ess.reflectometry.figures import wavelength_z_figure\n",
     "\n",
     "workflow[Filename[SampleRun]] = runs['608'][Filename[SampleRun]]\n",
-    "workflow[SampleRotation[SampleRun]] = runs['608'][SampleRotation[SampleRun]]\n",
+    "workflow[SampleRotationOffset[SampleRun]] = runs['608'][SampleRotationOffset[SampleRun]]\n",
     "wavelength_z_figure(\n",
     "    workflow.compute(Sample),\n",
     "    wavelength_bins=workflow.compute(WavelengthBins),\n",

docs/user-guide/amor/compare-to-eos.ipynb

@@ -96,7 +96,7 @@
     "# Chopper phase value in the file is wrong, so we set it manually\n",
     "workflow[ChopperPhase[ReferenceRun]] = sc.scalar(-7.5, unit='deg')\n",
     "# The sample rotation value in the file is slightly off, so we set it manually\n",
-    "workflow[SampleRotation[ReferenceRun]] = sc.scalar(0.65, unit='deg')\n",
+    "workflow[SampleRotationOffset[ReferenceRun]] = sc.scalar(0.05, unit='deg')\n",
     "workflow[Filename[ReferenceRun]] = amor.data.amor_run(614)\n",
     "\n",
     "reference_result = workflow.compute(ReducedReference)\n",
@@ -123,9 +123,9 @@
     "results = sc.DataGroup({'ess': sc.DataGroup(), 'psi': sc.DataGroup()})\n",
     "\n",
     "# ESS results\n",
-    "for key, angle in mu.items():\n",
+    "for key in mu:\n",
     "    print(key, '... ', end='')\n",
-    "    workflow[SampleRotation[SampleRun]] = sc.scalar(angle + 0.05, unit='deg')\n",
+    "    workflow[SampleRotationOffset[SampleRun]] = sc.scalar(0.05, unit='deg')\n",
     "    workflow[Filename[SampleRun]] = amor.data.amor_run(key)\n",
     "    da = workflow.compute(ReflectivityOverQ).hist()\n",
     "    da.coords['Q'] = sc.midpoints(da.coords['Q'], dim='Q')\n",