Changeset 2763

Timestamp:

01/09/04 22:50:43 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mcalib/MHCalibrationBlindPixel.h (modified) (1 diff)
• mcalib/MHCalibrationPixel.h (modified) (5 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -8 +8 @@
    * mcalib/MHCalibrationBlindPixel.h
      - make the fit by default quiet
+
+   * mcalib/MHCalibrationPixel.[h,cc]
+     - Ranges of time slices stored independently for HiGain and LoGain
+       in order to allow consecutive checks
 
    * mhist/MHCamera.[h.cc]

trunk/MagicSoft/Mars/mcalib/MHCalibrationBlindPixel.h

@@ -115 +115 @@
                            Double_t sigma1);
   
-  Bool_t FitSinglePhe(Axis_t rmin=0, Axis_t rmax=0, Option_t *opt="RL0+");
-  Bool_t FitTime(Axis_t rmin=0., Axis_t rmax=0.,Option_t *opt="R0+");
+  Bool_t FitSinglePhe(Axis_t rmin=0, Axis_t rmax=0, Option_t *opt="RL0+Q");
+  Bool_t FitTime(Axis_t rmin=0., Axis_t rmax=0.,Option_t *opt="R0+Q");
 
   void ChangeFitFunc(BlindPixelFitFunc fitfunc, Int_t par=5);

trunk/MagicSoft/Mars/mcalib/MHCalibrationPixel.h

@@ -85 +85 @@
   Double_t fTimeSigma;
 
-  Stat_t   fTimeLowerFitRange;
-  Stat_t   fTimeUpperFitRange;
+  Byte_t   fTimeLowerFitRangeHiGain;
+  Byte_t   fTimeUpperFitRangeHiGain;
+  Byte_t   fTimeLowerFitRangeLoGain;
+  Byte_t   fTimeUpperFitRangeLoGain;
   
   Bool_t fUseLoGain;
@@ -106 +108 @@
 
   void   SetPointInGraph(Float_t qhi, Float_t qlo);
-  void   FitHiGainvsLoGain();
 
   Bool_t FillChargeLoGain(Float_t q)             { return (fHChargeLoGain->Fill(q) > -1); }
@@ -116 +117 @@
   Bool_t FillChargevsNHiGain(Float_t q, Int_t n) { return (fHChargevsNHiGain->Fill(n,q) > -1); }
 
-  void   SetUseLoGain()                          { fUseLoGain = kTRUE; }
+  void   SetUseLoGain()                               { fUseLoGain = kTRUE; }
   Bool_t UseLoGain();
 
+  void SetTimeFitRangesHiGain(Byte_t low, Byte_t up) { fTimeLowerFitRangeHiGain = low,
+                                               fTimeUpperFitRangeHiGain = up ;  }
+  void SetTimeFitRangesLoGain(Byte_t low, Byte_t up) { fTimeLowerFitRangeLoGain = low,
+                                               fTimeUpperFitRangeLoGain = up ;  }
+  
   const TH1F *GetHCharge()                 { return fHChargeHiGain;    }
   const TH1F *GetHCharge() const           { return fHChargeHiGain;    }
@@ -136 +142 @@
   const Double_t GetTimeSigma()       const { return fTimeSigma; }
 
-  const Stat_t   GetTimeLowerFitRange()  const { return fTimeLowerFitRange;  }
-  const Stat_t   GetTimeUpperFitRange()  const { return fTimeUpperFitRange;  }
+  const Byte_t   GetTimeLowerFitRangeHiGain()  const { return fTimeLowerFitRangeHiGain;  }
+  const Byte_t   GetTimeUpperFitRangeHiGain()  const { return fTimeUpperFitRangeHiGain;  }
+  const Byte_t   GetTimeLowerFitRangeLoGain()  const { return fTimeLowerFitRangeLoGain;  }
+  const Byte_t   GetTimeUpperFitRangeLoGain()  const { return fTimeUpperFitRangeLoGain;  }
   
-  const Double_t GetTimeChiSquare()   const { return fTimeChisquare; }
+  const Double_t GetTimeChiSquare()     const { return fTimeChisquare; }
   const Double_t GetTimeProb()        const { return fTimeProb;      }
   const Int_t    GetTimeNdf()         const { return fTimeNdf;       }   
@@ -158 +166 @@
   Bool_t FitTimeLoGain(Axis_t rmin=0, Axis_t rmax=0, Option_t *option="RQ0");    
 
+  void   FitHiGainvsLoGain();
+
   virtual void Draw(Option_t *option="");
   virtual void CutAllEdges();