LMU/musrfit
5
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases 4 Activity

added the function string mmsetf for DKS.

Browse Source
This commit is contained in:
suter_a
2016-04-25 12:16:56 +02:00
parent 4dc36ffbae
commit 71fbce110b
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/classes/PMsrHandler.cpp
View File

@@ -5880,9 +5880,10 @@ void PMsrHandler::CheckMaxLikelihood()
{ {
if (!fStatistic.fChisq) { if (!fStatistic.fChisq) {
for (UInt_t i=0; i<fRuns.size(); i++) { for (UInt_t i=0; i<fRuns.size(); i++) {
if ((fRuns[i].GetFitType() != MSR_FITTYPE_SINGLE_HISTO) && (fGlobal.GetFitType() != MSR_FITTYPE_SINGLE_HISTO)) { if ((fRuns[i].GetFitType() != MSR_FITTYPE_SINGLE_HISTO) && (fGlobal.GetFitType() != MSR_FITTYPE_SINGLE_HISTO) &&
(fRuns[i].GetFitType() != MSR_FITTYPE_MU_MINUS) && (fGlobal.GetFitType() != MSR_FITTYPE_MU_MINUS)) {
cerr << endl << ">> PMsrHandler::CheckMaxLikelihood: **WARNING**: Maximum Log Likelihood Fit is only implemented"; cerr << endl << ">> PMsrHandler::CheckMaxLikelihood: **WARNING**: Maximum Log Likelihood Fit is only implemented";
cerr << endl << ">> for Single Histogram Fit. Will fall back to Chi Square Fit."; cerr << endl << ">> for Single Histogram and Mu Minus Fits. Will fall back to Chi Square Fit.";
cerr << endl << endl; cerr << endl << endl;
fStatistic.fChisq = true; fStatistic.fChisq = true;
break; break;
@@ -6231,6 +6232,22 @@ std::string PMsrHandler::GetDKSTheoryString()
result += ", "; result += ", ";
result += args[4].Data(); result += args[4].Data();
result += ")"; result += ")";
} else if (fTheory[i].fLine.BeginsWith("muMinusExpTF ", TString::kIgnoreCase) ||
fTheory[i].fLine.BeginsWith("mmsetf ")) { // mmsetf -> mmsetf(t, N0, tau, A, lambda, phi, nu)
result += "mmsetf(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 += ", ";
result += args[5].Data();
result += ")";
} else if (fTheory[i].fLine.BeginsWith("+")) { } else if (fTheory[i].fLine.BeginsWith("+")) {
result.erase(result.end()-3, result.end()); // remove the '*' at the end result.erase(result.end()-3, result.end()); // remove the '*' at the end
result += " + "; result += " + ";