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

(i) fix of missing status init. (ii) changed vector copy evaluation.

Browse Source
This commit is contained in:
suter_a 2023-10-24 21:09:35 +02:00
parent e676d3c045
commit fdeed5dec4
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/musredit_qt5/mupp/PmuppScript.cpp
View File

@ -73,6 +73,7 @@ int PmuppScript::executeScript()
QString cmd; QString cmd;
int status; int status;
for (int i=0; i<fScript.size(); i++) { for (int i=0; i<fScript.size(); i++) {
status = 0;
cmd = fScript.at(i); cmd = fScript.at(i);
if (cmd.startsWith("loadPath")) { if (cmd.startsWith("loadPath")) {
setLoadPath(cmd); setLoadPath(cmd);
@ -637,7 +638,8 @@ int PmuppScript::macro(const QString str, const QString plotFln)
#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0)) #if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
xx = QVector<double>::fromStdVector(fVarHandler[idx].getValues()); xx = QVector<double>::fromStdVector(fVarHandler[idx].getValues());
#else #else
QVector<double> qvec(fVarHandler[idx].getValues().begin(), fVarHandler[idx].getValues().end()); std::vector<double> xVal = fVarHandler[idx].getValues();
QVector<double> qvec(xVal.begin(), xVal.end());
xx = qvec; xx = qvec;
#endif #endif
} }
@ -670,9 +672,11 @@ int PmuppScript::macro(const QString str, const QString plotFln)
yyPosErr = QVector<double>::fromStdVector(fVarHandler[idx].getErrors()); yyPosErr = QVector<double>::fromStdVector(fVarHandler[idx].getErrors());
yyNegErr = QVector<double>::fromStdVector(fVarHandler[idx].getErrors()); yyNegErr = QVector<double>::fromStdVector(fVarHandler[idx].getErrors());
#else #else
QVector<double> qvecV(fVarHandler[idx].getValues().begin(), fVarHandler[idx].getValues().end()); std::vector<double> yVal = fVarHandler[idx].getValues();
QVector<double> qvecV(yVal.begin(), yVal.end());
yy = qvecV; yy = qvecV;
QVector<double> qvecE(fVarHandler[idx].getErrors().begin(), fVarHandler[idx].getErrors().end()); std::vector<double> yErr = fVarHandler[idx].getErrors();
QVector<double> qvecE(yErr.begin(), yErr.end());
yyPosErr = qvecE; yyPosErr = qvecE;
yyNegErr = qvecE; yyNegErr = qvecE;
#endif #endif

10
src/musredit_qt6/mupp/PmuppScript.cpp
View File

@ -73,6 +73,7 @@ int PmuppScript::executeScript()
QString cmd; QString cmd;
int status; int status;
for (int i=0; i<fScript.size(); i++) { for (int i=0; i<fScript.size(); i++) {
status = 0;
cmd = fScript.at(i); cmd = fScript.at(i);
if (cmd.startsWith("loadPath")) { if (cmd.startsWith("loadPath")) {
setLoadPath(cmd); setLoadPath(cmd);
@ -584,7 +585,8 @@ int PmuppScript::macro(const QString str, const QString plotFln)
std::cerr << " This should never happens." << std::endl; std::cerr << " This should never happens." << std::endl;
return -3; return -3;
} }
QVector<double> qvec(fVarHandler[idx].getValues().begin(), fVarHandler[idx].getValues().end()); std::vector<double> xVal = fVarHandler[idx].getValues();
QVector<double> qvec(xVal.begin(), xVal.end());
xx = qvec; xx = qvec;
} }
// get x-axis min/max // get x-axis min/max
@ -611,9 +613,11 @@ int PmuppScript::macro(const QString str, const QString plotFln)
std::cerr << " This should never happens." << std::endl; std::cerr << " This should never happens." << std::endl;
return -3; return -3;
} }
QVector<double> qvecV(fVarHandler[idx].getValues().begin(), fVarHandler[idx].getValues().end()); std::vector<double> yVal = fVarHandler[idx].getValues();
QVector<double> qvecV(yVal.begin(), yVal.end());
yy = qvecV; yy = qvecV;
QVector<double> qvecE(fVarHandler[idx].getErrors().begin(), fVarHandler[idx].getErrors().end()); std::vector<double> yErr = fVarHandler[idx].getErrors();
QVector<double> qvecE(yErr.begin(), yErr.end());
yyPosErr = qvecE; yyPosErr = qvecE;
yyNegErr = qvecE; yyNegErr = qvecE;
} }