review fixes

Author: alexhroom

RATapi/examples/bayes_benchmark/bayes_benchmark.ipynb

@@ -47,7 +47,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 2,
+   "execution_count": null,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -65,8 +65,8 @@
     "        bulk_in=[Parameter(name=\"Air\", min=0.0, value=0.0, max=0.0, fit=False)],\n",
     "        bulk_out=[Parameter(name=\"D2O\", min=6.3e-06, value=6.35e-06, max=6.4e-06, fit=False)],\n",
     "        resolution_parameters=[Parameter(name=\"Resolution parameter 1\", min=0.01, value=0.03, max=0.05, fit=False)],\n",
-    "        backgrounds=[Background(name=\"Background 1\", type=\"constant\", value_1=\"Background parameter 1\")],\n",
-    "        resolutions=[Resolution(name=\"Resolution 1\", type=\"constant\", value_1=\"Resolution parameter 1\")],\n",
+    "        backgrounds=[Background(name=\"Background 1\", type=\"constant\", source=\"Background parameter 1\")],\n",
+    "        resolutions=[Resolution(name=\"Resolution 1\", type=\"constant\", source=\"Resolution parameter 1\")],\n",
     "        data=[\n",
     "            Data(name=\"Simulation\", data=np.empty([0, 3]), simulation_range=[0.005, 0.7]),\n",
     "            Data(\n",
@@ -178,7 +178,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 4,
+   "execution_count": null,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -240,13 +240,11 @@
     "\n",
     "print(\"Best values according to Nested Sampler:\\n\",\n",
     "      \"Roughness: \", ns_results.fitParams[0], \"\\n\",\n",
-    "      ## FIXME: once fitParams outputs properly!\n",
-    ")#      \"Background: \", ns_results.fitParams[1])\n",
+    "      \"Background: \", ns_results.fitParams[1])\n",
     "\n",
     "print(\"Best values according to DREAM:\\n\",\n",
     "      \"Roughness: \", dream_results.fitParams[0], \"\\n\",\n",
-    "      ## FIXME: once fitParams outputs properly!\n",
-    "      )#      \"Background: \", dream_results.fitParams[1])"
+    "      \"Background: \", dream_results.fitParams[1])"
    ]
   },
   {
@@ -341,6 +339,13 @@
     "fig.tight_layout()\n",
     "fig.show()"
    ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": []
   }
  ],
  "metadata": {
@@ -359,7 +364,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.2"
+   "version": "3.10.12"
   }
  },
  "nbformat": 4,

RATapi/examples/bayes_benchmark/bayes_benchmark.py

@@ -48,8 +48,8 @@ def get_project() -> RAT.Project:
         bulk_in=[Parameter(name="Air", min=0.0, value=0.0, max=0.0, fit=False)],
         bulk_out=[Parameter(name="D2O", min=6.3e-06, value=6.35e-06, max=6.4e-06, fit=False)],
         resolution_parameters=[Parameter(name="Resolution parameter 1", min=0.01, value=0.03, max=0.05, fit=False)],
-        backgrounds=[Background(name="Background 1", type="constant", value_1="Background parameter 1")],
-        resolutions=[Resolution(name="Resolution 1", type="constant", value_1="Resolution parameter 1")],
+        backgrounds=[Background(name="Background 1", type="constant", source="Background parameter 1")],
+        resolutions=[Resolution(name="Resolution 1", type="constant", source="Resolution parameter 1")],
         data=[
             Data(name="Simulation", data=np.empty([0, 3]), simulation_range=[0.005, 0.7]),
             Data(