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

View File

@@ -1,18 +1,18 @@
import numpy as np
def ext(x, y):
def extremum(x, y):
"""
Return extremum coordinates of quadratic fit
"""
p = np.polyfit(x, y, 2)
f = np.poly1d(p)
x_fit = 1.0 #np.linspace(min(x), max(x), 100)
#y_fit = 2.0 #f(x_fit)
if p[0] != 0:
x_ext = -p[1]/2/p[0]
y_ext = f(x_ext)
else:
x_ext = None
y_ext = None
return (x_ext, y_ext, x_ext)
x_fit = np.linspace(min(x), max(x), 100)
y_fit = f(x_fit)
return (x_ext, y_ext, x_fit, y_fit)

View File

@@ -4,10 +4,9 @@ def hfitoff(data, xdeg):
ret = call_jep("CPython/hfitoff", "hfitoff", [to_npa(data),to_npa(xdeg)])
return (ret[0], ret[1], ret[2],ret[3], ret[4].data, ret[5].data)
def ext(x, y):
ret = call_jep("CPython/ext", "ext", [to_npa(x),to_npa(y)])
#return (ret[0], ret[1], ret[2].data, ret[3].data)
return (ret[0], ret[1], ret[2])
def extremum(x, y):
ret = call_jep("CPython/extremum", "extremum", [to_npa(x),to_npa(y)])
return (ret[0], ret[1], ret[2].data, ret[3].data)
def gfitoff(x, y, off=None, amp=None, com=None, sigma=None):
ret = call_jep("CPython/gfitoff", "gfitoff", [to_npa(x), to_npa(y), off, amp, com, sigma])