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

a more coherent error message handling.

Browse Source
This commit is contained in:
suter_a
2018-07-02 15:13:49 +02:00
parent 07ad8205c8
commit a3ddd07a9e
4 changed files with 65 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -180,9 +180,10 @@ void PParamDataHandler::NewCollection(const QString name)
* @param collectionName * @param collectionName
* @param arg * @param arg
* @param workDir * @param workDir
* @param errorMsg
* @return * @return
*/ */
bool PParamDataHandler::analyzeFileList(const QStringList &fln, QString &collectionName, QStringList &arg, QString &workDir) bool PParamDataHandler::analyzeFileList(const QStringList &fln, QString &collectionName, QStringList &arg, QString &workDir, QString &errorMsg)
{ {
// 1) check all the msr-files have the same structure: <runNo><extension>.msr with <extension> the same // 1) check all the msr-files have the same structure: <runNo><extension>.msr with <extension> the same
// for all msr-files present. // for all msr-files present.
@ -205,16 +206,16 @@ bool PParamDataHandler::analyzeFileList(const QStringList &fln, QString &collect
// get index of position between <run> and <extenstion> // get index of position between <run> and <extenstion>
pos0 = flnCurrent.indexOf("_"); pos0 = flnCurrent.indexOf("_");
if (pos0 == -1) { if (pos0 == -1) {
QMessageBox::critical(0, "ERROR", "msr-file name has a structure which cannot be handled.\n\ errorMsg = "msr-file name has a structure which cannot be handled.\n\
It should be <run><extension>, where <run> is the run number\n\ It should be <run><extension>, where <run> is the run number\n\
and <extension> needs to start with a '_'."); and <extension> needs to start with a '_'.";
return false; return false;
} }
pos1 = flnCurrent.lastIndexOf("."); pos1 = flnCurrent.lastIndexOf(".");
if ((pos1 == -1) || (pos1 < pos0)) { if ((pos1 == -1) || (pos1 < pos0)) {
QMessageBox::critical(0, "ERROR", "msr-file name has a structure which cannot be handled.\n\ errorMsg = "msr-file name has a structure which cannot be handled.\n\
It should be <run><extension>.msr, where <run> is the run number\n\ It should be <run><extension>.msr, where <run> is the run number\n\
and <extension> needs to start with a '_'."); and <extension> needs to start with a '_'.";
return false; return false;
} }
@ -222,7 +223,7 @@ and <extension> needs to start with a '_'.");
runStr = flnCurrent.left(pos0); runStr = flnCurrent.left(pos0);
runStr.toInt(&ok); // output not needed, only check that it is a number runStr.toInt(&ok); // output not needed, only check that it is a number
if (!ok) { if (!ok) {
QMessageBox::critical(0, "ERROR", QString("Found run number string '%1' which is not a number.").arg(runStr)); errorMsg = QString("Found run number string '%1' which is not a number.").arg(runStr);
return false; return false;
} }
run << runStr; run << runStr;
@ -235,7 +236,7 @@ and <extension> needs to start with a '_'.");
// make sure all extensions are identical // make sure all extensions are identical
if ((i>0) && (ext != extCurrent)) { if ((i>0) && (ext != extCurrent)) {
QMessageBox::critical(0, "ERROR", "Currently mixed msr-file extensions cannot be handled."); errorMsg = "Currently mixed msr-file extensions cannot be handled.";
return false; return false;
} }
} }
@ -255,9 +256,10 @@ and <extension> needs to start with a '_'.");
/** /**
* @brief PParamDataHandler::ReadParamFile * @brief PParamDataHandler::ReadParamFile
* @param fln * @param fln
* @param errorMsg
* @return * @return
*/ */
bool PParamDataHandler::ReadParamFile(const QStringList fln) bool PParamDataHandler::ReadParamFile(const QStringList fln, QString &errorMsg)
{ {
bool valid = true; bool valid = true;
PmuppRun run; PmuppRun run;
@ -278,7 +280,7 @@ bool PParamDataHandler::ReadParamFile(const QStringList fln)
// analyse file name list to get the appropriate parts for msr2data // analyse file name list to get the appropriate parts for msr2data
QStringList arg; QStringList arg;
QString workDir("./"); QString workDir("./");
if (!analyzeFileList(fln, collName, arg, workDir)) if (!analyzeFileList(fln, collName, arg, workDir, errorMsg))
return false; return false;
// make sure that the system environment variables are properly set // make sure that the system environment variables are properly set
@ -295,7 +297,7 @@ bool PParamDataHandler::ReadParamFile(const QStringList fln)
// try ROOTSYS // try ROOTSYS
cmd = env.value("ROOTSYS") + QString("/bin/msr2data"); cmd = env.value("ROOTSYS") + QString("/bin/msr2data");
if (!QFile::exists(cmd)) { if (!QFile::exists(cmd)) {
QMessageBox::critical(0, "ERROR", "cannot find msr2data need here."); errorMsg = "cannot find msr2data need here.";
return false; return false;
} }
} }
@ -306,18 +308,13 @@ bool PParamDataHandler::ReadParamFile(const QStringList fln)
fProc->setWorkingDirectory(workDir); fProc->setWorkingDirectory(workDir);
fProc->start(cmd, arg); fProc->start(cmd, arg);
if (!fProc->waitForFinished()) { if (!fProc->waitForFinished()) {
// error handling errorMsg = QString(tr("Could not execute the output command: ")+cmd[0]);
QString msg(tr("Could not execute the output command: ")+cmd[0]);
QMessageBox::critical( 0,
tr("Fatal error"),
msg,
tr("Quit") );
return false; return false;
} }
// since the db-file should now be present, just load it // since the db-file should now be present, just load it
collection = ReadDbFile(pathName, valid); collection = ReadDbFile(pathName, valid, errorMsg);
if (!valid) { if (!valid) {
cerr << endl; cerr << endl;
cerr << "----" << endl; cerr << "----" << endl;
cerr << "**ERROR** read db-file failure (" << pathName.toLatin1().data() << "." << endl; cerr << "**ERROR** read db-file failure (" << pathName.toLatin1().data() << "." << endl;
@ -331,21 +328,18 @@ bool PParamDataHandler::ReadParamFile(const QStringList fln)
} else { // db-, dat-file list } else { // db-, dat-file list
for (int i=0; i<fln.size(); i++) { for (int i=0; i<fln.size(); i++) {
if (fln[i].endsWith(".db")) { if (fln[i].endsWith(".db")) {
collection = ReadDbFile(fln[i], valid); collection = ReadDbFile(fln[i], valid, errorMsg);
if (!valid) { if (!valid) {
cerr << endl;
cerr << "----" << endl;
cerr << "**ERROR** read db-file failure." << endl;
cerr << "----" << endl;
return false; return false;
} }
if (!fln[i].startsWith("/")) { // file name only, or relative path if (!fln[i].startsWith("/")) { // file name only, or relative path
if (fln[i].startsWith("..")) { // relative path if (fln[i].startsWith("..")) { // relative path
int idx = fln[i].lastIndexOf("/"); int idx = fln[i].lastIndexOf("/");
if (idx == -1) { // should never happen if (idx == -1) { // should never happen
errorMsg = QString("found '%1' which shouldn't be possible!").arg(fln[i]);
cerr << endl; cerr << endl;
cerr << "----" << endl; cerr << "----" << endl;
cerr << "**ERROR** found '" << fln[i].toLatin1().data() << "' which shouldn't be possible" << endl; cerr << "**ERROR** " << errorMsg.toLatin1().data() << endl;
cerr << "----" << endl; cerr << "----" << endl;
return false; return false;
} }
@ -369,19 +363,16 @@ bool PParamDataHandler::ReadParamFile(const QStringList fln)
collection.SetName(collName); collection.SetName(collName);
fCollection.push_back(collection); fCollection.push_back(collection);
} else if (fln[i].endsWith(".dat") || fln[i].endsWith(".txt")) { } else if (fln[i].endsWith(".dat") || fln[i].endsWith(".txt")) {
collection = ReadColumnParamFile(fln[i], valid); collection = ReadColumnParamFile(fln[i], valid, errorMsg);
if (!valid) { if (!valid) {
cerr << endl;
cerr << "----" << endl;
cerr << "**ERROR** read db-file failure." << endl;
cerr << "----" << endl;
return false; return false;
} }
fCollection.push_back(collection); fCollection.push_back(collection);
} else { } else {
errorMsg = QString("unkown file type for ")+fln[i];
cerr << endl; cerr << endl;
cerr << "*********" << endl; cerr << "*********" << endl;
cerr << "**ERROR** unkown file type for " << fln[i].toLatin1().data() << endl; cerr << "**ERROR** " << errorMsg.toLatin1().data() << endl;
cerr << "*********" << endl; cerr << "*********" << endl;
return false; return false;
} }
@ -398,17 +389,20 @@ bool PParamDataHandler::ReadParamFile(const QStringList fln)
/** /**
* @brief PParamDataHandler::ReadDbFile * @brief PParamDataHandler::ReadDbFile
* @param fln * @param fln
* @param valid
* @param errorMsg
* @return * @return
*/ */
PmuppCollection PParamDataHandler::ReadDbFile(const QString fln, bool &valid) PmuppCollection PParamDataHandler::ReadDbFile(const QString fln, bool &valid, QString &errorMsg)
{ {
PmuppCollection collection; PmuppCollection collection;
PmuppRun run; PmuppRun run;
QFile file(fln); QFile file(fln);
if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) { if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
errorMsg = QString("couldn't open ") + fln;
cerr << endl; cerr << endl;
cerr << "----" << endl; cerr << "----" << endl;
cerr << "**ERROR** couldn't open " << fln.toLatin1().data() << endl; cerr << "**ERROR** " << errorMsg.toLatin1().data() << endl;
cerr << "----" << endl; cerr << "----" << endl;
valid = false; valid = false;
return collection; return collection;
@ -434,9 +428,10 @@ PmuppCollection PParamDataHandler::ReadDbFile(const QString fln, bool &valid)
token.clear(); token.clear();
token = line.split(",", QString::SkipEmptyParts); token = line.split(",", QString::SkipEmptyParts);
if (token.size()==0) { if (token.size()==0) {
errorMsg = fln + QString(". No parameter tokens.");
cerr << endl; cerr << endl;
cerr << "----" << endl; cerr << "----" << endl;
cerr << "**ERROR** in" << fln.toLatin1().data() <<". No parameter tokens." << endl; cerr << "**ERROR** in " << errorMsg.toLatin1().data() << endl;
cerr << "----" << endl; cerr << "----" << endl;
file.close(); file.close();
valid = false; valid = false;
@ -453,14 +448,13 @@ PmuppCollection PParamDataHandler::ReadDbFile(const QString fln, bool &valid)
// check that the number of parameters is the same for all runs // check that the number of parameters is the same for all runs
if (collection.GetNoOfRuns() > 0) { if (collection.GetNoOfRuns() > 0) {
if (collection.GetRun(0).GetNoOfParam() != run.GetNoOfParam()) { if (collection.GetRun(0).GetNoOfParam() != run.GetNoOfParam()) {
errorMsg = fln + QString(".\n");
errorMsg += QString(" first run (#%1) has %2 params.\n").arg(collection.GetRun(0).GetNumber()).arg(collection.GetRun(0).GetNoOfParam());
errorMsg += QString(" current run (#%1) has %2 params.\n").arg(run.GetNumber()).arg(run.GetNoOfParam());
errorMsg += QString(" Inspect your db-file!");
cerr << endl; cerr << endl;
cerr << "----" << endl; cerr << "----" << endl;
cerr << "**ERROR** in " << fln.toLatin1().data() << "." << endl; cerr << "**ERROR** in " << errorMsg.toLatin1().data() << endl;
cerr << " first run (#" << collection.GetRun(0).GetNumber() << ") has ";
cerr << collection.GetRun(0).GetNoOfParam() << " params." << endl;
cerr << " current run (#" << run.GetNumber() << ") has ";
cerr << run.GetNoOfParam() << " params!" << endl;
cerr << "Inspect your db-file!" << endl;
cerr << "----" << endl; cerr << "----" << endl;
file.close(); file.close();
valid = false; valid = false;
@ -551,9 +545,11 @@ PmuppCollection PParamDataHandler::ReadDbFile(const QString fln, bool &valid)
/** /**
* @brief PParamDataHandler::ReadColumnParamFile * @brief PParamDataHandler::ReadColumnParamFile
* @param fln * @param fln
* @param valid
* @param errorMsg
* @return * @return
*/ */
PmuppCollection PParamDataHandler::ReadColumnParamFile(const QString fln, bool &valid) PmuppCollection PParamDataHandler::ReadColumnParamFile(const QString fln, bool &valid, QString &errorMsg)
{ {
PmuppCollection collection; PmuppCollection collection;
PmuppRun run; PmuppRun run;
@ -561,9 +557,10 @@ PmuppCollection PParamDataHandler::ReadColumnParamFile(const QString fln, bool &
QFile file(fln); QFile file(fln);
if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) { if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
errorMsg = QString("couldn't open ")+fln;
cerr << endl; cerr << endl;
cerr << "----" << endl; cerr << "----" << endl;
cerr << "**ERROR** couldn't open " << fln.toLatin1().data() << endl; cerr << "**ERROR** " << errorMsg.toLatin1().data() << endl;
cerr << "----" << endl; cerr << "----" << endl;
valid = false; valid = false;
return collection; return collection;
@ -611,9 +608,10 @@ PmuppCollection PParamDataHandler::ReadColumnParamFile(const QString fln, bool &
token = line.split(QRegExp("\\s+"), QString::SkipEmptyParts); token = line.split(QRegExp("\\s+"), QString::SkipEmptyParts);
// paranoia check // paranoia check
if (token.size() != headerInfo.size()) { if (token.size() != headerInfo.size()) {
errorMsg = QString("size mismatch between header and parameter int line: %1 (header=%2 / param=%3)").arg(lineNo).arg(headerInfo.size()).arg(token.size());
cerr << endl; cerr << endl;
cerr << "----" << endl; cerr << "----" << endl;
cerr << "**ERROR** size mismatch between header and parameter int line: " << lineNo << " (header=" << headerInfo.size() << " / param=" << token.size() << ")." << endl; cerr << "**ERROR** " << errorMsg.toLatin1().data() << endl;
cerr << "----" << endl; cerr << "----" << endl;
valid = false; valid = false;
file.close(); file.close();
@ -625,9 +623,10 @@ PmuppCollection PParamDataHandler::ReadColumnParamFile(const QString fln, bool &
else else
dval = token[i].toDouble(&ok); 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);
cerr << endl; cerr << endl;
cerr << "----" << endl; cerr << "----" << endl;
cerr << "**ERROR** unrecognized token ('" << token[i].toLatin1().data() << "') in line " << line.toLatin1().data() << "(line number: " << lineNo << ")" << endl; cerr << "**ERROR** " << errorMsg.toLatin1().data() << endl;
cerr << "----" << endl; cerr << "----" << endl;
valid = false; valid = false;
file.close(); file.close();

8
src/musredit_qt5/mupp/Pmupp.h
View File

@ -113,9 +113,9 @@ class PParamDataHandler : public QObject {
int GetNoOfCollections() { return fCollection.size(); } int GetNoOfCollections() { return fCollection.size(); }
void NewCollection(const QString name); void NewCollection(const QString name);
bool ReadParamFile(const QStringList fln); bool ReadParamFile(const QStringList fln, QString &errorMsg);
PmuppCollection ReadDbFile(const QString fln, bool &valid); PmuppCollection ReadDbFile(const QString fln, bool &valid, QString &errorMsg);
PmuppCollection ReadColumnParamFile(const QString fln, bool &valid); PmuppCollection ReadColumnParamFile(const QString fln, bool &valid, QString &errorMsg);
PmuppCollection GetCollection(const int idx, bool &valid); PmuppCollection GetCollection(const int idx, bool &valid);
PmuppCollection GetCollection(const QString name, bool &valid); PmuppCollection GetCollection(const QString name, bool &valid);
@ -140,7 +140,7 @@ class PParamDataHandler : public QObject {
QProcess *fProc; QProcess *fProc;
QVector<PmuppCollection> fCollection; QVector<PmuppCollection> fCollection;
bool analyzeFileList(const QStringList &fln, QString &collectionName, QStringList &arg, QString &workDir); bool analyzeFileList(const QStringList &fln, QString &collectionName, QStringList &arg, QString &workDir, QString &errorMsg);
private slots: private slots:
void readFromStdOut(); void readFromStdOut();

22
src/musredit_qt5/mupp/PmuppGui.cpp
View File

@ -223,8 +223,9 @@ PmuppGui::PmuppGui( QStringList fln, QWidget *parent, Qt::WindowFlags f )
QString collName = QString("collName0"); QString collName = QString("collName0");
fParamDataHandler->NewCollection(collName); fParamDataHandler->NewCollection(collName);
} }
if (!fParamDataHandler->ReadParamFile(fln)) { QString errorMsg("");
// parameter file(s) is/are not valid if (!fParamDataHandler->ReadParamFile(fln, errorMsg)) {
QMessageBox::critical(this, "ERROR", errorMsg);
} else { } else {
dataAtStartup = true; // delay to deal with the data sets until the GUI is ready to do so dataAtStartup = true; // delay to deal with the data sets until the GUI is ready to do so
} }
@ -571,7 +572,10 @@ void PmuppGui::fileOpen()
return; return;
} }
fParamDataHandler->ReadParamFile(list); QString errorMsg("");
if (!fParamDataHandler->ReadParamFile(list, errorMsg)) {
QMessageBox::critical(this, "ERROR", errorMsg);
}
} }
//---------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------
@ -817,17 +821,21 @@ void PmuppGui::refresh()
PmuppCollection coll; PmuppCollection coll;
bool ok=false; bool ok=false;
if (pathName.endsWith(".db")) { if (pathName.endsWith(".db")) {
coll = fParamDataHandler->ReadDbFile(pathName, ok); QString errorMsg("");
coll = fParamDataHandler->ReadDbFile(pathName, ok, errorMsg);
if (!ok) { if (!ok) {
QMessageBox::critical(this, "ERROR - REFRESH", QMessageBox::critical(this, "ERROR - REFRESH",
QString("Couldn't refresh %1\nFile corrupted?!").arg(fParamDataHandler->GetCollection(collIdx)->GetName())); QString("Couldn't refresh %1\nFile corrupted?!\n").arg(fParamDataHandler->GetCollection(collIdx)->GetName())+
errorMsg);
return; return;
} }
} else if (pathName.endsWith(".dat")) { } else if (pathName.endsWith(".dat")) {
coll = fParamDataHandler->ReadColumnParamFile(pathName, ok); QString errorMsg("");
coll = fParamDataHandler->ReadColumnParamFile(pathName, ok, errorMsg);
if (!ok) { if (!ok) {
QMessageBox::critical(this, "ERROR - REFRESH", QMessageBox::critical(this, "ERROR - REFRESH",
QString("Couldn't refresh %1\nFile corrupted?!").arg(fParamDataHandler->GetCollection(collIdx)->GetName())); QString("Couldn't refresh %1\nFile corrupted?!\n").arg(fParamDataHandler->GetCollection(collIdx)->GetName())+
errorMsg);
return; return;
} }
} else { } else {

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

@ -204,7 +204,8 @@ int PmuppScript::loadCollection(const QString str)
QStringList flnList; QStringList flnList;
flnList << fln; flnList << fln;
fParamDataHandler->ReadParamFile(flnList); QString errorMsg("");
fParamDataHandler->ReadParamFile(flnList, errorMsg);
return 0; return 0;
} }