extended check

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

diff --git a/RAW/AliRawReaderRoot.cxx b/RAW/AliRawReaderRoot.cxx
index 7c87d5379f10f7e454884f50d358e934e62d855d..ec45eff76fc6926c374aaa34b7d8817779d8c50c 100644 (file)
--- a/RAW/AliRawReaderRoot.cxx
+++ b/RAW/AliRawReaderRoot.cxx
@@ -32,7 +32,10 @@ AliRawReaderRoot::AliRawReaderRoot(const char* fileName, Int_t eventNumber)
 // create an object to read digits from the given input file for the
 // event with the given number
 
 // create an object to read digits from the given input file for the
 // event with the given number
 

+  fEvent = NULL;
+  TDirectory* dir = gDirectory;

   fFile = TFile::Open(fileName);
   fFile = TFile::Open(fileName);

+  dir->cd();

   if (!fFile || !fFile->IsOpen()) {
     Error("AliRawReaderRoot", "could not open file %s", fileName);
     return;
   if (!fFile || !fFile->IsOpen()) {
     Error("AliRawReaderRoot", "could not open file %s", fileName);
     return;


@@ -182,31 +185,75 @@ Bool_t AliRawReaderRoot::ReadMiniHeader()
 // read a mini header at the current position
 // returns kFALSE if the mini header could not be read
 
 // read a mini header at the current position
 // returns kFALSE if the mini header could not be read
 

+  fErrorCode = 0;

   if (!fEvent) return kFALSE;
   if (!fEvent) return kFALSE;

+

   do {
   do {

-    if (fCount > 0) fPosition += fCount;      // skip payload if event was not selected
-    if (!fSubEvent || (fPosition >= fEnd)) {  // new sub event
+    // skip payload (if event was not selected)
+    if (fCount > 0) fPosition += fCount;
+
+    // get the first or the next sub event if at the end of a sub event
+    if (!fSubEvent || (fPosition >= fEnd)) {
+
+      // check for end of event data

       if (fSubEventIndex >= fEvent->GetNSubEvents()) return kFALSE;
       fSubEvent = fEvent->GetSubEvent(fSubEventIndex++);
       if (fSubEventIndex >= fEvent->GetNSubEvents()) return kFALSE;
       fSubEvent = fEvent->GetSubEvent(fSubEventIndex++);

+
+      // check the magic word of the sub event
+      if (!fSubEvent->GetHeader()->IsValid()) {
+       Error("ReadMiniHeader", "wrong magic number in sub event!");
+       fSubEvent->GetHeader()->Dump();
+       fErrorCode = kErrMagic;
+       return kFALSE;
+      }
+

       fRawData = fSubEvent->GetRawData();
       fCount = 0;
       fPosition = (UChar_t*) fRawData->GetBuffer();
       fEnd = ((UChar_t*) fRawData->GetBuffer()) + fRawData->GetSize();
     }
       fRawData = fSubEvent->GetRawData();
       fCount = 0;
       fPosition = (UChar_t*) fRawData->GetBuffer();
       fEnd = ((UChar_t*) fRawData->GetBuffer()) + fRawData->GetSize();
     }

-    if (fPosition >= fEnd) continue;          // no data left in the payload
+
+    // continue with the next sub event if no data left in the payload
+    if (fPosition >= fEnd) continue;
+
+    // check that there are enough bytes left for the mini header

     if (fPosition + sizeof(AliMiniHeader) > fEnd) {
     if (fPosition + sizeof(AliMiniHeader) > fEnd) {

-      Error("ReadMiniHeader", "could not read data!");
-      return kFALSE;
+      Error("ReadMiniHeader", "could not read mini header data!");
+      Warning("ReadMiniHeader", "skipping %d bytes", fEnd - fPosition);
+      fSubEvent->GetHeader()->Dump();
+      fCount = 0;
+      fPosition = fEnd;
+      fErrorCode = kErrNoMiniHeader;
+      continue;

     }
     }

+
+    // "read" and check the mini header

     fMiniHeader = (AliMiniHeader*) fPosition;
     fPosition += sizeof(AliMiniHeader);
     fMiniHeader = (AliMiniHeader*) fPosition;
     fPosition += sizeof(AliMiniHeader);

-    CheckMiniHeader();
+    if (!CheckMiniHeader()) {
+      Error("ReadMiniHeader", "wrong magic word in mini header!");
+      Warning("ReadMiniHeader", "skipping %d bytes", fEnd - fPosition);
+      fSubEvent->GetHeader()->Dump();
+      fCount = 0;
+      fPosition = fEnd;
+      fErrorCode = kErrMiniMagic;
+      continue;
+    }

     fCount = fMiniHeader->fSize;
     fCount = fMiniHeader->fSize;

-    if (fPosition + fCount > fEnd) {  // check data size in mini header and sub event
+
+    // check consistency of data size in the mini header and in the sub event
+    if (fPosition + fCount > fEnd) {  

       Error("ReadMiniHeader", "size in mini header exceeds event size!");
       Error("ReadMiniHeader", "size in mini header exceeds event size!");

-      fMiniHeader->fSize = fCount = fEnd - fPosition;
+      Warning("ReadMiniHeader", "skipping %d bytes", fEnd - fPosition);
+      fSubEvent->GetHeader()->Dump();
+      fCount = 0;
+      fPosition = fEnd;
+      fErrorCode = kErrSize;
+      continue;

     }
     }

+

   } while (!IsSelected());
   } while (!IsSelected());

+

   return kTRUE;
 }
 
   return kTRUE;
 }
 


@@ -215,6 +262,7 @@ Bool_t AliRawReaderRoot::ReadNextData(UChar_t*& data)
 // reads the next payload at the current position
 // returns kFALSE if the data could not be read
 
 // reads the next payload at the current position
 // returns kFALSE if the data could not be read
 

+  fErrorCode = 0;

   while (fCount == 0) {
     if (!ReadMiniHeader()) return kFALSE;
   }
   while (fCount == 0) {
     if (!ReadMiniHeader()) return kFALSE;
   }


@@ -229,8 +277,10 @@ Bool_t AliRawReaderRoot::ReadNext(UChar_t* data, Int_t size)
 // reads the next block of data at the current position
 // returns kFALSE if the data could not be read
 
 // reads the next block of data at the current position
 // returns kFALSE if the data could not be read
 

+  fErrorCode = 0;

   if (fPosition + size > fEnd) {
     Error("ReadNext", "could not read data!");
   if (fPosition + size > fEnd) {
     Error("ReadNext", "could not read data!");

+    fErrorCode = kErrOutOfBounds;

     return kFALSE;
   }
   memcpy(data, fPosition, size);
     return kFALSE;
   }
   memcpy(data, fPosition, size);


@@ -254,3 +304,59 @@ Bool_t AliRawReaderRoot::Reset()
   return kTRUE;
 }
 
   return kTRUE;
 }
 

+
+Int_t AliRawReaderRoot::CheckData() const
+{
+// check the consistency of the data
+
+  if (!fEvent) return 0;
+
+  AliRawEvent* subEvent = NULL;
+  Int_t subEventIndex = 0;
+  UChar_t* position = 0;
+  UChar_t* end = 0;
+  Int_t result = 0;
+
+  while (kTRUE) {
+    // get the first or the next sub event if at the end of a sub event
+    if (!subEvent || (position >= end)) {
+
+      // check for end of event data
+      if (subEventIndex >= fEvent->GetNSubEvents()) return result;
+      subEvent = fEvent->GetSubEvent(subEventIndex++);
+
+      // check the magic word of the sub event
+      if (!fSubEvent->GetHeader()->IsValid()) {
+       result |= kErrMagic;
+       return result;
+      }
+
+      AliRawData* rawData = subEvent->GetRawData();
+      position = (UChar_t*) rawData->GetBuffer();
+      end = ((UChar_t*) rawData->GetBuffer()) + rawData->GetSize();
+    }
+
+    // continue with the next sub event if no data left in the payload
+    if (position >= end) continue;
+
+    // check that there are enough bytes left for the mini header
+    if (position + sizeof(AliMiniHeader) > end) {
+      result |= kErrNoMiniHeader;
+      position = end;
+      continue;
+    }
+
+    // "read" and check the mini header
+    AliMiniHeader* miniHeader = (AliMiniHeader*) position;
+    position += sizeof(AliMiniHeader);
+    if (!CheckMiniHeader(miniHeader)) {
+      result |= kErrMiniMagic;
+      position = end;
+      continue;
+    }
+
+    // check consistency of data size in the mini header and in the sub event
+    if (position + miniHeader->fSize > end) result |= kErrSize;
+    position += miniHeader->fSize;
+  };
+}