This commit is contained in:
voulot_d
2017-08-15 12:12:09 +02:00
parent 73c0cf9798
commit ef416da30d
7 changed files with 36 additions and 35 deletions
+7 -5
View File
@@ -63,7 +63,7 @@ dx = camtool.stream.getChild("x_fit_standard_deviation")
#Creating averagers
x_averager = create_averager(x, nb, -1) # -1 event based, waits for the next value
dx_averager = create_averager(dx, nb, -1)
dx_averager.monitored=True # not blocking, will return last nb values
dx_averager.monitored = True # not blocking, will return last nb values
#Record callback: uptate of output plot
def after_sample(record, scan):
@@ -93,10 +93,12 @@ save_dataset(get_exec_pars().group + "/p", p)
save_dataset(get_exec_pars().group + "/dp", dp)
try:
run("CPython/wrapper")
(ph_p_max, p_max, ph_p_fit, p_fit) = ext(ph[i_max-5:i_max+6], p[i_max-5:i_max+6])
(ph_dp_min, dp_min, ph_dp_fit, dp_fit) = ext(ph[i_min-5:i_min+6], dp[i_min-5:i_min+6])
#plt.getSeries(2).appendData(ph_p_fit, p_fit)
#plt.getSeries(3).appendData(ph_dp_fit, dp_fit)
i_max = p.index(max(p))
i_min = dp.index(min(dp))
(ph_p_max, p_max, ph_p_fit, p_fit) = extremum(ph[i_max-5:i_max+6], p[i_max-5:i_max+6])
(ph_dp_min, dp_min, ph_dp_fit, dp_fit) = extremum(ph[i_min-5:i_min+6], dp[i_min-5:i_min+6])
plt.getSeries(2).appendData(ph_p_fit, p_fit)
plt.getSeries(3).appendData(ph_dp_fit, dp_fit)
except:
raise Exception("Fit failure")