Commit 75b7dc86 authored by whooie's avatar whooie
Browse files

set solid angle for MOT number and adjust dA handling in function args

parent 5c6c74ff
......@@ -131,7 +131,7 @@ class ImagingData:
raise NotImplementedError
class AbsorptionData(ImagingData):
def compute_results(self, dA=(2*3.45)**2, printflag: bool=True):
def compute_results(self, dA=(3.45)**2, printflag: bool=True):
_dA = self.config.get("bin_size", 1)**2 \
* (DEF_DX**2 if dA is None else dA)
if printflag: print("Compute results")
......@@ -152,7 +152,7 @@ def compute_od(shadow: np.ndarray, bright: np.ndarray, dark: np.ndarray):
return OD
class FluorescenceData(ImagingData):
def compute_results(self, dA=(2*3.45)**2, printflag: bool=True):
def compute_results(self, dA=3.45**2, printflag: bool=True):
_dA = self.config.get("bin_size", 1)**2 \
* (DEF_DX**2 if dA is None else dA)
if printflag: print("Compute results")
......@@ -161,7 +161,7 @@ class FluorescenceData(ImagingData):
0.76,
self.config["gain"], # dB
self.config["exposure_time"],
(0.0127**2 * np.pi) / (4 * np.pi * 0.1**2),
(0.0127**2 * np.pi) / (4 * np.pi * 0.125**2),
62e6 * 2 * np.pi,
0.1
)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment