Converging source

pytissueoptics/rayscattering/__init__.py

@@ -18,7 +18,7 @@
 from .opencl import CONFIG, disableOpenCL, hardwareAccelerationIsAvailable
 from .photon import Photon
 from .scatteringScene import ScatteringScene
-from .source import DirectionalSource, DivergentSource, IsotropicPointSource, PencilPointSource
+from .source import DirectionalSource, DivergentSource, ConvergentSource, IsotropicPointSource, PencilPointSource
 from .statistics import Stats
 
 __all__ = [
@@ -28,6 +28,7 @@
     "IsotropicPointSource",
     "DirectionalSource",
     "DivergentSource",
+    "ConvergentSource",
     "EnergyLogger",
     "EnergyType",
     "ScatteringScene",

pytissueoptics/rayscattering/source.py

@@ -335,3 +335,37 @@ def _getInitialDirections(self):
     @property
     def _hashComponents(self) -> tuple:
         return self._position, self._direction, self._diameter, self._divergence
+
+
+class ConvergentSource(DirectionalSource):
+    def __init__(
+        self,
+        position: Vector,
+        focal_point: Vector,
+        diameter: float,
+        N: int,
+        useHardwareAcceleration: bool = True,
+        displaySize: float = 0.1,
+        seed: Optional[int] = None,
+    ):
+        self._focal_point = focal_point
+
+        super().__init__(
+            position=position,
+            direction=focal_point - position,
+            diameter=diameter,
+            N=N,
+            useHardwareAcceleration=useHardwareAcceleration,
+            displaySize=displaySize,
+            seed=seed,
+        )
+
+    def getInitialPositionsAndDirections(self) -> Tuple[np.ndarray, np.ndarray]:
+        positions = self._getUniformlySampledDisc(self._diameter) + self._position.array
+        directions = self._focal_point.array - positions
+        directions /= np.linalg.norm(directions, axis=1, keepdims=True)
+        return positions, directions
+
+    @property
+    def _hashComponents(self) -> tuple:
+        return self._position, self._direction, self._diameter, self._focal_point