svn ci AliTPCtrackerMI.cxx AliTPCRecoParam.cxx AliTPCRecoParam.h

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

diff --git a/TPC/AliTPCCalibPedestal.h b/TPC/AliTPCCalibPedestal.h
index e6bd0e1858cc5a3057e258c172e62bfedd0eafa8..1bb45d3a781bd68d306b7282d74f7e6ccfd0bf0b 100644 (file)
--- a/TPC/AliTPCCalibPedestal.h
+++ b/TPC/AliTPCCalibPedestal.h
@@ -3,6 +3,12 @@
 /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
 
+/////////////////////////////////////////////////////////////////////////////////////////
+//                                                                                     //
+//                  Implementation of the TPC pedestal calibration                     //
+//                                                                                     //
+/////////////////////////////////////////////////////////////////////////////////////////
+
 #include <TObjArray.h>
 #include "AliTPCCalibRawBase.h"
 
@@ -12,9 +18,7 @@ class TTreeSRedirector;
 class AliTPCROC;
 class AliTPCCalROC;
 class AliTPCRawStream;
-class AliTPCRawStreamFast;
 class AliRawReader;
-class AliTPCAltroMapping;
 class TMap;
 
 struct eventHeaderStruct;
@@ -33,18 +37,15 @@ public:
                const Int_t iTimeBin, const Float_t signal);
   virtual void   Analyse();
   //
-  AliTPCAltroMapping **GetAltroMapping() { return fMapping; };
-  void  SetAltroMapping(AliTPCAltroMapping **mapp) { fMapping = mapp; };
-  //
   AliTPCCalROC* GetCalRocPedestal (Int_t sector, Bool_t force=kFALSE);  // get calibration object - sector
   AliTPCCalROC* GetCalRocSigma(Int_t sector, Bool_t force=kFALSE);        // get calibration object - sector
-  const TObjArray* GetCalPadPedestal (){return &fCalRocArrayPedestal;}  // get calibration object
-  const TObjArray* GetCalPadSigma(){return &fCalRocArraySigma;}             // get calibration object
+  const TObjArray* GetCalPadPedestal() const {return &fCalRocArrayPedestal;}  // get calibration object
+  const TObjArray* GetCalPadSigma() const {return &fCalRocArraySigma;}             // get calibration object
 
   AliTPCCalROC* GetCalRocMean (Int_t sector, Bool_t force=kFALSE);      // get calibration object - sector
   AliTPCCalROC* GetCalRocRMS(Int_t sector, Bool_t force=kFALSE);        // get calibration object - sector
-  const TObjArray* GetCalPadMean (){return &fCalRocArrayMean;}          // get calibration object
-  const TObjArray* GetCalPadRMS(){return &fCalRocArrayRMS;}             // get calibration object
+  const TObjArray* GetCalPadMean() const {return &fCalRocArrayMean;}          // get calibration object
+  const TObjArray* GetCalPadRMS()  const {return &fCalRocArrayRMS;}             // get calibration object
   
   TH2F* GetHistoPedestal  (Int_t sector, Bool_t force=kFALSE);          // get refernce histogram
   //
@@ -60,8 +61,9 @@ public:
   void  SetRangeAdc (Int_t aMin, Int_t aMax){ fAdcMin=aMin; fAdcMax=aMax; }  // Set adc range for the pedestal calibration
   void  SetAnalysisTruncationRange(Float_t down, Float_t up) {fAnaMeanDown=down; fAnaMeanUp=up;}    //Set range for truncated mean analysis of the channel information
 
-  void  Merge(AliTPCCalibPedestal *ped);
-
+  void  Merge(AliTPCCalibPedestal * const ped);
+  virtual Long64_t Merge(TCollection * const list);
+  
   Bool_t TestEvent();  // Test the fast approach to fill histogram - used for test purposes
 
 private:
@@ -89,7 +91,6 @@ private:
 
   AliTPCCalROC* GetCalRoc(Int_t sector, TObjArray* arr, Bool_t force);
 
-public:
   ClassDef(AliTPCCalibPedestal, 7)  // Implementation of the TPC pedestal and noise calibration
 };