changes from Gaute (TPC)

[u/mrichter/AliRoot.git] / HLT / TPCLib / AliHLTTPCGlobalMergerComponent.cxx

diff --git a/HLT/TPCLib/AliHLTTPCGlobalMergerComponent.cxx b/HLT/TPCLib/AliHLTTPCGlobalMergerComponent.cxx
index 249096d545f17b71a62f039158a26479f6ee505e..47f9263b8818fd698b0e4f40f8ef08649cb80a8c 100644 (file)
--- a/HLT/TPCLib/AliHLTTPCGlobalMergerComponent.cxx
+++ b/HLT/TPCLib/AliHLTTPCGlobalMergerComponent.cxx
@@ -16,11 +16,11 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-///////////////////////////////////////////////////////////////////////////////
-//                                                                           //
-// a TPC sector tracker processing component for the HLT                     //
-//                                                                           //
-///////////////////////////////////////////////////////////////////////////////
+/** @file   AliHLTTPCGlobalMergerComponent.h
+    @author Timm Steinbeck, Matthias Richter
+    @date   
+    @brief  HLT TPC global merger component.
+*/
 
 #if __GNUC__== 3
 using namespace std;
@@ -71,7 +71,7 @@ void AliHLTTPCGlobalMergerComponent::GetInputDataTypes( vector<AliHLTComponentDa
 
 AliHLTComponentDataType AliHLTTPCGlobalMergerComponent::GetOutputDataType()
     {
-    return AliHLTTPCDefinitions::gkTrackSegmentsDataType;
+    return AliHLTTPCDefinitions::gkTracksDataType;
     }
 
 void AliHLTTPCGlobalMergerComponent::GetOutputDataSize( unsigned long& constBase, double& inputMultiplier )
@@ -240,6 +240,7 @@ int AliHLTTPCGlobalMergerComponent::DoEvent( const AliHLTComponentEventData& evt
 
     // Now we can really merge
     fGlobalMerger->Merge();
+    fGlobalMerger->AddAllTracks();
 
     UInt_t ntracks0=0;
     outPtr = (AliHLTTPCTrackletData*)(outputPtr);