Changeset 2764

Timestamp:

01/09/04 22:52:28 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mcalib/MCalibrationPix.h (modified) (3 diffs)
• mcalib/MHCalibrationPixel.cc (modified) (5 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -10 +10 @@
 
    * mcalib/MHCalibrationPixel.[h,cc]
+   * mcalib/MCalibrationPix.[h,cc]
      - Ranges of time slices stored independently for HiGain and LoGain
        in order to allow consecutive checks

trunk/MagicSoft/Mars/mcalib/MCalibrationPix.h

@@ -29 +29 @@
   Float_t fTime;                         // The mean arrival time after the fit  
   Float_t fSigmaTime;                    // The error of the mean arrival time after the fit
-  Float_t fTimeChiSquare;                // The probability of the fit function 
+  Float_t fTimeChiSquare;                // The Chi Square of the fit function 
+  Float_t fTimeProb;                     // The probability of the fit function 
   
   Float_t fFactor;                       // The laboratory F-factor
@@ -78 +79 @@
   Bool_t IsPINDiodeMethodValid()   const { return fPINDiodeMethodValid;  }
 
+  // Charges
   Float_t GetCharge()              const { return fCharge;         }
-  Float_t GetRSigmaSquare()        const { return fRSigmaSquare;   }
-    
   Float_t GetErrCharge()           const { return fErrCharge;      }
   Float_t GetChargeProb()          const { return fChargeProb;     }    
-  
   Float_t GetSigmaCharge()         const { return fSigmaCharge;    }
   Float_t GetErrSigmaCharge()      const { return fErrSigmaCharge; }
+  Float_t GetRSigmaSquare()        const { return fRSigmaSquare;   }
+
+  // Times  
   Float_t GetTime()                const { return fTime;           }
   Float_t GetSigmaTime()           const { return fSigmaTime;      }
-  Float_t GetTimeChiSquare()       const { return fTimeChiSquare;  }    
+  Float_t GetTimeChiSquare()       const { return fTimeChiSquare;  }
+  Float_t GetTimeProb()            const { return fTimeProb;  }      
 
   Float_t GetConversionHiLo()                 const  { return fConversionHiLo;        }
@@ -167 +170 @@
   
   MHCalibrationPixel *GetHist() const   { return fHist;     }
-  void Draw(Option_t *opt="")           { fHist->Draw(opt); }
+  void Draw(Option_t *opt="")            { fHist->Draw(opt); }
   
   ClassDef(MCalibrationPix, 1)  // Storage Container for Calibration information of one pixel

trunk/MagicSoft/Mars/mcalib/MHCalibrationPixel.cc

@@ -88 +88 @@
         fTimeMean(-1.),
         fTimeSigma(-1.),
-        fTimeLowerFitRange(3.),
-        fTimeUpperFitRange(9.),
+        fTimeLowerFitRangeHiGain(0),
+        fTimeUpperFitRangeHiGain(0),
+        fTimeLowerFitRangeLoGain(0),
+        fTimeUpperFitRangeLoGain(0),
         fUseLoGain(kFALSE),
         fOffset(0.),
@@ -123 +125 @@
     fHTimeHiGain->SetXTitle("Mean Arrival Times [Hi Gain FADC slice nr]");
     fHTimeHiGain->SetYTitle("Nr. of events");
-    // fHTimeHiGain->Sumw2();
-
     fHTimeHiGain->SetDirectory(NULL);
 
@@ -131 +131 @@
     fHTimeLoGain->SetXTitle("Mean Arrival Times [Lo Gain FADC slice nr]");
     fHTimeLoGain->SetYTitle("Nr. of events");
-    //    fHTimeLoGain->Sumw2();
-
     fHTimeLoGain->SetDirectory(NULL);
 
@@ -590 +588 @@
     return kFALSE;
 
-  rmin = (rmin != 0.) ? rmin : fTimeLowerFitRange;
-  rmax = (rmax != 0.) ? rmax : fTimeUpperFitRange;
+  rmin = (rmin != 0.) ? rmin : (Axis_t)fTimeLowerFitRangeHiGain;
+  rmax = (rmax != 0.) ? rmax : (Axis_t)fTimeUpperFitRangeHiGain;
 
   const Stat_t entries       = fHTimeHiGain->Integral();
@@ -646 +644 @@
     return kFALSE;
 
-  rmin = (rmin != 0.) ? rmin : fTimeLowerFitRange;
-  rmax = (rmax != 0.) ? rmax : fTimeUpperFitRange;
+  rmin = (rmin != 0.) ? rmin : (Axis_t)fTimeLowerFitRangeLoGain;
+  rmax = (rmax != 0.) ? rmax : (Axis_t)fTimeUpperFitRangeLoGain;
 
   const Stat_t   entries     = fHTimeLoGain->Integral();