regular parameter adjustment

daily.py

@@ -30,8 +30,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
 
@@ -62,16 +62,16 @@ tau_freqpow_dur = 30e-3 # frequency/power ramp duration; s
 # camera timings
 tau_flir_pre = -20e-3 # Flir pre-release image time rel. to end of narrow_cooling; s
 tau_flir = +0.05e-3 # Flir post-tof image time rel. to end of tof; s
-# tau_flir = -20e-3 # Flir post-tof image time rel. to end of tof; s
+# tau_flir = -20e-3 # Flir post-tof image time rel. to end of tof; s # used for debugging CMOT
 tau_andor = +0e-3 # EMCCD post-tof image time rel. to end of tof; s
 
 # coil settings
 B_blue = int(441815) # blue MOT gradient setting
 B_green = int(55227) # green MOT gradient setting; 174: 48600
 B_comp = 1.8 # compression ramp endpoint multiplier (= B_comp * B_green)
-shim_fb = +1.210 # front/back shim; 174:  1.2
-shim_lr = -0.180 # left/right shim; 174: -0.2
-shim_ud = +0.560 #    up/down shim; 174:  0.4
+shim_fb = +1.255 # front/back shim; 174:  1.2
+shim_lr = +0.165 # left/right shim; 174: -0.2
+shim_ud = +0.565 #    up/down shim; 174:  0.4
 
 # CMOT AOM settings
 f_freqpow = 90.0 # start of frequency ramp; MHz
@@ -83,9 +83,9 @@ p_image_cmot = 20.0 # power for imaging with CMOT beams; dBm
 # PARAMETERS
 nu_freqpow0 = 3.58 # extent of CMOT frequency ramp; MHz
 NU_FREQPOW = np.linspace(3.3, 3.775, 20) # ^
-det_image0 = 0.45 # detuning for imaging rel. to AOM-fiber optimal 93.5; MHz
+det_image0 = 0.18 # detuning for imaging rel. to AOM-fiber optimal 93.5; MHz
 DET_IMAGE = np.arange(-2.2, +3.8, 150e-3) # ^
-tau_tof0 = 0.1e-3 # time of flight for free-space imaging; s
+tau_tof0 = 0.0e-3 # time of flight for free-space imaging; s
 TAU_TOF = np.array([0.1e-3, 0.5e-3, 1.0e-3, 2.0e-3, 3.0e-3, 4.0e-3]) # ^
 # TAU_TOF = np.array([0.1e-3])
 
@@ -310,8 +310,8 @@ def make_sequences(meas_type: DailyMeasType, name: str,
                 "Imaging": (Sequence()
                     + Sequence.digital_pulse(
                         *C.probe_green_aom,
-                        t0 + tau_flir,
-                        flir_config["exposure_time"] * 1e-6, # account for exposure delay
+                        t0 + tau_flir - tau_image / 2.0,
+                        tau_all, # account for exposure delay
                         invert=True
                     )
                     + Sequence.digital_pulse(