From a2aee52521c4d1c60071ab48d1e59cec55bea47a Mon Sep 17 00:00:00 2001
From: nemu <nemu>
Date: Fri, 24 Apr 2009 09:24:03 +0000
Subject: [PATCH] added 'fixed template fit' feature

---
 src/musrgui/PMsr2DataDialog.cpp          |  2 ++
 src/musrgui/PTextEdit.cpp                |  4 ++++
 src/musrgui/forms/PMsr2DataDialogBase.ui | 19 +++++++++++++++++++
 src/musrgui/musrgui.h                    |  1 +
 4 files changed, 26 insertions(+)

diff --git a/src/musrgui/PMsr2DataDialog.cpp b/src/musrgui/PMsr2DataDialog.cpp
index 9ddf6aba..22d8dc77 100644
--- a/src/musrgui/PMsr2DataDialog.cpp
+++ b/src/musrgui/PMsr2DataDialog.cpp
@@ -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;
 }
diff --git a/src/musrgui/PTextEdit.cpp b/src/musrgui/PTextEdit.cpp
index 81db5b0d..7263a79b 100644
--- a/src/musrgui/PTextEdit.cpp
+++ b/src/musrgui/PTextEdit.cpp
@@ -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);
     }
 
diff --git a/src/musrgui/forms/PMsr2DataDialogBase.ui b/src/musrgui/forms/PMsr2DataDialogBase.ui
index d769a3f6..9917e4e3 100644
--- a/src/musrgui/forms/PMsr2DataDialogBase.ui
+++ b/src/musrgui/forms/PMsr2DataDialogBase.ui
@@ -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">
diff --git a/src/musrgui/musrgui.h b/src/musrgui/musrgui.h
index 15404a20..742389c6 100644
--- a/src/musrgui/musrgui.h
+++ b/src/musrgui/musrgui.h
@@ -47,6 +47,7 @@ typedef struct {
   bool keepMinuit2Output;
   bool writeColumnData;
   bool recreateDbFile;
+  bool chainFit;
 } PMsr2DataParam;
 
 #endif // _MUSRGUI_H_