Increasing histo clu. lay.1 upper lim.

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

diff --git a/RAW/AliRawDataHeader.h b/RAW/AliRawDataHeader.h
index 8f0153de119315e9b26e902a069e7db83cc6dd72..2b87fbd1915fed12ba858a785594f65c6c081b2c 100644 (file)
--- a/RAW/AliRawDataHeader.h
+++ b/RAW/AliRawDataHeader.h
@@ -9,12 +9,17 @@ 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)
   {}
 
+  // Adding virtual destructor breaks
+  // C++ struct backward compatibility
+  // Do not uncomment the line below!!!
+  //  virtual ~AliRawDataHeader() {}
+
   UShort_t  GetEventID1() const
     {
       return (UShort_t)( fWord2 & 0xFFF );
@@ -49,12 +54,12 @@ struct AliRawDataHeader {
   UInt_t    GetStatus() const
     {return (fStatusMiniEventID >> 12) & 0xFFFF;};
   UInt_t    GetMiniEventID() const
-    {return fStatusMiniEventID & 0x7FF;};
+    {return fStatusMiniEventID & 0xFFF;};
 
   ULong64_t GetTriggerClasses() const
-    {return ((ULong64_t) (fROILowTriggerClassHigh & 0x1FFFF)) << 32 + fTriggerClassLow;}
+  {return (((ULong64_t) (fROILowTriggerClassHigh & 0x3FFFF)) << 32) | fTriggerClassLow;}
   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