Old work

1 files changed, 17 insertions, 6 deletions

diff --git a/schofield.py b/schofield.py
index 96fe68a..0894a42 100644
--- a/schofield.py
+++ b/schofield.py
@@ -1,5 +1,5 @@
-from sympy import *
-from mpmath import glaisher, pi
+from sympy import Rational, Symbol, Ei, diff
+from mpmath import glaisher, pi, exp, factorial
 
 β = Rational(1/8)
 δ = 15
@@ -9,19 +9,29 @@ from mpmath import glaisher, pi
 
 s = 2**Rational(1, 12) * exp(-β) * glaisher**Rational(3, 2)
 
+
 def f(B, θc, θ):
-    return (θc * Ei(-1 / (B * θc)) * exp(1 / (B * θc)) + (θ - θc) * Ei(1/(B * (θ - θc))) * exp(-1/(B * (θ - θc)))) / pi
+    return (θc * Ei(-1 / (B * θc)) * exp(1 / (B * θc))
+            + (θ - θc) * Ei(1/(B * (θ - θc))) * exp(-1/(B * (θ - θc)))) / pi
+
 
 def FH(θ0, θ):
     return (θ**2 + θ0**2)**σ - (θ0**2)**σ
 
+
+def FA(As, θ):
+    return sum([A * θ**(2 * i + 2) for i, A in enumerate(As)])
+
+
 def FR(AL, AH, As, B, θc, θ0, θ):
-    return AL * f(B, θc, -θ) + AH * FH(θ0, θ) + sum([A * θ**(2 * i + 2) for i,A in enumerate(As)])
+    return AL * f(B, θc, -θ) + AH * FH(θ0, θ) + FA(As, θ)
+
 
 def F(AL, AH, As, B, θc, θ0, θ):
     return FR(AL, AH, As, B, θc, θ0, θ) + AL * f(B, θc, θ)
 
-def dfc(AL, B, m):
+
+def dfc(AL, B, θc, m):
     if m == 0:
         return AL * θc * Ei(-1 / (B * θc)) * exp(1 / (B * θc)) / pi
     elif m == 1:
@@ -29,6 +39,7 @@ def dfc(AL, B, m):
     else:
         return AL * factorial(m) * factorial(m - 2) * B**(m-1) / pi
 
+
 def dFc(AL, AH, As, B, θc, θ0, m):
     θ = Symbol['θ']
-    return dfc(AL, B, m) + diff(FR(AL, AH, As, B, θc, θ0, θ), θ).subs(θ, θc) 
+    return dfc(AL, B, m) + diff(FR(AL, AH, As, B, θc, θ0, θ), θ).subs(θ, θc)