Fixing generation of HLT DDL header. Event ID high and low words were being swapped...

diff --git a/HLT/BASE/AliHLTOUT.h b/HLT/BASE/AliHLTOUT.h
index fd67d6e3ee47545213bbb4cf3dafeb2b6600942c..00eb8ee39d85c5d99a9db4beb51328eb1bfc5f67 100644 (file)
--- a/HLT/BASE/AliHLTOUT.h
+++ b/HLT/BASE/AliHLTOUT.h
@@ -76,8 +76,10 @@ class AliHLTOUT : public AliHLTLogging {
     AliHLTUInt32_t fLength; //! see above
     /** version of the header */
     AliHLTUInt32_t fVersion; //! see above
-    /** event id */
-    AliHLTUInt64_t fEventID; //! see above
+    /** High 32 bit word of event id */
+    AliHLTUInt32_t fEventIDHigh; //! see above
+    /** Low 32 bit word of event id */
+    AliHLTUInt32_t fEventIDLow; //! see above
   };
 
   enum {

diff --git a/HLT/sim/AliHLTOUTComponent.cxx b/HLT/sim/AliHLTOUTComponent.cxx
index fb3c306c013c63ace8c944c8b41f9aa2c374c748..f4ebcadbee862994ac2d20c46b02fe14b834dc1a 100644 (file)
--- a/HLT/sim/AliHLTOUTComponent.cxx
+++ b/HLT/sim/AliHLTOUTComponent.cxx
@@ -326,7 +326,7 @@ int AliHLTOUTComponent::FillOutputBuffer(int eventNo, AliHLTMonitoringWriter* pW
   if (bufferSize<=fBuffer.size()) {
     AliRawDataHeader* pCDH=reinterpret_cast<AliRawDataHeader*>(&fBuffer[0]);
     AliHLTOUT::AliHLTOUTEventHeader* pHLTH=reinterpret_cast<AliHLTOUT::AliHLTOUTEventHeader*>(&fBuffer[sizeof(AliRawDataHeader)]);
-    memset(pCDH, 0, sizeof(AliRawDataHeader));
+    *pCDH = AliRawDataHeader();  // Fill with default values.
     memset(pHLTH, 0, sizeof(AliHLTOUT::AliHLTOUTEventHeader));
 
     if (pWriter) {
@@ -337,7 +337,8 @@ int AliHLTOUTComponent::FillOutputBuffer(int eventNo, AliHLTMonitoringWriter* pW
       pCDH->fStatusMiniEventID|=0x1<<(AliHLTOUT::kCDHStatusFlagsOffset+AliHLTOUT::kCDHFlagsHLTPayload);
     }
     pHLTH->fLength+=sizeof(AliHLTOUT::AliHLTOUTEventHeader);
-    pHLTH->fEventID=eventNo;
+    // pHLTH->fEventIDLow is already set to zero in memset above.
+    pHLTH->fEventIDLow = eventNo;
     // version does not really matter since we do not add decision data
     pHLTH->fVersion=AliHLTOUT::kVersion1;