Changeset 3055 for trunk/MagicSoft/Mars/mcalib

Timestamp:

02/08/04 20:45:43 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mcalib/MHCalibrationPixel.h (modified) (6 diffs)

trunk/MagicSoft/Mars/mcalib/MHCalibrationPixel.h

@@ -20 +20 @@
   static const Int_t   fChargeNbinsHiGain;
   static const Int_t   fChargeNbinsLoGain;
-  static const Int_t   fChargevsNbins;
   static const Int_t   fAbsTimeNbins;
   static const Axis_t  fAbsTimeFirst;
   static const Axis_t  fAbsTimeLast;
-  static const Int_t   fRelTimeNbins;
-  static const Axis_t  fRelTimeFirst;
-  static const Axis_t  fRelTimeLast;
   static const Float_t fProbLimit;
   static const Int_t   fNDFLimit;  
+
+  static const Axis_t  fNyquistFreq;
+  static const Axis_t  fMinFreq;
+  static const Int_t   fPSDNbins;
   
   Int_t fPixId;                  // Pixel Nr
 
-  TArrayF *fHiGains;             //->
-  TArrayF *fLoGains;             //->
-
-  TProfile* fHivsLoGain;
+  TProfile* fHivsLoGain;         //->
 
   Double_t fOffset;
   Double_t fSlope;
-  
+
 protected:
 
   TH1F* fHChargeHiGain;          //-> Summed FADC slices High Gain
   TH1F* fHAbsTimeHiGain;         //-> Mean arrival time in number of FADC sice
-  TH1F* fHRelTimeHiGain;         //-> Mean arrival time in number of FADC sice
-  TH1I* fHChargevsNHiGain;       //-> Summed Charge vs. Event Nr. 
                           
   TH1F* fHChargeLoGain;          //-> Summed FADC slices Low Gain
   TH1F* fHAbsTimeLoGain;         //-> Mean arrival time in number of FADC sice
-  TH1F* fHRelTimeLoGain;         //-> Mean arrival time in number of FADC sice
-  TH1I* fHChargevsNLoGain;       //-> Summed Charge vs. Event Nr. 
 
-  TH1F* fHPSD;                   // Power spectrum density of fHBlindPixelChargevsN
+  TArrayF* fPSDHiGain;           //-> Power spectrum density of fHiGains
+  TArrayF* fPSDLoGain;           //-> Power spectrum density of fLoGains
   
-  TF1* fChargeGausFit;
-  TF1* fRelTimeGausFit;  
+  TF1* fChargeGausFit;           //->
+
+  TH1F* fHPSD;                   //-> 
+  TF1*  fPSDExpFit;              //->
   
-  TPaveText *fFitLegend;  
+  TArrayF *fHiGains;             //->
+  TArrayF *fLoGains;             //->
+  TArrayF *fChargeXaxis;         //
+  TArrayF *fPSDXaxis;            //
+  
+  TPaveText *fFitLegend;         //->
   
   Int_t fTotalEntries;           // Number of entries
-
+  Int_t fCurrentSize;
+  
   Axis_t  fChargeFirstHiGain;
   Axis_t  fChargeLastHiGain;
@@ -75 +77 @@
   Double_t fChargeSigmaErr;
   
-  Double_t fRelTimeChisquare;
-  Double_t fRelTimeProb;
-  Int_t    fRelTimeNdf;
-  Double_t fRelTimeMean;
-  Double_t fRelTimeMeanErr;
-  Double_t fRelTimeSigma;
-
   Float_t  fAbsTimeMean;
   Float_t  fAbsTimeMeanErr;  
   Float_t  fAbsTimeRms;
   
-  Float_t  fRelTimeLowerFitRangeHiGain;
-  Float_t  fRelTimeUpperFitRangeHiGain;
-  Float_t  fRelTimeLowerFitRangeLoGain;
-  Float_t  fRelTimeUpperFitRangeLoGain;
-
   Float_t  fAbsTimeFirstHiGain;
   Float_t  fAbsTimeFirstLoGain;
   Float_t  fAbsTimeLastHiGain;
   Float_t  fAbsTimeLastLoGain;
+
+  Float_t  fPSDProb;
   
   Byte_t   fFlags;
 
-  enum     { kUseLoGain, kChargeFitOK, kTimeFitOK };
+  enum     { kUseLoGain, kChargeFitOK, kOscillating };
   
   virtual void DrawLegend();
+  virtual void CreateChargeXaxis(Int_t n);
+  virtual void CreatePSDXaxis(Int_t n);
+  virtual void CutArrayBorder(TArrayF *array);
   
 public:
@@ -129 +124 @@
   const Float_t  GetAbsTimeLastLoGain()  const { return fAbsTimeLastLoGain;  }
 
-  const Double_t GetRelTimeMean()      const { return fRelTimeMean;     }
-  const Double_t GetRelTimeMeanErr()    const { return fRelTimeMeanErr;     }
-  const Double_t GetRelTimeSigma()     const { return fRelTimeSigma;    }
-  const Double_t GetRelTimeChiSquare() const { return fRelTimeChisquare;}
-  const Double_t GetRelTimeProb()      const { return fRelTimeProb;     }
-  const Int_t    GetRelTimeNdf()       const { return fRelTimeNdf;      }   
-
-
   const Float_t  GetAbsTimeMean()      const { return fAbsTimeMean;     }
   const Float_t  GetAbsTimeMeanErr()   const { return fAbsTimeMeanErr;   }  
@@ -147 +134 @@
   const TH1F *GetHAbsTime()            const { return fHAbsTimeHiGain;  }
   
-  const TH1F *GetHRelTime()                  { return fHRelTimeHiGain;  }
-  const TH1F *GetHRelTime()            const { return fHRelTimeHiGain;  }
-  
-  const TH1I *GetHChargevsN()                { return fHChargevsNHiGain;}
-  const TH1I *GetHChargevsN()          const { return fHChargevsNHiGain;}
-
   Double_t GetOffset()                 const { return fOffset;          }
   Double_t GetSlope()                  const { return fSlope;           }
 
   Bool_t UseLoGain();
-
+  Bool_t CheckOscillations();
+  
   Bool_t IsChargeFitOK()               const;
-  Bool_t IsTimeFitOK()                 const;      
+  Bool_t IsOscillating();
   Bool_t IsUseLoGain()                 const;
   Bool_t IsEmpty()                     const;
@@ -166 +148 @@
   Bool_t FillChargeLoGain(Float_t q);
   Bool_t FillAbsTimeLoGain(Float_t t);
-  Bool_t FillRelTimeLoGain(Float_t t);
-  Bool_t FillChargevsNLoGain(Float_t q, Int_t n);
 
   Bool_t FillChargeHiGain(Float_t q);
   Bool_t FillAbsTimeHiGain(Float_t t);
-  Bool_t FillRelTimeHiGain(Float_t t);
-  Bool_t FillChargevsNHiGain(Float_t q, Int_t n);
 
-  Bool_t FillPointInGraph(Float_t qhi, Float_t qlo);
+  Bool_t FillGraphs(Float_t qhi, Float_t qlo);
 
-  Bool_t SetupFill(const MParList *pList);
-  Bool_t Fill(const MParContainer *, const Stat_t w=1) { return kTRUE; }
-  
   // Fits
   Bool_t FitCharge(Option_t *option="RQ0");  
-  Bool_t FitTime(Option_t *option="RQ0");    
 
   void   FitHiGainvsLoGain();
@@ -191 +165 @@
   // Prints
   void PrintChargeFitResult();
-  void PrintTimeFitResult();  
 
   // Others