]> git.uio.no Git - u/mrichter/AliRoot.git/commitdiff
git://git.uio.no / u / mrichter / AliRoot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f5d6bdb)
Qmax for merged clusters fixed
authorsgorbuno <sgorbuno@f7af4fe6-9843-0410-8265-dc069ae4e863>
Fri, 9 Dec 2011 06:24:43 +0000 (06:24 +0000)
committersgorbuno <sgorbuno@f7af4fe6-9843-0410-8265-dc069ae4e863>
Fri, 9 Dec 2011 06:24:43 +0000 (06:24 +0000)
HLT/TPCLib/HWCFemulator/AliHLTTPCHWClusterMerger.cxx patch | blob | blame | history

diff --git a/HLT/TPCLib/HWCFemulator/AliHLTTPCHWClusterMerger.cxx b/HLT/TPCLib/HWCFemulator/AliHLTTPCHWClusterMerger.cxx
index ce3b32c29658455e8301d1652004e5746ac539df..c179ddf9030c7aaa878a7c8fbbf2d8f42664bbb0 100644 (file)
--- a/HLT/TPCLib/HWCFemulator/AliHLTTPCHWClusterMerger.cxx
+++ b/HLT/TPCLib/HWCFemulator/AliHLTTPCHWClusterMerger.cxx
@@ -392,7 +392,7 @@ sLeft+=n1;
       w2*=w;
       
       c1.Cluster().fCharge += c2.Cluster().fCharge;
-      c1.Cluster().fQMax += c2.Cluster().fQMax;
+      if( c1.Cluster().fQMax < c2.Cluster().fQMax ) c1.Cluster().fQMax = c2.Cluster().fQMax;
       
       c1.Cluster().fSigmaY2 = 
        w1*c1.Cluster().fSigmaY2 + w2*c2.Cluster().fSigmaY2
@@ -426,7 +426,7 @@ sLeft+=n1;
 
       sort(labels, labels+6, CompareMCWeights );
     
-      for( unsigned int i=0; i<3 && i<6; i++ ){
+      for( unsigned int i=0; i<3; i++ ){
        c1.MCLabel().fClusterID[i] = labels[i];
       }