mcammara
/
dispersiveXanes
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

trying to get the gauss convolution to work again...

This commit is contained in:
Marco Cammarata 2016-12-01 11:15:17 +01:00
parent 66ca11e014
commit 66dd58a94b
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mcutils/mcutils.py
View File

@ -288,7 +288,7 @@ def convolveQuad(x,y,xres,yres,useAutoCrop=True,
x_integral = xresInv+x[i] x_integral = xresInv+x[i]
ytemp = interpolate(x,y,x_integral,fill_value=fill_value,axis=axis)/area ytemp = interpolate(x,y,x_integral,fill_value=fill_value,axis=axis)/area
# do integration # do integration
res = integrate.simps(ytemp*yresInv,x=xresInv+x[i],axis=axis) res = integrate.simps(ytemp[0]*yresInv,x=xresInv+x[i],axis=axis)
colon = (slice(None),) colon = (slice(None),)
setElement(out,i,res,axis=axis) setElement(out,i,res,axis=axis)
return out return out
@ -326,6 +326,14 @@ def convolve(x,y,xres,yres,useAutoCrop=True,approximantOrder=None,fill_value=0.,
## prepare output ## prepare output
out = np.empty_like(y) out = np.empty_like(y)
## fill up NaN
for i in range(y.shape[0]):
isok = np.isfinite(y[i])
xp = x[isok]
fp = y[i,isok]
y[i] = np.interp(x, xp, fp)
nP = len(x) nP = len(x)
f = interpolator(x,y,fill_value=fill_value,axis=axis) f = interpolator(x,y,fill_value=fill_value,axis=axis)
for i in range(nP): for i in range(nP):
@ -335,10 +343,10 @@ def convolve(x,y,xres,yres,useAutoCrop=True,approximantOrder=None,fill_value=0.,
#ytemp = interpolate(x,y,x_integral,fill_value=fill_value,axis=axis)/area #ytemp = interpolate(x,y,x_integral,fill_value=fill_value,axis=axis)/area
#ytemp = f(x_integral)/area #ytemp = f(x_integral)/area
# do integration # do integration
res = integrate.simps( np.transpose(ytemp.T*yresInv),x=xresInv+x[i],axis=axis) res = integrate.simps( ytemp*yresInv,x=xresInv+x[i],axis=axis)
colon = (slice(None),) colon = (slice(None),)
setElement(out,i,res,axis=axis) setElement(out,i,res,axis=axis)
return out return out.T
def fftconvolve(x,y,yres,xres=None,normalize=False): def fftconvolve(x,y,yres,xres=None,normalize=False):