From b18d78acea83d8f7339abf2d79c857f8ed9fb50c Mon Sep 17 00:00:00 2001 From: sfop Date: Thu, 7 Jul 2016 14:52:37 +0200 Subject: [PATCH] Closedown --- script/RFscan/phase_scan_caqtdm.py | 2 +- script/RFscan/phase_scan_caqtdm_dv.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/script/RFscan/phase_scan_caqtdm.py b/script/RFscan/phase_scan_caqtdm.py index 4e3619c..30ccc1f 100755 --- a/script/RFscan/phase_scan_caqtdm.py +++ b/script/RFscan/phase_scan_caqtdm.py @@ -64,7 +64,7 @@ try: #r = lscan(pos, [rf_phase_readback, rf_ampl_readback, sim], start, stop, step , latency=0.2, after_read = after) #r = lscan(rf_phase_setpoint, [rf_phase_readback, rf_ampl_readback, sim], start, stop, step , latency=0.5, after_read = after) sim.step = step - r = lscan(rf_phase_var, [rf_ampl_readback, sim], start, stop, step , latency=latency, after_read = after) + r = lscan(rf_phase_var, [rf_ampl_readback, bpm_q], start, stop, step , latency=latency, after_read = after) #To sample a0 f = r.getReadable(1) # r.getReadable(2) diff --git a/script/RFscan/phase_scan_caqtdm_dv.py b/script/RFscan/phase_scan_caqtdm_dv.py index c136eca..dbfae5f 100644 --- a/script/RFscan/phase_scan_caqtdm_dv.py +++ b/script/RFscan/phase_scan_caqtdm_dv.py @@ -27,7 +27,7 @@ arr_phase,arr_energy = [],[] def after(rec): global arrpos,arrval, disp, energy0 arr_phase.append(rec.positions[0]) - arr_energy.append(rec.values[0]/1000.0/disp*energy0) + arr_energy.append(rec.values[1]/1000.0/disp*energy0) caput(prefix + ":GET-ENERGY-ARRAY", to_array(arr_energy,'d')) caput(prefix + ":GET-PHASE-ARRAY", to_array(arr_phase,'d')) try: @@ -38,9 +38,10 @@ try: caput(prefix + ":GET-ENERGY-ARRAY", to_array(energy,'d')) caput(prefix + ":GET-PHASE-ARRAY", to_array(rf_phase,'d')) + phase_fit_max = None try: - (energy_max, angular_frequency, phase0, phase_fit_max, fit_x, fit_y) = hfit(energy , xdata = rf_phase) + (energy_max, angular_frequency, phase0, in_range, phase_fit_max, fit_x, fit_y) = hfit(energy , xdata = rf_phase) except: raise Exception("Fit failure")