Bugfix in raw data reader classes. The bug affected the determination of the raw...

[u/mrichter/AliRoot.git] / RAW / AliRawReaderFile.h

diff --git a/RAW/AliRawReaderFile.h b/RAW/AliRawReaderFile.h
index 71a366c8d66f9177cb2645b0279b018163911a66..a3e25190488f3fd3831c6de87578d7589cdcecf6 100644 (file)
--- a/RAW/AliRawReaderFile.h
+++ b/RAW/AliRawReaderFile.h
@@ -22,18 +22,21 @@ class fstream;
 
 class AliRawReaderFile: public AliRawReader {
   public :
-    AliRawReaderFile(Int_t eventNumber);
-    AliRawReaderFile(const char* dirName);
+    AliRawReaderFile(Int_t eventNumber = -1);
+    AliRawReaderFile(const char* dirName, Int_t eventNumber = -1);
     AliRawReaderFile(const AliRawReaderFile& rawReader);
     AliRawReaderFile& operator = (const AliRawReaderFile& rawReader);
     virtual ~AliRawReaderFile();
 
+    virtual void     RequireHeader(Bool_t required);
+
     virtual UInt_t   GetType() const {return 0;};
     virtual UInt_t   GetRunNumber() const {return 0;};
     virtual const UInt_t* GetEventId() const {return 0;};
     virtual const UInt_t* GetTriggerPattern() const {return 0;};
     virtual const UInt_t* GetDetectorPattern() const {return 0;};
     virtual const UInt_t* GetAttributes() const {return 0;};
+    virtual const UInt_t* GetSubEventAttributes() const {return 0;};
     virtual UInt_t   GetLDCId() const {return 0;};
     virtual UInt_t   GetGDCId() const {return 0;};
 
@@ -42,17 +45,23 @@ class AliRawReaderFile: public AliRawReader {
     virtual Int_t    GetEquipmentId() const {return fEquipmentId;};
     virtual const UInt_t* GetEquipmentAttributes() const {return NULL;};
     virtual Int_t    GetEquipmentElementSize() const {return 0;};
+    virtual Int_t    GetEquipmentHeaderSize() const {return 0;};
 
     virtual Bool_t   ReadHeader();
     virtual Bool_t   ReadNextData(UChar_t*& data);
+    virtual Bool_t   ReadNext(UChar_t* data, Int_t size);
 
     virtual Bool_t   Reset();
 
+    virtual Bool_t   NextEvent();
+    virtual Bool_t   RewindEvents();
+
   protected :
+    TString          GetDirName() const;
+    void*            OpenDirectory();
     Bool_t           OpenNextFile();
 
-    virtual Bool_t   ReadNext(UChar_t* data, Int_t size);
-
+    Int_t            fEventIndex;  // index of the event
     TString          fDirName;     // name of the input directory
     void*            fDirectory;   // pointer to the input directory
     fstream*         fStream;      // stream of raw digits