Interface to the new class for storing and retrieving of the raw-data decoding errors...

diff --git a/RAW/AliRawReader.cxx b/RAW/AliRawReader.cxx
index 95570b08b46da1f343aa8ec3c7b8a03d0b3bf287..8294b3a1fb6a5edbb5bce4102d0ae78387cee13a 100644 (file)
--- a/RAW/AliRawReader.cxx
+++ b/RAW/AliRawReader.cxx
@@ -39,6 +39,7 @@
 #include <Riostream.h>
 #include "AliRawReader.h"
 #include "AliDAQ.h"
+#include "AliLog.h"
 
 ClassImp(AliRawReader)
 
@@ -54,7 +55,9 @@ AliRawReader::AliRawReader() :
   fSelectMaxEquipmentId(-1),
   fSkipInvalid(kFALSE),
   fSelectEventType(-1),
-  fErrorCode(0)
+  fErrorCode(0),
+  fEventNumber(-1),
+  fErrorLogs("AliRawDataErrorLog",100)
 {
 // default constructor: initialize data members
 }
@@ -103,7 +106,9 @@ AliRawReader::AliRawReader(const AliRawReader& rawReader) :
   fSelectMaxEquipmentId(rawReader.fSelectMaxEquipmentId),
   fSkipInvalid(rawReader.fSkipInvalid),
   fSelectEventType(rawReader.fSelectEventType),
-  fErrorCode(0)
+  fErrorCode(0),
+  fEventNumber(-1),
+  fErrorLogs("AliRawDataErrorLog",100)
 {
 // copy constructor
 }
@@ -125,6 +130,9 @@ AliRawReader& AliRawReader::operator = (const AliRawReader& rawReader)
 
   fErrorCode = rawReader.fErrorCode;
 
+  fEventNumber = rawReader.fEventNumber;
+  fErrorLogs = *((TClonesArray*)rawReader.fErrorLogs.Clone());
+
   return *this;
 }
 
@@ -448,3 +456,25 @@ void AliRawReader::DumpData(Int_t limit)
           
   } while (ReadHeader());
 }
+
+void AliRawReader::AddErrorLog(AliRawDataErrorLog::ERawDataErrorType type,
+                              const char *message)
+{
+  // Add a raw data error message to the list
+  // of raw-data decoding errors
+  if (fEventNumber < 0) {
+    AliError("No events have read so far! Impossible to add a raw data error log!");
+    return;
+  }
+  Int_t ddlId = GetDDLID();
+  if (ddlId < 0) {
+    AliError("No ddl raw data have been read so far! Impossible to add a raw data error log!");
+    return;
+  }
+
+  new (fErrorLogs[fErrorLogs.GetEntriesFast()])
+    AliRawDataErrorLog(fEventNumber,
+                      ddlId,
+                      type,
+                      message);
+}

diff --git a/RAW/AliRawReader.h b/RAW/AliRawReader.h
index daf56642212428be8a1a40949426c5f667745d03..6072b7f2694af111fe9c396c06ec9a24b7db3c7f 100644 (file)
--- a/RAW/AliRawReader.h
+++ b/RAW/AliRawReader.h
@@ -13,6 +13,9 @@
 
 #include <TObject.h>
 #include <TArrayI.h>
+#include <TClonesArray.h>
+
+#include "AliRawDataErrorLog.h"
 #include "AliRawDataHeader.h"
 
 class AliRawEventHeaderBase;
@@ -106,6 +109,13 @@ class AliRawReader: public TObject {
 
     void             DumpData(Int_t limit = -1);
 
+    void             AddErrorLog(AliRawDataErrorLog::ERawDataErrorType type,
+                                const char *message = NULL);
+    Int_t            GetNumberOfErrorLogs() const { return fErrorLogs.GetEntriesFast(); }
+    AliRawDataErrorLog *GetErrorLog(Int_t i) const {
+      return (AliRawDataErrorLog *)fErrorLogs.UncheckedAt(i);
+    }
+
   protected :
     Bool_t           IsSelected() const;
     Bool_t           IsEventSelected() const;
@@ -126,6 +136,9 @@ class AliRawReader: public TObject {
 
     Int_t            fErrorCode;            // code of last error
 
+    Int_t            fEventNumber;          // current event number
+    TClonesArray     fErrorLogs;        // raw data decoding errors
+
     ClassDef(AliRawReader, 0) // base class for reading raw digits
 };
 

diff --git a/RAW/AliRawReaderDate.cxx b/RAW/AliRawReaderDate.cxx
index cce49d515c04d8c593e54ebf2602e2d8e7587ab5..89732d1fe8c8c71942531c63def2a86b5ea32b87 100644 (file)
--- a/RAW/AliRawReaderDate.cxx
+++ b/RAW/AliRawReaderDate.cxx
@@ -523,6 +523,7 @@ Bool_t AliRawReaderDate::NextEvent()
       break;
     }
     fEvent = (eventHeaderStruct*) buffer;
+    fEventNumber++;
     return kTRUE;
   };
 
@@ -539,6 +540,7 @@ Bool_t AliRawReaderDate::RewindEvents()
   if (!fFile) return kFALSE;
 
   fseek(fFile, 0, SEEK_SET);
+  fEventNumber = -1;
   return Reset();
 }
 

diff --git a/RAW/AliRawReaderDateV3.cxx b/RAW/AliRawReaderDateV3.cxx
index 3bc53c8560794b739baf7a2589d1eea67cd5fade..dcee6aab1bfaa699f022c4ad18b9064c3c1c0119 100644 (file)
--- a/RAW/AliRawReaderDateV3.cxx
+++ b/RAW/AliRawReaderDateV3.cxx
@@ -411,6 +411,7 @@ Bool_t AliRawReaderDateV3::NextEvent()
       break;
     }
     fEvent = (eventHeaderStruct*) buffer;
+    fEventNumber++;
     return kTRUE;
   };
 
@@ -425,6 +426,7 @@ Bool_t AliRawReaderDateV3::RewindEvents()
   if (!fFile) return kFALSE;
 
   fseek(fFile, 0, SEEK_SET);
+  fEventNumber = -1;
   return Reset();
 }
 

diff --git a/RAW/AliRawReaderFile.cxx b/RAW/AliRawReaderFile.cxx
index ff8c5301c5a95d4c0eceba33977f0c55cb26fbee..fe33f776157d003f77ea0b4fab3ac75d1564f1d9 100644 (file)
--- a/RAW/AliRawReaderFile.cxx
+++ b/RAW/AliRawReaderFile.cxx
@@ -266,6 +266,8 @@ Bool_t AliRawReaderFile::NextEvent()
     Reset();
   } while (!IsEventSelected());
 
+  fEventNumber++;
+
   return kTRUE;
 }
 
@@ -274,5 +276,6 @@ Bool_t AliRawReaderFile::RewindEvents()
 // reset the event counter
 
   if (fEventIndex >= 0)  fEventIndex = -1;
+  fEventNumber = -1;
   return Reset();
 }

diff --git a/RAW/AliRawReaderMemory.cxx b/RAW/AliRawReaderMemory.cxx
index c35df703fd5bef16f7ed2b7212002aa14177d297..caa36603c02ec59504a72aa2b92294bfabb75c90 100644 (file)
--- a/RAW/AliRawReaderMemory.cxx
+++ b/RAW/AliRawReaderMemory.cxx
@@ -38,6 +38,8 @@ AliRawReaderMemory::AliRawReaderMemory() :
 // the given memory location
 
   fHeader = new AliRawDataHeader;
+
+  fEventNumber = 0;
 }
 
 AliRawReaderMemory::AliRawReaderMemory(UChar_t* memory, UInt_t size) :
@@ -49,6 +51,8 @@ AliRawReaderMemory::AliRawReaderMemory(UChar_t* memory, UInt_t size) :
 // create an object to read digits from the given memory
 
   fHeader = new AliRawDataHeader;
+
+  fEventNumber = 0;
 }
 
 AliRawReaderMemory::~AliRawReaderMemory()

diff --git a/RAW/AliRawReaderRoot.cxx b/RAW/AliRawReaderRoot.cxx
index f2575dc7c3c4ffae9c83b78ab41b4df4bd6f3e7c..c1252ef055018ea18ed3a76a571a699247790a98 100644 (file)
--- a/RAW/AliRawReaderRoot.cxx
+++ b/RAW/AliRawReaderRoot.cxx
@@ -477,6 +477,7 @@ Bool_t AliRawReaderRoot::NextEvent()
       return kFALSE;
     fEventIndex++;
   } while (!IsEventSelected());
+  fEventNumber++;
   return Reset();
 }
 
@@ -490,6 +491,7 @@ Bool_t AliRawReaderRoot::RewindEvents()
   delete fEvent;
   fEvent = new AliRawEvent;
   fBranch->SetAddress(&fEvent);
+  fEventNumber = -1;
   return Reset();
 }