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

improved dat file read routine for mupp for the case columns are added after RUN.

Browse Source
This commit is contained in:
suter_a 2022-12-21 15:07:52 +01:00
parent f22b16876f
commit 39cf9854db
2 changed files with 24 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -586,7 +586,6 @@ PmuppCollection PParamDataHandler::ReadColumnParamFile(const QString fln, bool &
QStringList token; QStringList token;
bool done = false, ok; bool done = false, ok;
double dval = 0; double dval = 0;
int ival;
PmuppParam param; PmuppParam param;
run.SetName(fln); run.SetName(fln);
@ -641,10 +640,7 @@ PmuppCollection PParamDataHandler::ReadColumnParamFile(const QString fln, bool &
return collection; return collection;
} }
for (int i=0; i<token.size(); i++) { for (int i=0; i<token.size(); i++) {
if (headerCode[i] == PMUPP_RUN) dval = token[i].toDouble(&ok);
ival = token[i].toInt(&ok);
else
dval = token[i].toDouble(&ok);
if (!ok) { if (!ok) {
errorMsg = QString("unrecognized token ('%1') in line %2 (line number: %3)").arg(token[i].toLatin1().data()).arg(line.toLatin1().data()).arg(lineNo); errorMsg = QString("unrecognized token ('%1') in line %2 (line number: %3)").arg(token[i].toLatin1().data()).arg(line.toLatin1().data()).arg(lineNo);
std::cerr << std::endl; std::cerr << std::endl;
@ -680,20 +676,19 @@ PmuppCollection PParamDataHandler::ReadColumnParamFile(const QString fln, bool &
param.ResetParam(); param.ResetParam();
} else if (headerCode[i] == PMUPP_RUN) { } else if (headerCode[i] == PMUPP_RUN) {
param.ResetParam(); param.ResetParam();
run.SetNumber(ival); run.SetNumber((int)dval);
run.SetName(QString("%1").arg(ival)); run.SetName(QString("%1").arg((int)dval));
QString collName("");
int pos = fln.lastIndexOf("/");
if (pos == -1)
collName = fln;
else
collName = fln.right(fln.length()-pos-1);
collection.SetName(collName);
collection.AddRun(run);
run.Clear();
} }
} }
QString collName("");
int pos = fln.lastIndexOf("/");
if (pos == -1)
collName = fln;
else
collName = fln.right(fln.length()-pos-1);
collection.SetName(collName);
collection.AddRun(run);
run.Clear();
} }
file.close(); file.close();

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

@ -583,7 +583,6 @@ PmuppCollection PParamDataHandler::ReadColumnParamFile(const QString fln, bool &
QStringList token; QStringList token;
bool done = false, ok; bool done = false, ok;
double dval = 0; double dval = 0;
int ival;
PmuppParam param; PmuppParam param;
run.SetName(fln); run.SetName(fln);
@ -630,10 +629,7 @@ PmuppCollection PParamDataHandler::ReadColumnParamFile(const QString fln, bool &
return collection; return collection;
} }
for (int i=0; i<token.size(); i++) { for (int i=0; i<token.size(); i++) {
if (headerCode[i] == PMUPP_RUN) dval = token[i].toDouble(&ok);
ival = token[i].toInt(&ok);
else
dval = token[i].toDouble(&ok);
if (!ok) { if (!ok) {
errorMsg = QString("unrecognized token ('%1') in line %2 (line number: %3)").arg(token[i].toLatin1().data()).arg(line.toLatin1().data()).arg(lineNo); errorMsg = QString("unrecognized token ('%1') in line %2 (line number: %3)").arg(token[i].toLatin1().data()).arg(line.toLatin1().data()).arg(lineNo);
std::cerr << std::endl; std::cerr << std::endl;
@ -669,20 +665,19 @@ PmuppCollection PParamDataHandler::ReadColumnParamFile(const QString fln, bool &
param.ResetParam(); param.ResetParam();
} else if (headerCode[i] == PMUPP_RUN) { } else if (headerCode[i] == PMUPP_RUN) {
param.ResetParam(); param.ResetParam();
run.SetNumber(ival); run.SetNumber((int)dval);
run.SetName(QString("%1").arg(ival)); run.SetName(QString("%1").arg((int)dval));
QString collName("");
int pos = fln.lastIndexOf("/");
if (pos == -1)
collName = fln;
else
collName = fln.right(fln.length()-pos-1);
collection.SetName(collName);
collection.AddRun(run);
run.Clear();
} }
} }
QString collName("");
int pos = fln.lastIndexOf("/");
if (pos == -1)
collName = fln;
else
collName = fln.right(fln.length()-pos-1);
collection.SetName(collName);
collection.AddRun(run);
run.Clear();
} }
file.close(); file.close();