changing argument type to pointer to better fit the implementation in the decoder...
authorrichterm <richterm@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 6 Dec 2011 21:52:47 +0000 (21:52 +0000)
committerrichterm <richterm@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 6 Dec 2011 21:52:47 +0000 (21:52 +0000)
HLT/TPCLib/HWCFemulator/AliHLTTPCHWClusterMerger.cxx
HLT/TPCLib/HWCFemulator/AliHLTTPCHWClusterMerger.h
HLT/TPCLib/HWCFemulator/macro/ClusterMergerQA.C

index 3d1757a..ce3b32c 100644 (file)
@@ -213,7 +213,7 @@ int AliHLTTPCHWClusterMerger::AddCandidate(int slice,
                                           unsigned short charge,
                                           unsigned short qmax,
                                           AliHLTUInt32_t id,
-                                          const AliHLTTPCClusterMCLabel &mc 
+                                          const AliHLTTPCClusterMCLabel *mc 
                                           )
 {
   /// add a candidate for merging and register in the index grid
@@ -260,7 +260,8 @@ int AliHLTTPCHWClusterMerger::AddCandidate(int slice,
   }
 
   fClusters.push_back(AliClusterRecord(slice, partition, iBorder, -1, id,
-                                      AliHLTTPCRawCluster(partitionrow, pad, time, sigmaY2, sigmaZ2, charge, qmax), mc ));
+                                      AliHLTTPCRawCluster(partitionrow, pad, time, sigmaY2, sigmaZ2, charge, qmax),
+                                      mc!=NULL?*mc:AliHLTTPCClusterMCLabel() ));
 
   if( iBorder>=0 ){
     fBorderNClusters[iBorder]++;
index 0568f08..1b525b3 100644 (file)
@@ -76,7 +76,7 @@ class AliHLTTPCHWClusterMerger : public AliHLTLogging
                   int partition,
                   AliHLTUInt32_t id,
                   const T& c,
-                  const AliHLTTPCClusterMCLabel &mc) {
+                  const AliHLTTPCClusterMCLabel *mc) {
     return AddCandidate(slice,
                        partition,
                        c.GetPadRow(),
@@ -102,7 +102,7 @@ class AliHLTTPCHWClusterMerger : public AliHLTLogging
                   unsigned short charge,
                   unsigned short qmax,
                   AliHLTUInt32_t id=~AliHLTUInt32_t(0),
-                  const AliHLTTPCClusterMCLabel &mc=AliHLTTPCClusterMCLabel()
+                  const AliHLTTPCClusterMCLabel *mc=NULL
                   );
 
   /// merge clusters
index 596fdda..e8e80c3 100644 (file)
@@ -194,7 +194,7 @@ Int_t runTest(const char *recPointsName )
          if( !merger.CheckCandidate(slice, patch, rawCluster) ) continue;
          
          
-         int id = merger.AddCandidate(slice, patch, ~AliHLTUInt32_t(0), rawCluster, mc);
+         int id = merger.AddCandidate(slice, patch, ~AliHLTUInt32_t(0), rawCluster, &mc);
          if( id>=0 ){
            nAccepted++;
            vClusters.push_back(*cl);