- Add merge functionality in raw data calibration classes and virtual interface

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

diff --git a/TPC/AliTPCCalibRaw.h b/TPC/AliTPCCalibRaw.h
index f45a6b25271a9ee1ae6756943d102cc4d1fffb4e..004d1793c258693bd3a1d0a89b8b817a78f939a7 100644 (file)
--- a/TPC/AliTPCCalibRaw.h
+++ b/TPC/AliTPCCalibRaw.h
@@ -1,5 +1,5 @@
-#ifndef ALITPCCALIBALTROHEADERS_H
-#define ALITPCCALIBALTROHEADERS_H
+#ifndef ALITPCCALIBRAW_H
+#define ALITPCCALIBRAW_H
 /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
 
@@ -66,13 +66,16 @@ public:
   TVectorF *MakeVectL1PhaseDist();
   //Occupancy info
   TGraph*  MakeGraphOccupancy(const Int_t type=0, const Int_t xType=0);
-  TGraph*  MakeGraphNoiseEvents();
+//   TGraph*  MakeGraphNoiseEvents();
   TCanvas* MakeCanvasOccupancy(const Int_t xType=1, Bool_t sen=kFALSE);
 
   const THnSparseI *GetHnDrift() const {return fHnDrift;}
 //   AliTPCCalPad *CreateCalPadL1Mean();
 //   AliTPCCalPad *CreateCalPadL1RMS();
   
+  void Merge(AliTPCCalibRaw * const sig);
+  virtual Long64_t Merge(TCollection * const list);
+  
 private:
   Int_t   fPeakDetMinus;             //  Consecutive timebins on rising edge to be regarded as a signal
   Int_t   fPeakDetPlus;              //  Consecutive timebins on falling edge to be regarded as a signal
@@ -120,7 +123,7 @@ private:
   Bool_t IsEdgePad(Int_t sector, Int_t row, Int_t pad) const;
   void CreateDVhist();
   
-  AliTPCCalibRaw(AliTPCCalibRaw &calib);
+  AliTPCCalibRaw(const AliTPCCalibRaw &calib);
   AliTPCCalibRaw& operator = (const  AliTPCCalibRaw &source);
 
   ClassDef(AliTPCCalibRaw,3) //  Analysis of the Altro header information