[Commits] [svn:einsteintoolkit] pyGWAnalysis/trunk/DataAnalysis/ (Rev. 12)
reisswig at tapir.caltech.edu
reisswig at tapir.caltech.edu
Tue Mar 27 19:59:56 CDT 2012
User: reisswig
Date: 2012/03/27 07:59 PM
Modified:
/trunk/DataAnalysis/
DataAnalysis.py
Log:
Argl. Hopefully final fix!
File Changes:
Directory: /trunk/DataAnalysis/
===============================
File [modified]: DataAnalysis.py
Delta lines: +5 -1
===================================================================
--- trunk/DataAnalysis/DataAnalysis.py 2012-03-28 00:42:46 UTC (rev 11)
+++ trunk/DataAnalysis/DataAnalysis.py 2012-03-28 00:59:56 UTC (rev 12)
@@ -734,8 +734,10 @@
while (x_off < maxX):
DF2shift = DiscreteFunction(DF2.x+x_off, DF2.f)
subDF1, subDF2 = MakeConsistent(DF1, DF2shift, x0, x1, dx)
- # first, compute DeltaPhi analytically according to Boyle et al.
+ # first, compute DeltaPhi analytically according to Boyle et al. via midpoint rule
DeltaPhi = 0
+ DeltaPhi += (subDF1.f[0]-subDF2.f[0])
+ DeltaPhi += (subDF1.f[-1]-subDF2.f[-1])
for ii in range (0, subDF1.Length()):
DeltaPhi += (subDF1.f[ii]-subDF2.f[ii])
DeltaPhi /= (subDF1.Length()-1)
@@ -774,6 +776,8 @@
subDF1, subDF2 = MakeConsistent(DF1, DF2shift, x0, x1, dx)
# first, compute DeltaPhi analytically according to Boyle et al.
DeltaPhi = 0
+ DeltaPhi += (subDF1.f[0]-subDF2.f[0])
+ DeltaPhi += (subDF1.f[-1]-subDF2.f[-1])
for ii in range (0, subDF1.Length()):
DeltaPhi += (subDF1.f[ii]-subDF2.f[ii])
DeltaPhi /= (subDF1.Length()-1)
More information about the Commits
mailing list