From f8c41ec77b56a8653a0fe8ccc36a82f98f20fcd8 Mon Sep 17 00:00:00 2001 From: aszostak Date: Fri, 11 Nov 2011 14:17:44 +0000 Subject: [PATCH] Will now forward the whole trigger meta data structure normally passed to HLT components as a data block through TCPDumpSubscriber. So updating datatype appropriately. --- HLT/BASE/AliHLTDataTypes.cxx | 6 +++--- HLT/BASE/AliHLTDataTypes.h | 15 ++++++++------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/HLT/BASE/AliHLTDataTypes.cxx b/HLT/BASE/AliHLTDataTypes.cxx index 33ddb0b230d..14bec23b227 100644 --- a/HLT/BASE/AliHLTDataTypes.cxx +++ b/HLT/BASE/AliHLTDataTypes.cxx @@ -238,9 +238,9 @@ const AliHLTComponentDataType kAliHLTDataTypeInputTriggerCounters = AliHLTCompon const char kAliHLTOutputTriggerCountersDataTypeIDstring[8] = kAliHLTOutputTriggerCountersDataTypeID; const AliHLTComponentDataType kAliHLTDataTypeOutputTriggerCounters = AliHLTComponentDataTypeInitializer(kAliHLTOutputTriggerCountersDataTypeIDstring, kAliHLTDataOriginHLT); -/** Common Data Header block type */ -const char kAliHLTCDHBlockDataTypeIDstring[8] = kAliHLTCDHBlockDataTypeID; -const AliHLTComponentDataType kAliHLTDataTypeCDHBlock = AliHLTComponentDataTypeInitializer(kAliHLTCDHBlockDataTypeIDstring, kAliHLTDataOriginPrivate); +/** Meta data block for the Common Data Header (CDH) and readout list forwarded by TCPDumpSubscriber. */ +const char kAliHLTMetaDataTypeIDstring[8] = kAliHLTMetaDataTypeID; +const AliHLTComponentDataType kAliHLTDataTypeTriggerMetaBlock = AliHLTComponentDataTypeInitializer(kAliHLTMetaDataTypeIDstring, kAliHLTDataOriginPrivate); ////////////////////////////////////////////////////////////////////////// // diff --git a/HLT/BASE/AliHLTDataTypes.h b/HLT/BASE/AliHLTDataTypes.h index 7a428c4ce0d..0f2157fd6a9 100644 --- a/HLT/BASE/AliHLTDataTypes.h +++ b/HLT/BASE/AliHLTDataTypes.h @@ -67,10 +67,11 @@ * Adding data block type for forwarded component table blocks * Adding new event type for software triggers. * 15 Modifying data block types for trigger counter blocks. - * 16 Adding data type for Common Data Header (CDH) block to be forwarded - * by the TCPDumpSubscriber. + * 16 Adding data type for the meta data block to be forwarded by the + * TCPDumpSubscriber for the Common Data Header (CDH) and readout + * list information. */ -#define ALIHLT_DATA_TYPES_VERSION 15 +#define ALIHLT_DATA_TYPES_VERSION 16 ////////////////////////////////////////////////////////////////////////// // @@ -562,10 +563,10 @@ const int kAliHLTComponentDataTypefIDsize=8; */ # define kAliHLTOutputTriggerCountersDataTypeID {'O','T','T','R','G','C','N','T'} -/** Common Data Header block data type that TCPDumpSubscriber sends. +/** Generic meta data block type ID. * @ingroup alihlt_component_datatypes */ -# define kAliHLTCDHBlockDataTypeID {'C','D','H','B','L','O','C','K'} +# define kAliHLTMetaDataTypeID {'M','E','T','A','D','A','T','A'} using namespace std; @@ -1178,10 +1179,10 @@ extern "C" { extern const AliHLTComponentDataType kAliHLTDataTypeComponentFwdTable; /** - * Data type for Common Data Header block sent by TCPDumpSubscriber. + * Data type for the Common Data Header and readout list information sent by TCPDumpSubscriber. * @ingroup alihlt_component_datatypes */ - extern const AliHLTComponentDataType kAliHLTDataTypeCDHBlock; // {CDHBLOCK:PRIV} + extern const AliHLTComponentDataType kAliHLTDataTypeTriggerMetaBlock; // {METADATA:PRIV} ////////////////////////////////////////////////////////////////////////// // -- 2.39.3