User: reisswig Date: 2011/06/28 09:31 AM
Modified: /trunk/DataAnalysis/ DataAnalysis.py
Log: Fixed a bug in integration from news->h
File Changes:
Directory: /trunk/DataAnalysis/ ===============================
File [modified]: DataAnalysis.py Delta lines: +3 -2 =================================================================== --- trunk/DataAnalysis/DataAnalysis.py 2011-06-14 23:19:15 UTC (rev 3) +++ trunk/DataAnalysis/DataAnalysis.py 2011-06-28 14:31:10 UTC (rev 4) @@ -298,9 +298,9 @@
for ii in range(0, fr.Length()): if (fr.x[ii] != 0): - if fr.x[ii] < 0: fr.f[ii] = 0 + #if fr.x[ii] < 0: fr.f[ii] = 0 div = 2*pi*fr.x[ii] - if abs(fr.x[ii]) < abs(frange[0]): div = 2*pi*frange[0]*sign(fr.x[ii]) + if abs(fr.x[ii]) < abs(frange[0]): div = 2*pi*abs(frange[0])*sign(fr.x[ii]) #if fr.x[ii] > frange[1]: div = 4*pi**2*frange[1]**2 #if DF1fr.x[ii] > frange[0] and DF1fr.x[ii] < frange[1]: #div = (1.0-GaussBlend(DF1fr.x[ii], frange[0], (frange[1]-frange[0])/100)) * div + GaussBlend(DF1fr.x[ii], frange[0], (frange[1]-frange[0])/100) * 4*pi**2*frange[0]**2 # div = (1 - (DF1fr.x[ii]-frange[0])/(frange[1]-frange[0])) * 4*pi**2*frange[0]**2 + (DF1fr.x[ii]-frange[0])/(frange[1]-frange[0]) * div @@ -317,6 +317,7 @@
return res
+ def PolynomialFilterDriver(WFfr, x0, x1, blend=False): """Given a waveform in Fourier domain, we fit a polynomial between frequncy range frange as described in Reisswig&Pollney 2010"""