code cleanup: remove unused data in HLTTRDTracklet (clusters indexes) (Theo)

diff --git a/HLT/TRD/AliHLTTRDTracklet.cxx b/HLT/TRD/AliHLTTRDTracklet.cxx
index baec8bdc241956fe77053072138454181c8f7683..3552157355374d759be03379dd6e995192584f26 100644 (file)
--- a/HLT/TRD/AliHLTTRDTracklet.cxx
+++ b/HLT/TRD/AliHLTTRDTracklet.cxx
@@ -14,7 +14,7 @@ AliHLTTRDTracklet::AliHLTTRDTracklet():
   fDet(-1),
   fCount(0),
 #if defined(__HP_aCC) || defined(__DECCXX) || defined(__SUNPRO_CC)
-  fSize(sizeof(AliHLTTRDTracklet)-sizeof(IndexAndCluster))
+  fSize(sizeof(AliHLTTRDTracklet)-sizeof(AliHLTTRDCluster)),
 #else
   fSize(sizeof(AliHLTTRDTracklet))
 #endif
@@ -37,7 +37,7 @@ AliHLTTRDTracklet::AliHLTTRDTracklet(const AliTRDseedV1* const inTracklet):
   fDet(inTracklet->fDet),
   fCount(0),
 #if defined(__HP_aCC) || defined(__DECCXX) || defined(__SUNPRO_CC)
-  fSize(sizeof(AliHLTTRDTracklet)-sizeof(IndexAndCluster))
+  fSize(sizeof(AliHLTTRDTracklet)-sizeof(AliHLTTRDCluster)),
 #else
   fSize(sizeof(AliHLTTRDTracklet))
 #endif
@@ -72,10 +72,9 @@ void AliHLTTRDTracklet::CopyDataMembers(const AliTRDseedV1* const inTracklet)
     {
       AliTRDcluster* trdCluster = inTracklet->GetClusters(iTimeBin);
       if (trdCluster){
-       fClusters[fCount].Index = inTracklet->fIndexes[iTimeBin];
-       new (&fClusters[fCount].Cluster) AliHLTTRDCluster(trdCluster);
+       new (&fClusters[fCount]) AliHLTTRDCluster(trdCluster);
        fCount++;
-       fSize += sizeof(IndexAndCluster);
+       fSize += sizeof(AliHLTTRDCluster);
       }
     }
   
@@ -117,10 +116,9 @@ void AliHLTTRDTracklet::ExportTRDTracklet(AliTRDseedV1* const outTracklet) const
 
   for (UInt_t iCluster=0; iCluster < fCount; iCluster++){
     AliTRDcluster *trdCluster = new AliTRDcluster();
-    fClusters[iCluster].Cluster.ExportTRDCluster(trdCluster);
+    fClusters[iCluster].ExportTRDCluster(trdCluster);
     outTracklet->fClusters[iCluster] = trdCluster;
-    outTracklet->fIndexes[iCluster] = fClusters[iCluster].Index;
-    iCluster++;
+    outTracklet->fIndexes[iCluster] = iCluster;
   }
 }
 
@@ -151,10 +149,9 @@ void AliHLTTRDTracklet::Print(Bool_t printClusters) const
   printf("      fDet %i; fPt %f; fdX %f fN %i\n", fDet, fPt, fdX, fN);
 
   if(!printClusters) return;
-  for (UInt_t iCount=0, iCluster = 0; iCluster < fCount; iCount++){
-    printf(" [%i] ",iCount);
-    fClusters[iCluster].Cluster.Print();
-    iCluster++;
+  for (UInt_t iCluster = 0; iCluster < fCount; iCluster++){
+    printf(" [%i] ",iCluster);
+    fClusters[iCluster].Print();
   }
 }
 

diff --git a/HLT/TRD/AliHLTTRDTracklet.h b/HLT/TRD/AliHLTTRDTracklet.h
index 4788421dd76f6fe35b929c2daf364b1ed3344645..db6bb97156e3b9443a5e4dd8db3eebda1391c77e 100644 (file)
--- a/HLT/TRD/AliHLTTRDTracklet.h
+++ b/HLT/TRD/AliHLTTRDTracklet.h
@@ -68,15 +68,10 @@ class AliHLTTRDTracklet
   AliHLTUInt16_t fCount;                  // Number of clusters saved in the open array
   AliHLTUInt32_t fSize;                   // Size of the tracklet with clusters in the memory
 
-  struct IndexAndCluster{
-    Int_t            Index;
-    AliHLTTRDCluster Cluster;
-    IndexAndCluster():Index(),Cluster() {}
-  }
 #if defined(__HP_aCC) || defined(__DECCXX) || defined(__SUNPRO_CC)
-    fClusters[1];                         // Open array of clusters and their index
+  AliHLTTRDCluster fClusters[1];                         // Open array of clusters and their index
 #else
-    fClusters[0];                         // Open array of clusters and their index
+  AliHLTTRDCluster fClusters[0];                         // Open array of clusters and their index
 #endif
 
 };