Skip to content

Commit c42bbd2

Browse files
victorpoughonvictorpoughon
committed
fix example notebooks
1 parent 4dc2f6e commit c42bbd2

File tree

6 files changed

+37
-50
lines changed

6 files changed

+37
-50
lines changed

‎docs/src/examples/cooke_triplet.ipynb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,9 @@
6969
"material1 = tlm.NonDispersiveMaterial(1.5108)\n",
7070
"material2 = tlm.NonDispersiveMaterial(1.6042)\n",
7171
"\n",
72-
"L1 = tlm.Lens(r1, r2, material=material1, inner_thickness=5.9)\n",
73-
"L2 = tlm.Lens(r3, r4, material=material2, inner_thickness=0.2)\n",
74-
"L3 = tlm.Lens(r5, r6, material=material1, inner_thickness=5.9)"
72+
"L1 = tlm.lenses.singlet(r1, tlm.InnerGap(5.9), r2, material=material1)\n",
73+
"L2 = tlm.lenses.singlet(r3, tlm.InnerGap(0.2), r4, material=material2)\n",
74+
"L3 = tlm.lenses.singlet(r5, tlm.InnerGap(5.9), r6, material=material1)"
7575
]
7676
},
7777
{

‎docs/src/examples/pink_floyd.ipynb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"\n",
4242
"optics.set_sampling2d(wavelength=10)\n",
4343
"\n",
44-
"output = optics(tlm.default_input(dim=2, dtype=torch.float64))\n",
44+
"output = optics(tlm.default_input(dim=2))\n",
4545
"\n",
4646
"tlm.show(optics, dim=2, end=10, controls={\"color_rays\": \"wavelength\"})"
4747
]

‎docs/src/examples/simple_lenses.ipynb‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,11 @@
3333
"source": [
3434
"import torchlensmaker as tlm\n",
3535
"\n",
36-
"lens = tlm.BiLens(\n",
37-
" tlm.Sphere(diameter=10, R=20), material=\"BK7\", outer_thickness=0.5\n",
36+
"\n",
37+
"lens = tlm.lenses.symmetric_singlet(\n",
38+
" tlm.Sphere(diameter=10, R=20),\n",
39+
" tlm.OuterGap(0.5),\n",
40+
" material=\"BK7\",\n",
3841
")\n",
3942
"\n",
4043
"optics = tlm.Sequential(\n",
@@ -63,8 +66,10 @@
6366
"source": [
6467
"import torchlensmaker as tlm\n",
6568
"\n",
66-
"lens = tlm.BiLens(\n",
67-
" tlm.Parabola(diameter=10, A=0.03), material=\"BK7\", outer_thickness=0.5\n",
69+
"lens = tlm.lenses.symmetric_singlet(\n",
70+
" tlm.Parabola(diameter=10, A=0.03),\n",
71+
" tlm.OuterGap(0.5),\n",
72+
" material=\"BK7\",\n",
6873
")\n",
6974
"\n",
7075
"optics = tlm.Sequential(\n",
@@ -93,13 +98,10 @@
9398
"source": [
9499
"import torchlensmaker as tlm\n",
95100
"\n",
96-
"# The shape given to BiLens is the first surface.\n",
97-
"# The second surface is mirrored by its Y axis.\n",
98-
"# Hence to make a diverging lens, r is negative here\n",
99-
"# Note we also use inner_thickness to specify the lens thickness\n",
100-
"# because the inner thickness is smallest in a diverging lens.\n",
101-
"lens = tlm.BiLens(\n",
102-
" tlm.Sphere(diameter=10, R=-18), material=\"BK7\", inner_thickness=0.5\n",
101+
"lens = tlm.lenses.symmetric_singlet(\n",
102+
" tlm.Sphere(diameter=10, R=-18),\n",
103+
" tlm.InnerGap(0.5),\n",
104+
" material=\"BK7\",\n",
103105
")\n",
104106
"\n",
105107
"optics = tlm.Sequential(\n",
@@ -128,11 +130,11 @@
128130
"source": [
129131
"import torchlensmaker as tlm\n",
130132
"\n",
131-
"lens = tlm.Lens(\n",
133+
"lens = tlm.lenses.singlet(\n",
132134
" tlm.Parabola(diameter=10, A=0.03),\n",
135+
" tlm.OuterGap(0.5),\n",
133136
" tlm.Sphere(diameter=10, R=30),\n",
134137
" material=\"BK7\",\n",
135-
" outer_thickness=0.5,\n",
136138
")\n",
137139
"\n",
138140
"optics = tlm.Sequential(\n",
@@ -163,17 +165,16 @@
163165
"source": [
164166
"import torchlensmaker as tlm\n",
165167
"\n",
166-
"lens1 = tlm.PlanoLens(\n",
168+
"lens1 = tlm.lenses.semiplanar_front(\n",
167169
" tlm.Sphere(diameter=10, R=-15),\n",
170+
" tlm.OuterGap(0.8),\n",
168171
" material=\"BK7\",\n",
169-
" outer_thickness=0.8,\n",
170172
")\n",
171173
"\n",
172-
"lens2 = tlm.PlanoLens(\n",
173-
" tlm.Sphere(diameter=10, R=15),\n",
174+
"lens2 = tlm.lenses.semiplanar_rear(\n",
175+
" tlm.Sphere(diameter=10, R=-15),\n",
176+
" tlm.InnerGap(0.6),\n",
174177
" material=\"BK7\",\n",
175-
" inner_thickness=0.6,\n",
176-
" reverse=True,\n",
177178
")\n",
178179
"\n",
179180
"optics = tlm.Sequential(\n",

‎docs/src/examples/simple_optimization.ipynb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"import torchlensmaker as tlm\n",
1919
"\n",
2020
"surface = tlm.Sphere(diameter=15, R=tlm.parameter(25))\n",
21-
"lens = tlm.BiLens(surface, material=\"BK7\", outer_thickness=1.5)\n",
21+
"lens = tlm.lenses.symmetric_singlet(surface, tlm.OuterGap(1.5), material=\"BK7\")\n",
2222
"\n",
2323
"optics = tlm.Sequential(\n",
2424
" tlm.PointSourceAtInfinity(beam_diameter=18.5),\n",

‎docs/src/examples/triple_biconvex.ipynb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
"lens_diameter = 15.0\n",
2424
"\n",
2525
"surface = tlm.Parabola(lens_diameter, A=tlm.parameter(0.005))\n",
26-
"lens1 = tlm.BiLens(surface, material = 'BK7', outer_thickness=0.5)\n",
27-
"lens2 = tlm.BiLens(surface, material = 'BK7', outer_thickness=0.5)\n",
28-
"lens3 = tlm.BiLens(surface, material = 'BK7', outer_thickness=0.5)\n",
26+
"lens1 = tlm.lenses.symmetric_singlet(surface, tlm.OuterGap(0.5), material = 'BK7')\n",
27+
"lens3 = tlm.lenses.symmetric_singlet(surface, tlm.OuterGap(0.5), material = 'BK7')\n",
28+
"lens2 = tlm.lenses.symmetric_singlet(surface, tlm.OuterGap(0.5), material = 'BK7')\n",
2929
"\n",
3030
"optics = tlm.Sequential(\n",
3131
" tlm.PointSourceAtInfinity(0.9*lens_diameter),\n",

‎docs/src/examples/variable_lens_sequence.ipynb‎

Lines changed: 9 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -65,24 +65,23 @@
6565
"surface_biconvex = tlm.Parabola(lens_diameter, tlm.parameter(0.002))\n",
6666
"\n",
6767
"# Lenses\n",
68-
"lenses_plano = [tlm.PlanoLens(\n",
68+
"lenses_plano = [tlm.lenses.semiplanar_front(\n",
6969
" surface_plano,\n",
70+
" tlm.OuterGap(lens_min_thickness),\n",
7071
" material=\"BK7\",\n",
71-
" outer_thickness = lens_min_thickness,\n",
72-
" reverse=False,\n",
7372
") for i in range(nplano)]\n",
7473
"\n",
75-
"lenses_biconvex = [tlm.BiLens(\n",
74+
"lenses_biconvex = [tlm.lenses.symmetric_singlet(\n",
7675
" surface_biconvex,\n",
76+
" tlm.OuterGap(lens_min_thickness),\n",
7777
" material=\"BK7\",\n",
78-
" outer_thickness = lens_min_thickness,\n",
7978
") for i in range(nbiconvex)]\n",
8079
"\n",
81-
"lenses_rplano = [tlm.PlanoLens(\n",
80+
"lenses_rplano = [tlm.lenses.semiplanar_rear(\n",
8281
" surface_plano,\n",
82+
" tlm.OuterGap(lens_min_thickness),\n",
8383
" material=\"BK7\",\n",
84-
" outer_thickness = lens_min_thickness,\n",
85-
" reverse=True,\n",
84+
" scale=-1,\n",
8685
") for i in range(nrplano)]\n",
8786
"\n",
8887
"optics = tlm.Sequential(\n",
@@ -146,8 +145,8 @@
146145
" outer = lens.outer_thickness().item()\n",
147146
" print(f\" inner: {inner:.3f} outer: {outer:.3f}\")\n",
148147
" \n",
149-
" a1 = lens.surface1.surface.parameters()\n",
150-
" a2 = lens.surface2.surface.parameters()\n",
148+
" a1 = lens.sequence[0].surface.parameters()\n",
149+
" a2 = lens.sequence[-1].surface.parameters()\n",
151150
" print(\" surface1\", [p.tolist() for p in a1.values()])\n",
152151
" print(\" surface2\", [p.tolist() for p in a2.values()])\n",
153152
"\n",
@@ -167,19 +166,6 @@
167166
"tlm.show3d(optics)"
168167
]
169168
},
170-
{
171-
"cell_type": "code",
172-
"execution_count": null,
173-
"id": "3",
174-
"metadata": {},
175-
"outputs": [],
176-
"source": [
177-
"from IPython.display import display\n",
178-
"\n",
179-
"tlm.show_part(tlm.export.lens_to_part(lenses_plano[0]))\n",
180-
"tlm.show_part(tlm.export.lens_to_part(lenses_biconvex[0]))"
181-
]
182-
},
183169
{
184170
"cell_type": "code",
185171
"execution_count": null,

0 commit comments

Comments
 (0)