rearranging data type ids for HLT TRD data transport (Theodor)

diff --git a/HLT/TRD/AliHLTTRDCalibrationComponent.cxx b/HLT/TRD/AliHLTTRDCalibrationComponent.cxx
index 7c45a7213c9da43e5c3c72c5d06e0ecd797b63c9..c13d9d47b4246ad84b7b51339cf40553c2a1a382 100644 (file)
--- a/HLT/TRD/AliHLTTRDCalibrationComponent.cxx
+++ b/HLT/TRD/AliHLTTRDCalibrationComponent.cxx
@@ -89,7 +89,7 @@ void AliHLTTRDCalibrationComponent::GetInputDataTypes( vector<AliHLTComponentDat
 {
   // Get the list of input data
   list.clear(); // We do not have any requirements for our input data type(s).
-  list.push_back(AliHLTTRDDefinitions::fgkTRDSATracksDataType);
+  list.push_back(AliHLTTRDDefinitions::fgkTracksDataType);
 }
 
 AliHLTComponentDataType AliHLTTRDCalibrationComponent::GetOutputDataType()

diff --git a/HLT/TRD/AliHLTTRDDefinitions.cxx b/HLT/TRD/AliHLTTRDDefinitions.cxx
index 209d33f8d53b82a802287e0d0f38a8fe9e0e9034..a6725673682094f4c92bff66c8185bdee5eea3a7 100644 (file)
--- a/HLT/TRD/AliHLTTRDDefinitions.cxx
+++ b/HLT/TRD/AliHLTTRDDefinitions.cxx
@@ -27,11 +27,15 @@
 
 ClassImp(AliHLTTRDDefinitions)
 
+const AliHLTComponentDataType AliHLTTRDDefinitions::fgkDigitsDataType = { sizeof(AliHLTComponentDataType), {'A','L','I','T','R','E','E','D'},{'T','R','D',' '}};;
+
 const AliHLTComponentDataType AliHLTTRDDefinitions::fgkClusterDataType = { sizeof(AliHLTComponentDataType), {'C','L','U','S','T','E','R','S'},{'T','R','D',' '}};;
 
-const AliHLTComponentDataType AliHLTTRDDefinitions::fgkTRDSATracksDataType = { sizeof(AliHLTComponentDataType), {'T','R','A','C','K','S','S','A'},{'T','R','D',' '}};;
+const AliHLTComponentDataType AliHLTTRDDefinitions::fgkHiLvlClusterDataType = { sizeof(AliHLTComponentDataType), {'H','I','C','L','U','S','T','S'},{'T','R','D',' '}};;
+
+const AliHLTComponentDataType AliHLTTRDDefinitions::fgkTracksDataType = { sizeof(AliHLTComponentDataType), {'T','R','A','C','K','S','S','A'},{'T','R','D',' '}};;
 
-const AliHLTComponentDataType AliHLTTRDDefinitions::fgkTRDOffTracksDataType = { sizeof(AliHLTComponentDataType), {'O','F','F','T','R','A','C','K'},{'T','R','D',' '}};;
+const AliHLTComponentDataType AliHLTTRDDefinitions::fgkHiLvlTracksDataType = { sizeof(AliHLTComponentDataType), {'H','I','T','R','A','C','K','S'},{'T','R','D',' '}};;
 
 const AliHLTComponentDataType AliHLTTRDDefinitions::fgkMCMtrackletDataType = { sizeof(AliHLTComponentDataType), {'M','C','M','T','R','L','E','T'},{'T','R','D',' '}};;
 

diff --git a/HLT/TRD/AliHLTTRDDefinitions.h b/HLT/TRD/AliHLTTRDDefinitions.h
index 824ef62697e35b3de6f9135bb0248134d544e006..88c9a15178977cfa5772d0dba6cef267e778f8b2 100644 (file)
--- a/HLT/TRD/AliHLTTRDDefinitions.h
+++ b/HLT/TRD/AliHLTTRDDefinitions.h
@@ -28,9 +28,11 @@ public:
   AliHLTTRDDefinitions();
   virtual ~AliHLTTRDDefinitions();
   
-  static const AliHLTComponentDataType fgkClusterDataType; // TRD Cluster Data
-  static const AliHLTComponentDataType fgkTRDSATracksDataType; // Stand Alone tracks
-  static const AliHLTComponentDataType fgkTRDOffTracksDataType; // Stand Alone tracks for offline comparation
+  static const AliHLTComponentDataType fgkDigitsDataType;  // TRD digits 
+  static const AliHLTComponentDataType fgkClusterDataType; // Cluster
+  static const AliHLTComponentDataType fgkHiLvlClusterDataType; // Cluster for offline comparation
+  static const AliHLTComponentDataType fgkTracksDataType; // Stand Alone tracks
+  static const AliHLTComponentDataType fgkHiLvlTracksDataType; // Stand Alone tracks for offline comparation
   static const AliHLTComponentDataType fgkMCMtrackletDataType; // MCM tracklet Data
   static const AliHLTComponentDataType fgkMCMcalibrationDataType; // MCM Calibration data
   static const AliHLTComponentDataType fgkCalibrationDataType; // Calibration with TRDtracks

diff --git a/HLT/TRD/AliHLTTRDEsdWriterComponent.cxx b/HLT/TRD/AliHLTTRDEsdWriterComponent.cxx
index 9b39e764cb20d14b57e1d624c85086cf7ffd9808..e40546297049a1d2bd0a242c81b50c8444d3b1c1 100644 (file)
--- a/HLT/TRD/AliHLTTRDEsdWriterComponent.cxx
+++ b/HLT/TRD/AliHLTTRDEsdWriterComponent.cxx
@@ -65,7 +65,7 @@ void AliHLTTRDEsdWriterComponent::GetInputDataTypes( vector<AliHLTComponent_Data
 {
   // Get the list of input data  
   list.clear(); // We do not have any requirements for our input data type(s).
-  list.push_back( AliHLTTRDDefinitions::fgkTRDSATracksDataType );
+  list.push_back( AliHLTTRDDefinitions::fgkTracksDataType );
 }
 
 AliHLTTRDEsdWriterComponent::~AliHLTTRDEsdWriterComponent()

diff --git a/HLT/TRD/AliHLTTRDOfflineTrackerV1Component.cxx b/HLT/TRD/AliHLTTRDOfflineTrackerV1Component.cxx
index 3399be27641b24e546f606cdc6957f1f11759530..d850856151ae1f643d252bcb6437a6b6246e504a 100644 (file)
--- a/HLT/TRD/AliHLTTRDOfflineTrackerV1Component.cxx
+++ b/HLT/TRD/AliHLTTRDOfflineTrackerV1Component.cxx
@@ -46,8 +46,7 @@ int AliHLTTRDOfflineTrackerV1Component::GetOutputDataTypes(AliHLTComponentDataTy
 {
   // Get the output data types
   tgtList.clear();
-  AliHLTTRDTrackerV1Component::GetOutputDataTypes(tgtList);
-  tgtList.push_back(AliHLTTRDDefinitions::fgkTRDOffTracksDataType);
+  tgtList.push_back(AliHLTTRDDefinitions::fgkHiLvlTracksDataType);
   return tgtList.size();
 }
 

diff --git a/HLT/TRD/AliHLTTRDTrackerV1Component.cxx b/HLT/TRD/AliHLTTRDTrackerV1Component.cxx
index b9f76666473bf3ce0cc4e98764b4ef599c7c9cc6..444e17b85c43df7c6f16a15389cf1be808053249 100644 (file)
--- a/HLT/TRD/AliHLTTRDTrackerV1Component.cxx
+++ b/HLT/TRD/AliHLTTRDTrackerV1Component.cxx
@@ -112,7 +112,7 @@ int AliHLTTRDTrackerV1Component::GetOutputDataTypes(AliHLTComponentDataTypeList&
   tgtList.clear();
   //tgtList.push_back(AliHLTTRDDefinitions::fgkTimeBinPropagationDataType);
   tgtList.push_back(kAliHLTDataTypeTrack | kAliHLTDataOriginTRD);
-  tgtList.push_back(AliHLTTRDDefinitions::fgkTRDSATracksDataType);
+  tgtList.push_back(AliHLTTRDDefinitions::fgkTracksDataType);
   return tgtList.size();
 }
 
@@ -291,7 +291,7 @@ int AliHLTTRDTrackerV1Component::DoEvent( const AliHLTComponentEventData& evtDat
          bd.fOffset = offset;
          bd.fSize = addedSize;
          bd.fSpecification = block.fSpecification;
-         bd.fDataType = AliHLTTRDDefinitions::fgkTRDSATracksDataType;
+         bd.fDataType = AliHLTTRDDefinitions::fgkTracksDataType;
          outputBlocks.push_back( bd );
          HLTDebug("BD ptr 0x%x, offset %i, size %i, dataType %s, spec 0x%x ", bd.fPtr, bd.fOffset, bd.fSize, DataType2Text(bd.fDataType).c_str(), bd.fSpecification);
          offset = totalSize;
@@ -299,9 +299,9 @@ int AliHLTTRDTrackerV1Component::DoEvent( const AliHLTComponentEventData& evtDat
       }
       if(fOffline){
        if(trdTracks)
-         PushBack(trdTracks, AliHLTTRDDefinitions::fgkTRDOffTracksDataType, 0); 
+         PushBack(trdTracks, AliHLTTRDDefinitions::fgkHiLvlTracksDataType, 0); 
        else
-         PushBack(new TObject, AliHLTTRDDefinitions::fgkTRDOffTracksDataType, 0);
+         PushBack(new TObject, AliHLTTRDDefinitions::fgkHiLvlTracksDataType, 0);
       }
 
       HLTDebug("totalSize: %i", totalSize);