Rename PSFImager to microscope. (#9)

chromatix-team · Feb 21, 2023 · c147c79 · c147c79
1 parent 54f6815
commit c147c79
Show file tree

Hide file tree

Showing 5 changed files with 658 additions and 619 deletions.
diff --git a/docs/101.ipynb b/docs/101.ipynb
diff --git a/docs/examples/holoscope.ipynb b/docs/examples/holoscope.ipynb
diff --git a/examples/holoscope.py b/examples/holoscope.py
@@ -1,5 +1,5 @@
 from chromatix.elements import ObjectivePointSource, PhaseMask, FFLens
-from chromatix import PSFImager
+from chromatix import Microscope
 from chromatix.ops.noise import approximate_shot_noise
 import jax.numpy as jnp
 from jax import jit
@@ -43,7 +43,7 @@ def setup(self):
             / (self.n * shape[0] * self.camera_pixel_pitch)
         )
 
-        self.model = PSFImager(
+        self.model = Microscope(
             [
                 ObjectivePointSource(
                     shape,

diff --git a/src/chromatix/__init__.py b/src/chromatix/__init__.py
@@ -3,4 +3,4 @@
 
 
 from .field import Field
-from .optical_system import OpticalSystem, PSFImager
+from .optical_system import OpticalSystem, Microscope
diff --git a/src/chromatix/optical_system.py b/src/chromatix/optical_system.py
@@ -8,7 +8,7 @@
 from typing import Callable, Sequence, Optional, Any
 
 
-class PSFImager(nn.Module):
+class Microscope(nn.Module):
     optical_system: Sequence[Callable]
     noise_fn: Optional[Callable[[PRNGKey, Array], Array]] = None
     reduce_fn: Optional[Callable] = None
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,4 +3,4 @@


		from .field import Field
		from .optical_system import OpticalSystem, PSFImager
		from .optical_system import OpticalSystem, Microscope