From 910807dde622d0bf842f325d048f688e8b7fd1d9 Mon Sep 17 00:00:00 2001 From: szostak Date: Fri, 18 May 2007 20:24:28 +0000 Subject: [PATCH] Fixing data type constants. --- HLT/MUON/AliHLTMUONConstants.cxx | 52 +++++++++++++++----- HLT/MUON/AliHLTMUONConstants.h | 81 +++++++++++++++++++++----------- 2 files changed, 93 insertions(+), 40 deletions(-) diff --git a/HLT/MUON/AliHLTMUONConstants.cxx b/HLT/MUON/AliHLTMUONConstants.cxx index 3e524041fd7..ea692796bd3 100644 --- a/HLT/MUON/AliHLTMUONConstants.cxx +++ b/HLT/MUON/AliHLTMUONConstants.cxx @@ -25,11 +25,16 @@ #include "AliHLTMUONConstants.h" + const AliHLTMUONRecHitStruct AliHLTMUONConstants::fgkNilRecHitStruct = {0, 0, 0}; -const AliHLTMUONChannelInfoStruct -AliHLTMUONConstants::fgkNilChannelInfoStruct = {0, 0, 0, 0}; +const AliHLTMUONClusterStruct +AliHLTMUONConstants::fgkNilClusterStruct = {0, {0, 0, 0}, 0, 0}; + +const AliHLTMUONChannelStruct +AliHLTMUONConstants::fgkNilChannelStruct = {0, 0, 0, 0, 0}; + const AliHLTComponentDataType AliHLTMUONConstants::fgkTriggerDDLStreamDataType = { @@ -46,30 +51,44 @@ AliHLTMUONConstants::fgkTrackingDDLStreamDataType = { }; const AliHLTComponentDataType -AliHLTMUONConstants::fgkRecHitsBlockDataType = { +AliHLTMUONConstants::fgkTriggerRecordsBlockDataType = { sizeof(AliHLTComponentDataType), - {'R','E','C','H','I','T','S',' '}, + {'T','R','I','G','R','E','C','S'}, {'D','I','M','U'} }; const AliHLTComponentDataType -AliHLTMUONConstants::fgkRecHitsDebugBlockDataType = { +AliHLTMUONConstants::fgkTrigRecsDebugBlockDataType = { sizeof(AliHLTComponentDataType), - {'R','H','I','T','S','d','b','g'}, + {'T','R','I','G','R','D','B','G'}, {'D','I','M','U'} }; const AliHLTComponentDataType -AliHLTMUONConstants::fgkTriggerRecordsBlockDataType = { +AliHLTMUONConstants::fgkTriggerChannelBlockDataType = { sizeof(AliHLTComponentDataType), - {'T','R','I','G','R','E','C','S'}, + {'T','R','I','G','C','H','N','L'}, + {'D','I','M','U'} +}; + +const AliHLTComponentDataType +AliHLTMUONConstants::fgkRecHitsBlockDataType = { + sizeof(AliHLTComponentDataType), + {'R','E','C','H','I','T','S',' '}, {'D','I','M','U'} }; const AliHLTComponentDataType -AliHLTMUONConstants::fgkTriggerRecordsDebugBlockDataType = { +AliHLTMUONConstants::fgkClusterBlockDataType = { sizeof(AliHLTComponentDataType), - {'T','R','I','G','R','d','b','g'}, + {'C','L','U','S','T','E','R','S'}, + {'D','I','M','U'} +}; + +const AliHLTComponentDataType +AliHLTMUONConstants::fgkChannelBlockDataType = { + sizeof(AliHLTComponentDataType), + {'C','H','A','N','N','E','L','S'}, {'D','I','M','U'} }; @@ -81,9 +100,16 @@ AliHLTMUONConstants::fgkMansoTracksBlockDataType = { }; const AliHLTComponentDataType -AliHLTMUONConstants::fgkMansoTracksDebugBlockDataType = { +AliHLTMUONConstants::fgkMansoRoIBlockDataType = { + sizeof(AliHLTComponentDataType), + {'M','A','N','S','O','R','O','I'}, + {'D','I','M','U'} +}; + +const AliHLTComponentDataType +AliHLTMUONConstants::fgkMansoTrialsBlockDataType = { sizeof(AliHLTComponentDataType), - {'M','N','T','R','K','d','b','g'}, + {'M','A','N','T','R','I','A','L'}, {'D','I','M','U'} }; @@ -97,6 +123,6 @@ AliHLTMUONConstants::fgkDecisionBlockDataType = { const AliHLTComponentDataType AliHLTMUONConstants::fgkDecisionDebugBlockDataType = { sizeof(AliHLTComponentDataType), - {'D','E','C','I','S','d','b','g'}, + {'D','E','C','I','S','D','B','G'}, {'D','I','M','U'} }; diff --git a/HLT/MUON/AliHLTMUONConstants.h b/HLT/MUON/AliHLTMUONConstants.h index 5c8f0161330..1a9abf38e61 100644 --- a/HLT/MUON/AliHLTMUONConstants.h +++ b/HLT/MUON/AliHLTMUONConstants.h @@ -13,9 +13,10 @@ * @brief Class containing various dimuon HLT constants used in the system. */ -#include "AliHLTDataTypes.h" +#include "AliHLTMUONTriggerRecordsBlockStruct.h" #include "AliHLTMUONRecHitsBlockStruct.h" -#include "AliHLTMUONRecHitsDebugBlockStruct.h" +#include "AliHLTMUONClustersBlockStruct.h" +#include "AliHLTMUONChannelsBlockStruct.h" /** * AliHLTMUONConstants contains a list of global dimuon HLT specific constants @@ -31,14 +32,14 @@ public: return fgkNilRecHitStruct; } - static const AliHLTMUONChannelInfoStruct& NilChannelInfoStruct() + static const AliHLTMUONChannelStruct& NilChannelStruct() { - return fgkNilChannelInfoStruct; + return fgkNilChannelStruct; } - static const AliHLTMUONClusterInfoStruct& NilClusterInfoStruct() + static const AliHLTMUONClusterStruct& NilClusterStruct() { - return fgkNilClusterInfoStruct; + return fgkNilClusterStruct; } static const AliHLTComponentDataType& TriggerDDLStreamDataType() @@ -51,24 +52,34 @@ public: return fgkTrackingDDLStreamDataType; } - static const AliHLTComponentDataType& RecHitsBlockDataType() + static const AliHLTComponentDataType& TriggerRecordsBlockDataType() { - return fgkRecHitsBlockDataType; + return fgkTriggerRecordsBlockDataType; } - static const AliHLTComponentDataType& RecHitsDebugBlockDataType() + static const AliHLTComponentDataType& TrigRecsDebugBlockDataType() { - return fgkRecHitsDebugBlockDataType; + return fgkTrigRecsDebugBlockDataType; } - static const AliHLTComponentDataType& TriggerRecordsBlockDataType() + static const AliHLTComponentDataType& TriggerChannelBlockDataType() { - return fgkTriggerRecordsBlockDataType; + return fgkTriggerChannelBlockDataType; + } + + static const AliHLTComponentDataType& RecHitsBlockDataType() + { + return fgkRecHitsBlockDataType; + } + + static const AliHLTComponentDataType& ClusterBlockDataType() + { + return fgkClusterBlockDataType; } - static const AliHLTComponentDataType& TriggerRecordsDebugBlockDataType() + static const AliHLTComponentDataType& ChannelBlockDataType() { - return fgkTriggerRecordsDebugBlockDataType; + return fgkChannelBlockDataType; } static const AliHLTComponentDataType& MansoTracksBlockDataType() @@ -76,9 +87,14 @@ public: return fgkMansoTracksBlockDataType; } - static const AliHLTComponentDataType& MansoTracksDebugBlockDataType() + static const AliHLTComponentDataType& MansoRoIBlockDataType() { - return fgkMansoTracksDebugBlockDataType; + return fgkMansoRoIBlockDataType; + } + + static const AliHLTComponentDataType& MansoTrialsBlockDataType() + { + return fgkMansoTrialsBlockDataType; } static const AliHLTComponentDataType& DecisionBlockDataType() @@ -100,10 +116,10 @@ private: static const AliHLTMUONRecHitStruct fgkNilRecHitStruct; // Sentinel structure for channel information. - static const AliHLTMUONChannelInfoStruct fgkNilChannelInfoStruct; + static const AliHLTMUONChannelStruct fgkNilChannelStruct; // Sentinel structure for cluster information. - static const AliHLTMUONClusterInfoStruct fgkNilClusterInfoStruct; + static const AliHLTMUONClusterStruct fgkNilClusterStruct; // DDL packed data block type from dimuon trigger stations. static const AliHLTComponentDataType fgkTriggerDDLStreamDataType; @@ -111,23 +127,34 @@ private: // DDL packed data block type from dimuon tracking stations. static const AliHLTComponentDataType fgkTrackingDDLStreamDataType; - // Reconstructed hits block type generated by hit reconstruction components. - static const AliHLTComponentDataType fgkRecHitsBlockDataType; - - // Debugging information block type generated by hit reconstruction components. - static const AliHLTComponentDataType fgkRecHitsDebugBlockDataType; - // Trigger records block type generated by trigger DDL translation components. static const AliHLTComponentDataType fgkTriggerRecordsBlockDataType; // Debugging information block type generated by trigger DDL translation components. - static const AliHLTComponentDataType fgkTriggerRecordsDebugBlockDataType; + static const AliHLTComponentDataType fgkTrigRecsDebugBlockDataType; + + // Debugging information about the channels from the hardware trigger. + static const AliHLTComponentDataType fgkTriggerChannelBlockDataType; + + // Reconstructed hits block type generated by hit reconstruction components. + static const AliHLTComponentDataType fgkRecHitsBlockDataType; + + // Debugging information block type for reconstructed hit clusters. + static const AliHLTComponentDataType fgkClusterBlockDataType; + + // Debugging information block type for channels corresponding to clusters. + static const AliHLTComponentDataType fgkChannelBlockDataType; // Manso tracks block type generated by Manso tracker components. static const AliHLTComponentDataType fgkMansoTracksBlockDataType; - // Debugging information block type generated by Manso tracker components. - static const AliHLTComponentDataType fgkMansoTracksDebugBlockDataType; + // Debugging information block type containing region of interests + // considered by the Manso tracker components. + static const AliHLTComponentDataType fgkMansoRoIBlockDataType; + + // Debugging information block type containing the trial tracks considered + // by the Manso tracker components. + static const AliHLTComponentDataType fgkMansoTrialsBlockDataType; // Trigger decision block type generated by dimuon HLT trigger components. static const AliHLTComponentDataType fgkDecisionBlockDataType; -- 2.39.3