sm/smbinterp
1
0
Fork 0
Code Issues Pull Requests Activity

fixed discrepancy with Baker's eq 17.

Browse Source
This commit is contained in:
Stephen Mardson McQuay 2010-04-09 15:03:16 -06:00
parent 3efe335563
commit 79880acad4
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/baker/__init__.py
View File

@ -149,12 +149,12 @@ def get_error_cubic(phi, R, S):
# basing this on eq 17 # basing this on eq 17
B.append( B.append(
[ [
phi1 * phi2, # a phi1 * phi2 * phi2, # a
phi1 * phi3, # b phi1 * phi3 * phi3, # b
phi2 * phi1, # c phi2 * phi1 * phi1, # c
phi2 * phi3, # d phi2 * phi3 * phi3, # d
phi3 * phi1, # e phi3 * phi1 * phi1, # e
phi3 * phi2, # f phi3 * phi2 * phi2, # f
phi1 * phi2 * phi3, # g phi1 * phi2 * phi3, # g
] ]
) )
@ -173,12 +173,12 @@ def get_error_cubic(phi, R, S):
print >> sys.stderr, "warning: run_baker: linear calculation went bad, resorting to np.linalg.pinv", e print >> sys.stderr, "warning: run_baker: linear calculation went bad, resorting to np.linalg.pinv", e
(a, b, c, d, e, f, g) = np.dot(np.linalg.pinv(A), b) (a, b, c, d, e, f, g) = np.dot(np.linalg.pinv(A), b)
error_term = a * phi[0] * phi[1]\ error_term = a * phi[0] * phi[1] * phi[1]\
+ b * phi[0] * phi[2]\ + b * phi[0] * phi[2] * phi[2]\
+ c * phi[1] * phi[0]\ + c * phi[1] * phi[0] * phi[0]\
+ d * phi[1] * phi[2]\ + d * phi[1] * phi[2] * phi[2]\
+ e * phi[2] * phi[0]\ + e * phi[2] * phi[0] * phi[0]\
+ f * phi[2] * phi[1]\ + f * phi[2] * phi[1] * phi[1]\
+ g * phi[0] * phi[1] * phi[2]\ + g * phi[0] * phi[1] * phi[2]\
return error_term, a, b, c return error_term, a, b, c