sync with master

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

diff --git a/RAW/AliRawDataHeader.h b/RAW/AliRawDataHeader.h
index 78bbddc4642613af63f6d4c2458725b2fe318e3c..7a4da2ee7d256a3a412a45a3dc326fcf81ae34b8 100644 (file)
--- a/RAW/AliRawDataHeader.h
+++ b/RAW/AliRawDataHeader.h
@@ -9,7 +9,7 @@ struct AliRawDataHeader {
     fWord2(2<<24),
     fEventID2(0),
     fAttributesSubDetectors(0),
-    fStatusMiniEventID(0x1000),  // status bit 4: no L1/L2 trigger information
+    fStatusMiniEventID(0x10000),  // status bit 4: no L1/L2 trigger information
     fTriggerClassLow(0),
     fROILowTriggerClassHigh(0),
     fROIHigh(0)
@@ -32,7 +32,7 @@ struct AliRawDataHeader {
 
   UChar_t   GetL1TriggerMessage() const
     {
-      return (UChar_t)( (fWord2 >> 14) & 0x3FF );
+      return (UChar_t)( (fWord2 >> 14) & 0xFF );
     };
 
   UChar_t   GetVersion() const
@@ -57,9 +57,11 @@ struct AliRawDataHeader {
     {return fStatusMiniEventID & 0xFFF;};
 
   ULong64_t GetTriggerClasses() const
-  {return (((ULong64_t) (fROILowTriggerClassHigh & 0x1FFFF)) << 32) + fTriggerClassLow;}
+  {return (((ULong64_t) (fROILowTriggerClassHigh & 0x3FFFF)) << 32) | fTriggerClassLow;}
+  ULong64_t GetTriggerClassesNext50() const
+  {return 0;}
   ULong64_t GetROI() const
-  {return (((ULong64_t) fROIHigh) << 32) + ((fROILowTriggerClassHigh >> 28) & 0xF);}
+  {return (((ULong64_t) fROIHigh) << 4) | ((fROILowTriggerClassHigh >> 28) & 0xF);}
 
   void      SetTriggerClass(ULong64_t mask)
     {fTriggerClassLow = (UInt_t)(mask & 0xFFFFFFFF);  // low bits of trigger class