Getter for the total number of events in a raw-data file or collection (chain). For...

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

diff --git a/RAW/AliRawReaderDateV3.cxx b/RAW/AliRawReaderDateV3.cxx
index 7fc77b8bdd62c789b219cd3f80165e2ff43329f3..de82a383a28e0bd0bab9bf80bf05835b8976ffa7 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),
@@ -88,7 +86,7 @@ AliRawReaderDateV3::AliRawReaderDateV3(const char* fileName,
   while (fread(&header, 1, headerSize, fFile) == headerSize) {
     if (eventNumber == 0) {
       UChar_t* buffer = new UChar_t[header.size];
-      fseek(fFile, -headerSize, SEEK_CUR);
+      fseek(fFile, -(long)headerSize, SEEK_CUR);
       if (Int_t(fread(buffer, 1, header.size, fFile)) != header.size) break;
       fEvent = (eventHeaderStruct*) buffer;
       break;
@@ -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),
@@ -202,6 +199,13 @@ UInt_t AliRawReaderDateV3::GetGDCId() const
   return UInt_t(-1);
 }
 
+UInt_t AliRawReaderDateV3::GetTimestamp() const
+{
+// get the timestamp from the event header
+
+  if (!fEvent) return 0;
+  return fEvent->time;
+}
 
 Int_t AliRawReaderDateV3::GetEquipmentSize() const
 {
@@ -239,6 +243,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()
 {
@@ -258,7 +268,7 @@ Bool_t AliRawReaderDateV3::ReadHeader()
 
     // check for end of event data
     if (fPosition >= ((UChar_t*)fEvent)+fEvent->size) return kFALSE;
-    if ((fEvent->detectorId[2] && 0x8000) != 0x8000) {
+    if ((fEvent->detectorId[2] & 0x8000) != 0x8000) {
       fSubEvent = fEvent;   // no super event
     } else if (fSubEvent) {
       fSubEvent = (eventHeaderStruct*) (((UChar_t*)fSubEvent) + 
@@ -306,6 +316,13 @@ Bool_t AliRawReaderDateV3::ReadHeader()
 
       // "read" the data header
       fHeader = (AliRawDataHeader*) fPosition;
+      if ((fPosition + fHeader->fSize) != fEnd) {
+       if (fHeader->fSize != 0xFFFFFFFF)
+         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);
     }
 
@@ -395,13 +412,14 @@ Bool_t AliRawReaderDateV3::NextEvent()
       continue;
     }
     UChar_t* buffer = new UChar_t[header.size];
-    fseek(fFile, -headerSize, SEEK_CUR);
+    fseek(fFile, -(long)headerSize, SEEK_CUR);
     if (Int_t(fread(buffer, 1, header.size, fFile)) != header.size) {
       Error("NextEvent", "could not read event from file");
       delete[] buffer;
       break;
     }
     fEvent = (eventHeaderStruct*) buffer;
+    fEventNumber++;
     return kTRUE;
   };
 
@@ -416,6 +434,7 @@ Bool_t AliRawReaderDateV3::RewindEvents()
   if (!fFile) return kFALSE;
 
   fseek(fFile, 0, SEEK_SET);
+  fEventNumber = -1;
   return Reset();
 }
 
@@ -436,7 +455,7 @@ Int_t AliRawReaderDateV3::CheckData() const
   while (kTRUE) {
     // check for end of event data
     if (position >= ((UChar_t*)fEvent)+fEvent->size) return result;
-    if ((fEvent->detectorId[2] && 0x8000) != 0x8000) {
+    if ((fEvent->detectorId[2] & 0x8000) != 0x8000) {
       subEvent = fEvent;   // no super event
     } else if (subEvent) {
       subEvent = (eventHeaderStruct*) (((UChar_t*)subEvent) + 
@@ -468,8 +487,13 @@ 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) {
+       if (header->fSize != 0xFFFFFFFF)
+         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;