adjust names and timings for blue MOT number measurement

daily.py

@@ -85,7 +85,7 @@ 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_IMAGE = np.arange(-2.2, +3.8, 150e-3) # ^
-tau_tof0 = 1.5e-3 # time of flight for free-space imaging; s
+tau_tof0 = 0.1e-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])
 
@@ -266,7 +266,7 @@ def make_sequences(meas_type: DailyMeasType, name: str,
             CONNECTIONS
         )
     elif meas_type in {
-        DailyMeasType.MOT_NUM,
+        DailyMeasType.BMOT_NUM,
         DailyMeasType.BMOT_DET,
     }:
         tau_all = flir_config["exposure_time"] * 1e-6 + tau_image
@@ -468,7 +468,7 @@ class DailyMeasurement(Controller):
                 ])
             self.sequences = [sseq.to_sequence() for sseq in self.ssequences]
 
-        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}"
@@ -574,7 +574,8 @@ 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():
             print(
@@ -677,7 +678,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():
@@ -693,7 +694,7 @@ class DailyMeasurement(Controller):
             sseq, tab = make_sequences(self.mode, "", tau_tof0, DET_IMAGE.max(), nu_freqpow0)
         elif self.mode == DailyMeasType.CMOT_DET:
             sseq, tab = make_sequences(self.mode, "", tau_tof0, det_image0, NU_FREQPOW.max())
-        elif self.mode == DailyMeasType.MOT_NUM:
+        elif self.mode == DailyMeasType.BMOT_NUM:
             sseq, tab = make_sequences(self.mode, "", tau_tof0, det_image0, nu_freqpow0)
         elif self.mode == DailyMeasType.BMOT_DET:
             sseq, tab = make_sequences(self.mode, "", tau_tof0, DET_IMAGE.max(), nu_freqpow0)
@@ -705,7 +706,7 @@ class DailyMeasurement(Controller):
             mogtables=[
                 ( tab.with_color("C6"), dict(name="Green MOT AOM", offset=t0) ),
             ] if self.mode not in {
-                DailyMeasType.MOT_NUM,
+                DailyMeasType.BMOT_NUM,
                 DailyMeasType.BMOT_DET,
             } else list()
         ).set_xlim(tmin, tmax).show()

lib/imaging.py

@@ -408,7 +408,7 @@ class DailyMeasType(IntEnum):
     TOF = 0 # for time-of-flight temperature measurement
     DET = 1 # for imaging detuning free-space resonance measurement
     CMOT_DET = 2 # for free-space resonance measurement via CMOT TOF size
-    MOT_NUM = 3 # for measuring blue MOT number
+    BMOT_NUM = 3 # for measuring blue MOT number
     BMOT_DET = 4 # for free-space resonance measurement via blue-MOT release fluorescence
 
 probe_aom_fiber_eff = lambda d: (