From c2b283d6641081b73bc2510b51c9cfe4c6774ef7 Mon Sep 17 00:00:00 2001 From: aszostak Date: Thu, 29 May 2008 12:45:30 +0000 Subject: [PATCH] Fixing generation of HLT DDL header. Event ID high and low words were being swapped. Also filling in correct DDL version number into the CDH header. --- HLT/BASE/AliHLTOUT.h | 6 ++++-- HLT/sim/AliHLTOUTComponent.cxx | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/HLT/BASE/AliHLTOUT.h b/HLT/BASE/AliHLTOUT.h index fd67d6e3ee4..00eb8ee39d8 100644 --- 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 fb3c306c013..f4ebcadbee8 100644 --- 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(&fBuffer[0]); AliHLTOUT::AliHLTOUTEventHeader* pHLTH=reinterpret_cast(&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; -- 2.43.0