AMS-BP 0.0.21__py3-none-any.whl → 0.0.22__py3-none-any.whl

AMS_BP/__init__.py

@@ -10,4 +10,4 @@ Last updated: 2024-12-16
 
 """
 
-__version__ = "0.0.21"
+__version__ = "0.0.22"

AMS_BP/configio/convertconfig.py

@@ -324,11 +324,12 @@ class ConfigLoader:
         ):
             # Create PSFParameters instance
             parameters = PSFParameters(
-                wavelength=wavelength,
+                emission_wavelength=wavelength,
                 numerical_aperture=float(params_config["numerical_aperture"]),
                 pixel_size=pixel_size,
                 z_step=float(params_config["z_step"]) if z_step is None else z_step,
                 refractive_index=float(params_config.get("refractive_index", 1.0)),
+                pinhole_diameter=params_config.get("pinhole_diameter", None),
             )
 
             # Create PSF engine

AMS_BP/metadata/metadata.py

@@ -1,4 +1,4 @@
-from typing import Iterator, List, Literal, Union
+from typing import Dict, Iterator, List, Literal, Union
 
 from pydantic import BaseModel
 
@@ -77,7 +77,7 @@ class MetaData(BaseModel):
     PhysicalSizeXUnit: Literal["nm", "m"]
     PhysicalSizeY: float
     PhysicalSizeYUnit: Literal["nm", "m"]
-    # Channel: Dict[Literal["Name"], List[str]]
+    Channel: Dict[Literal["Name"], List[str]]
 
     def __post_init__(self):
         if isinstance(self.notes, (list, str)):

AMS_BP/optics/psf/psf_engine.py

@@ -5,52 +5,61 @@ from typing import Literal, Optional, Tuple
 import numpy as np
 from numpy.typing import NDArray
 
+AIRYFACTOR = 1.0
+
 
 @dataclass(frozen=True)
 class PSFParameters:
-    """Parameters for PSF (Point Spread Function) generation.
+    """Parameters for emission PSF (Point Spread Function) at the detector.
+
+
+    This class defines parameters that determine how light from a point source
+    (e.g., a fluorescent molecule) diffracts through the collection optics
+    to form a pattern at the detector.
 
     Attributes:
-        wavelength: Light wavelength in nanometers
-        numerical_aperture: Numerical aperture of the optical system
-        pixel_size: Size of pixels in micrometers
+        emission_wavelength: Emission wavelength in nanometers
+        numerical_aperture: Numerical aperture of the collection objective
+        pixel_size: Size of pixels in micrometers at the detector
         z_step: Axial step size in micrometers
         refractive_index: Refractive index of the medium (default: 1.0 for air)
+        pinhole_diameter: Diameter of the pinhole in micrometers (default: None for widefield)
+                         The pinhole spatially filters the emitted light before it reaches
+                         the detector.
     """
 
-    wavelength: float
+    emission_wavelength: float
     numerical_aperture: float
     pixel_size: float
     z_step: float
     refractive_index: float = 1.0
-
-    # def __post_init__(self) -> None:
-    #     """Validate parameters after initialization."""
-    #     if any(
-    #         param <= 0
-    #         for param in (
-    #             self.wavelength,
-    #             self.numerical_aperture,
-    #             self.pixel_size,
-    #             self.z_step,
-    #             self.refractive_index,
-    #         )
-    #     ):
-    #         raise ValueError("All parameters must be positive numbers")
-    #     if self.numerical_aperture >= self.refractive_index:
-    #         raise ValueError("Numerical aperture must be less than refractive index")
+    pinhole_diameter: Optional[float] = None  # um
 
     @cached_property
     def wavelength_um(self) -> float:
-        """Wavelength in micrometers."""
-        return self.wavelength / 1000.0
+        """Emission wavelength in micrometers."""
+        return self.emission_wavelength / 1000.0
+
+    @cached_property
+    def pinhole_radius(self) -> Optional[float]:
+        """Pinhole radius in micrometers."""
+        return (
+            self.pinhole_diameter / 2.0 if self.pinhole_diameter is not None else None
+        )
 
 
 class PSFEngine:
-    """Engine for generating various microscope Point Spread Functions.
+    """Engine for calculating emission light PSF at the detector.
+
+    This class calculates how light from a point source (like a fluorescent molecule)
+    spreads due to diffraction through the collection optics to form a pattern at
+    the detector. For confocal systems, it can include the effect of a pinhole
+    that spatially filters the light before detection.
 
-    This class implements calculations for both 2D and 3D Point Spread Functions
-    using Gaussian approximations.
+    Note: This PSF describes only the diffraction of emitted light through the
+    collection optics. While a confocal microscope uses focused illumination to
+    excite molecules, that illumination pattern does not affect how the emitted
+    light diffracts to form the PSF we calculate here.
     """
 
     def __init__(self, params: PSFParameters):
@@ -79,34 +88,69 @@ class PSFEngine:
         self._norm_sigma_xy = self._sigma_xy / 2.355
         self._norm_sigma_z = self._sigma_z / 2.355
 
+        # Generate pinhole mask if specified
+        if self.params.pinhole_radius is not None:
+            if self.params.pinhole_radius < AIRYFACTOR * self._sigma_xy:
+                raise ValueError(
+                    f"Pinhole size ({self.params.pinhole_radius} um) is smaller than {AIRYFACTOR} times the Airy lobe. This will diffract the emission light in the pinhole; an ideal pinhole size for this setup is {self._sigma_xy} um."
+                )
+            self._pinhole_mask = self._generate_pinhole_mask()
+        else:
+            self._pinhole_mask = None
+
+    def _generate_pinhole_mask(self) -> NDArray[np.float64]:
+        """Generate a binary mask representing the pinhole's spatial filtering.
+
+        The pinhole blocks emission light based on position in the image plane,
+        affecting what portion of the diffracted light reaches the detector.
+        """
+        x, y = self._grid_xy
+        r = np.sqrt(x**2 + y**2)
+        return (r <= self.params.pinhole_radius).astype(np.float64)
+
     @lru_cache(maxsize=128)
     def psf_z(self, z_val: float) -> NDArray[np.float64]:
-        """Generate z=z_val Gaussian approximation of PSF.
+        """Calculate the PSF at the detector for a point source at z_val.
+
+        This represents how light from a point source at position z_val
+        diffracts through the collection optics to form a pattern at the
+        detector. If a pinhole is present, it spatially filters this pattern.
 
         Args:
-            z_val: Z-position in micrometers
+            z_val: Z-position of the point source in micrometers
 
         Returns:
-            2D array containing the PSF at given z position
+            2D array containing the light intensity pattern at the detector
         """
         x, y = self._grid_xy
 
-        # Vectorized calculation
+        # Calculate how light from the point source diffracts through collection optics
         r_squared = (x / self._norm_sigma_xy) ** 2 + (y / self._norm_sigma_xy) ** 2
         z_term = (z_val / self._norm_sigma_z) ** 2
-        return np.exp(-0.5 * (r_squared + z_term))
+        psf_at_detector = np.exp(-0.5 * (r_squared + z_term))
+
+        if self._pinhole_mask is not None:
+            # Apply pinhole's spatial filtering
+            return psf_at_detector * self._pinhole_mask
+
+        return psf_at_detector
 
     @lru_cache(maxsize=128)
     def psf_z_xy0(self, z_val: float) -> float:
-        """Generate z=z_val Gaussian approximation of PSF with x=y=0.
+        """Calculate the PSF intensity at the center of the detector.
+
+        For a point source at z_val, this gives the intensity of light
+        that reaches the detector center (x=y=0). This point is always
+        within the pinhole if one is present.
 
         Args:
-            z_val: Z-position in micrometers
+            z_val: Z-position of the point source in micrometers
 
         Returns:
-            PSF value at x=y=0 and given z position
+            Light intensity at detector center
         """
-        return np.exp(-0.5 * (z_val / self._norm_sigma_z) ** 2)
+        z_term = (z_val / self._norm_sigma_z) ** 2
+        return np.exp(-0.5 * z_term)
 
     @cache
     def _3d_normalization_A(

AMS_BP/run_cell_simulation.py

@@ -1,14 +1,14 @@
 """
 run_cell_simulation.py
 
-This file contains the command-line interface (CLI) for the SMS_BP package, which is used for simulating single molecule localization microscopy experiments.
+This file contains the command-line interface (CLI) for the AMS_BP package.
 
 The CLI is built using Typer and provides two main commands:
 1. 'config': Generates a sample configuration file.
 2. 'runsim': Runs the cell simulation using a provided configuration file.
 
 Main Components:
-- typer_app_sms_bp: The main Typer application object.
+- typer_app_asms_bp: The main Typer application object.
 - cell_simulation(): Callback function that displays the version information.
 - generate_config(): Command to generate a sample configuration file.
 - run_cell_simulation(): Command to run the cell simulation using a configuration file.
@@ -37,7 +37,7 @@ from .configio.saving import save_config_frames
 
 cli_help_doc = str(
     """
-CLI tool to run [underline]A[/underline]dvanced [underline]M[/underline]olecule [underline]S[/underline]imulation: [underline]ASMS[/underline]-BP. GitHub: [green]https://github.com/joemans3/AMS_BP[/green].
+CLI tool to run [underline]A[/underline]dvanced [underline]M[/underline]olecule [underline]S[/underline]imulation: [underline]AMS[/underline]-BP. GitHub: [green]https://github.com/joemans3/AMS_BP[/green].
 [Version: [bold]{0}[/bold]]
 """.format(__version__)
 )

AMS_BP/sim_config.toml

@@ -275,6 +275,7 @@ custom_path = ""
 [psf.parameters]
 numerical_aperture = 1.4 # typical range: 0.1 - 1.5
 refractive_index = 1.0   # default is air (1.0)
+#pinhole_diameter = 1.0  # Do not include for no pinhole else float in um units
 
 # Multiple Laser Configuration File
 

AMS_BP/sim_microscopy.py

@@ -276,7 +276,7 @@ class VirtualMicroscope:
             PhysicalSizeXUnit="m",
             PhysicalSizeY=self.camera.pixel_size * 1e-6,
             PhysicalSizeYUnit="m",
-            # Channel={"Name": self.channels.names},
+            Channel={"Name": self.channels.names},
         )
 
         # return frames in the format ZCTYX

{ams_bp-0.0.21.dist-info → ams_bp-0.0.22.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: AMS_BP
-Version: 0.0.21
+Version: 0.0.22
 Summary: Advanced Microscopy Simulations developed for the Weber Lab by Baljyot Singh Parmar
 Project-URL: Documentation, https://joemans3.github.io/AMS_BP/
 Project-URL: Source code, https://github.com/joemans3/AMS_BP

{ams_bp-0.0.21.dist-info → ams_bp-0.0.22.dist-info}/RECORD

@@ -1,7 +1,7 @@
-AMS_BP/__init__.py,sha256=gA3WHujyg_TRO9bQK9orLK8uNHSObJpmsLkv8GHRzLc,327
-AMS_BP/run_cell_simulation.py,sha256=fPU1Tuu7hBupGtMk07j2t8QYo_TjFLMJRU9fwmAgU9c,7502
-AMS_BP/sim_config.toml,sha256=FD-OcSDAgRuNIalFe0pC8sbsaSwM-9DV2DNswds2q54,11976
-AMS_BP/sim_microscopy.py,sha256=7JQ6NQlgNZCvFE-FC1f9Ehh6DoJgn7bLzeqS_Mamq9Y,18619
+AMS_BP/__init__.py,sha256=NlkysP1_GeDxvsm-dQaJIW9U1iNFB0jI_34DmCYn-bg,327
+AMS_BP/run_cell_simulation.py,sha256=7InopFikjo0HfaLO2siXskBIbyCIte9avG4YXjjaWCI,7420
+AMS_BP/sim_config.toml,sha256=LVpxp2zv-y6Ic-ve2AG7Ted1Fr_Tni-8yh8l5gp-7oM,12056
+AMS_BP/sim_microscopy.py,sha256=0UZfyT44nrB4JdfnFnRPTVBm3tPbCyOnPXiBBZs8xIc,18617
 AMS_BP/cells/__init__.py,sha256=yWFScBC1uOGDkeC8i1m1ZBtIREcyt4JHxYa72LxbBZU,177
 AMS_BP/cells/base_cell.py,sha256=FIPB9J8F40tb53vv7C6qG-SaAFLOI8-MGIk1mmZ-gnI,1503
 AMS_BP/cells/rectangular_cell.py,sha256=5yGxvTXYvgldLXyWXpE_SD9Zx2NLerC-I2j02reHsJ0,2515
@@ -9,11 +9,11 @@ AMS_BP/cells/rod_cell.py,sha256=jQ1kLEk74Pv2rcXPRJ6-QJJhux-mYiDSytzqlxCNWfA,3181
 AMS_BP/cells/spherical_cell.py,sha256=n3ou3tW0nCxXIwv6uLkVKHkYCfgoNn8VI6CVTLBIll0,2140
 AMS_BP/configio/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 AMS_BP/configio/configmodels.py,sha256=Isc6THk3RAIVdjEUBW4c_OD0I122dYufgEvAcGJQ5uo,3046
-AMS_BP/configio/convertconfig.py,sha256=lS7FTDheESdbpaZ0K1LcE8rkdJOKLjzIvcmWpjeebSs,34654
+AMS_BP/configio/convertconfig.py,sha256=Fg9pOCZSxmWuHnrg-5xZRvhPEK6Qc1kXqu6LL9e9QYw,34741
 AMS_BP/configio/experiments.py,sha256=HdfaSi0gPPJ_wLF87XcW5ICja19Uezx7-ygFEwNzi30,3995
 AMS_BP/configio/saving.py,sha256=596QgAadV32rzsN4B2FngGFcBWCzCDnLFN-qtQsv3bM,857
 AMS_BP/metadata/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-AMS_BP/metadata/metadata.py,sha256=_FwbSRsUhGwigY6YYffMgEx5hlXTT_vu-9AldMFPa6w,2923
+AMS_BP/metadata/metadata.py,sha256=YDumjc5sI3lY_UZx8f0ZhMqbG2qKQkysXwl7CY4ZtnY,2927
 AMS_BP/motion/__init__.py,sha256=cy3W-wCRjjlN1DrTqYc-JltYwcE8SZCXMVPJ2o6q_BQ,178
 AMS_BP/motion/condensate_movement.py,sha256=cGLHIOL7VUJ7U-JrJXetcnUF2v9SepIBznoqu6AQPxU,13252
 AMS_BP/motion/track_gen.py,sha256=Z3QJLVMP1gX4SlgOXFxBg8sJhBG0Xq25ixnBoEHEAZI,19462
@@ -31,7 +31,7 @@ AMS_BP/optics/filters/channels/channelschema.py,sha256=SConyA5yVdfnI_8sgcxVC8SV7
 AMS_BP/optics/lasers/__init__.py,sha256=T7dHohhyLf_pBw4TidarYHWmiwxVXGE71-Bf1aeBbuc,564
 AMS_BP/optics/lasers/laser_profiles.py,sha256=J9czY646XcW8GzXx9Eb16mG7tQdWw4oVYveOrihZCeY,22745
 AMS_BP/optics/psf/__init__.py,sha256=ezrKPgpTeR4gTHOvF0mhF6u2zMMTd8Bgp8PGeOf11fA,121
-AMS_BP/optics/psf/psf_engine.py,sha256=ejmTwAKtEpXvKeMuUFcuz6HjJbEjQa_NvkE6a3hkVzk,6769
+AMS_BP/optics/psf/psf_engine.py,sha256=wabdBszY4CcGUtt7ye8e3tQXQQxDJ8griGD7FMgAdIo,9192
 AMS_BP/photophysics/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 AMS_BP/photophysics/photon_physics.py,sha256=QRG_QIZ4csJ3g5qGP9Wtk7kzqm8_MUbVHfFef6cMtHQ,6671
 AMS_BP/photophysics/state_kinetics.py,sha256=0cc7Vc4LtAbEdGDeg22IJmRGLsONOty4c32hXHO-TSU,5281
@@ -48,8 +48,8 @@ AMS_BP/utils/decorators.py,sha256=4qFdvzPJne0dhkhD1znPxRln1Rfr5NX8rdcCDcbATRU,62
 AMS_BP/utils/errors.py,sha256=7BOd-L4_YeKmWn3Q4EOdTnNF3Bj_exDa3eg5X0yCZrc,759
 AMS_BP/utils/maskMaker.py,sha256=2ca3n2nc8rFtUh1LurKXOJJsUmhrOpWbRnVX7fjRVvs,335
 AMS_BP/utils/util_functions.py,sha256=jI6WBh09_khdABnEoVK7SK1WRvCLHuw40f5ALyflzlc,9478
-ams_bp-0.0.21.dist-info/METADATA,sha256=RhM8C7dT2SXt-rbPFdQdo_EaiOFUx-7uC7uvic8IpvU,5316
-ams_bp-0.0.21.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-ams_bp-0.0.21.dist-info/entry_points.txt,sha256=MFUK9bZWW61djfsavqopMqiVPVn4lJtt6v8qzyEFyNM,76
-ams_bp-0.0.21.dist-info/licenses/LICENSE,sha256=k_-JV1DQKvO0FR8WjvOisqdTl0kp6VJ7RFM3YZhao0c,1071
-ams_bp-0.0.21.dist-info/RECORD,,
+ams_bp-0.0.22.dist-info/METADATA,sha256=VQheoFTH5ZdmZTZwrb58UxP9YTowy8U7r6zW5kabIMI,5316
+ams_bp-0.0.22.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+ams_bp-0.0.22.dist-info/entry_points.txt,sha256=MFUK9bZWW61djfsavqopMqiVPVn4lJtt6v8qzyEFyNM,76
+ams_bp-0.0.22.dist-info/licenses/LICENSE,sha256=k_-JV1DQKvO0FR8WjvOisqdTl0kp6VJ7RFM3YZhao0c,1071
+ams_bp-0.0.22.dist-info/RECORD,,