blue_fluorescence_green_mot: change data directory, add shim coils, rename images

blue_fluorescence_green_mot.py

@@ -4,12 +4,11 @@ import datetime, sys, pathlib
 
 timestamp = get_timestamp()
 print(timestamp)
-outdir = DATADIRS.fluorescence_imaging.joinpath(timestamp)
+outdir = DATADIRS.green_mot_fluor.joinpath(timestamp)
 
 comments = """
 Blue fluorescence from green MOT
 ================================
-with scanning shim coils
 """[1:-1]
 
 # CAMERA OPTIONS
@@ -23,7 +22,7 @@ camera_config = {
 
 # BUILD SEQUENCE
 t0 = 1.0 # take the picture
-tau = 50e-3
+tau = 70e-3
 SEQ = SuperSequence(outdir, "sequence", {
     "Sequence": (Sequence
         .digital_hilo(*C.dummy, 0.0, t0 + 800e-3)
@@ -60,6 +59,12 @@ SEQ = SuperSequence(outdir, "sequence", {
     "MOT shims": (Sequence
         .digital_hilo(*C.mot3_shims_onoff, t0 - 0.5e-3, t0 + tau)
     ).with_color("C1").with_stack_idx(3),
+    "FB/LR shims": (Sequence()
+        << Event.analog(**C.shim_coils_fb, s=2.0) @ (t0 - 0.5e-3 + 1e-16)
+        << Event.analog(**C.shim_coils_fb, s=0.0) @ (t0 + tau + 1e-16)
+        << Event.analog(**C.shim_coils_lr, s=1.0) @ (t0 - 0.5e-3 + 2e-16)
+        << Event.analog(**C.shim_coils_lr, s=0.0) @ (t0 + tau + 2e-16)
+    ).with_color("C8"),
     "Green beams AOM": (Sequence
         .digital_hilo(*C.mot3_green_aom, t0 - 1.8e-3, t0  + tau -0*700e-6)
     ).with_color("C6").with_stack_idx(6),
@@ -135,7 +140,7 @@ class FluorescenceImaging(Controller):
         frames = self.cam.acquire_frames(2)
         data = FluorescenceData(
             outdir=outdir,
-            arrays={"image": frames[0], "background": frames[1]},
+            arrays={"image1": frames[0], "image2": frames[1]},
             config=camera_config,
             comments=comments
         )