add lens_minimal_diameter

Author: victorpoughon

src/torchlensmaker/__init__.py

@@ -44,6 +44,7 @@
     SagSum,
     SagFunction,
 )
+from torchlensmaker.core.tensor_manip import to_tensor
 
 ############
 # Kinematics
@@ -123,6 +124,7 @@
 from torchlensmaker.light_sources.light_sources_elements import (
     RaySource,
     PointSourceAtInfinity,
+    PointSourceAtInfinity2D,
     PointSource,
     ObjectAtInfinity,
     Object,
@@ -161,6 +163,12 @@
 ########
 from . import lenses
 
+##########
+# Cardinal
+##########
+
+from . import cardinal
+
 ##############
 # Optimization
 ##############

src/torchlensmaker/lens/lens.py

@@ -20,7 +20,11 @@
 
 from torchlensmaker.elements.sequential import SequentialElement, Sequential
 from torchlensmaker.optical_data import OpticalData
-from .lens_thickness import lens_inner_thickness, lens_outer_thickness
+from .lens_thickness import (
+    lens_inner_thickness,
+    lens_outer_thickness,
+    lens_minimal_diameter,
+)
 
 
 class Lens(SequentialElement):
@@ -36,3 +40,6 @@ def inner_thickness(self) -> Float[torch.Tensor, ""]:
 
     def outer_thickness(self) -> Float[torch.Tensor, ""]:
         return lens_outer_thickness(self)
+
+    def minimal_diameter(self) -> Float[torch.Tensor, ""]:
+        return lens_minimal_diameter(self)

src/torchlensmaker/lens/lens_thickness.py

@@ -50,7 +50,7 @@ def tokinematic(mod: nn.Module) -> KinematicElement:
         raise RuntimeError("inner_thickness() got invalid lens")
 
 
-def lens_inner_thickness(lens: 'Lens') -> Float[torch.Tensor, ""]:
+def lens_inner_thickness(lens: "Lens") -> Float[torch.Tensor, ""]:
     "Thickness of a lens at the center"
 
     first_surface, last_surface = lens.sequence[0], lens.sequence[-1]
@@ -87,7 +87,7 @@ def lens_inner_thickness(lens: 'Lens') -> Float[torch.Tensor, ""]:
     return (p2 - p1)[0]
 
 
-def lens_outer_thickness(lens: 'Lens') -> Float[torch.Tensor, ""]:
+def lens_outer_thickness(lens: "Lens") -> Float[torch.Tensor, ""]:
     "Thickness of a lens at the edge"
 
     front_surface, rear_surface = lens.sequence[0], lens.sequence[-1]
@@ -124,3 +124,21 @@ def lens_outer_thickness(lens: 'Lens') -> Float[torch.Tensor, ""]:
     p2 = transform_points(a2, root_point)
 
     return (p2 - p1)[0]
+
+
+def lens_minimal_diameter(lens: "Lens") -> Float[torch.Tensor, ""]:
+    """
+    Minimal diameter of a lens
+
+    The minimal diameter of a lens is the smallest surface diameter,
+    out of all the surfaces in the lens
+    """
+
+    mini = lens.sequence[0].collision_surface.surface.diameter
+    for mod in lens.sequence:
+        if isinstance(mod, RefractiveSurface):
+            diam = mod.collision_surface.surface.diameter
+            if diam < mini:
+                mini = diam
+
+    return mini