Better fix for coverity

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

diff --git a/TPC/AliTPCCalibRawBase.h b/TPC/AliTPCCalibRawBase.h
index 7528cfe12c4f29e4527aa6bb7d13fe4f47acf6d8..1cae2c26df3ddec50f15a9f2db5204610df9bdb4 100644 (file)
--- a/TPC/AliTPCCalibRawBase.h
+++ b/TPC/AliTPCCalibRawBase.h
@@ -15,7 +15,6 @@ class AliAltroMapping;
 class AliAltroRawStream;
 class AliRawReader;
 class AliTPCAltroMapping;
-class AliTPCRawStreamFast;
 class AliTPCRawStreamV3;
 class AliTPCRawStream;
 class AliTPCROC;
@@ -34,10 +33,6 @@ public:
 
   virtual ~AliTPCCalibRawBase();
   
-  
-  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   * const rawStreamV3);
   Bool_t ProcessEvent(AliRawReader        * const rawReader);
@@ -55,6 +50,7 @@ public:
   virtual void Analyse(){ return; }
   
   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
@@ -74,9 +70,11 @@ 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() const {return fAltroRawStream;}
@@ -84,7 +82,7 @@ public:
   //
   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;}
@@ -102,6 +100,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
   //
@@ -124,9 +124,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