From 09278f2baacffbf0a76b5056c6062916d97fdc45 Mon Sep 17 00:00:00 2001
From: nemu <nemu>
Date: Tue, 29 Apr 2008 19:20:16 +0000
Subject: [PATCH] some new stuff, some bug fixing

---
 src/ToDo.txt                |  6 ++++
 src/classes/PMsrHandler.cpp |  5 +--
 src/classes/PMusrCanvas.cpp | 34 ++++++++++++--------
 src/classes/PRunNonMusr.cpp | 64 +++++++++++++++++++++++++++++++++++++
 src/include/PMusr.h         |  7 ++--
 src/include/PRunNonMusr.h   |  2 ++
 6 files changed, 99 insertions(+), 19 deletions(-)

diff --git a/src/ToDo.txt b/src/ToDo.txt
index 266b5098..32f2cfb3 100644
--- a/src/ToDo.txt
+++ b/src/ToDo.txt
@@ -80,6 +80,12 @@ long term:
 * implement FFT with msr-interface
 * switch from qmake to cmake
 
+---------------------
+bugs:
+---------------------
+* when having multiple plots: closing some of the plots and finally pressing 'q' will lead to a crash
+  since root already eliminated the closed canvas plot.
+
 ---------------------
 problems:
 ---------------------
diff --git a/src/classes/PMsrHandler.cpp b/src/classes/PMsrHandler.cpp
index b7646b5b..cf7a998c 100644
--- a/src/classes/PMsrHandler.cpp
+++ b/src/classes/PMsrHandler.cpp
@@ -329,10 +329,10 @@ int PMsrHandler::WriteMsrLogFile()
       f << left << fParam[i].fUpperBoundary;
       f << " ";
     }
+    CheckAndWriteComment(f, ++lineNo);
     // terminate parameter line if not the last line
     if (i != fParam.size()-1)
       f << endl;
-    CheckAndWriteComment(f, ++lineNo);
   }
 
   // write theory block
@@ -2266,8 +2266,9 @@ void PMsrHandler::CheckAndWriteComment(ofstream &f, int &lineNo)
 
   // check if lineNo is present
   for (i=0; i<fComments.size(); i++) {
-    if (fComments[i].fLineNo == lineNo)
+    if (fComments[i].fLineNo == lineNo) {
       break;
+    }
   }
 
   if (i<fComments.size()) {
diff --git a/src/classes/PMusrCanvas.cpp b/src/classes/PMusrCanvas.cpp
index f356fc83..47eb848d 100644
--- a/src/classes/PMusrCanvas.cpp
+++ b/src/classes/PMusrCanvas.cpp
@@ -316,31 +316,37 @@ void PMusrCanvas::UpdateParamTheoryPad()
       str += " ";
     // parameter value
     if (round(param[i].fValue)-param[i].fValue==0)
-      sprintf(cnum, "%.1lf", param[i].fValue);
+      sprintf(cnum, "%.1lg", param[i].fValue);
     else
-      sprintf(cnum, "%.6lf", param[i].fValue);
+      sprintf(cnum, "%.6lg", param[i].fValue);
     str += cnum;
     for (int j=0; j<9-(int)strlen(cnum); j++) // fill spaces
       str += " ";
     str += " "; // to make sure that at least 1 space is placed
     // parameter error
     if (param[i].fPosErrorPresent) { // minos was used
-      if (round(param[i].fStep)-param[i].fStep==0)
-        sprintf(cnum, "%.1lf", param[i].fStep);
-      else
-        sprintf(cnum, "%.6lf", param[i].fStep);
-      str += cnum;
-      str += "/";
-      if (round(param[i].fPosError)-param[i].fPosError==0)
-        sprintf(cnum, "%.1lf", param[i].fPosError);
-      else
-        sprintf(cnum, "%.6lf", param[i].fPosError);
+      // calculate the arithmetic average of the pos. and neg. error
+      double err;
+      err = param[i].fPosError - param[i].fStep / 2.0;
+      // check if the pos. and neg. error within 10%
+      if ((fabs(fabs(param[i].fStep) - param[i].fPosError) < 0.1*fabs(param[i].fStep)) &&
+          (fabs(fabs(param[i].fStep) - param[i].fPosError) < 0.1*param[i].fPosError)) {
+        if (round(err)-err==0)
+          sprintf(cnum, "%.1lg", err);
+        else
+          sprintf(cnum, "%.6lg", err);
+      } else {
+        if (round(err)-err==0)
+          sprintf(cnum, "%.1lg!!", err);
+        else
+          sprintf(cnum, "%.6lg!!", err);
+      }
       str += cnum;
     } else { // minos was not used
       if (round(param[i].fStep)-param[i].fStep==0)
-        sprintf(cnum, "%.1lf", param[i].fStep);
+        sprintf(cnum, "%.1lg", param[i].fStep);
       else
-        sprintf(cnum, "%.6lf", param[i].fStep);
+        sprintf(cnum, "%.6lg", param[i].fStep);
       str += cnum;
     }
     ypos = 0.925-i*0.025;
diff --git a/src/classes/PRunNonMusr.cpp b/src/classes/PRunNonMusr.cpp
index 3b623eb9..166dd2e7 100644
--- a/src/classes/PRunNonMusr.cpp
+++ b/src/classes/PRunNonMusr.cpp
@@ -134,6 +134,70 @@ bool PRunNonMusr::PrepareData()
 
   cout << endl << "in PRunNonMusr::PrepareData(): will feed fFitData";
 
+  if (fHandleTag == kFit)
+    success = PrepareFitData();
+  else if (fHandleTag == kView)
+    success = PrepareViewData();
+  else
+    success = false;
+
   return success;
 }
 
+//--------------------------------------------------------------------------
+// PrepareFitData
+//--------------------------------------------------------------------------
+/**
+ * <p>
+ *
+ */
+bool PRunNonMusr::PrepareFitData()
+{
+  bool success = true;
+
+  // get the proper run
+  PRawRunData* runData = fRawData->GetRunData(fRunInfo->fRunName);
+  if (!runData) { // couldn't get run
+    cout << endl << "PRunNonMusr::PrepareFitData(): **ERROR** Couldn't get run " << fRunInfo->fRunName.Data() << "!";
+    return false;
+  }
+
+  // keep start/stop time for fit: here the meaning is of course start x, stop x
+  fFitStartTime = fRunInfo->fFitRange[0];
+  fFitStopTime  = fRunInfo->fFitRange[1];
+
+  // pack the raw data
+  double value  = 0.0;
+  double err = 0.0;
+  for (unsigned int i=0; i<runData->fXData.size(); i++) {
+    if ((i % fRunInfo->fPacking == 0) && (i != 0)) { // fill data
+      fData.fX.push_back(runData->fXData[i]-(runData->fXData[i]-runData->fXData[i-fRunInfo->fPacking])/2.0);
+      fData.fValue.push_back(value);
+      fData.fError.push_back(TMath::Sqrt(err));
+      value = 0.0;
+      err = 0.0;
+    }
+    // sum raw data values
+    value += runData->fYData[i];
+    err += runData->fErrYData[i]*runData->fErrYData[i];
+  }
+
+  // count the number of bins to be fitted
+  fNoOfFitBins=0; // STILL MISSING!!
+
+  return success;
+}
+
+//--------------------------------------------------------------------------
+// PrepareViewData
+//--------------------------------------------------------------------------
+/**
+ * <p>
+ *
+ */
+bool PRunNonMusr::PrepareViewData()
+{
+  bool success = true;
+
+  return success;
+}
diff --git a/src/include/PMusr.h b/src/include/PMusr.h
index 54fcf38e..9629271c 100644
--- a/src/include/PMusr.h
+++ b/src/include/PMusr.h
@@ -130,12 +130,13 @@ typedef struct {
   // data related info
   double fDataTimeStart;
   double fDataTimeStep;
-  vector<double> fValue;
-  vector<double> fError;
+  PDoubleVector fX; // only used for non-muSR
+  PDoubleVector fValue;
+  PDoubleVector fError;
   // theory related info
   double fTheoryTimeStart;
   double fTheoryTimeStep;
-  vector<double> fTheory;
+  PDoubleVector fTheory;
 } PRunData;
 
 //-------------------------------------------------------------
diff --git a/src/include/PRunNonMusr.h b/src/include/PRunNonMusr.h
index bf51836d..15aca2c0 100644
--- a/src/include/PRunNonMusr.h
+++ b/src/include/PRunNonMusr.h
@@ -49,6 +49,8 @@ class PRunNonMusr : public PRunBase
 
   protected:
     virtual bool PrepareData();
+    virtual bool PrepareFitData();
+    virtual bool PrepareViewData();
 
   private:
     double fFitStartTime;