Skip to content
Snippets Groups Projects
Commit 80145555 authored by Yb Tweezer's avatar Yb Tweezer
Browse files

upkeep (dirty)

parent 0c20562d
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
blue_fluorescence_green_mot_shim_scan.py
+ 9
− 9
View file @ 80145555
......@@ -29,9 +29,9 @@ camera_config = {
clk_freq = 10e6 # Hz
t0 = 1.0 # take the picture
tau = 50e-3
SHIMS_LR = np.linspace(0, 2, 16) # LeftRight
SHIMS_LR = np.linspace(0, 2, 1) # LeftRight
SHIMS_FB = np.linspace(2, 2, 1) # FrontBack
SHIMS_UD = np.linspace(0, 2, 16) # UpDown
SHIMS_UD = np.linspace(0, 2, 1) # UpDown
def make_sequence(name: str, shim_fb: float, shim_lr: float, shim_ud: float):
SEQ = SuperSequence(outdir.joinpath("sequences"), name, {
"Sequence": (Sequence
......@@ -108,13 +108,13 @@ def make_sequence(name: str, shim_fb: float, shim_lr: float, shim_ud: float):
.digital_hilo(*C.mot3_green_sh, t0 - 10e-3, t0 + tau)
).with_color("C6").with_stack_idx(7),
"Blue tweezer shutter": (Sequence
.digital_pulse(*C.probe_sh, t0 - 5e-3 + 30e-3, 15e-3)
).with_color("C4").with_stack_idx(3),
# "Blue tweezer shutter": (Sequence
# .digital_pulse(*C.probe_sh, t0 - 5e-3 + 30e-3, 15e-3)
# ).with_color("C4").with_stack_idx(3),
"Blue tweezer aom": (Sequence
.digital_pulse(*C.probe_aom, t0 + 30e-3 , 10e-3)
).with_color("C4").with_stack_idx(3),
# "Blue tweezer aom": (Sequence
# .digital_pulse(*C.probe_aom, t0 + 30e-3 , 10e-3)
# ).with_color("C4").with_stack_idx(3),
# "EMCCD": (Sequence
# .digital_pulse(*C.andor_trig, t0 - 27e-3 + 0*30e-3 + 5e-3, 10e-3)
......@@ -197,7 +197,7 @@ class FluorescenceImaging(Controller):
data.save()
for sseq in self.ssequences:
sseq.save()
# data.render_arrays()
data.render_arrays()
def run_sequence(self, *args):
for name, seq in zip(self.names, self.sequences):
......
green_mot_ramp.py
+ 66
− 17
View file @ 80145555
......@@ -16,7 +16,7 @@ Narrowline cooling
# CAMERA OPTIONS
camera_config = {
"exposure_time": 100,
"exposure_time": 300,
"gain": 45.49,
"gamma": 1.25,
"black_level": 5.0,
......@@ -32,7 +32,7 @@ SEQ = SuperSequence(outdir, "sequence", {
.with_color("k").with_stack_idx(0)
),
"Camera 1": (Sequence
.digital_pulse(*C.flir_trig, t0 - 5e-3, 0.2985e-3)
.digital_pulse(*C.flir_trig, t0 - 10e-3, 0.2985e-3)
.with_color("C2").with_stack_idx(4)
),
"Camera 2": (Sequence
......@@ -40,49 +40,97 @@ SEQ = SuperSequence(outdir, "sequence", {
.with_color("C2").with_stack_idx(4)
),
"Push shutter": (Sequence
.digital_lohi(*C.push_sh, t0 - 10e-3 - 5e-3, t0 + 800e-3)
.digital_lohi(*C.push_sh, t0 - 25e-3 - 5e-3, t0 + 800e-3)
.with_color("C3").with_stack_idx(3)
),
"Push aom": (Sequence
.digital_lohi(*C.push_aom, t0 - 10e-3, t0 + 800e-3)
.digital_lohi(*C.push_aom, t0 - 15e-3, t0 + 800e-3)
.with_color("C3").with_stack_idx(3)
),
"MOT servo green MOT": (Sequence.serial_bits_c(
C.mot3_coils_sig, t0 - 0.5e-3,
C.mot3_coils_sig, t0,
44182, 20,
AD5791_DAC, 4,
C.mot3_coils_clk, C.mot3_coils_sync,
clk_freq)
).with_color("C1").with_stack_idx(2),
"MOT servo green CMOT 1": (Sequence.serial_bits_c(
C.mot3_coils_sig, t0 + tau - 23e-3,
int(44182*1.2), 20,
AD5791_DAC, 4,
C.mot3_coils_clk, C.mot3_coils_sync,
clk_freq)
).with_color("C1").with_stack_idx(2),
"MOT servo green CMOT 2": (Sequence.serial_bits_c(
C.mot3_coils_sig, t0 + tau - 22e-3,
int(44182*1.4), 20,
AD5791_DAC, 4,
C.mot3_coils_clk, C.mot3_coils_sync,
clk_freq)
).with_color("C1").with_stack_idx(2),
"MOT servo green CMOT 3": (Sequence.serial_bits_c(
C.mot3_coils_sig, t0 + tau - 21e-3,
int(44182*1.6), 20,
AD5791_DAC, 4,
C.mot3_coils_clk, C.mot3_coils_sync,
clk_freq)
).with_color("C1").with_stack_idx(2),
"MOT servo green CMOT 4": (Sequence.serial_bits_c(
C.mot3_coils_sig, t0 + tau - 20e-3,
int(44182*1.8), 20,
AD5791_DAC, 4,
C.mot3_coils_clk, C.mot3_coils_sync,
clk_freq)
).with_color("C1").with_stack_idx(2),
"MOT servo blue MOT recapture": (Sequence.serial_bits_c(
C.mot3_coils_sig, t0 + tau,
C.mot3_coils_sig, t0 + tau - 4e-3,
441815, 20,
AD5791_DAC, 4,
C.mot3_coils_clk, C.mot3_coils_sync,
clk_freq)
).with_color("C1").with_stack_idx(2),
"Blue beams ": (Sequence
.digital_hilo(*C.mot3_blue_sh, 0.0, t0 - 4e-3)
.digital_hilo(*C.mot3_blue_sh, 0.0, t0 - 3e-3 + 0*4e-3)
).with_color("C0").with_stack_idx(5),
"Blue beams recapture": (Sequence
.digital_pulse(*C.mot3_blue_sh, t0 + tau, 700e-3)
.digital_pulse(*C.mot3_blue_sh, t0 + tau - 4e-3 , 700e-3)
).with_color("C0").with_stack_idx(5),
"FB/LR shims": (Sequence()
<< Event.analog(**C.shim_coils_fb, s=0.0) @ (t0 - 0.5e-3 + 1e-16)
<< Event.analog(**C.shim_coils_fb, s=3.45) @ (t0 + tau + 1e-16)
<< Event.analog(**C.shim_coils_lr, s=0.0) @ (t0 - 0.5e-3 + 2e-16)
<< Event.analog(**C.shim_coils_fb, s=2.0) @ (t0 + 1e-16)
<< Event.analog(**C.shim_coils_lr, s=0.0) @ (t0 + 2e-16)
<< Event.analog(**C.shim_coils_ud, s=0.5) @ (t0 + 3e-16)
<< Event.analog(**C.shim_coils_fb, s=4.50) @ (t0 + tau + 1e-16)
<< Event.analog(**C.shim_coils_lr, s=2.20) @ (t0 + tau + 2e-16)
<< Event.analog(**C.shim_coils_ud, s=0.0) @ (t0 - 0.5e-3 + 3e-16)
<< Event.analog(**C.shim_coils_ud, s=3.75) @ (t0 + tau + 3e-16)
<< Event.analog(**C.shim_coils_ud, s=4.30) @ (t0 + tau + 3e-16)
).with_color("C8"),
"Green beams AOM": (Sequence
.digital_hilo(*C.mot3_green_aom, t0 - 15e-3, t0 - 10e-3)
).with_color("C6").with_stack_idx(6),
"Green beams shutter": (Sequence
.digital_hilo(*C.mot3_green_sh, t0 - 1e-3, t0 + tau)
.digital_hilo(*C.mot3_green_sh, t0 - 5e-3, t0 + tau + 3e-3)
).with_color("C6").with_stack_idx(7),
"Green imaging AOM": (Sequence
.digital_hilo(*C.raman_green_aom, t0 + tau + 5e-3, t0 + tau + 15e-3 )
).with_color("C6").with_stack_idx(6),
# "Blue tweezer shutter": (Sequence
# .digital_pulse(*C.probe_sh, t0 - 5e-3 + 0e-3, 15e-3)
# ).with_color("C4").with_stack_idx(3),
# "Blue tweezer aom": (Sequence
# .digital_pulse(*C.probe_aom, t0 + 0e-3 , 10e-3)
# ).with_color("C4").with_stack_idx(3),
# "EMCCD": (Sequence
# .digital_pulse(*C.andor_trig, t0 + tau -27e-3 - 14e-3, 10e-3)
# ).with_color("C2").with_stack_idx(4),
"Scope": (Sequence
.digital_hilo(*C.scope_trig, t0 - 50e-3, t0 + 800e-3)
.with_color("C7").with_stack_idx(1)
......@@ -131,9 +179,9 @@ class FluorescenceImaging(Controller):
)
ramp_time = 30e-3 # in s
ramp_N = 1000 # 10 us between each step
ramp_N = 1000
delta_t = ramp_time/ramp_N
ramp_range = 5 # MHz
ramp_range = 4 # MHz
f0 = 90 # MHz
delta_f = ramp_range/ramp_N
freq = f0+np.arange(0,ramp_N+1)*delta_f
......@@ -142,9 +190,10 @@ class FluorescenceImaging(Controller):
t_ref = 10e-3
t_ramp = t_ref + 20e-3
t_hold = 20e-3
table << mogdriver.MOGEvent(frequency=f0, power = 0) @ (1e-4)
table << mogdriver.MOGEvent(frequency=f0, power = 29.0) @ (t_ref)
for ind, value in enumerate(freq):
table << mogdriver.MOGEvent(frequency=value, power = 29.0) @ (t_ramp + ind * delta_t)
table << mogdriver.MOGEvent(frequency=value, power = 29.0-ind*0.015) @ (t_ramp + ind * delta_t)
table << mogdriver.MOGEvent(frequency=value, power = 0.0) @ (t_ramp + ind * delta_t + t_hold)
......
green_mot_ramp_shim_scan.py 0 → 100644
+ 273
− 0
View file @ 80145555
from lib import *
from lib import CONNECTIONS as C
import datetime, sys, pathlib
from lib.system import MOGRF
import time
import numpy as np
timestamp = get_timestamp()
print(timestamp)
outdir = DATADIRS.compressed_mot.joinpath(timestamp)
comments = """
Narrowline cooling
w/o blue tweezer
================================
"""[1:-1]
# CAMERA OPTIONS
camera_config = {
"exposure_time": 300,
"gain": 45.49,
"gamma": 1.25,
"black_level": 5.0,
"bin_size": 1,
}
clk_freq = 10e6 # Hz
t0 = 2.0 # cooling seq
tau = 70e-3
SHIMS_LR = np.linspace(0.2, 0.2, 1) # LeftRight
SHIMS_FB = np.linspace(2.2, 2.2, 1) # FrontBack
SHIMS_UD = np.linspace(0.7, 0.7, 1) # UpDown
def make_sequence(name: str, shim_fb: float, shim_lr: float, shim_ud: float):
name = f"fb={shim_fb:.5f}_lr={shim_lr:.5f}_ud={shim_ud:.5f}" \
if name is None else name
SEQ = SuperSequence(outdir.joinpath("sequences"), name, {
"Sequence": (Sequence
.digital_hilo(*C.dummy, 0.0, t0 + 800e-3)
.with_color("k").with_stack_idx(0)
),
"Camera 1": (Sequence
.digital_pulse(*C.flir_trig, t0 - 10e-3, 0.2985e-3)
.with_color("C2").with_stack_idx(4)
),
"Camera 2": (Sequence
.digital_pulse(*C.flir_trig, t0 + 80e-3, 0.2985e-3)
.with_color("C2").with_stack_idx(4)
),
"Push shutter": (Sequence
.digital_lohi(*C.push_sh, t0 - 25e-3 - 5e-3, t0 + 800e-3)
.with_color("C3").with_stack_idx(3)
),
"Push aom": (Sequence
.digital_lohi(*C.push_aom, t0 - 15e-3, t0 + 800e-3)
.with_color("C3").with_stack_idx(3)
),
"MOT servo green MOT": (Sequence.serial_bits_c(
C.mot3_coils_sig, t0,
44182, 20,
AD5791_DAC, 4,
C.mot3_coils_clk, C.mot3_coils_sync,
clk_freq)
).with_color("C1").with_stack_idx(2),
"MOT servo green CMOT 1": (Sequence.serial_bits_c(
C.mot3_coils_sig, t0 + tau - 23e-3,
int(44182*1.2), 20,
AD5791_DAC, 4,
C.mot3_coils_clk, C.mot3_coils_sync,
clk_freq)
).with_color("C1").with_stack_idx(2),
"MOT servo green CMOT 2": (Sequence.serial_bits_c(
C.mot3_coils_sig, t0 + tau - 22e-3,
int(44182*1.4), 20,
AD5791_DAC, 4,
C.mot3_coils_clk, C.mot3_coils_sync,
clk_freq)
).with_color("C1").with_stack_idx(2),
"MOT servo green CMOT 3": (Sequence.serial_bits_c(
C.mot3_coils_sig, t0 + tau - 21e-3,
int(44182*1.6), 20,
AD5791_DAC, 4,
C.mot3_coils_clk, C.mot3_coils_sync,
clk_freq)
).with_color("C1").with_stack_idx(2),
"MOT servo green CMOT 4": (Sequence.serial_bits_c(
C.mot3_coils_sig, t0 + tau - 20e-3,
int(44182*1.8), 20,
AD5791_DAC, 4,
C.mot3_coils_clk, C.mot3_coils_sync,
clk_freq)
).with_color("C1").with_stack_idx(2),
"MOT servo blue MOT recapture": (Sequence.serial_bits_c(
C.mot3_coils_sig, t0 + tau - 4e-3,
441815, 20,
AD5791_DAC, 4,
C.mot3_coils_clk, C.mot3_coils_sync,
clk_freq)
).with_color("C1").with_stack_idx(2),
"Blue beams ": (Sequence
.digital_hilo(*C.mot3_blue_sh, 0.0, t0 - 3e-3 + 0*4e-3)
).with_color("C0").with_stack_idx(5),
"Blue beams recapture": (Sequence
.digital_pulse(*C.mot3_blue_sh, t0 + tau - 4e-3 , 700e-3)
).with_color("C0").with_stack_idx(5),
"FB/LR/UD shims": (Sequence()
<< Event.analog(**C.shim_coils_fb, s=2.0) @ (t0 + 1e-16)
<< Event.analog(**C.shim_coils_lr, s=0.0) @ (t0 + 2e-16)
<< Event.analog(**C.shim_coils_ud, s=0.5) @ (t0 + 3e-16)
<< Event.analog(**C.shim_coils_fb, s=shim_fb) @ (t0 + tau - 20.5e-3 + 1e-16)
<< Event.analog(**C.shim_coils_lr, s=shim_lr) @ (t0 + tau - 20.5e-3 + 2e-16)
<< Event.analog(**C.shim_coils_ud, s=shim_ud) @ (t0 + tau - 20.5e-3 + 3e-16)
<< Event.analog(**C.shim_coils_fb, s=4.50) @ (t0 + tau + 0e-3 + 1e-16)
<< Event.analog(**C.shim_coils_lr, s=2.20) @ (t0 + tau + 0e-3 + 2e-16)
<< Event.analog(**C.shim_coils_ud, s=4.30) @ (t0 + tau + 0e-3 + 3e-16)
).with_color("C8"),
"Green beams AOM": (Sequence
.digital_hilo(*C.mot3_green_aom, t0 - 15e-3, t0 - 10e-3)
).with_color("C6").with_stack_idx(6),
"Green beams shutter": (Sequence
.digital_hilo(*C.mot3_green_sh, t0 - 5e-3, t0 + tau)
).with_color("C6").with_stack_idx(7),
# "Green imaging AOM": (Sequence
# .digital_hilo(*C.raman_green, t0 + tau + 10e-3, t0 + tau + 20e-3 )
# ).with_color("C6").with_stack_idx(6),
# "Blue tweezer shutter": (Sequence
# .digital_pulse(*C.probe_sh, t0 + tau - 15e-3, 15e-3)
# ).with_color("C4").with_stack_idx(3),
# "Blue tweezer aom": (Sequence
# .digital_pulse(*C.probe_aom, t0 + tau - 10e-3, 10e-3)
# ).with_color("C4").with_stack_idx(3),
# "EMCCD": (Sequence
# .digital_pulse(*C.andor_trig, t0 + tau - 17e-3, 10e-3)
# ).with_color("C2").with_stack_idx(4),
"Scope": (Sequence
.digital_hilo(*C.scope_trig, t0 - 50e-3, t0 + 800e-3)
.with_color("C7").with_stack_idx(1)
),
}, C)
return SEQ
seq_bkgd = SuperSequence(outdir.joinpath("sequences"), f"background", {
"Sequence": (Sequence
.digital_hilo(*C.dummy, 0.0, 100e-3)
),
"Push": (Sequence
.digital_lohi(*C.push_sh, 0.0, 100e-3)
),
"MOT beams": (Sequence
.digital_lohi(*C.mot3_blue_sh, 0.0, 50e-3)
),
"MOT coils": (Sequence
.digital_hilo(*C.mot3_coils_igbt, 0.0, 100e-3)
.digital_hilo(*C.mot3_coils_onoff, 0.0, 100e-3)
),
"Camera": (Sequence
.digital_pulse(*C.flir_trig, 80e-3, camera_config["exposure_time"] * 1e-6)
),
"Scope": (Sequence
.digital_hilo(*C.scope_trig, 0.0, 100e-3)
),
}, C)
class FluorescenceImaging(Controller):
def precmd(self, *args):
self.comp = MAIN.connect()
(self.comp
.def_digital(*C.mot3_coils_onoff, 1)
.def_digital(*C.mot3_blue_sh, 1)
.def_digital(*C.push_aom, 1)
.def_digital(*C.push_sh, 1)
)
self.cam = FLIR.connect()
(self.cam
.configure_capture(**camera_config)
.configure_trigger()
)
self.names = list()
self.sequences = list()
self.ssequences = list()
for fb in SHIMS_FB:
for lr in SHIMS_LR:
for ud in SHIMS_UD:
name = f"fb={fb:.5f}_lr={lr:.5f}_ud={ud:.5f}"
sseq = make_sequence(name, fb, lr, ud)
self.names.append(name)
self.sequences.append(sseq.to_sequence())
self.ssequences.append(sseq)
ramp_time = 30e-3 # in s
ramp_N = 1000
delta_t = ramp_time/ramp_N
ramp_range = 4 # MHz
f0 = 90 # MHz
delta_f = ramp_range/ramp_N
freq = f0+np.arange(0,ramp_N+1)*delta_f
table = mogdriver.MOGTable()
t_ref = 10e-3
t_ramp = t_ref + 20e-3
t_hold = 20e-3
table << mogdriver.MOGEvent(frequency=f0, power = 29.0) @ (t_ref)
for ind, value in enumerate(freq):
table << mogdriver.MOGEvent(frequency=value, power = 29.0-ind*0.015) @ (t_ramp + ind * delta_t)
table << mogdriver.MOGEvent(frequency=value, power = 0.0) @ (t_ramp + ind * delta_t + t_hold)
self.mog = MOGRF.connect()
(self.mog
.set_frequency(1, 90.0).set_power(1, 29.4)
.set_mode(1, "TSB")
.table_load(1, table)
.set_table_rearm(1, True)
.table_arm(1)
)
def postcmd(self, *args):
self.comp.clear().disconnect()
self.cam.disconnect()
(self.mog
.table_stop(1)
.table_clear(1)
.set_frequency(1, 90.0).set_power(1, 29.04)
.set_mode(1, "NSB")
.set_output(1, True)
.disconnect()
)
arrays = dict()
for k, name in enumerate(self.names):
arrays[name + "_0"] = self.frames[2 * k]
arrays[name + "_1"] = self.frames[2 * k + 1]
data = FluorescenceData(
outdir=outdir,
arrays=arrays,
config=camera_config,
comments=comments
)
data.compute_results()
data.save()
for sseq in self.ssequences:
sseq.save()
data.render_arrays()
def run_sequence(self, *args):
for name, seq in zip(self.names, self.sequences):
print(name)
(self.comp
.enqueue(seq)
.run()
.clear()
)
def run_camera(self, *args):
self.frames = self.cam.acquire_frames(2 * len(self.names))
def cmd_visualize(self, *args):
make_sequence("", SHIMS_FB.max(), SHIMS_LR.max(), SHIMS_UD.max()) \
.draw_detailed().show().close()
sys.exit(0)
if __name__ == "__main__":
FluorescenceImaging().RUN()
\ No newline at end of file
lib/system.py
+ 6
− 5
View file @ 80145555
......@@ -19,6 +19,7 @@ DATADIRS = DataPaths(
mot_transfer = DATA_HOME.joinpath("MOT transfer"),
green_shim_scan = DATA_HOME.joinpath("green shim scan"),
green_mot_fluor = DATA_HOME.joinpath("blue fluorescence from green mot"),
compressed_mot = DATA_HOME.joinpath("compressed mot"),
)
# DEPRECATED NAMES
......@@ -38,14 +39,14 @@ DATADIRS = DataPaths(
# Analog(channel, state)
CONNECTIONS = ConnectionLayout(
mot3_coils_onoff = Digital(0, 2, 1),
mot3_coils_cur = Analog(0, 3.45),
mot3_coils_vol = Analog(1, 7.00),
mot3_coils_cur = Analog(0, 9.90),
mot3_coils_vol = Analog(1, 5.50),
mot3_coils_sig = Digital(0, 8, 0),
mot3_coils_clk = Digital(0, 10, 0),
mot3_coils_sync = Digital(0, 14, 1),
shim_coils_ud = Analog(2, 0.00),
shim_coils_lr = Analog(3, 0.00),
shim_coils_fb = Analog(4, 0.00),
shim_coils_ud = Analog(2, 4.30),
shim_coils_lr = Analog(3, 2.20),
shim_coils_fb = Analog(4, 4.50),
mot3_coils_igbt = Digital(0, 4, 1),
mot3_shims_onoff = Digital(0, 0, 0),
mot3_blue_sh = Digital(1, 7, 1),
......
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