Closedown

This commit is contained in:
sfop
2016-07-07 14:52:37 +02:00
parent 3db64efee8
commit b18d78acea
2 changed files with 4 additions and 3 deletions

View File

@@ -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)

View File

@@ -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")