Commit 81127967 authored by camera computer's avatar camera computer
Browse files

regular parameter adjustment

parent 0de4bd05
......@@ -33,8 +33,8 @@ flir_config = dict(
# add a comment for any literal numbers used
## GLOBAL PARAMETERS
reps = 5 # repeat shots for statistics
take_background = True # include a background shot in frame capture
reps = 1 # repeat shots for statistics
take_background = False # include a background shot in frame capture
flir_prerelease = True # use the Flir to take a pre-release image
probe_image = True # use the probe beams for recapture imaging, else CMOT beams
......@@ -52,8 +52,8 @@ TAU_TOF = np.array([0.1e-3, 0.5e-3, 1.0e-3, 2.0e-3, 3.0e-3, 4.0e-3]) # ^
# PARAMETERS
freespace_res = 93.68 # AOM RF equivalent to free-space resonance; MHz
nu_freqpow0 = 3.58 # extent of CMOT frequency ramp; MHz
det_image0 = 0.45 # detuning for imaging rel. to AOM-fiber optimal 93.5; MHz
tau_tof0 = 1.5e-3 # time of flight; s
det_image0 = 0.18 # detuning for imaging rel. to AOM-fiber optimal 93.5; MHz
tau_tof0 = 0.1e-3 # time of flight; s
aom_fiber_optim = 93.5 # RF frequency used for AOM+fiber optimization
f_image0 = f_freqpow + nu_freqpow0 # (nominal) CMOT beam imaging frequency; MHz
# f_image0 = aom_fiber_optim + det_image0 # (nominal) probe beam imaging frequency; MHz
......@@ -109,7 +109,7 @@ class DailyMeasurement(Controller):
for rep, nu_freqpow in product(range(reps), NU_FREQPOW)
]
elif self.mode == DailyMeasType.MOT_NUM:
elif self.mode == DailyMeasType.BMOT_NUM:
# if measuring the blue MOT number
self.names = [
f"tau-tof={tau_tof0:.5f}"
......@@ -137,15 +137,15 @@ class DailyMeasurement(Controller):
+ int(
flir_prerelease
and self.mode not in {
DailyMeasType.MOT_NUM,
DailyMeasType.BMOT_NUM,
DailyMeasType.BMOT_DET,
}
) * len(self.names)
+ int(take_background)
),
timeout=10, # s
roi=[835, 647, 40, 40] # [826, 590, 340, 340]
# roi=[780, 592, 200, 200] # blue MOT imaging
roi=[835, 647, 40, 40] # others
)
self.cam.disconnect()
......@@ -154,7 +154,7 @@ class DailyMeasurement(Controller):
"temperature": DailyMeasType.TOF,
"resonance": DailyMeasType.DET,
"tof_resonance": DailyMeasType.CMOT_DET,
"blue_mot_number": DailyMeasType.MOT_NUM,
"blue_mot_number": DailyMeasType.BMOT_NUM,
"blue_mot_resonance": DailyMeasType.BMOT_DET,
}
if len(args) < 1 or args[0] not in run_modes.keys():
......@@ -182,7 +182,7 @@ class DailyMeasurement(Controller):
def postcmd(self, *args):
names = list()
for name in self.names:
if flir_prerelease and self.mode != DailyMeasType.MOT_NUM:
if flir_prerelease and self.mode != DailyMeasType.BMOT_NUM:
avgimgdir_pre = Path("pre")
avgimgdir_post = Path("post")
name_split = name.split("_")
......@@ -210,7 +210,7 @@ class DailyMeasurement(Controller):
# "_".join(name_split[:-1]) + "_post_" + name_split[-1])
# ))
else:
names.append(name)
names.append(ImageLabel(name))
if take_background:
names.append("background")
arrays = { name: frame for name, frame in zip(names, self.frames) }
......@@ -223,7 +223,7 @@ class DailyMeasurement(Controller):
try:
data.compute_results(
measurement_type=self.mode,
size_fit=True,
size_fit=False,
subtract_bkgd=take_background,
debug=True,
mot_number_params={ # for post-release image
......
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