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

some more bits into the direction of musrview

Browse Source
This commit is contained in:
nemu
2008-04-16 14:32:42 +00:00
parent 9105df85e4
commit 499684fc8b
5 changed files with 246 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/classes/PMsrHandler.cpp
View File

@ -1846,6 +1846,13 @@ bool PMsrHandler::HandleStatisticEntry(PMsrLines &lines)
return false;
}
// check if chisq or max.log likelihood
fStatistic.fChisq = true;
for (unsigned int i=0; i<fCommands.size(); i++) {
if (fCommands[i].fLine.Contains("MAX_LIKELIHOOD"))
fStatistic.fChisq = false; // max.log likelihood
}
char str[128];
char date[128];
char time[128];
@ -1865,7 +1872,6 @@ bool PMsrHandler::HandleStatisticEntry(PMsrLines &lines)
}
// extract chisq
if (lines[i].fLine.Contains("chisq =")) {
fStatistic.fChisq = true;
strncpy(str, lines[i].fLine.Data(), sizeof(str));
status = sscanf(str+lines[i].fLine.Index("chisq = ")+8, "%lf", &dval);
if (status == 1) {
@ -1876,7 +1882,6 @@ bool PMsrHandler::HandleStatisticEntry(PMsrLines &lines)
}
// extract maxLH
if (lines[i].fLine.Contains("maxLH =")) {
fStatistic.fChisq = true;
strncpy(str, lines[i].fLine.Data(), sizeof(str));
status = sscanf(str+lines[i].fLine.Index("maxLH = ")+8, "%lf", &dval);
if (status == 1) {
@ -1887,7 +1892,6 @@ bool PMsrHandler::HandleStatisticEntry(PMsrLines &lines)
}
// extract NDF
if (lines[i].fLine.Contains(", NDF =")) {
fStatistic.fChisq = true;
strncpy(str, lines[i].fLine.Data(), sizeof(str));
status = sscanf(str+lines[i].fLine.Index(", NDF = ")+8, "%u", &ival);
if (status == 1) {