The folder which should be used to store the guid files is added as an option to...

[u/mrichter/AliRoot.git] / RAW / AliRawReaderDateV3.cxx

diff --git a/RAW/AliRawReaderDateV3.cxx b/RAW/AliRawReaderDateV3.cxx
index dd9e6e7bfe081d0192cb946b368c328d5c850f98..dcee6aab1bfaa699f022c4ad18b9064c3c1c0119 100644 (file)
--- a/RAW/AliRawReaderDateV3.cxx
+++ b/RAW/AliRawReaderDateV3.cxx
@@ -53,7 +53,6 @@ ClassImp(AliRawReaderDateV3)
 
 
 AliRawReaderDateV3::AliRawReaderDateV3(void* event) :
-  fRequireHeader(kTRUE),
   fFile(NULL),
   fEvent(NULL),
   fSubEvent(NULL),
@@ -67,7 +66,6 @@ AliRawReaderDateV3::AliRawReaderDateV3(void* event) :
 
 AliRawReaderDateV3::AliRawReaderDateV3(const char* fileName, 
                                       Int_t eventNumber) :
-  fRequireHeader(kTRUE),
   fFile(NULL),
   fEvent(NULL),
   fSubEvent(NULL),
@@ -100,7 +98,6 @@ AliRawReaderDateV3::AliRawReaderDateV3(const char* fileName,
 
 AliRawReaderDateV3::AliRawReaderDateV3(const AliRawReaderDateV3& rawReader) :
   AliRawReader(rawReader),
-  fRequireHeader(rawReader.fRequireHeader),
   fFile(rawReader.fFile),
   fEvent(rawReader.fEvent),
   fSubEvent(rawReader.fSubEvent),
@@ -239,6 +236,12 @@ Int_t AliRawReaderDateV3::GetEquipmentElementSize() const
   return 0;
 }
 
+Int_t AliRawReaderDateV3::GetEquipmentHeaderSize() const
+{
+// get the size of the equipment header
+
+  return 0;
+}
 
 Bool_t AliRawReaderDateV3::ReadHeader()
 {
@@ -306,6 +309,12 @@ Bool_t AliRawReaderDateV3::ReadHeader()
 
       // "read" the data header
       fHeader = (AliRawDataHeader*) fPosition;
+      if ((fPosition + fHeader->fSize) != fEnd) {
+       Warning("ReadHeader",
+               "raw data size found in the header is wrong (%d != %d)! Using the equipment size instead !",
+               fHeader->fSize, fEnd - fPosition);
+       fHeader->fSize = fEnd - fPosition;
+      }
       fPosition += sizeof(AliRawDataHeader);
     }
 
@@ -402,6 +411,7 @@ Bool_t AliRawReaderDateV3::NextEvent()
       break;
     }
     fEvent = (eventHeaderStruct*) buffer;
+    fEventNumber++;
     return kTRUE;
   };
 
@@ -416,6 +426,7 @@ Bool_t AliRawReaderDateV3::RewindEvents()
   if (!fFile) return kFALSE;
 
   fseek(fFile, 0, SEEK_SET);
+  fEventNumber = -1;
   return Reset();
 }
 
@@ -468,8 +479,12 @@ Int_t AliRawReaderDateV3::CheckData() const
 
       // check consistency of data size in the data header and in the sub event
       AliRawDataHeader* header = (AliRawDataHeader*) position;
-      if (header->fSize != 0xFFFFFFFF) {
-       if (position + header->fSize > end) result |= kErrSize;
+      if ((position + header->fSize) != end) {
+       Warning("ReadHeader",
+               "raw data size found in the header is wrong (%d != %d)! Using the equipment size instead !",
+               header->fSize, end - position);
+       header->fSize = end - position;
+       result |= kErrSize;
       }
     }
     position = end;