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

improved dat-file reading for mupp.

Browse Source
This commit is contained in:
suter_a 2024-07-02 09:26:44 +02:00
parent ebefcf7af9
commit c9fc373862
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/musredit_qt5/mupp/Pmupp.cpp
View File

@ -656,12 +656,17 @@ PmuppCollection PParamDataHandler::ReadColumnParamFile(const QString fln, bool &
param.SetName(headerInfo[i]); param.SetName(headerInfo[i]);
param.SetValue(dval); param.SetValue(dval);
if (i+1 < token.size()) { if (i+1 < token.size()) {
if (headerCode[i+1] == PMUPP_VALUE) { if ((headerCode[i+1] == PMUPP_VALUE) || (headerCode[i+1] == PMUPP_RUN)) {
param.SetNegErr(0.0); param.SetNegErr(0.0);
param.SetPosErr(0.0); param.SetPosErr(0.0);
run.AddParam(param); run.AddParam(param);
param.ResetParam(); param.ResetParam();
} }
} else { // last token
param.SetNegErr(0.0);
param.SetPosErr(0.0);
run.AddParam(param);
param.ResetParam();
} }
} else if (headerCode[i] == PMUPP_POSNEGERR) { } else if (headerCode[i] == PMUPP_POSNEGERR) {
param.SetPosErr(dval); param.SetPosErr(dval);

7
src/musredit_qt6/mupp/Pmupp.cpp
View File

@ -645,12 +645,17 @@ PmuppCollection PParamDataHandler::ReadColumnParamFile(const QString fln, bool &
param.SetName(headerInfo[i]); param.SetName(headerInfo[i]);
param.SetValue(dval); param.SetValue(dval);
if (i+1 < token.size()) { if (i+1 < token.size()) {
if (headerCode[i+1] == PMUPP_VALUE) { if ((headerCode[i+1] == PMUPP_VALUE) || (headerCode[i+1] == PMUPP_RUN)) {
param.SetNegErr(0.0); param.SetNegErr(0.0);
param.SetPosErr(0.0); param.SetPosErr(0.0);
run.AddParam(param); run.AddParam(param);
param.ResetParam(); param.ResetParam();
} }
} else { // last token
param.SetNegErr(0.0);
param.SetPosErr(0.0);
run.AddParam(param);
param.ResetParam();
} }
} else if (headerCode[i] == PMUPP_POSNEGERR) { } else if (headerCode[i] == PMUPP_POSNEGERR) {
param.SetPosErr(dval); param.SetPosErr(dval);