X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=blobdiff_plain;f=HLT%2FBASE%2FAliHLTDataTypes.h;h=d9e1cc5366e5d12e41fce13317e9a6214eff0249;hp=0a7c8cd3ff4ed7fa428fd6126b89cfc542e54ac8;hb=511b250948b8c2b77b15b6aa73f6183351e39149;hpb=1a5b20b82f0904212509701f1657feb09ef7f4b8 diff --git a/HLT/BASE/AliHLTDataTypes.h b/HLT/BASE/AliHLTDataTypes.h index 0a7c8cd3ff4..d9e1cc5366e 100644 --- a/HLT/BASE/AliHLTDataTypes.h +++ b/HLT/BASE/AliHLTDataTypes.h @@ -289,7 +289,7 @@ extern "C" { * The struct is send with the DDLLIST event. * Used in the trigger structure for internal apperance of * the DLLs as well as for the HLT readout list send to DAQ - * ( as DataType :kAliHLTDataTypeDDL ) + * ( as DataType : kAliHLTDataTypeDDL ) */ struct AliHLTEventDDL { @@ -297,51 +297,15 @@ extern "C" { AliHLTUInt32_t fList[gkAliHLTDDLListSize]; }; - /** - * @struct AliHLTBlockHeader - * 1 to 1 copy from HLT framework, remember before changeing - */ - struct AliHLTBlockHeader - { - AliHLTUInt32_t fLength; - union - { - AliHLTUInt32_t fID; - AliHLTUInt8_t fDescr[4]; - } fType; - union - { - AliHLTUInt32_t fID:24; - AliHLTUInt8_t fDescr[3]; - } fSubType; - AliHLTUInt8_t fVersion; - }; - - /** - * @struct AliHLTEventTriggerStruct - * 1 to 1 copy from HLT framework, remember before changeing - */ - struct AliHLTEventTriggerStruct - { - AliHLTBlockHeader fHeader; - AliHLTUInt32_t fDataWordCount; - AliHLTUInt32_t fDataWords[0]; - }; - /** * @struct AliHLTEventTriggerData - * 1 to 1 copy from HLT framework, remember before changeing */ struct AliHLTEventTriggerData { - AliHLTEventTriggerStruct fETS; AliHLTUInt8_t fAttributes[gkAliHLTBlockDAttributeCount]; - /** Bit field */ - AliHLTUInt64_t fHLTStatus; + AliHLTUInt64_t fHLTStatus; // Bit field AliHLTUInt32_t fCommonHeaderWordCnt; AliHLTUInt32_t fCommonHeader[gkAliHLTCommonHeaderCount]; - /** First word holds number of words (excluding first word) */ - //AliHLTUInt32_t fReadoutList[gkAliHLTDDLListSize+1]; AliHLTEventDDL fReadoutList; };