diff --git a/script/RFscan/phase_scan_caqtdm_dv2.py b/script/RFscan/phase_scan_caqtdm_dv2.py index 2fca9f7..56e637d 100644 --- a/script/RFscan/phase_scan_caqtdm_dv2.py +++ b/script/RFscan/phase_scan_caqtdm_dv2.py @@ -61,8 +61,10 @@ try: except: raise Exception("Fit failure") - caput(prefix + ":GET-FIT-PHASE-ARRAY", fit_x) - caput(prefix + ":GET-FIT-ENERGY-ARRAY", fit_y) + caput(prefix + ":GET-ONCREST-VSUM-PHASE", phase_fit_max) + caput(prefix + ":GET-ONCREST-E-GAIN", energy_max) + caput(prefix + ":GET-FIT-PHASE-ARRAY", fit_x) + caput(prefix + ":GET-FIT-ENERGY-ARRAY", fit_y) phase_min, phase_max = min(rf_phase), max(rf_phase) if not (phase_min <= phase_fit_max <= phase_max): @@ -72,6 +74,8 @@ try: time.sleep(lat) ampl = rf_ampl_rbk.read() power = rf_power_rbk.read() + caput(prefix + ":GET-ONCREST-VSUM-AMPLT", ampl) + caput(prefix + ":GET-ONCREST-KLY-POWER", power) finally: rf_phase_var.close() rf_ampl_rbk.close()