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

fixed some minor issue concerning the statistic block.

Browse Source
This commit is contained in:
nemu 2010-07-28 07:18:02 +00:00
parent f4d3b25fc3
commit f5991767fb
1 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/msr2msr.cpp
View File

@ -585,6 +585,46 @@ bool msr2msr_finalize_theory(char *fln, int theoryTag, int noOfAddionalParams)
return true;
}
//--------------------------------------------------------------------------
/**
* <p>Filters out the old chi-square related informations. And sets them according
* to the new scheme.
*
* <b>return:</b>
* - true if everything went smooth
* - false otherwise
*
* \param str msr-file statistic block line
*/
bool msr2msr_statistic(char *str) {
bool success = true;
char *pstr;
int status;
double chisq, chisqred;
if (strstr(str, " chi")) {
pstr = strstr(str, "abs = ");
if (pstr != 0) {
status = sscanf(pstr, "abs = %lf", &chisq);
if (status != 1) {
success = false;
}
}
pstr = strstr(str, "norm = ");
if (pstr != 0) {
status = sscanf(pstr, "norm = %lf", &chisqred);
if (status != 1) {
success = false;
}
}
if (success) {
sprintf(str, " chisq = %lf, NDF = %d, chisq/NDF = %lf", chisq, static_cast<int>(chisq/chisqred), chisqred);
}
}
return success;
}
//--------------------------------------------------------------------------
/**
* <p>msr2msr is needed to convert old WKM msr-files to musrfit msr-files. Eventhough the syntax is <b>very</b>
@ -636,6 +676,8 @@ int main(int argc, char *argv[])
tag = MSR_TAG_RUN;
} else if (strstr(str, "THEORY")) {
tag = MSR_TAG_THEORY;
} else if (strstr(str, "STATISTIC")) {
tag = MSR_TAG_STATISTIC;
}
switch (tag) {
@ -648,6 +690,9 @@ int main(int argc, char *argv[])
case MSR_TAG_RUN:
success = msr2msr_run(str);
break;
case MSR_TAG_STATISTIC:
success = msr2msr_statistic(str);
break;
default:
break;
}