diff --git a/sodetlib/det_config.py b/sodetlib/det_config.py index 441eb45f..7a141bcb 100644 --- a/sodetlib/det_config.py +++ b/sodetlib/det_config.py @@ -83,7 +83,7 @@ def odict_rep(dumper, data): band_defaults = { # General "band_delay_us": None, "uc_att": None, "dc_att": None, - "attens_optimized": False, "tone_power": 12, + "attens_optimized": False, "tone_power": 12, "synthesis_scale": None, # Band-specific tracking stuff "lms_gain": 0, "feedback_gain": 2048, "frac_pp": None, "lms_freq_hz": None, diff --git a/sodetlib/operations/uxm_relock.py b/sodetlib/operations/uxm_relock.py index fe62af06..8caf6739 100644 --- a/sodetlib/operations/uxm_relock.py +++ b/sodetlib/operations/uxm_relock.py @@ -320,7 +320,10 @@ def uxm_relock( for band in bands: band_cfg = cfg.dev.bands[band] - S.set_synthesis_scale(band, exp['synthesis_scale']) + scale = cfg.dev.bands.get('synthesis_scale') + if scale is None: + scale = exp['synthesis_scale'] + S.set_synthesis_scale(band, scale) S.set_att_uc(band, band_cfg['uc_att']) S.set_att_dc(band, band_cfg['dc_att']) S.set_band_delay_us(band, band_cfg['band_delay_us']) diff --git a/sodetlib/operations/uxm_setup.py b/sodetlib/operations/uxm_setup.py index 3ce8697c..3606c87e 100644 --- a/sodetlib/operations/uxm_setup.py +++ b/sodetlib/operations/uxm_setup.py @@ -442,7 +442,10 @@ def uxm_setup(S, cfg, bands=None, show_plots=True, update_cfg=True, S.set_mode_ac() for band in bands: - S.set_synthesis_scale(band, exp['synthesis_scale']) + scale = cfg.dev.bands.get('synthesis_scale') + if scale is None: + scale = exp['synthesis_scale'] + S.set_synthesis_scale(band, scale) summary = {} summary['timestamps'] = []