Skip to content

Change relock_tracking to setup_tracking in uxm_relock #509

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tpsatt wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Change relock_tracking to setup_tracking in uxm_relock #509

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions sodetlib/operations/uxm_relock.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import time
import numpy as np
import sodetlib as sdl
from sodetlib.operations.tracking import relock_tracking_setup
from sodetlib.operations.tracking import setup_tracking_params
from sodetlib.operations import uxm_setup, bias_steps

import matplotlib.pyplot as plt
Expand Down Expand Up @@ -367,9 +367,14 @@ def uxm_relock(
for b in bands:
S.set_feedback_enable(b, 1)

tr = relock_tracking_setup(
S, cfg, bands, show_plots=show_plots,
reset_rate_khz=reset_rate_khz, nphi0=nphi0
# Possibly override cfg values to pass to tracking setup
if reset_rate_khz is not None:
cfg.dev.exp['flux_ramp_rate_khz'] = reset_rate_khz
if nphi0 is not None:
cfg.dev.exp['nphi0'] = nphi0

tr = setup_tracking_params(
S, cfg, bands=bands, show_plots=show_plots
)
summary['tracking_setup_results'] = tr

Expand Down