Skip to content

Commit 3bd7caf

Browse files
DrPaulSharpDrPaulSharp
committed
Uses extend method in jupyter notebooks
1 parent f9d33cc commit 3bd7caf

11 files changed

+701
-796
lines changed

‎RATapi/examples/absorption/absorption.ipynb‎

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
"import numpy as np\n",
1313
"from IPython.display import Code\n",
1414
"\n",
15-
"import RATapi as RAT"
15+
"import RATapi as RAT\n",
16+
"from RATapi.models import Parameter"
1617
]
1718
},
1819
{
@@ -52,26 +53,28 @@
5253
"metadata": {},
5354
"outputs": [],
5455
"source": [
55-
"problem.parameters.append(name=\"Alloy Thickness\", min=100.0, value=135.6, max=200.0, fit=True)\n",
56-
"problem.parameters.append(name=\"Alloy SLD up\", min=6.0e-6, value=9.87e-6, max=1.2e-5, fit=True)\n",
57-
"problem.parameters.append(name=\"Alloy SLD imaginary up\", min=1.0e-9, value=4.87e-8, max=1.0e-7, fit=True)\n",
58-
"problem.parameters.append(name=\"Alloy SLD down\", min=6.0e-6, value=7.05e-6, max=1.3e-5, fit=True)\n",
59-
"problem.parameters.append(name=\"Alloy SLD imaginary down\", min=1.0e-9, value=4.87e-8, max=1.0e-7, fit=True)\n",
60-
"problem.parameters.append(name=\"Alloy Roughness\", min=2.0, value=5.71, max=10.0, fit=True)\n",
61-
"problem.parameters.append(name=\"Gold Thickness\", min=100.0, value=154.7, max=200.0, fit=True)\n",
62-
"problem.parameters.append(name=\"Gold Roughness\", min=0.1, value=5.42, max=10.0, fit=True)\n",
63-
"problem.parameters.append(name=\"Gold SLD\", min=4.0e-6, value=4.49e-6, max=5.0e-6, fit=True)\n",
64-
"problem.parameters.append(name=\"Gold SLD imaginary\", min=1.0e-9, value=4.20e-8, max=1.0e-7, fit=True)\n",
56+
"parameter_list = [\n",
57+
" Parameter(name=\"Alloy Thickness\", min=100.0, value=135.6, max=200.0, fit=True),\n",
58+
" Parameter(name=\"Alloy SLD up\", min=6.0e-6, value=9.87e-6, max=1.2e-5, fit=True),\n",
59+
" Parameter(name=\"Alloy SLD imaginary up\", min=1.0e-9, value=4.87e-8, max=1.0e-7, fit=True),\n",
60+
" Parameter(name=\"Alloy SLD down\", min=6.0e-6, value=7.05e-6, max=1.3e-5, fit=True),\n",
61+
" Parameter(name=\"Alloy SLD imaginary down\", min=1.0e-9, value=4.87e-8, max=1.0e-7, fit=True),\n",
62+
" Parameter(name=\"Alloy Roughness\", min=2.0, value=5.71, max=10.0, fit=True),\n",
63+
" Parameter(name=\"Gold Thickness\", min=100.0, value=154.7, max=200.0, fit=True),\n",
64+
" Parameter(name=\"Gold Roughness\", min=0.1, value=5.42, max=10.0, fit=True),\n",
65+
" Parameter(name=\"Gold SLD\", min=4.0e-6, value=4.49e-6, max=5.0e-6, fit=True),\n",
66+
" Parameter(name=\"Gold SLD imaginary\", min=1.0e-9, value=4.20e-8, max=1.0e-7, fit=True),\n",
67+
" Parameter(name=\"Thiol APM\", min=40.0, value=56.27, max=100.0, fit=True),\n",
68+
" Parameter(name=\"Thiol Head Hydration\", min=20.0, value=30.0, max=50.0, fit=True),\n",
69+
" Parameter(name=\"Thiol Coverage\", min=0.5, value=0.9, max=1.0, fit=True),\n",
70+
" Parameter(name=\"CW Thickness\", min=1.0, value=12.87, max=25.0, fit=True),\n",
71+
" Parameter(name=\"Bilayer APM\", min=48.0, value=65.86, max=90.0, fit=True),\n",
72+
" Parameter(name=\"Bilayer Head Hydration\", min=20.0, value=30.0, max=50.0, fit=True),\n",
73+
" Parameter(name=\"Bilayer Roughness\", min=1.0, value=3.87, max=10.0, fit=True),\n",
74+
" Parameter(name=\"Bilayer Coverage\", min=0.5, value=0.94, max=1.0, fit=True)\n",
75+
"]\n",
6576
"\n",
66-
"problem.parameters.append(name=\"Thiol APM\", min=40.0, value=56.27, max=100.0, fit=True)\n",
67-
"problem.parameters.append(name=\"Thiol Head Hydration\", min=20.0, value=30.0, max=50.0, fit=True)\n",
68-
"problem.parameters.append(name=\"Thiol Coverage\", min=0.5, value=0.9, max=1.0, fit=True)\n",
69-
"\n",
70-
"problem.parameters.append(name=\"CW Thickness\", min=1.0, value=12.87, max=25.0, fit=True)\n",
71-
"problem.parameters.append(name=\"Bilayer APM\", min=48.0, value=65.86, max=90.0, fit=True)\n",
72-
"problem.parameters.append(name=\"Bilayer Head Hydration\", min=20.0, value=30.0, max=50.0, fit=True)\n",
73-
"problem.parameters.append(name=\"Bilayer Roughness\", min=1.0, value=3.87, max=10.0, fit=True)\n",
74-
"problem.parameters.append(name=\"Bilayer Coverage\", min=0.5, value=0.94, max=1.0, fit=True)"
77+
"problem.parameters.extend(parameter_list)"
7578
]
7679
},
7780
{

‎RATapi/examples/domains/.ipynb_checkpoints/domains_standard_layers-checkpoint.ipynb‎

Lines changed: 198 additions & 31 deletions
Large diffs are not rendered by default.

‎RATapi/examples/domains/domains_custom_XY.ipynb‎

Lines changed: 34 additions & 9 deletions
Large diffs are not rendered by default.

‎RATapi/examples/domains/domains_custom_layers.ipynb‎

Lines changed: 41 additions & 16 deletions
Large diffs are not rendered by default.

‎RATapi/examples/domains/domains_standard_layers.ipynb‎

Lines changed: 46 additions & 24 deletions
Large diffs are not rendered by default.

‎RATapi/examples/non_polarised/.ipynb_checkpoints/DSPC_custom_layers-checkpoint.ipynb‎

Lines changed: 51 additions & 27 deletions
Large diffs are not rendered by default.

‎RATapi/examples/non_polarised/.ipynb_checkpoints/DSPC_custom_xy-checkpoint.ipynb‎

Lines changed: 55 additions & 514 deletions
Large diffs are not rendered by default.

‎RATapi/examples/non_polarised/.ipynb_checkpoints/DSPC_standard_layers-checkpoint.ipynb‎

Lines changed: 88 additions & 59 deletions
Large diffs are not rendered by default.

‎RATapi/examples/non_polarised/DSPC_custom_layers.ipynb‎

Lines changed: 51 additions & 27 deletions
Large diffs are not rendered by default.

‎RATapi/examples/non_polarised/DSPC_custom_xy.ipynb‎

Lines changed: 26 additions & 10 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)