diff options
| -rw-r--r-- | schofield.wl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/schofield.wl b/schofield.wl index f6d2efc..3a57f96 100644 --- a/schofield.wl +++ b/schofield.wl @@ -59,7 +59,7 @@ invDerivativeList[n_][f_][x_] := Module[ MapIndexed[{Pn, i} \[Function] Pn/dfs[[1]]^(2 i[[1]] - 1), Pns] ] -dFdξLowList[n_, h_][m_] := Module[ +dGdξLowList[n_, h_][m_] := Module[ { ds, dF, df }, ds = invDerivativeList[m+1][Function[θ, h[θ] / t[θ]^Δ[2]]][θc]; dF = NestList[Function[f, D[f, θ]], RFReg[n][θ], m] + Table[dfLow[AL, B][k], {k, 0, m}] /. θ -> θc; @@ -71,7 +71,7 @@ dFdξLowList[n_, h_][m_] := Module[ Table[Sum[df[[k+1]] BellY[j, k, ds[[;; j - k + 1]]], {k, 0, j}]/(j!), {j, 0, m}] ] -dFdξList[n_, h_][m_, θp_] := Module[ +dGdξList[n_, h_][m_, θp_] := Module[ { ds, dF, df }, ds = invDerivativeList[m+1][Function[θ, h[θ] / RealAbs[t[θ]]^Δ[2]]][θp]; dF = NestList[Function[f, D[f, θ]], RF[n][θ], m] /. θ -> θp; @@ -83,7 +83,7 @@ dFdξList[n_, h_][m_, θp_] := Module[ Table[Sum[df[[k+1]] BellY[j, k, ds[[;; j - k + 1]]], {k, 0, j}]/(j!), {j, 0, m}] ] -dFdηList[n_, h_][m_, θp_] := Module[ +dΦdηList[n_, h_][m_, θp_] := Module[ { ds, dF, df }, ds = invDerivativeList[m+1][Function[θ, t[θ] / h[θ]^(1 / Δ[2])]][θp]; dF = NestList[Function[f, D[f, θ]], RF[n][θ], m] /. θ -> θp; @@ -183,9 +183,9 @@ formResiduals[data_, functions_, δ_:10^(-15)] := If[Head[#1]===Around, (#2-#1["Value"]) / Max[#1["Uncertainty"], δ], (#2-#1) / δ] & @@@ Thread[{data, functions}] -resLow[n_, g_, δ_][m_] := formResiduals[Gls[[;;m+1]], dFdξLowList[n, g][m], δ] +resLow[n_, g_, δ_][m_] := formResiduals[Gls[[;;m+1]], dGdξLowList[n, g][m], δ] -resHigh[n_, g_, δ_][m_] := Rest[formResiduals[Ghs[[;;m+1]], dFdξList[n, g][m, 0], δ][[;;;;2]]] +resHigh[n_, g_, δ_][m_] := Rest[formResiduals[Ghs[[;;m+1]], dGdξList[n, g][m, 0], δ][[;;;;2]]] res[F_, g_, δ_][m_] := Join[resLow[F, g, δ][m], resHigh[F, g, δ][m], {ruleθ0[g] / 0.00005, ruleAH[g] / 0.02} /. Around[x_, _] :> x] chiSquared[F_, g_, δ_][m_] := Total[res[F, g, δ][m]^2] |