This commit is contained in:
sfop
2016-07-05 10:21:23 +02:00
parent d6b5860fd2
commit a3160dc2a1
7 changed files with 91 additions and 30 deletions
+2 -2
View File
@@ -85,11 +85,11 @@ def hfit(ydata, xdata = None):
if start <=m <=end:
print "fit = ", m
p.addMarker(m, None, "Fit="+str(round(m ,2)), Color.MAGENTA.darker())
return (amplitude, angular_frequency, phase, True, m)
return (amplitude, angular_frequency, phase, True, m, fit_x, fit_y)
else:
print "max = ",max_x
p.addMarker(max_x, None, "Max="+str(round(max_x ,2)), Color.MAGENTA.darker())
return (amplitude, angular_frequency, phase, False, max_x)
return (amplitude, angular_frequency, phase, False, max_x, fit_x, fit_y)
def elog(title, message, attachments = [], author = None, category = "Info", domain = "", logbook = "SwissFEL commissioning data", encoding=1):