Will now forward the whole trigger meta data structure normally passed to HLT compone...

diff --git a/HLT/BASE/AliHLTDataTypes.cxx b/HLT/BASE/AliHLTDataTypes.cxx
index 33ddb0b230dc41e1a99b6212808757b961547338..14bec23b2278b7e9cb7ea0e6c2f64f9bd845d88a 100644 (file)
--- 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 7a428c4ce0d254f7801730805b9ea52de48f4ab4..0f2157fd6a98441b65432e5654fc9b2af47bb3ac 100644 (file)
--- 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}
 
   //////////////////////////////////////////////////////////////////////////
   //