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

changed musredit/musrgui msr2data interface such that it is hopefully closer to the command line (MUSR-162, MUSR-173)

Browse Source
This commit is contained in:
nemu
2011-07-15 05:43:41 +00:00
parent 5672c43d2e
commit 2a4f5bf78a
18 changed files with 228 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/musrgui/PAdmin.cpp
+15 -5
View File
@@ -97,8 +97,8 @@ bool PAdminXMLParser::startElement( const QString&, const QString&,
fKeyWord = eChainFit;
} else if (qName == "write_data_header") {
fKeyWord = eWriteDataHeader;
} else if (qName == "summary_files_present") {
fKeyWord = eSummaryFilesPresent;
} else if (qName == "ignore_data_header_info") {
fKeyWord = eIgnoreDataHeaderInfo;
} else if (qName == "keep_minuit2_output") {
fKeyWord = eKeepMinuit2Output;
} else if (qName == "write_column_data") {
@@ -113,6 +113,8 @@ bool PAdminXMLParser::startElement( const QString&, const QString&,
fKeyWord = eFitOnly;
} else if (qName == "global") {
fKeyWord = eGlobal;
} else if (qName == "global_plus") {
fKeyWord = eGlobalPlus;
} else if (qName == "func_pixmap_path") {
fKeyWord = eTheoFuncPixmapPath;
} else if (qName == "func") {
@@ -236,12 +238,12 @@ bool PAdminXMLParser::characters(const QString& str)
flag = false;
fAdmin->fMsr2DataParam.writeDbHeader = flag;
break;
case eSummaryFilesPresent:
case eIgnoreDataHeaderInfo:
if (str == "y")
flag = true;
else
flag = false;
fAdmin->fMsr2DataParam.summaryFilePresent = flag;
fAdmin->fMsr2DataParam.ignoreDataHeaderInfo = flag;
break;
case eKeepMinuit2Output:
if (str == "y")
@@ -292,6 +294,13 @@ bool PAdminXMLParser::characters(const QString& str)
flag = false;
fAdmin->fMsr2DataParam.global = flag;
break;
case eGlobalPlus:
if (str == "y")
flag = true;
else
flag = false;
fAdmin->fMsr2DataParam.globalPlus = flag;
break;
case eTheoFuncPixmapPath:
fAdmin->setTheoFuncPixmapPath(QString(str.ascii()).stripWhiteSpace());
break;
@@ -490,7 +499,7 @@ PAdmin::PAdmin()
fMsr2DataParam.templateRunNo = -1;
fMsr2DataParam.dbOutputFileName = QString("");
fMsr2DataParam.writeDbHeader = true;
fMsr2DataParam.summaryFilePresent = true;
fMsr2DataParam.ignoreDataHeaderInfo = false;
fMsr2DataParam.keepMinuit2Output = false;
fMsr2DataParam.writeColumnData = false;
fMsr2DataParam.recreateDbFile = false;
@@ -500,6 +509,7 @@ PAdmin::PAdmin()
fMsr2DataParam.createMsrFileOnly = false;
fMsr2DataParam.fitOnly = false;
fMsr2DataParam.global = false;
fMsr2DataParam.globalPlus = false;
// XML Parser part
QString fln = "./musrgui_startup.xml";