From 2e0f01ea96dd495ba88e293fcd04c4126e7a8a71 Mon Sep 17 00:00:00 2001 From: Toby Satterthwaite Date: Mon, 15 Jun 2026 09:56:50 -0700 Subject: [PATCH] Change relock_tracking to setup_tracking in uxm_relock --- sodetlib/operations/uxm_relock.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/sodetlib/operations/uxm_relock.py b/sodetlib/operations/uxm_relock.py index 5d13161f..a8b0be82 100644 --- a/sodetlib/operations/uxm_relock.py +++ b/sodetlib/operations/uxm_relock.py @@ -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 @@ -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