X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TPC%2FAliTPCCalibRawBase.h;h=bb1953bf6e89cbd7eacf287d3286546967364ca3;hb=36c8e4e6653257a74461b21b2f00c23be60b337f;hp=c355cccd005c535a81ed1c4a848e1306445d04f6;hpb=96bf9029bb22e9a4fe10b0e0f4712e21959aace4;p=u%2Fmrichter%2FAliRoot.git

diff --git a/TPC/AliTPCCalibRawBase.h b/TPC/AliTPCCalibRawBase.h
index c355cccd005..bb1953bf6e8 100644
--- a/TPC/AliTPCCalibRawBase.h
+++ b/TPC/AliTPCCalibRawBase.h
@@ -20,6 +20,7 @@ class AliTPCRawStreamV3;
 class AliTPCRawStream;
 class AliTPCROC;
 class TTreeSRedirector;
+class TCollection;
 struct eventHeaderStruct;
 
 class AliTPCCalibRawBase : public TNamed {
@@ -34,17 +35,17 @@ public:
   virtual ~AliTPCCalibRawBase();
   
   
-  Bool_t ProcessEventFast(AliTPCRawStreamFast *rawStreamFast);
-  Bool_t ProcessEventFast(AliRawReader        *rawReader);
+  Bool_t ProcessEventFast(AliTPCRawStreamFast * const rawStreamFast);
+  Bool_t ProcessEventFast(AliRawReader        * const rawReader);
 
   //uses the new decoder which is compatible with the new altro format
-  Bool_t ProcessEvent(AliTPCRawStreamV3   *rawStreamV3);
-  Bool_t ProcessEvent(AliRawReader        *rawReader);
-  Bool_t ProcessEvent(eventHeaderStruct   *event);
+  Bool_t ProcessEvent(AliTPCRawStreamV3   * const rawStreamV3);
+  Bool_t ProcessEvent(AliRawReader        * const rawReader);
+  Bool_t ProcessEvent(eventHeaderStruct   * const event);
 
   //For using the old decoder use the following functions
-  Bool_t ProcessEvent(AliTPCRawStream *rawStream);
-  Bool_t ProcessEventOld(AliRawReader    *rawReader);
+  Bool_t ProcessEvent(AliTPCRawStream * const rawStream);
+  Bool_t ProcessEventOld(AliRawReader * const rawReader);
   
   virtual Int_t Update(const Int_t /*isector*/, const Int_t /*iRow*/, const Int_t /*iPad*/,
                        const Int_t /*iTimeBin*/, const Float_t /*signal*/) { return 0; }
@@ -53,7 +54,10 @@ public:
                             const Int_t /*length*/, const UInt_t /*startTimeBin*/, const UShort_t* /*signal*/) {return; }
   virtual void Analyse(){ return; }
   
-    //Setters
+  virtual Long64_t Merge(TCollection * /*list*/) {return 0;}
+  void MergeBase(const AliTPCCalibRawBase *calib);
+  
+  //Setters
   void  SetRangeTime (Int_t firstTimeBin, Int_t lastTimeBin) { fFirstTimeBin=firstTimeBin;   fLastTimeBin=lastTimeBin;  } //Set range in which the signal is expected
   void  SetAltroMapping(AliTPCAltroMapping **mapp) { fMapping = mapp; }
   //
@@ -71,24 +75,26 @@ public:
   Double_t GetL1PhaseTB() const {return fAltroL1PhaseTB;}
   Bool_t   GetUseL1Phase()const {return fUseL1Phase;}
 //
-  UInt_t GetRunNumber() const {return fRunNumber;}
-  UInt_t GetTimeStamp() const {return fTimeStamp;}
-  UInt_t GetEventType() const {return fEventType;}
+  UInt_t GetRunNumber()      const {return fRunNumber;}
+  UInt_t GetFirstTimeStamp() const {return fFirstTimeStamp;}
+  UInt_t GetLastTimeStamp()  const {return fLastTimeStamp;}
+  UInt_t GetTimeStamp()      const {return fTimeStamp;}
+  UInt_t GetEventType()      const {return fEventType;}
   //
   AliTPCAltroMapping **GetAltroMapping() { return fMapping; }
-  const AliAltroRawStream *GetAltroRawStream() {return fAltroRawStream;}
-  const AliTPCROC *GetTPCROC() {return fROC;}
+  const AliAltroRawStream *GetAltroRawStream() const {return fAltroRawStream;}
+  const AliTPCROC *GetTPCROC() const {return fROC;}
   //
   void IncrementNevents(){++fNevents;}
   //
-  void DumpToFile(const Char_t *filename, const Char_t *dir="", Bool_t append=kFALSE);
+  virtual void DumpToFile(const Char_t *filename, const Char_t *dir="", Bool_t append=kFALSE);
   // debug and debug streamer support
   TTreeSRedirector *GetDebugStreamer();
   void       SetStreamLevel(Int_t streamLevel){fStreamLevel=streamLevel;}
   void       SetDebugLevel(Int_t level) {fDebugLevel = level;}
   Int_t      GetStreamLevel() const {return fStreamLevel;}
   Int_t      GetDebugLevel() const {return fDebugLevel;}
-  
+
 protected:
   Int_t fFirstTimeBin;                //  First Time bin used for analysis
   Int_t fLastTimeBin;                 //  Last Time bin used for analysis
@@ -99,6 +105,8 @@ protected:
   Int_t fStreamLevel;                 //! level of streamer output
   //
   UInt_t fRunNumber;                  // current run number from event header
+  UInt_t fFirstTimeStamp;             // First event time stamp
+  UInt_t fLastTimeStamp;              // Last event time stamp
   UInt_t fTimeStamp;                  //! time stamp from event header
   UInt_t fEventType;                  //! current event Type from event header
   //
@@ -121,9 +129,10 @@ protected:
   virtual void ResetEvent(){ return; }           //Reset Event counters
   
   
-  ClassDef(AliTPCCalibRawBase,2)      //  Calibration base class for raw data processing
+  ClassDef(AliTPCCalibRawBase,3)      //  Calibration base class for raw data processing
     
 };
 
+
 #endif