No double step.

[u/mrichter/AliRoot.git] / TPC / AliTPCCalibPedestal.h

diff --git a/TPC/AliTPCCalibPedestal.h b/TPC/AliTPCCalibPedestal.h
index 9ffc18569a489946acdd80372db0622a273c2ed7..48ef36004196828c3ba6496e4af8df6b660a795b 100644 (file)
--- a/TPC/AliTPCCalibPedestal.h
+++ b/TPC/AliTPCCalibPedestal.h
@@ -5,15 +5,15 @@
 
 
 
+#include <TObject.h>
+#include <TObjArray.h>
 
-
-class TObjArray;
 class TH2F;
 class TTreeSRedirector;
 class AliTPCROC;
 class AliTPCCalROC;
-class AliRawReader;
 class AliTPCRawStream;
+class AliRawReader;
 struct eventHeaderStruct;
 
 
@@ -38,50 +38,52 @@ public:
   AliTPCCalROC* GetCalRocRMS(Int_t sector, Bool_t force=kFALSE);        // get calibration object - sector
   const TObjArray* GetCalPadPedestal (){return &fCalRocArrayPedestal;}  // get calibration object
   const TObjArray* GetCalPadRMS(){return &fCalRocArrayRMS;}             // get calibration object
-  void SetCalRocPedestal (AliTPCCalROC *roc, Int_t sector)
-                                     { fCalRocArrayPedestal.RemoveAt(sector);
-                                      fCalRocArrayPedestal.AddAt(roc,sector); }
-
+  
   TH2F* GetHistoPedestal  (Int_t sector, Bool_t force=kFALSE);          // get refernce histogram
   void  DumpToFile(const Char_t *filename, const Char_t *dir="", const Bool_t append=kFALSE);
   //
-  Int_t   GetFirstTimeBin() const { return fFirstTimeBin; }
-  Int_t   GetLastTimeBin()  const { return fLastTimeBin;  }
-  Int_t   GetAdcMin()       const { return fAdcMin;       }
-  Int_t   GetAdcMax()       const { return fAdcMax;       }
+  Int_t GetFirstTimeBin() const { return fFirstTimeBin; }
+  Int_t GetLastTimeBin()  const { return fLastTimeBin;  }
+  Int_t GetAdcMin()       const { return fAdcMin;       }
+  Int_t GetAdcMax()       const { return fAdcMax;       }
+
+  void  SetRangeTime(Int_t tMin, Int_t tMax){ fFirstTimeBin=tMin; fLastTimeBin=tMax; }  // Set time bin range that is used for the pedestal calibration
+  void  SetRangeAdc (Int_t aMin, Int_t aMax){ fAdcMin=aMin; fAdcMax=aMax; }  // Set adc range for the pedestal calibration
 
-  void    SetRangeTime(Int_t tMin, Int_t tMax){ fFirstTimeBin=tMin; fLastTimeBin=tMax; }  // Set time bin range that is used for the pedestal calibration
-  void    SetRangeAdc (Int_t aMin, Int_t aMax){ fAdcMin=aMin; fAdcMax=aMax; }  // Set adc range for the pedestal calibration
+  void  SetOldRCUformat(Bool_t format=kTRUE){ fOldRCUformat = format; }
 
+  void Merge(AliTPCCalibPedestal *ped);
 
   Bool_t TestEvent();  //test the fast approach to fill histogram  - used for test purposes
 
 private:
   Int_t fFirstTimeBin;              //  First Time bin needed for analysis
   Int_t fLastTimeBin;               //  Last Time bin needed for analysis
-
+  
   Int_t fAdcMin;                    //  min adc channel of pedestal value
   Int_t fAdcMax;                    //  max adc channel of pedestal value
+  
+  Bool_t  fOldRCUformat;            //! Should we use the old RCU format for data reading
 
   AliTPCROC *fROC;                  //! ROC information
-
+  
   TObjArray fCalRocArrayPedestal;   //  Array of AliTPCCalROC class for Time0 calibration
   TObjArray fCalRocArrayRMS;        //  Array of AliTPCCalROC class for signal width calibration
-
+  
   TObjArray fHistoPedestalArray;    //  Calibration histograms for Pedestal distribution
-
-
-
+  
+  
+  
   TH2F* GetHisto(Int_t sector, TObjArray *arr,
                 Int_t nbinsY, Float_t ymin, Float_t ymax,
                 Char_t *type, Bool_t force);
-
+    
   AliTPCCalROC* GetCalRoc(Int_t sector, TObjArray* arr, Bool_t force);
 
 public:
 
 
-  ClassDef(AliTPCCalibPedestal,1)
+  ClassDef(AliTPCCalibPedestal,1)  //Implementation of the TPC pedestal and noise calibration
 };