Combined event ID complaint with the DAQ software.
authorcvetan <cvetan@f7af4fe6-9843-0410-8265-dc069ae4e863>
Mon, 13 Sep 2010 15:04:52 +0000 (15:04 +0000)
committercvetan <cvetan@f7af4fe6-9843-0410-8265-dc069ae4e863>
Mon, 13 Sep 2010 15:04:52 +0000 (15:04 +0000)
RAW/AliRawReader.h

index 9de4d85..e8665fa 100644 (file)
@@ -63,9 +63,9 @@ class AliRawReader: public TObject {
       return id ? ((id)[1]&0x00000fff) : 0;
     }
     ULong64_t             GetEventIdAsLong() const {
-      return ((ULong64_t)GetBCID()+
-             (ULong64_t)GetOrbitID()*3564+
-             (ULong64_t)GetPeriod()*16777215*3564);
+      return (((ULong64_t)GetPeriod() << 36) |
+             ((ULong64_t)GetOrbitID() << 12) |
+             (ULong64_t)GetBCID()); 
     }
     virtual const UInt_t* GetTriggerPattern() const = 0;
     ULong64_t             GetClassMask() const {