Skip to content

update tutorials #207

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andped10 merged 1 commit into from
Nov 27, 2024
Merged

update tutorials #207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions docs/src/tutorials/fitting/repeating.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
},
{
"cell_type": "code",
"execution_count": 1,
"execution_count": null,
"id": "29d5d62d-af4a-416d-bbe2-1338d32b30f5",
"metadata": {},
"outputs": [],
Expand All @@ -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"
]
Expand Down Expand Up @@ -88,7 +88,7 @@
},
{
"cell_type": "code",
"execution_count": 3,
"execution_count": null,
"id": "7121c7e9",
"metadata": {},
"outputs": [],
Expand Down Expand Up @@ -142,7 +142,7 @@
},
{
"cell_type": "code",
"execution_count": 5,
"execution_count": null,
"id": "0f95d620-35b7-4b47-a3b4-9e33d5525b50",
"metadata": {},
"outputs": [],
Expand All @@ -155,7 +155,7 @@
},
{
"cell_type": "code",
"execution_count": 6,
"execution_count": null,
"id": "9a0b37ed-8714-4614-b49f-1e86ac232ac1",
"metadata": {},
"outputs": [],
Expand Down Expand Up @@ -196,7 +196,7 @@
},
{
"cell_type": "code",
"execution_count": 8,
"execution_count": null,
"id": "fed8d60f-a4a7-40f1-8063-eb975bfa6115",
"metadata": {},
"outputs": [],
Expand All @@ -222,7 +222,7 @@
},
{
"cell_type": "code",
"execution_count": 9,
"execution_count": null,
"id": "db1e3df9-d0fa-421a-a959-a8b2fe483310",
"metadata": {},
"outputs": [],
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -327,7 +327,7 @@
],
"metadata": {
"kernelspec": {
"display_name": "erl_1_311",
"display_name": "Python 3",
"language": "python",
"name": "python3"
},
Expand All @@ -341,7 +341,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.12.5"
"version": "3.11.10"
}
},
"nbformat": 4,
Expand Down
34 changes: 17 additions & 17 deletions docs/src/tutorials/fitting/simple_fitting.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
},
{
"cell_type": "code",
"execution_count": 1,
"execution_count": null,
"id": "f026d35c-6a4a-4e9d-889c-d23ea6ee7adc",
"metadata": {},
"outputs": [],
Expand All @@ -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"
]
},
Expand Down Expand Up @@ -79,7 +79,7 @@
},
{
"cell_type": "code",
"execution_count": 3,
"execution_count": null,
"id": "7d851064-605c-4f80-a510-197bcdbff2ea",
"metadata": {},
"outputs": [],
Expand Down Expand Up @@ -157,7 +157,7 @@
},
{
"cell_type": "code",
"execution_count": 6,
"execution_count": null,
"id": "1fd5d9ba-a912-40f1-96a9-8d8d85c35c18",
"metadata": {},
"outputs": [],
Expand Down Expand Up @@ -196,7 +196,7 @@
},
{
"cell_type": "code",
"execution_count": 8,
"execution_count": null,
"id": "bfd2d8a1-35fe-4a6c-aeee-93f1b4066b61",
"metadata": {},
"outputs": [],
Expand Down Expand Up @@ -235,7 +235,7 @@
},
{
"cell_type": "code",
"execution_count": 10,
"execution_count": null,
"id": "a6508395-d292-4338-9fbe-77e19b011ae6",
"metadata": {},
"outputs": [],
Expand All @@ -253,7 +253,7 @@
},
{
"cell_type": "code",
"execution_count": 11,
"execution_count": null,
"id": "2a0aee2a-e77e-4558-a8b0-ef2d1cffd4d0",
"metadata": {},
"outputs": [],
Expand Down Expand Up @@ -301,7 +301,7 @@
},
{
"cell_type": "code",
"execution_count": 13,
"execution_count": null,
"id": "8646c977-28b4-4cd4-adbd-fc263359ca1c",
"metadata": {},
"outputs": [],
Expand Down Expand Up @@ -347,7 +347,7 @@
},
{
"cell_type": "code",
"execution_count": 18,
"execution_count": null,
"id": "a4d3eae5-ec8d-4a7f-91ef-fcce3cc5a5ed",
"metadata": {},
"outputs": [],
Expand All @@ -373,7 +373,7 @@
},
{
"cell_type": "code",
"execution_count": 19,
"execution_count": null,
"id": "7e2d7b81-7b49-4831-9508-75e0e234f15f",
"metadata": {},
"outputs": [],
Expand All @@ -400,7 +400,7 @@
},
{
"cell_type": "code",
"execution_count": 20,
"execution_count": null,
"id": "cdbe172a-1283-4cdc-8fb2-d3383b8d21b3",
"metadata": {},
"outputs": [],
Expand Down Expand Up @@ -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)"
]
},
{
Expand All @@ -458,7 +458,7 @@
},
{
"cell_type": "code",
"execution_count": 23,
"execution_count": null,
"id": "9762fc0b-c4c2-4f92-8560-079ea248dfca",
"metadata": {},
"outputs": [],
Expand Down Expand Up @@ -523,7 +523,7 @@
],
"metadata": {
"kernelspec": {
"display_name": "erl_1_311",
"display_name": "Python 3",
"language": "python",
"name": "python3"
},
Expand All @@ -537,7 +537,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.12.5"
"version": "3.11.10"
}
},
"nbformat": 4,
Expand Down
12 changes: 6 additions & 6 deletions docs/src/tutorials/magnetism.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
},
{
"cell_type": "code",
"execution_count": 1,
"execution_count": null,
"id": "29d5d62d-af4a-416d-bbe2-1338d32b30f5",
"metadata": {},
"outputs": [],
Expand Down Expand Up @@ -91,7 +91,7 @@
},
{
"cell_type": "code",
"execution_count": 3,
"execution_count": null,
"id": "0f95d620-35b7-4b47-a3b4-9e33d5525b50",
"metadata": {},
"outputs": [],
Expand Down Expand Up @@ -119,7 +119,7 @@
},
{
"cell_type": "code",
"execution_count": 4,
"execution_count": null,
"id": "2af8c30b",
"metadata": {},
"outputs": [],
Expand All @@ -144,7 +144,7 @@
},
{
"cell_type": "code",
"execution_count": 5,
"execution_count": null,
"id": "b0259cd0",
"metadata": {},
"outputs": [],
Expand Down Expand Up @@ -175,7 +175,7 @@
},
{
"cell_type": "code",
"execution_count": 6,
"execution_count": null,
"id": "f1500603-d85d-4e16-b697-e1bf16502991",
"metadata": {},
"outputs": [],
Expand All @@ -194,7 +194,7 @@
},
{
"cell_type": "code",
"execution_count": 7,
"execution_count": null,
"id": "18010202",
"metadata": {},
"outputs": [],
Expand Down
22 changes: 11 additions & 11 deletions docs/src/tutorials/sample/material_solvated.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
},
{
"cell_type": "code",
"execution_count": 1,
"execution_count": null,
"id": "88c86e82-88dd-4c2d-ad99-826f409ec7b7",
"metadata": {},
"outputs": [],
Expand All @@ -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"
]
},
Expand Down Expand Up @@ -85,7 +85,7 @@
},
{
"cell_type": "code",
"execution_count": 3,
"execution_count": null,
"id": "a95a39dd-d0eb-4029-9dc8-41e6e7918f66",
"metadata": {},
"outputs": [],
Expand All @@ -110,7 +110,7 @@
},
{
"cell_type": "code",
"execution_count": 4,
"execution_count": null,
"id": "60e5a3c5-58a8-429a-a446-a115f489af0f",
"metadata": {},
"outputs": [],
Expand All @@ -132,7 +132,7 @@
},
{
"cell_type": "code",
"execution_count": 5,
"execution_count": null,
"id": "f2b910db-530f-49c5-907a-67712ba939d2",
"metadata": {},
"outputs": [],
Expand Down Expand Up @@ -178,7 +178,7 @@
},
{
"cell_type": "code",
"execution_count": 7,
"execution_count": null,
"id": "f1ea2e41-f50e-4fbb-989f-aecc0e3e9860",
"metadata": {},
"outputs": [],
Expand Down Expand Up @@ -216,7 +216,7 @@
},
{
"cell_type": "code",
"execution_count": 8,
"execution_count": null,
"id": "f99fba34-268d-40ee-a74d-982bb2805b11",
"metadata": {},
"outputs": [],
Expand All @@ -236,7 +236,7 @@
},
{
"cell_type": "code",
"execution_count": 11,
"execution_count": null,
"id": "0e872a4d-f468-4e5a-8938-9cb50d16c460",
"metadata": {},
"outputs": [],
Expand Down Expand Up @@ -264,7 +264,7 @@
},
{
"cell_type": "code",
"execution_count": 14,
"execution_count": null,
"id": "79c3dc7a-b4cd-4eea-b098-08c962d747e6",
"metadata": {},
"outputs": [],
Expand Down Expand Up @@ -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)"
]
},
Expand Down
Loading
Loading