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

fixed wrong chisq output in musrview if expected chisq ispresent

Browse Source
This commit is contained in:
suter_a
2012-09-24 11:02:06 +00:00
parent 4ad5b37441
commit 6c0fdb6ab8
3 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/classes/PMsrHandler.cpp
View File

@ -3928,13 +3928,23 @@ Bool_t PMsrHandler::HandleStatisticEntry(PMsrLines &lines)
}
// extract chisq
if (lines[i].fLine.Contains("chisq =")) {
fStatistic.fValid = true;
strncpy(str, lines[i].fLine.Data(), sizeof(str));
status = sscanf(str+lines[i].fLine.Index("chisq = ")+8, "%lf", &dval);
if (status == 1) {
fStatistic.fMin = dval;
} else {
fStatistic.fMin = -1.0;
if (lines[i].fLine.Contains("expected")) { // expected chisq
strncpy(str, lines[i].fLine.Data(), sizeof(str));
status = sscanf(str+lines[i].fLine.Index("chisq = ")+8, "%lf", &dval);
if (status == 1) {
fStatistic.fMinExpected = dval;
} else {
fStatistic.fMinExpected = -1.0;
}
} else { // chisq
fStatistic.fValid = true;
strncpy(str, lines[i].fLine.Data(), sizeof(str));
status = sscanf(str+lines[i].fLine.Index("chisq = ")+8, "%lf", &dval);
if (status == 1) {
fStatistic.fMin = dval;
} else {
fStatistic.fMin = -1.0;
}
}
}
// extract maxLH

1
src/musrfit_startup.xml
View File

@ -13,6 +13,7 @@
<data_path>/afs/psi.ch/project/bulkmusr/data/gpd</data_path>
<data_path>/afs/psi.ch/project/bulkmusr/data/ltf</data_path>
<data_path>/afs/psi.ch/project/bulkmusr/data/alc</data_path>
<data_path>/afs/psi.ch/project/bulkmusr/data/hifi</data_path>
<write_per_run_block_chisq>n</write_per_run_block_chisq>
<fourier_settings>
<units>Gauss</units>