diff --git a/src/classes/PMsrHandler.cpp b/src/classes/PMsrHandler.cpp index a5f257ce..09cff3f8 100644 --- a/src/classes/PMsrHandler.cpp +++ b/src/classes/PMsrHandler.cpp @@ -6074,15 +6074,68 @@ std::string PMsrHandler::GetDKSTheoryString() fTheory[i].fLine.BeginsWith("a ", TString::kIgnoreCase)) { result += args[0].Data(); } else if (fTheory[i].fLine.BeginsWith("simplExpo ", TString::kIgnoreCase) || - fTheory[i].fLine.BeginsWith("se ")) { // se -> se(t,lambda) + fTheory[i].fLine.BeginsWith("se ")) { // se -> se(t, lambda) result += "se(t, "; result += args[0].Data(); result += ")"; + } else if (fTheory[i].fLine.BeginsWith("generExpo ", TString::kIgnoreCase) || + fTheory[i].fLine.BeginsWith("ge ")) { // ge -> ge(t, lambda, beta) + result += "ge(t, "; + result += args[0].Data(); + result += ", "; + result += args[1].Data(); + result += ")"; } else if (fTheory[i].fLine.BeginsWith("simpleGss ", TString::kIgnoreCase) || - fTheory[i].fLine.BeginsWith("sg ")) { // sg -> sg(t,sigma) + fTheory[i].fLine.BeginsWith("sg ")) { // sg -> sg(t, sigma) result += "sg(t, "; result += args[0].Data(); result += ")"; + } else if (fTheory[i].fLine.BeginsWith("statGssKT ", TString::kIgnoreCase) || + fTheory[i].fLine.BeginsWith("stg ")) { // stg -> stg(t, sigma) + + result += "stg(t, "; + result += args[0].Data(); + result += ")"; + } else if (fTheory[i].fLine.BeginsWith("statExpKT ", TString::kIgnoreCase) || + fTheory[i].fLine.BeginsWith("sekt ")) { // sekt -> sekt(t, lambda) + + result += "sekt(t, "; + result += args[0].Data(); + result += ")"; + } else if (fTheory[i].fLine.BeginsWith("combiLGKT ", TString::kIgnoreCase) || + fTheory[i].fLine.BeginsWith("lgkt ")) { // lgkt -> lgkt(t, lambda, sigma) + + result += "lgkt(t, "; + result += args[0].Data(); + result += ", "; + result += args[1].Data(); + result += ")"; + } else if (fTheory[i].fLine.BeginsWith("strKT ", TString::kIgnoreCase) || + fTheory[i].fLine.BeginsWith("skt ")) { // skt -> skt(t, sigma, beta) + + result += "skt(t, "; + result += args[0].Data(); + result += ", "; + result += args[1].Data(); + result += ")"; + } else if (fTheory[i].fLine.BeginsWith("spinGlass ", TString::kIgnoreCase) || + fTheory[i].fLine.BeginsWith("spg ")) { // spg -> spg(t, lambda, gamma, q) + + result += "spg(t, "; + result += args[0].Data(); + result += ", "; + result += args[1].Data(); + result += ", "; + result += args[2].Data(); + result += ")"; + } else if (fTheory[i].fLine.BeginsWith("rdAnisoHf ", TString::kIgnoreCase) || + fTheory[i].fLine.BeginsWith("rahf ")) { // rahf -> rahf(t, nu, lambda) + + result += "rahf(t, "; + result += args[0].Data(); + result += ", "; + result += args[1].Data(); + result += ")"; } else if (fTheory[i].fLine.BeginsWith("TFieldCos ", TString::kIgnoreCase) || fTheory[i].fLine.BeginsWith("tf ")) { // tf -> tf(t, phi (°), nu (MHz)) result += "tf(t, "; @@ -6090,6 +6143,92 @@ std::string PMsrHandler::GetDKSTheoryString() result += ", "; result += args[1].Data(); result += ")"; + } else if (fTheory[i].fLine.BeginsWith("internFld ", TString::kIgnoreCase) || + fTheory[i].fLine.BeginsWith("if ")) { // if -> ifld(t, alpha, phi, nu, lambdaT, lambdaL) + + result += "ifld(t, "; + result += args[0].Data(); + result += ", "; + result += args[1].Data(); + result += ", "; + result += args[2].Data(); + result += ", "; + result += args[3].Data(); + result += ", "; + result += args[4].Data(); + result += ")"; + } else if (fTheory[i].fLine.BeginsWith("Bessel ", TString::kIgnoreCase) || + fTheory[i].fLine.BeginsWith("b ")) { // b -> b(t, phi, nu) + + result += "b(t, "; + result += args[0].Data(); + result += ", "; + result += args[1].Data(); + result += ")"; + } else if (fTheory[i].fLine.BeginsWith("internBsl ", TString::kIgnoreCase) || + fTheory[i].fLine.BeginsWith("ib ")) { // ib -> ib(t, alpha, phi, nu, lambdaT, lambdaL) + + result += "ib(t, "; + result += args[0].Data(); + result += ", "; + result += args[1].Data(); + result += ", "; + result += args[2].Data(); + result += ", "; + result += args[3].Data(); + result += ", "; + result += args[4].Data(); + result += ")"; + } else if (fTheory[i].fLine.BeginsWith("abragam ", TString::kIgnoreCase) || + fTheory[i].fLine.BeginsWith("ab ")) { // ab -> ab(t, sigma, gamma) + result += "ab(t, "; + result += args[0].Data(); + result += ", "; + result += args[1].Data(); + result += ")"; + } else if (fTheory[i].fLine.BeginsWith("staticNKZF ", TString::kIgnoreCase) || + fTheory[i].fLine.BeginsWith("snkzf ")) { // snkzf -> snkzf(t, Deltat0, Rb) + result += "snkzf(t, "; + result += args[0].Data(); + result += ", "; + result += args[1].Data(); + result += ")"; + } else if (fTheory[i].fLine.BeginsWith("staticNKTF ", TString::kIgnoreCase) || + fTheory[i].fLine.BeginsWith("snktf ")) { // snktf -> snktf(t, phi, nu, Delta0, Rb) + + result += "snktf(t, "; + result += args[0].Data(); + result += ", "; + result += args[1].Data(); + result += ", "; + result += args[2].Data(); + result += ", "; + result += args[3].Data(); + result += ")"; + } else if (fTheory[i].fLine.BeginsWith("dynamicNKZF ", TString::kIgnoreCase) || + fTheory[i].fLine.BeginsWith("dnkzf ")) { // dnkzf -> dnkzf(t, Delta0, Rb, nu_c) + + result += "dnkzf(t, "; + result += args[0].Data(); + result += ", "; + result += args[1].Data(); + result += ", "; + result += args[2].Data(); + result += ")"; + } else if (fTheory[i].fLine.BeginsWith("dynamicNKTF ", TString::kIgnoreCase) || + fTheory[i].fLine.BeginsWith("dnktf ")) { // dnktf -> dnktf(t, phi, nu, Delta0, Rb, nu_c) + + result += "dnktf(t, "; + result += args[0].Data(); + result += ", "; + result += args[1].Data(); + result += ", "; + result += args[2].Data(); + result += ", "; + result += args[3].Data(); + result += ", "; + result += args[4].Data(); + result += ")"; } else if (fTheory[i].fLine.BeginsWith("+")) { result.erase(result.end()-3, result.end()); // remove the '*' at the end result += " + "; @@ -6099,6 +6238,11 @@ std::string PMsrHandler::GetDKSTheoryString() } } +/* + cout << "debug> ++++" << endl; + cout << "debug> " << result << endl; + cout << "debug> ++++" << endl; +*/ return result; }