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

shift map and function offset from 1e3/2e3 to 1e4/2e4. Fixed parameter pad problem with truncated numbers

Browse Source
This commit is contained in:
nemu 2008-06-10 05:13:19 +00:00
parent 1c44bc4f0e
commit 180ced9223
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/classes/PMusrCanvas.cpp
View File

@ -316,9 +316,9 @@ void PMusrCanvas::UpdateParamTheoryPad()
str += " ";
// parameter value
if (round(param[i].fValue)-param[i].fValue==0)
sprintf(cnum, "%.1lg", param[i].fValue);
sprintf(cnum, "%.1lf", param[i].fValue);
else
sprintf(cnum, "%.6lg", param[i].fValue);
sprintf(cnum, "%.6lf", param[i].fValue);
str += cnum;
for (int j=0; j<9-(int)strlen(cnum); j++) // fill spaces
str += " ";
@ -332,21 +332,21 @@ void PMusrCanvas::UpdateParamTheoryPad()
if ((fabs(fabs(param[i].fStep) - param[i].fPosError) < 0.1*fabs(param[i].fStep)) &&
(fabs(fabs(param[i].fStep) - param[i].fPosError) < 0.1*param[i].fPosError)) {
if (round(err)-err==0)
sprintf(cnum, "%.1lg", err);
sprintf(cnum, "%.1lf", err);
else
sprintf(cnum, "%.6lg", err);
sprintf(cnum, "%.6lf", err);
} else {
if (round(err)-err==0)
sprintf(cnum, "%.1lg!!", err);
sprintf(cnum, "%.1lf!!", err);
else
sprintf(cnum, "%.6lg!!", err);
sprintf(cnum, "%.6lf!!", err);
}
str += cnum;
} else { // minos was not used
if (round(param[i].fStep)-param[i].fStep==0)
sprintf(cnum, "%.1lg", param[i].fStep);
sprintf(cnum, "%.1lf", param[i].fStep);
else
sprintf(cnum, "%.6lg", param[i].fStep);
sprintf(cnum, "%.6lf", param[i].fStep);
str += cnum;
}
ypos = 0.925-i*0.025;

4
src/include/PMusr.h
View File

@ -89,8 +89,8 @@ using namespace std;
//-------------------------------------------------------------
// map and fun offsets for parameter parsing
#define MSR_PARAM_MAP_OFFSET 1000
#define MSR_PARAM_FUN_OFFSET 2000
#define MSR_PARAM_MAP_OFFSET 10000
#define MSR_PARAM_FUN_OFFSET 20000
//-------------------------------------------------------------
/**