added 'fixed template fit' feature

This commit is contained in:
nemu 2009-04-24 09:24:03 +00:00
parent 1f7b86d2ce
commit a2aee52521
4 changed files with 26 additions and 0 deletions

View File

@ -86,6 +86,7 @@ PMsr2DataDialog::PMsr2DataDialog(PMsr2DataParam *msr2DataParam) : fMsr2DataParam
fKeepMinuit2Output_checkBox->setChecked(fMsr2DataParam->keepMinuit2Output);
fWriteColumnData_checkBox->setChecked(fMsr2DataParam->writeColumnData);
fRecreateDbFile_checkBox->setChecked(fMsr2DataParam->recreateDbFile);
fChainFit_checkBox->setChecked(fMsr2DataParam->chainFit);
}
//----------------------------------------------------------------------------------------------------
@ -118,6 +119,7 @@ PMsr2DataParam* PMsr2DataDialog::getMsr2DataParam()
fMsr2DataParam->keepMinuit2Output = fKeepMinuit2Output_checkBox->isChecked();
fMsr2DataParam->writeColumnData = fWriteColumnData_checkBox->isChecked();
fMsr2DataParam->recreateDbFile = fRecreateDbFile_checkBox->isChecked();
fMsr2DataParam->chainFit = fChainFit_checkBox->isChecked();
return fMsr2DataParam;
}

View File

@ -1017,6 +1017,7 @@ void PTextEdit::musrMsr2Data()
fMsr2DataParam->keepMinuit2Output = fKeepMinuit2Output;
fMsr2DataParam->writeColumnData = false;
fMsr2DataParam->recreateDbFile = false;
fMsr2DataParam->chainFit = true;
}
PMsr2DataDialog *dlg = new PMsr2DataDialog(fMsr2DataParam);
@ -1135,6 +1136,9 @@ void PTextEdit::musrMsr2Data()
if (fMsr2DataParam->templateRunNo != -1) {
str = QString("%1").arg(fMsr2DataParam->templateRunNo);
str = "fit-" + str;
if (!fMsr2DataParam->chainFit) {
str += "!";
}
cmd.append(str);
}

View File

@ -492,6 +492,25 @@
<string>will recreate the db-file. Default (unchecked) will append data</string>
</property>
</widget>
<widget class="QCheckBox">
<property name="name">
<cstring>fChainFit_checkBox</cstring>
</property>
<property name="geometry">
<rect>
<x>230</x>
<y>70</y>
<width>95</width>
<height>22</height>
</rect>
</property>
<property name="text">
<string>Chain Fit</string>
</property>
<property name="toolTip" stdset="0">
<string>on: chain fit, off: always start from the template run</string>
</property>
</widget>
</widget>
<widget class="QGroupBox">
<property name="name">

View File

@ -47,6 +47,7 @@ typedef struct {
bool keepMinuit2Output;
bool writeColumnData;
bool recreateDbFile;
bool chainFit;
} PMsr2DataParam;
#endif // _MUSRGUI_H_