diff --git a/Autolens_rms.ipynb b/Autolens_rms.ipynb index 076a336..68290d5 100644 --- a/Autolens_rms.ipynb +++ b/Autolens_rms.ipynb @@ -126,7 +126,7 @@ "fnum = 4.0 # F-number\n", "flange = 18.0 # Flange distance in mm\n", "thickness = 120.0 # Maximum thickness in mm\n", - "lens_type = [[\"Spheric\", \"Spheric\"], [\"Spheric\", \"Spheric\"], [\"Spheric\", \"Spheric\", \"Spheric\"], [\"Aperture\"], [\"Spheric\", \"Spheric\", \"Spheric\"], [\"Spheric\", \"Aspheric\"], [\"Spheric\", \"Aspheric\"]]\n", + "surf_list = [[\"Spheric\", \"Spheric\"], [\"Spheric\", \"Spheric\"], [\"Spheric\", \"Spheric\", \"Spheric\"], [\"Aperture\"], [\"Spheric\", \"Spheric\", \"Spheric\"], [\"Spheric\", \"Aspheric\"], [\"Spheric\", \"Aspheric\"]]\n", "\n", "# Create a lens from scratch\n", "lens = create_lens(\n", @@ -135,7 +135,7 @@ " fnum=fnum,\n", " flange=flange,\n", " thickness=thickness,\n", - " lens_type=lens_type,\n", + " surf_list=surf_list,\n", " save_dir=result_dir,\n", ")\n", "\n", @@ -941,7 +941,7 @@ " )\n", " rays_backup.append(ray)\n", "\n", - " center_ref = -lens.psf_center(points=ray.o[:, :, 0, :], method=\"pinhole\")\n", + " center_ref = -lens.psf_center(ray.o[:, :, 0, :], method=\"pinhole\")\n", " center_ref = center_ref.unsqueeze(-2).repeat(1, 1, spp, 1)\n", "\n", " # Optimize lens by minimizing RMS\n", @@ -953,7 +953,7 @@ "\n", " # Ray error and valid mask\n", " ray_xy = ray.o[..., :2]\n", - " ray_valid = ray.valid\n", + " ray_valid = ray.is_valid\n", " ray_err = ray_xy - center_ref\n", "\n", " # Weight mask (non-differentiable)\n",