diff --git a/docs/src/tutorials/fitting/repeating.ipynb b/docs/src/tutorials/fitting/repeating.ipynb index 9eb6e170..7da35fb7 100644 --- a/docs/src/tutorials/fitting/repeating.ipynb +++ b/docs/src/tutorials/fitting/repeating.ipynb @@ -26,7 +26,7 @@ }, { "cell_type": "code", - "execution_count": 1, + "execution_count": null, "id": "29d5d62d-af4a-416d-bbe2-1338d32b30f5", "metadata": {}, "outputs": [], @@ -49,7 +49,7 @@ "from easyreflectometry.model import Model\n", "from easyreflectometry.model import PercentageFwhm\n", "from easyreflectometry.calculators import CalculatorFactory\n", - "from easyreflectometry.fitting import Fitter\n", + "from easyreflectometry.fitting import MultiFitter\n", "from easyreflectometry.plot import plot\n", "from easyscience.fitting import AvailableMinimizers" ] @@ -88,7 +88,7 @@ }, { "cell_type": "code", - "execution_count": 3, + "execution_count": null, "id": "7121c7e9", "metadata": {}, "outputs": [], @@ -142,7 +142,7 @@ }, { "cell_type": "code", - "execution_count": 5, + "execution_count": null, "id": "0f95d620-35b7-4b47-a3b4-9e33d5525b50", "metadata": {}, "outputs": [], @@ -155,7 +155,7 @@ }, { "cell_type": "code", - "execution_count": 6, + "execution_count": null, "id": "9a0b37ed-8714-4614-b49f-1e86ac232ac1", "metadata": {}, "outputs": [], @@ -196,7 +196,7 @@ }, { "cell_type": "code", - "execution_count": 8, + "execution_count": null, "id": "fed8d60f-a4a7-40f1-8063-eb975bfa6115", "metadata": {}, "outputs": [], @@ -222,7 +222,7 @@ }, { "cell_type": "code", - "execution_count": 9, + "execution_count": null, "id": "db1e3df9-d0fa-421a-a959-a8b2fe483310", "metadata": {}, "outputs": [], @@ -273,7 +273,7 @@ "metadata": {}, "outputs": [], "source": [ - "fitter = Fitter(model)\n", + "fitter = MultiFitter(model)\n", "fitter.switch_minimizer(AvailableMinimizers.LMFit_differential_evolution)\n", "analysed = fitter.fit(data)\n", "analysed" @@ -327,7 +327,7 @@ ], "metadata": { "kernelspec": { - "display_name": "erl_1_311", + "display_name": "Python 3", "language": "python", "name": "python3" }, @@ -341,7 +341,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.12.5" + "version": "3.11.10" } }, "nbformat": 4, diff --git a/docs/src/tutorials/fitting/simple_fitting.ipynb b/docs/src/tutorials/fitting/simple_fitting.ipynb index 889ec2fc..c17e03e2 100644 --- a/docs/src/tutorials/fitting/simple_fitting.ipynb +++ b/docs/src/tutorials/fitting/simple_fitting.ipynb @@ -22,7 +22,7 @@ }, { "cell_type": "code", - "execution_count": 1, + "execution_count": null, "id": "f026d35c-6a4a-4e9d-889c-d23ea6ee7adc", "metadata": {}, "outputs": [], @@ -42,7 +42,7 @@ "from easyreflectometry.model import Model\n", "from easyreflectometry.model import PercentageFwhm\n", "from easyreflectometry.calculators import CalculatorFactory\n", - "from easyreflectometry.fitting import Fitter\n", + "from easyreflectometry.fitting import MultiFitter\n", "from easyreflectometry.plot import plot" ] }, @@ -79,7 +79,7 @@ }, { "cell_type": "code", - "execution_count": 3, + "execution_count": null, "id": "7d851064-605c-4f80-a510-197bcdbff2ea", "metadata": {}, "outputs": [], @@ -157,7 +157,7 @@ }, { "cell_type": "code", - "execution_count": 6, + "execution_count": null, "id": "1fd5d9ba-a912-40f1-96a9-8d8d85c35c18", "metadata": {}, "outputs": [], @@ -196,7 +196,7 @@ }, { "cell_type": "code", - "execution_count": 8, + "execution_count": null, "id": "bfd2d8a1-35fe-4a6c-aeee-93f1b4066b61", "metadata": {}, "outputs": [], @@ -235,7 +235,7 @@ }, { "cell_type": "code", - "execution_count": 10, + "execution_count": null, "id": "a6508395-d292-4338-9fbe-77e19b011ae6", "metadata": {}, "outputs": [], @@ -253,7 +253,7 @@ }, { "cell_type": "code", - "execution_count": 11, + "execution_count": null, "id": "2a0aee2a-e77e-4558-a8b0-ef2d1cffd4d0", "metadata": {}, "outputs": [], @@ -301,7 +301,7 @@ }, { "cell_type": "code", - "execution_count": 13, + "execution_count": null, "id": "8646c977-28b4-4cd4-adbd-fc263359ca1c", "metadata": {}, "outputs": [], @@ -347,7 +347,7 @@ }, { "cell_type": "code", - "execution_count": 18, + "execution_count": null, "id": "a4d3eae5-ec8d-4a7f-91ef-fcce3cc5a5ed", "metadata": {}, "outputs": [], @@ -373,7 +373,7 @@ }, { "cell_type": "code", - "execution_count": 19, + "execution_count": null, "id": "7e2d7b81-7b49-4831-9508-75e0e234f15f", "metadata": {}, "outputs": [], @@ -400,7 +400,7 @@ }, { "cell_type": "code", - "execution_count": 20, + "execution_count": null, "id": "cdbe172a-1283-4cdc-8fb2-d3383b8d21b3", "metadata": {}, "outputs": [], @@ -434,17 +434,17 @@ "source": [ "## Performing an optimisation\n", "\n", - "The optimisation of our model is achieved with a `Fitter`, which takes our model and calculator. " + "The optimisation of our model is achieved with a `MultiFitter`, which takes our model. " ] }, { "cell_type": "code", - "execution_count": 22, + "execution_count": null, "id": "3648873e-16bb-449d-b90d-8b1bd4f05eb6", "metadata": {}, "outputs": [], "source": [ - "fitter = Fitter(model)" + "fitter = MultiFitter(model)" ] }, { @@ -458,7 +458,7 @@ }, { "cell_type": "code", - "execution_count": 23, + "execution_count": null, "id": "9762fc0b-c4c2-4f92-8560-079ea248dfca", "metadata": {}, "outputs": [], @@ -523,7 +523,7 @@ ], "metadata": { "kernelspec": { - "display_name": "erl_1_311", + "display_name": "Python 3", "language": "python", "name": "python3" }, @@ -537,7 +537,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.12.5" + "version": "3.11.10" } }, "nbformat": 4, diff --git a/docs/src/tutorials/magnetism.ipynb b/docs/src/tutorials/magnetism.ipynb index ef40dffa..237c67bf 100644 --- a/docs/src/tutorials/magnetism.ipynb +++ b/docs/src/tutorials/magnetism.ipynb @@ -22,7 +22,7 @@ }, { "cell_type": "code", - "execution_count": 1, + "execution_count": null, "id": "29d5d62d-af4a-416d-bbe2-1338d32b30f5", "metadata": {}, "outputs": [], @@ -91,7 +91,7 @@ }, { "cell_type": "code", - "execution_count": 3, + "execution_count": null, "id": "0f95d620-35b7-4b47-a3b4-9e33d5525b50", "metadata": {}, "outputs": [], @@ -119,7 +119,7 @@ }, { "cell_type": "code", - "execution_count": 4, + "execution_count": null, "id": "2af8c30b", "metadata": {}, "outputs": [], @@ -144,7 +144,7 @@ }, { "cell_type": "code", - "execution_count": 5, + "execution_count": null, "id": "b0259cd0", "metadata": {}, "outputs": [], @@ -175,7 +175,7 @@ }, { "cell_type": "code", - "execution_count": 6, + "execution_count": null, "id": "f1500603-d85d-4e16-b697-e1bf16502991", "metadata": {}, "outputs": [], @@ -194,7 +194,7 @@ }, { "cell_type": "code", - "execution_count": 7, + "execution_count": null, "id": "18010202", "metadata": {}, "outputs": [], diff --git a/docs/src/tutorials/sample/material_solvated.ipynb b/docs/src/tutorials/sample/material_solvated.ipynb index b46085d7..cfaca5b5 100644 --- a/docs/src/tutorials/sample/material_solvated.ipynb +++ b/docs/src/tutorials/sample/material_solvated.ipynb @@ -25,7 +25,7 @@ }, { "cell_type": "code", - "execution_count": 1, + "execution_count": null, "id": "88c86e82-88dd-4c2d-ad99-826f409ec7b7", "metadata": {}, "outputs": [], @@ -48,7 +48,7 @@ "from easyreflectometry.model import Model\n", "from easyreflectometry.model import PercentageFwhm\n", "from easyreflectometry.calculators import CalculatorFactory\n", - "from easyreflectometry.fitting import Fitter\n", + "from easyreflectometry.fitting import MultiFitter\n", "from easyreflectometry.plot import plot" ] }, @@ -85,7 +85,7 @@ }, { "cell_type": "code", - "execution_count": 3, + "execution_count": null, "id": "a95a39dd-d0eb-4029-9dc8-41e6e7918f66", "metadata": {}, "outputs": [], @@ -110,7 +110,7 @@ }, { "cell_type": "code", - "execution_count": 4, + "execution_count": null, "id": "60e5a3c5-58a8-429a-a446-a115f489af0f", "metadata": {}, "outputs": [], @@ -132,7 +132,7 @@ }, { "cell_type": "code", - "execution_count": 5, + "execution_count": null, "id": "f2b910db-530f-49c5-907a-67712ba939d2", "metadata": {}, "outputs": [], @@ -178,7 +178,7 @@ }, { "cell_type": "code", - "execution_count": 7, + "execution_count": null, "id": "f1ea2e41-f50e-4fbb-989f-aecc0e3e9860", "metadata": {}, "outputs": [], @@ -216,7 +216,7 @@ }, { "cell_type": "code", - "execution_count": 8, + "execution_count": null, "id": "f99fba34-268d-40ee-a74d-982bb2805b11", "metadata": {}, "outputs": [], @@ -236,7 +236,7 @@ }, { "cell_type": "code", - "execution_count": 11, + "execution_count": null, "id": "0e872a4d-f468-4e5a-8938-9cb50d16c460", "metadata": {}, "outputs": [], @@ -264,7 +264,7 @@ }, { "cell_type": "code", - "execution_count": 14, + "execution_count": null, "id": "79c3dc7a-b4cd-4eea-b098-08c962d747e6", "metadata": {}, "outputs": [], @@ -296,14 +296,14 @@ }, { "cell_type": "code", - "execution_count": 15, + "execution_count": null, "id": "3e24b615-cb32-41f8-95e5-5998072c7868", "metadata": {}, "outputs": [], "source": [ "interface = CalculatorFactory()\n", "model.interface = interface\n", - "fitter = Fitter(model)\n", + "fitter = MultiFitter(model)\n", "analysed = fitter.fit(data)" ] }, diff --git a/docs/src/tutorials/sample/monolayer.ipynb b/docs/src/tutorials/sample/monolayer.ipynb index d9e4881a..42b20958 100644 --- a/docs/src/tutorials/sample/monolayer.ipynb +++ b/docs/src/tutorials/sample/monolayer.ipynb @@ -22,7 +22,7 @@ }, { "cell_type": "code", - "execution_count": 16, + "execution_count": null, "id": "619bb767-475a-408b-b576-552f0bc4f2a7", "metadata": {}, "outputs": [], @@ -45,7 +45,7 @@ "from easyreflectometry.sample import Sample\n", "from easyreflectometry.model import Model\n", "from easyreflectometry.model import PercentageFwhm\n", - "from easyreflectometry.fitting import Fitter\n", + "from easyreflectometry.fitting import MultiFitter\n", "from easyreflectometry.plot import plot\n", "from easyscience.fitting import AvailableMinimizers\n" ] @@ -132,7 +132,7 @@ }, { "cell_type": "code", - "execution_count": 19, + "execution_count": null, "id": "80c8d71f-d309-4104-bae6-3941daa525d3", "metadata": {}, "outputs": [], @@ -164,7 +164,7 @@ }, { "cell_type": "code", - "execution_count": 20, + "execution_count": null, "id": "3ad9adef-8845-486d-8075-9ad6bb81ea6f", "metadata": {}, "outputs": [], @@ -183,7 +183,7 @@ }, { "cell_type": "code", - "execution_count": 21, + "execution_count": null, "id": "a39a0eca-97d6-44d7-8796-a5e98d024788", "metadata": {}, "outputs": [], @@ -202,7 +202,7 @@ }, { "cell_type": "code", - "execution_count": 22, + "execution_count": null, "id": "204144c3-a3e7-4ab1-9a6c-6aca8241f69e", "metadata": {}, "outputs": [], @@ -221,7 +221,7 @@ }, { "cell_type": "code", - "execution_count": 23, + "execution_count": null, "id": "e39cf91b-e049-4619-a5cd-4bdf8492252d", "metadata": {}, "outputs": [], @@ -282,7 +282,7 @@ }, { "cell_type": "code", - "execution_count": 25, + "execution_count": null, "id": "c17ecc32-c578-4a22-a12c-da13af1e0347", "metadata": {}, "outputs": [], @@ -302,7 +302,7 @@ }, { "cell_type": "code", - "execution_count": 26, + "execution_count": null, "id": "f17762ca-33c5-48bb-88a2-bc2568bb18f7", "metadata": {}, "outputs": [], @@ -320,7 +320,7 @@ }, { "cell_type": "code", - "execution_count": 27, + "execution_count": null, "id": "216bfe40-a97c-4437-a2f9-8bc7966ae58d", "metadata": {}, "outputs": [], @@ -349,7 +349,7 @@ }, { "cell_type": "code", - "execution_count": 28, + "execution_count": null, "id": "d30eaa0f-be7f-4cbe-a7d6-11f43512f014", "metadata": {}, "outputs": [], @@ -366,19 +366,19 @@ "id": "514afa7a-cfa4-4ef9-a2c9-105c4d56ec6a", "metadata": {}, "source": [ - "Finally, as with other [tutorials](./tutorials.rst), we create the `CalculatorFactory` (and connect this to our model) and `Fitter` objects and perform the fit. " + "Finally, as with other [tutorials](./tutorials.rst), we create the `CalculatorFactory` (and connect this to our model) and `MultiFitter` objects and perform the fit. " ] }, { "cell_type": "code", - "execution_count": 29, + "execution_count": null, "id": "bc61b31f-11bf-43e1-9fd9-d697ded79196", "metadata": {}, "outputs": [], "source": [ "calculator = CalculatorFactory()\n", "model.interface = calculator\n", - "fitter = Fitter(model)\n", + "fitter = MultiFitter(model)\n", "fitter.switch_minimizer(AvailableMinimizers.LMFit_differential_evolution)\n", "analysed = fitter.fit(data)" ] @@ -474,7 +474,7 @@ ], "metadata": { "kernelspec": { - "display_name": "erl_1_311", + "display_name": "Python 3", "language": "python", "name": "python3" }, @@ -488,7 +488,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.12.5" + "version": "3.11.10" } }, "nbformat": 4, diff --git a/docs/src/tutorials/sample/multi_contrast.ipynb b/docs/src/tutorials/sample/multi_contrast.ipynb index 029a41ee..b3ba549e 100644 --- a/docs/src/tutorials/sample/multi_contrast.ipynb +++ b/docs/src/tutorials/sample/multi_contrast.ipynb @@ -45,7 +45,7 @@ "from easyreflectometry.model import Model\n", "from easyreflectometry.model import PercentageFwhm\n", "from easyreflectometry.calculators import CalculatorFactory\n", - "from easyreflectometry.fitting import Fitter\n", + "from easyreflectometry.fitting import MultiFitter\n", "from easyscience.fitting import AvailableMinimizers\n", "\n", "print(f'easyreflectometry: {easyreflectometry.__version__}')\n", @@ -66,7 +66,7 @@ }, { "cell_type": "code", - "execution_count": 2, + "execution_count": null, "id": "694b4e5e-2d1a-402e-aa3f-a26cc82f7774", "metadata": {}, "outputs": [], @@ -125,7 +125,7 @@ }, { "cell_type": "code", - "execution_count": 5, + "execution_count": null, "id": "7834b80e-1dc9-47b8-923a-dec58e3494be", "metadata": {}, "outputs": [], @@ -144,7 +144,7 @@ }, { "cell_type": "code", - "execution_count": 6, + "execution_count": null, "id": "58855c68-c95b-40de-9fee-a662771c247b", "metadata": {}, "outputs": [], @@ -163,7 +163,7 @@ }, { "cell_type": "code", - "execution_count": 7, + "execution_count": null, "id": "08112c21-2027-47ba-845b-a3135439d862", "metadata": {}, "outputs": [], @@ -181,7 +181,7 @@ }, { "cell_type": "code", - "execution_count": 8, + "execution_count": null, "id": "e7caedc2-8305-4f3b-bad2-c042bacb363b", "metadata": {}, "outputs": [], @@ -201,7 +201,7 @@ }, { "cell_type": "code", - "execution_count": 9, + "execution_count": null, "id": "74e19578-03d4-4295-b6e2-a65fb2508c78", "metadata": {}, "outputs": [], @@ -224,7 +224,7 @@ }, { "cell_type": "code", - "execution_count": 10, + "execution_count": null, "id": "c4aa6c00", "metadata": {}, "outputs": [], @@ -264,7 +264,7 @@ }, { "cell_type": "code", - "execution_count": 11, + "execution_count": null, "id": "16a970d8", "metadata": {}, "outputs": [], @@ -304,7 +304,7 @@ }, { "cell_type": "code", - "execution_count": 12, + "execution_count": null, "id": "021272e0-7abb-4703-a4cd-92daed10ae50", "metadata": {}, "outputs": [], @@ -347,7 +347,7 @@ }, { "cell_type": "code", - "execution_count": 13, + "execution_count": null, "id": "24808923-ba02-4a7d-9be3-8d717b08aa8e", "metadata": {}, "outputs": [], @@ -382,7 +382,7 @@ }, { "cell_type": "code", - "execution_count": 15, + "execution_count": null, "id": "e31a4807-c6f4-4bfd-986e-749955aa7e49", "metadata": {}, "outputs": [], @@ -412,7 +412,7 @@ }, { "cell_type": "code", - "execution_count": 19, + "execution_count": null, "id": "6e92498a-581b-445d-94cd-dda6474f1984", "metadata": {}, "outputs": [], @@ -456,7 +456,7 @@ }, { "cell_type": "code", - "execution_count": 20, + "execution_count": null, "id": "cf35ee97-2d64-4a0f-9212-7cca8bb2dcfc", "metadata": {}, "outputs": [], @@ -487,7 +487,7 @@ }, { "cell_type": "code", - "execution_count": 21, + "execution_count": null, "id": "dc8e7f8f-6b4b-45ce-a38c-274dea683df4", "metadata": {}, "outputs": [], @@ -502,23 +502,23 @@ "id": "0570619e-2768-409d-ab9d-2c2c584dd711", "metadata": {}, "source": [ - "The models and the interface fit functions are then passed to the `Fitter` object, which is capable of performed the multiple dataset fitting process." + "The models and the interface fit functions are then passed to the `MultiFitter` object, which is capable of performed the multiple dataset fitting process." ] }, { "cell_type": "code", - "execution_count": 22, + "execution_count": null, "id": "ce890544-f3cf-4a74-b927-d19dc292e12c", "metadata": {}, "outputs": [], "source": [ - "fitter = Fitter(d13d2o_model, d70d2o_model, d83acmw_model)\n", + "fitter = MultiFitter(d13d2o_model, d70d2o_model, d83acmw_model)\n", "fitter.switch_minimizer(AvailableMinimizers.LMFit_scipy_least_squares)" ] }, { "cell_type": "code", - "execution_count": 23, + "execution_count": null, "id": "0cb9d7b4-aa04-4c73-a700-4ff5af7e6f47", "metadata": {}, "outputs": [], @@ -557,7 +557,7 @@ ], "metadata": { "kernelspec": { - "display_name": "erl_1_311", + "display_name": "Python 3", "language": "python", "name": "python3" }, @@ -571,7 +571,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.12.5" + "version": "3.11.10" } }, "nbformat": 4,