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

msr2data default option flags added to musredit_startup.xml

Browse Source
This commit is contained in:
nemu
2010-06-23 06:25:48 +00:00
parent 10993ff2ee
commit c3ba0077eb
5 changed files with 134 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

111
src/musredit/PAdmin.cpp
View File

@ -112,7 +112,27 @@ bool PAdminXMLParser::startElement( const QString&, const QString&,
} else if (qName == "musr_web_statistic") {
fKeyWord = eHelpStatistic;
} else if (qName == "musr_web_msr2data") {
fKeyWord = eHelpMsr2Data;
fKeyWord = eHelpMsr2Data;
} else if (qName == "chain_fit") {
fKeyWord = eChainFit;
} else if (qName == "write_data_header") {
fKeyWord = eWriteDataHeader;
} else if (qName == "summary_files_present") {
fKeyWord = eSummaryFilesPresent;
} else if (qName == "keep_minuit2_output") {
fKeyWord = eKeepMinuit2Output;
} else if (qName == "write_column_data") {
fKeyWord = eWriteColumnData;
} else if (qName == "recreate_data_file") {
fKeyWord = eRecreateDataFile;
} else if (qName == "open_file_after_fitting") {
fKeyWord = eOpenFileAfterFitting;
} else if (qName == "create_msr_file_only") {
fKeyWord = eCreateMsrFileOnly;
} else if (qName == "fit_only") {
fKeyWord = eFitOnly;
} else if (qName == "global") {
fKeyWord = eGlobal;
} else if (qName == "func_pixmap_path") {
fKeyWord = eTheoFuncPixmapPath;
} else if (qName == "func") {
@ -254,6 +274,76 @@ bool PAdminXMLParser::characters(const QString& str)
case eHelpMsr2Data:
fAdmin->setHelpUrl("msr2data", str);
break;
case eChainFit:
if (str == "y")
flag = true;
else
flag = false;
fAdmin->fMsr2DataParam.chainFit = flag;
break;
case eWriteDataHeader:
if (str == "y")
flag = true;
else
flag = false;
fAdmin->fMsr2DataParam.writeDbHeader = flag;
break;
case eSummaryFilesPresent:
if (str == "y")
flag = true;
else
flag = false;
fAdmin->fMsr2DataParam.summaryFilePresent = flag;
break;
case eKeepMinuit2Output:
if (str == "y")
flag = true;
else
flag = false;
fAdmin->fMsr2DataParam.keepMinuit2Output = flag;
break;
case eWriteColumnData:
if (str == "y")
flag = true;
else
flag = false;
fAdmin->fMsr2DataParam.writeColumnData = flag;
break;
case eRecreateDataFile:
if (str == "y")
flag = true;
else
flag = false;
fAdmin->fMsr2DataParam.recreateDbFile = flag;
break;
case eOpenFileAfterFitting:
if (str == "y")
flag = true;
else
flag = false;
fAdmin->fMsr2DataParam.openFilesAfterFitting = flag;
break;
case eCreateMsrFileOnly:
if (str == "y")
flag = true;
else
flag = false;
fAdmin->fMsr2DataParam.createMsrFileOnly = flag;
break;
case eFitOnly:
if (str == "y")
flag = true;
else
flag = false;
fAdmin->fMsr2DataParam.fitOnly = flag;
break;
case eGlobal:
if (str == "y")
flag = true;
else
flag = false;
fAdmin->fMsr2DataParam.global = flag;
break;
case eTheoFuncPixmapPath:
fAdmin->setTheoFuncPixmapPath(QString(str.toLatin1()).trimmed());
break;
@ -386,6 +476,25 @@ PAdmin::PAdmin()
fEnableMusrT0 = false;
fLifetimeCorrection = true;
fMsr2DataParam.firstRun = -1;
fMsr2DataParam.lastRun = -1;
fMsr2DataParam.runList = QString("");
fMsr2DataParam.runListFileName = QString("");
fMsr2DataParam.msrFileExtension = QString("");
fMsr2DataParam.templateRunNo = -1;
fMsr2DataParam.dbOutputFileName = QString("");
fMsr2DataParam.writeDbHeader = true;
fMsr2DataParam.summaryFilePresent = true;
fMsr2DataParam.keepMinuit2Output = false;
fMsr2DataParam.writeColumnData = false;
fMsr2DataParam.recreateDbFile = false;
fMsr2DataParam.chainFit = true;
fMsr2DataParam.openFilesAfterFitting = true;
fMsr2DataParam.titleFromDataFile = true;
fMsr2DataParam.createMsrFileOnly = false;
fMsr2DataParam.fitOnly = false;
fMsr2DataParam.global = false;
// XML Parser part
QString fln = "./musredit_startup.xml";
if (!QFile::exists(fln)) {

9
src/musredit/PAdmin.h
View File

@ -38,6 +38,8 @@
#include <QPixmap>
#include <QtXml>
#include <musredit.h>
class PAdmin;
//---------------------------------------------------------------------------
@ -72,7 +74,9 @@ class PAdminXMLParser : public QXmlDefaultHandler
eBeamline, eInstitute, eFileFormat, eLifetimeCorrection, eMsrDefaultFilePath,
eTheoFuncPixmapPath, eFunc, eFuncName, eFuncComment, eFuncLabel,
eFuncPixmap, eFuncParams, eHelpMain, eHelpTitle, eHelpParameters, eHelpTheory, eHelpFunctions,
eHelpRun, eHelpCommand, eHelpFourier, eHelpPlot, eHelpStatistic, eHelpMsr2Data};
eHelpRun, eHelpCommand, eHelpFourier, eHelpPlot, eHelpStatistic, eHelpMsr2Data,
eChainFit, eWriteDataHeader, eSummaryFilesPresent, eKeepMinuit2Output, eWriteColumnData,
eRecreateDataFile, eOpenFileAfterFitting, eCreateMsrFileOnly, eFitOnly, eGlobal};
bool startDocument();
bool startElement( const QString&, const QString&, const QString& ,
@ -119,6 +123,7 @@ class PAdmin
QString getTheoFuncPixmapPath() { return fTheoFuncPixmapPath; }
unsigned int getTheoryCounts() { return fTheory.size(); }
PTheory* getTheoryItem(const unsigned int idx);
PMsr2DataParam getMsr2DataParam() { return fMsr2DataParam; }
void setFontName(const QString str) { fFontName = str; }
void setFontSize(const int ival) { fFontSize = ival; }
@ -156,6 +161,8 @@ class PAdmin
QString fFileFormat; ///< default file format. Used to generate default run header lines.
bool fLifetimeCorrection; ///< flag indicating if by default the lifetime-correction-flag in a single histo file shall be set.
mutable PMsr2DataParam fMsr2DataParam; ///< keeps msr2data default parameter flags
QMap<QString, QString> fHelpUrl; ///< maps tag to help url
QVector<PTheory> fTheory; ///< stores all known theories. Needed when generating theory blocks from within musredit.

1
src/musredit/PMsr2DataDialog.cpp
View File

@ -287,6 +287,7 @@ void PMsr2DataDialog::globalChanged(int buttonState)
{
if (buttonState == Qt::Checked) {
fFitOnly_checkBox->setChecked(false);
fOpenFilesAfterFitting_checkBox->setChecked(false);
}
}

17
src/musredit/PTextEdit.cpp
View File

@ -1704,25 +1704,10 @@ void PTextEdit::musrMsr2Data()
{
if (fMsr2DataParam == 0) {
fMsr2DataParam = new PMsr2DataParam();
*fMsr2DataParam = fAdmin->getMsr2DataParam();
// init fMsr2DataParam
fMsr2DataParam->firstRun = -1;
fMsr2DataParam->lastRun = -1;
fMsr2DataParam->runList = QString("");
fMsr2DataParam->runListFileName = QString("");
fMsr2DataParam->msrFileExtension = QString("");
fMsr2DataParam->templateRunNo = -1;
fMsr2DataParam->dbOutputFileName = QString("");
fMsr2DataParam->writeDbHeader = false;
fMsr2DataParam->summaryFilePresent = false;
fMsr2DataParam->keepMinuit2Output = fKeepMinuit2Output;
fMsr2DataParam->writeColumnData = false;
fMsr2DataParam->recreateDbFile = false;
fMsr2DataParam->chainFit = true;
fMsr2DataParam->openFilesAfterFitting = false;
fMsr2DataParam->titleFromDataFile = fTitleFromDataFile;
fMsr2DataParam->createMsrFileOnly = false;
fMsr2DataParam->fitOnly = false;
fMsr2DataParam->global = false;
}
PMsr2DataDialog *dlg = new PMsr2DataDialog(fMsr2DataParam, fAdmin->getHelpUrl("msr2data"));

15
src/musredit/musredit_startup.xml
View File

@ -8,7 +8,7 @@
<exec_path>$ROOTSYS/bin</exec_path>
<default_save_path>./</default_save_path>
<msr_default_file_path>$HOME/analysis/musrfit/src/musredit</msr_default_file_path>
<title_from_data_file>n</title_from_data_file>
<title_from_data_file>y</title_from_data_file>
<enable_musrt0>n</enable_musrt0>
</general>
<help_section>
@ -34,6 +34,19 @@
<file_format>root-npp</file_format>
<lifetime_correction>y</lifetime_correction>
</msr_file_defaults>
<msr2data_defaults>
<chain_fit>y</chain_fit>
<write_data_header>y</write_data_header>
<summary_files_present>y</summary_files_present>
<keep_minuit2_output>n</keep_minuit2_output>
<write_column_data>n</write_column_data>
<recreate_data_file>n</recreate_data_file>
<open_file_after_fitting>y</open_file_after_fitting>
<take_data_file_title>y</take_data_file_title>
<create_msr_file_only>n</create_msr_file_only>
<fit_only>n</fit_only>
<global>n</global>
</msr2data_default>
<func_pixmap_path>$HOME/analysis/musrfit/src/musredit/latex_images</func_pixmap_path>
<theory_functions>
<func>