#2 Modify the unit of psf_width

ecell · Mar 4, 2019 · 28f929b · 28f929b
1 parent 8a049e9
commit 28f929b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/examples/defaults.ini b/examples/defaults.ini
@@ -62,7 +62,7 @@ hc_const = 2e-25
 pinhole_radius = 1.6e-05
 photobleaching_tau0 = 2.27
 psf_intensity_noise = 0.5
-psf_width = (200, 200)
+psf_width = (200e-9, 200e-9)
 source_center = (0, 0.5, 0.5)
 fluorophore_lifetime = 1e-08
 source_angle = 72

diff --git a/scopyon/defaults.ini b/scopyon/defaults.ini
@@ -25,7 +25,7 @@ fluorophore_lifetime = 10e-9 # sec
 psf_wavelength = 600 # nm
 psf_normalization = 1.00
 psf_intensity_noise = 0.50
-psf_width  = (200, 200) # Gaussian function (radial width, lateral width) [nm]
+psf_width  = (200e-9, 200e-9) # Gaussian function (radial width, lateral width) [nm]
 psf_radial_cutoff = 1000e-9
 psf_depth_cutoff = 1000e-9
 psf_min_wave_length = 300

diff --git a/scopyon/epifm.py b/scopyon/epifm.py
@@ -438,8 +438,8 @@ def get_PSF_detector(self):
 
             # Ir = sum(list(map(lambda x: x * numpy.exp(-0.5 * (r / self.psf_width[0]) ** 2), norm)))
             # Iz = sum(list(map(lambda x: x * numpy.exp(-0.5 * (z / self.psf_width[1]) ** 2), norm)))
-            Ir = norm * numpy.exp(-0.5 * numpy.power(self.radial / 1e-9 / self.psf_width[0], 2))
-            Iz = norm * numpy.exp(-0.5 * numpy.power(self.radial / 1e-9 / self.psf_width[1], 2))
+            Ir = norm * numpy.exp(-0.5 * numpy.power(self.radial / self.psf_width[0], 2))
+            Iz = norm * numpy.exp(-0.5 * numpy.power(self.radial / self.psf_width[1], 2))
 
             psf_fl = numpy.sum(I) * numpy.array(list(map(lambda x: Ir * x, Iz)))