speedup of track model compression by another factor 2

diff --git a/HLT/TPCLib/comp/AliHLTTPCDataCompressionComponent.cxx b/HLT/TPCLib/comp/AliHLTTPCDataCompressionComponent.cxx
index 6d3a7f8ad33a7fc8efd68f5e2a645591d8f8e2e5..7a254083aef559d70567c5ef17cd29a9ca2c06d8 100644 (file)
--- a/HLT/TPCLib/comp/AliHLTTPCDataCompressionComponent.cxx
+++ b/HLT/TPCLib/comp/AliHLTTPCDataCompressionComponent.cxx
@@ -336,7 +336,7 @@ int AliHLTTPCDataCompressionComponent::DoEvent( const AliHLTComponentEventData&
       assignedInThisPartition=iResult;
       associatedClusters+=iResult;
     }
-    iResult=ProcessRemainingClusters(&inputTrackArray[0], inputTrackArray.size(), fTrackGrid, fSpacePointGrid, fRawInputClusters, slice, patch);
+    iResult=ProcessRemainingClusters(&inputTrackArray[0], inputTrackArray.size(), fTrackGrid, trackindexmap, fSpacePointGrid, fRawInputClusters, slice, patch);
     if (iResult>=0) {
       if (fSpacePointGrid->GetNumberOfSpacePoints()>0) {
        if (fVerbosity>0) HLTInfo("associated %d (%d) of %d clusters in slice %d partition %d", iResult+assignedInThisPartition, assignedInThisPartition, fSpacePointGrid->GetNumberOfSpacePoints(), slice, patch);
@@ -545,6 +545,7 @@ int AliHLTTPCDataCompressionComponent::ProcessTrackClusters(AliHLTGlobalBarrelTr
 
 int AliHLTTPCDataCompressionComponent::ProcessRemainingClusters(AliHLTGlobalBarrelTrack* pTracks, unsigned nofTracks,
                                                                AliHLTTrackGeometry::AliHLTTrackGrid* pTrackIndex,
+                                                               const vector<int>& trackIndexMap,
                                                                AliHLTSpacePointContainer::AliHLTSpacePointPropertyGrid* pClusterIndex,
                                                                AliHLTSpacePointContainer* pClusters,
                                                                int slice, int partition) const
@@ -557,15 +558,16 @@ int AliHLTTPCDataCompressionComponent::ProcessRemainingClusters(AliHLTGlobalBarr
   for (int padrow=0; padrow<AliHLTTPCTransform::GetNRows(partition); padrow++) {
     for (AliHLTTrackGeometry::AliHLTTrackGrid::iterator& trackId=pTrackIndex->begin(slice, partition, padrow);
         trackId!=pTrackIndex->end(); trackId++) {
-      unsigned i=0;
-      for (; i<nofTracks; i++) {
-       if ((unsigned)pTracks[i].GetID()==trackId.Data()) break;
+      if (trackId.Data()>=trackIndexMap.size()) {
+       HLTError("can not find track id %d in index map of size %d", trackId.Data(), trackIndexMap.size());
+       continue;
       }
-      if (i>=nofTracks) {
-       HLTError("can not find track of id %d", trackId.Data());
+      int trackindex=trackIndexMap[trackId.Data()];
+      if (trackindex<0 || trackindex>=(int)nofTracks) {
+       HLTError("invalid index %d found for track id %d", trackindex, trackId.Data());
        continue;
       }
-      AliHLTGlobalBarrelTrack& track=pTracks[i];
+      AliHLTGlobalBarrelTrack& track=pTracks[trackindex];
       if (!track.GetTrackGeometry()) {
        HLTError("can not find track geometry for track %d", trackId.Data());
        continue;

diff --git a/HLT/TPCLib/comp/AliHLTTPCDataCompressionComponent.h b/HLT/TPCLib/comp/AliHLTTPCDataCompressionComponent.h
index 7803d0e45b19252a137a792e197d9dd485dde639..837ce0297d56ccc54d84005f4d74b66e6e78704c 100644 (file)
--- a/HLT/TPCLib/comp/AliHLTTPCDataCompressionComponent.h
+++ b/HLT/TPCLib/comp/AliHLTTPCDataCompressionComponent.h
@@ -128,6 +128,7 @@ protected:
 
   int ProcessRemainingClusters(AliHLTGlobalBarrelTrack* pTracks, unsigned nofTracks,
                               AliHLTTrackGeometry::AliHLTTrackGrid* pTrackIndex,
+                              const vector<int>& trackIndexMap,
                               AliHLTSpacePointContainer::AliHLTSpacePointPropertyGrid* pClusterIndex,
                               AliHLTSpacePointContainer* pClusters,
                               int slice, int partition) const;