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

moved musrWiz.log to /home/suter_a/.musrfit/musredit

Browse Source
This commit is contained in:
suter_a 2017-04-03 18:17:38 +02:00
parent f906c81448
commit 9cad7580b7
2 changed files with 3246 additions and 3232 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/musredit_qt5/musrWiz/musrWiz.cpp
View File

@ -37,7 +37,7 @@ void musrWiz_syntax()
std::cout << " --debug 0 : dump's the instrument definition(s) at startup." << std::endl; std::cout << " --debug 0 : dump's the instrument definition(s) at startup." << std::endl;
std::cout << " --debug 1 : dump's the musrfit functions at startup." << std::endl; std::cout << " --debug 1 : dump's the musrfit functions at startup." << std::endl;
std::cout << " --debug 2 : dump's the musrfit functions and instrument definition(s) at startup." << std::endl; std::cout << " --debug 2 : dump's the musrfit functions and instrument definition(s) at startup." << std::endl;
std::cout << " --log : writes a log-file '.musrWiz.log' which contains the path-file-name of" << std::endl; std::cout << " --log : writes a log-file 'musrWiz.log' which contains the path-file-name of" << std::endl;
std::cout << " the created msr-file." << std::endl; std::cout << " the created msr-file." << std::endl;
std::cout << " --help : shows this help." << std::endl << std::endl; std::cout << " --help : shows this help." << std::endl << std::endl;
} }
@ -94,23 +94,25 @@ int main(int argc, char *argv[])
if (result == 1) { // if everything went fine up to this point if (result == 1) { // if everything went fine up to this point
// check if a log-file shall be written // check if a log-file shall be written
QProcessEnvironment procEnv = QProcessEnvironment::systemEnvironment();
QString pathName = procEnv.value("HOME", "");
pathName += "/.musrfit/musredit/musrWiz.log";
if (logFile) { if (logFile) {
std::ofstream fout(".musrWiz.log", std::ofstream::out); std::ofstream fout(pathName.toLatin1().data(), std::ofstream::out);
fout << "path-file-name: " << info->getMsrPathName().toLatin1().data() << "/" << info->getMsrFileName().toLatin1().data() << std::endl; fout << "path-file-name: " << info->getMsrPathName().toLatin1().data() << "/" << info->getMsrFileName().toLatin1().data() << std::endl;
fout.close(); fout.close();
} }
// check if musrt0 shall be called. If the option --log is set, only add musrt0 flag to in the .musrWiz.log file // check if musrt0 shall be called. If the option --log is set, only add musrt0 flag to in the musrWiz.log file
if (info->getT0Tag() == T0_FROM_MUSR_T0) { if (info->getT0Tag() == T0_FROM_MUSR_T0) {
if (logFile) { if (logFile) {
std::ofstream fout(".musrWiz.log", std::ofstream::app); std::ofstream fout(pathName.toLatin1().data(), std::ofstream::app);
fout << "musrt0-tag: yes" << std::endl; fout << "musrt0-tag: yes" << std::endl;
fout.close(); fout.close();
} else { } else {
QProcessEnvironment pe = QProcessEnvironment::systemEnvironment(); QString musrt0Path = procEnv.value("MUSRFITPATH", "??");
QString musrt0Path = pe.value("MUSRFITPATH", "??");
if (musrt0Path == "??") { // not found hence try ROOTSYS if (musrt0Path == "??") { // not found hence try ROOTSYS
musrt0Path = pe.value("ROOTSYS", "??"); musrt0Path = procEnv.value("ROOTSYS", "??");
if (musrt0Path != "??") { if (musrt0Path != "??") {
musrt0Path += "/bin"; musrt0Path += "/bin";
} }

16
src/musredit_qt5/musredit/PTextEdit.cpp
View File

@ -2751,9 +2751,14 @@ void PTextEdit::exitStatusMusrWiz(int exitCode, QProcess::ExitStatus exitStatus)
return; return;
// read .musrWiz.log // read .musrWiz.log
ifstream fin(".musrWiz.log", ifstream::in); QProcessEnvironment procEnv = QProcessEnvironment::systemEnvironment();
QString pathName = procEnv.value("HOME", "");
pathName += "/.musrfit/musredit/musrWiz.log";
QString errMsg;
ifstream fin(pathName.toLatin1().data(), ifstream::in);
if (!fin.is_open()) { if (!fin.is_open()) {
QMessageBox::critical(0, "**ERROR**", "PTextEdit::exitStatusMusrWiz: couldn't read .musrWiz.log file."); errMsg = QString("PTextEdit::exitStatusMusrWiz: couldn't read %1 file.").arg(pathName);
QMessageBox::critical(0, "**ERROR**", errMsg);
return; return;
} }
char line[128]; char line[128];
@ -2783,6 +2788,13 @@ void PTextEdit::exitStatusMusrWiz(int exitCode, QProcess::ExitStatus exitStatus)
if (musrT0tag) if (musrT0tag)
musrT0(); musrT0();
// remove musrWiz.log file
QFile logFile(pathName);
if (!logFile.remove()) {
errMsg = QString("PTextEdit::exitStatusMusrWiz: couldn't delete %1 file.").arg(pathName);
QMessageBox::critical(0, "**ERROR**", errMsg);
}
} }
//---------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------