Changeset 2581 for trunk/MagicSoft/Mars/mhist

Timestamp:

12/01/03 18:58:01 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhist

Files:

• MHCalibrationPixel.cc (modified) (6 diffs)
• MHCalibrationPixel.h (modified) (3 diffs)

trunk/MagicSoft/Mars/mhist/MHCalibrationPixel.cc

@@ -55 +55 @@
 
 using namespace std;
+
 // --------------------------------------------------------------------------
 //
@@ -60 +61 @@
 //
 MHCalibrationPixel::MHCalibrationPixel(Int_t pix, const char *name, const char *title)
-    : fFitOK(kFALSE), fPixId(pix), fTGausFit(NULL), fQGausFit(NULL), fFitLegend(NULL)
-{
+      : fPixId(pix),
+        fQGausFit(NULL), 
+        fTGausFit(NULL), 
+        fFitLegend(NULL),
+        fLowerFitRange(0.),
+        fFitOK(kFALSE)
+{ 
 
     fName  = name  ? name  : "MHCalibrationPixel";
@@ -328 +334 @@
 }
 
-Bool_t MHCalibrationPixel::FitQ(Axis_t rmin, Axis_t rmax, Option_t *option)
+Bool_t MHCalibrationPixel::FitQ(Option_t *option)
 {
 
@@ -337 +343 @@
   // Get the fitting ranges
   //
-  rmin = (rmin != 0.) ? rmin : fQfirst;
-  rmax = (rmax != 0.) ? rmax : fQlast;
+  Axis_t rmin = (fLowerFitRange != 0.) ? fLowerFitRange : fQfirst;
 
   //
@@ -349 +354 @@
   const Double_t si_guess = mu_guess/500.;
 
-  fQGausFit = new TF1("QGausFit","gaus",rmin,rmax);
+  fQGausFit = new TF1("QGausFit","gaus",rmin,fQlast);
 
   if (!fQGausFit) 
@@ -360 +365 @@
   fQGausFit->SetParNames("Area","#mu","#sigma");
   fQGausFit->SetParLimits(0,0.,entries);
-  fQGausFit->SetParLimits(1,rmin,rmax);
-  fQGausFit->SetParLimits(2,0.,rmax-rmin);
+  fQGausFit->SetParLimits(1,rmin,fQlast);
+  fQGausFit->SetParLimits(2,0.,fQlast-rmin);
 
   fHQ->Fit("QGausFit",option);

trunk/MagicSoft/Mars/mhist/MHCalibrationPixel.h

@@ -41 +41 @@
   TPaveText *fFitLegend;  
   
+  Axis_t  fLowerFitRange;
   Axis_t  fQfirst;
   Axis_t  fQlast;
@@ -104 +105 @@
   const TH1I *GetHQvsN() const { return fHQvsN; }
   
-  Bool_t FitQ(Axis_t rmin=0, Axis_t rmax=0, Option_t *option="RQ0+");  
+  Bool_t FitQ(Option_t *option="RQ0+");  
   Bool_t FitT(Axis_t rmin=0, Axis_t rmax=0, Option_t *option="RQ0+");    
 
@@ -110 +111 @@
   virtual void CutAllEdges();
   virtual void Reset();
+
+  void SetLowerFitRange(Axis_t min)  { fLowerFitRange = min; }
 
   void PrintQFitResult();