X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TOF%2FAliTOFRawStream.h;h=b12e74fe5dd34145d576dacf2b1cc8218686c8ef;hb=ffc53def10d733d88df9d10b8f1e25ada73176af;hp=5e5da32b22fc7f0b436145db9b401985e63ce7f0;hpb=a3ed394729d245d27ce51ee70309f24823f8e314;p=u%2Fmrichter%2FAliRoot.git

diff --git a/TOF/AliTOFRawStream.h b/TOF/AliTOFRawStream.h
index 5e5da32b22f..b12e74fe5dd 100644
--- a/TOF/AliTOFRawStream.h
+++ b/TOF/AliTOFRawStream.h
@@ -20,6 +20,8 @@
 
 class AliTOFHitData;
 
+class AliTOFDecoderV2;
+
 /**********************************
  * OLD DEFINITIONS 
  **********************************/ 
@@ -464,13 +466,15 @@ class AliTOFRawStream: public TObject {
 
   Bool_t DecodeDDL(Int_t DDLMin, Int_t DDLMax, Int_t verbose);
   Bool_t Decode(Int_t verbose);
+  Bool_t DecodeV2(Int_t verbose);
   AliTOFDecoder *GetDecoder() const {return fDecoder;};
+  AliTOFDecoderV2 *GetDecoderV2() const {return fDecoderV2;};
   void SetV2718Patch(Bool_t V2718Patch = kTRUE) {fDecoder->SetV2718Patch(V2718Patch);};
 
   void SetRawReader(AliRawReader * const rawReader) {fRawReader=rawReader;};
 
-  const AliTOFHitDataBuffer * GetDataBuffer(Int_t DDL) const {return &fDataBuffer[DDL];};
-  const AliTOFHitDataBuffer * GetPackedDataBuffer(Int_t DDL) const {return &fPackedDataBuffer[DDL];};
+  AliTOFHitDataBuffer * GetDataBuffer(Int_t DDL) {return &fDataBuffer[DDL];};
+  AliTOFHitDataBuffer * GetPackedDataBuffer(Int_t DDL) {return &fPackedDataBuffer[DDL];};
 
   void ResetDataBuffer(Int_t DDL) {fDataBuffer[DDL].Reset();};
   void ResetPackedDataBuffer(Int_t DDL) {fPackedDataBuffer[DDL].Reset();};
@@ -478,6 +482,7 @@ class AliTOFRawStream: public TObject {
   void ResetBuffers();
 
   Bool_t LoadRawDataBuffers(Int_t indexDDL, Int_t verbose = 0);
+  Bool_t LoadRawDataBuffersV2(Int_t indexDDL, Int_t verbose = 0);
   static void ApplyBCCorrections(Bool_t Value = kTRUE) {fgApplyBCCorrections = Value;};
   
   Int_t GetEventID() const {return fEventID;}; // getter for the eventID1 (bunch crossing) in the common data header
@@ -489,11 +494,11 @@ class AliTOFRawStream: public TObject {
 		    Int_t iChannel,
 		    Int_t detind0[], Int_t detind1[]) const;
   void VolumeID2LTM(Int_t detind[],
-		    Int_t iDDL = -1,
-		    Int_t iTRM = -1,
-		    Int_t iChain = -1,
-		    Int_t iTDC = -1,
-		    Int_t iChannel = -1) const;
+		    Int_t &iDDL,
+		    Int_t &iTRM,
+		    Int_t &iChain,
+		    Int_t &iTDC,
+		    Int_t &iChannel) const;
 
   enum ETOFRawStreamError {
     kPadXError = 0,
@@ -516,6 +521,7 @@ class AliTOFRawStream: public TObject {
   TClonesArray *fTOFrawData; // pointer to AliTOFrawData TClonesArray
 
   AliTOFDecoder *fDecoder; //pointer to TOF decoder
+  AliTOFDecoderV2 *fDecoderV2; //pointer to TOF decoder
 
   Int_t         fDDL;          // DDL file number [0;71]
   Int_t         fTRM;          // TRM number [1;12]