ALIROOT-5420 ALIROOT5683 Consistent version (3.14) of event.h from DATE

diff --git a/RAW/dateStream.cxx b/RAW/dateStream.cxx
index 59678d1ae5e273683b091804af0e25ae34b529f4..8bd9334dfa4a42387b1bfe8dae6b66b384d722fb 100644 (file)
--- a/RAW/dateStream.cxx
+++ b/RAW/dateStream.cxx
@@ -579,9 +579,6 @@ void loadPayload( const char *fileName ) {
          printf( "\n" );
          printf( "      " );
          
-         if ( cdh->cdhMBZ2 != 0 )
-           printf( "MBZ2:0x%x ",
-                   cdh->cdhMBZ2 );
          printf( "Status/Error:0x%x", cdh->cdhStatusErrorBits );
          if ( cdh->cdhStatusErrorBits != 0 ) {
            printf( "=<" );
@@ -1584,12 +1581,11 @@ RoiHigh/Low reference:0x%x-%x current:0x%x-%x\n",
        }
        if ( cdh->cdhMBZ0 != 0
             || cdh->cdhMBZ1 != 0
-            || cdh->cdhMBZ2 != 0
             || cdh->cdhMBZ4 != 0 ) {
          fprintf( stderr,
-                  "%s: CDH check failed. MBZ0:0x%x MBZ1:0x%x MBZ2:0x%x MBZ4:0x%x\n",
+                  "%s: CDH check failed. MBZ0:0x%x MBZ1:0x%x MBZ4:0x%x\n",
                   myName,
-                  cdh->cdhMBZ0, cdh->cdhMBZ1, cdh->cdhMBZ2, cdh->cdhMBZ4 );
+                  cdh->cdhMBZ0, cdh->cdhMBZ1, cdh->cdhMBZ4 );
          exit( 1 );
        }
       }

diff --git a/RAW/event.h b/RAW/event.h
index 31b4459cc42f49318ca7f30c95593f2c896a5822..76ddd2a39e4d221ca5fbaa39a69fe1639a609d83 100644 (file)
--- a/RAW/event.h
+++ b/RAW/event.h
@@ -53,6 +53,7 @@
  *            RD        15-Jan-14 Added FLUSHED_EVENT and INCOMPLETE_EVENT
  *    V03.14  RD        12-Feb-14 Changes for increased number of trigger classes
  *                                (old:50, new:100) and for CDH V3
+ *                               Added the possibility to compile with extra symbols
  *
  * Preprocessor definitions:
  *  NDEBUG  Define BEFORE including this file to disable run-time checks on
@@ -72,6 +73,18 @@
 #include <string.h> /* Needed by: memset, memcpy */
 #include <assert.h> /* Needed by: assert */
 
+/* ========== Data types ========= */
+/* These data types can be overridden via compile-time symbols */
+#ifndef long32
+# define long32 int
+#endif
+#ifndef long64
+# define long64 long long
+#endif
+#ifndef datePointer
+# define datePointer long
+#endif
+
 /* ========== Definitions for the event header ========== */
 
 /* ------------------------- Header base size ------------------------- */
@@ -511,10 +524,10 @@ struct eventLocationDescriptorStruct {
 /* Macro to load the trigger classes of an event header
    using the cdhTriggerClasses* fields */
 #define CDH_LOAD_EVENT_TRIGGER_PATTERN( etp, l, ml, mh, h )    \
-  ( etp[0] = ((unsigned long32)(l)),                                   \
-    etp[1] = ((unsigned long32)(ml) & 0x0003ffff) | ((unsigned long32)(mh) << 18), \
-    etp[2] = ((unsigned long32)(mh) >> 14) | ((unsigned long32)(h) << 18), \
-    etp[3] = ((unsigned long32)(h)  >> 14) & 0xf)
+  ( etp[0] = ((unsigned long32)(l)),                           \
+    etp[1] = ((unsigned long32)(ml)),                          \
+    etp[2] = ((unsigned long32)(mh)),                          \
+    etp[3] = ((unsigned long32)(h) & 0xf) )
 
 /* Please note how the above data structure has been
    defined for LE systems. Code running on BE systems
@@ -539,13 +552,12 @@ struct commonDataHeaderStruct {
   /* ------------------------------------- */
   unsigned cdhTriggerClassesLow         : 32; // Goes into eventTriggerPattern[0]
   /* ------------------------------------- */
-  unsigned cdhTriggerClassesMiddleLow   : 18; // Goes into eventTriggerPattern[1] (low)
-  unsigned cdhMBZ2                      : 14;
+  unsigned cdhTriggerClassesMiddleLow   : 32; // Goes into eventTriggerPattern[1]
   /* ------------------------------------- */
-  unsigned cdhTriggerClassesMiddleHigh  : 32; // Goes into eventTriggerPattern[1] (high) and [2] (low)
+  unsigned cdhTriggerClassesMiddleHigh  : 32; // Goes into eventTriggerPattern[2]
   /* ------------------------------------- */
-  unsigned cdhTriggerClassesHigh        : 18; // Goes into eventTriggerPattern[2] (high) and [3]
-  unsigned cdhMBZ4                      : 10;
+  unsigned cdhTriggerClassesHigh        :  4; // Goes into eventTriggerPattern[3] (zero-filled)
+  unsigned cdhMBZ4                      : 24;
   unsigned cdhRoiLow                    :  4;
   /* ------------------------------------- */
   unsigned cdhRoiHigh                   : 32;