Merge branch 'master' into TPCdev

[u/mrichter/AliRoot.git] / ITS / AliITSClusterFinderV2SSD.cxx

diff --git a/ITS/AliITSClusterFinderV2SSD.cxx b/ITS/AliITSClusterFinderV2SSD.cxx
index f06685a13984ce678ded9ca60d589dc3f2460c9a..2d8c9716bb51d8bbde86b8b411ca1a6211d08099 100644 (file)
--- a/ITS/AliITSClusterFinderV2SSD.cxx
+++ b/ITS/AliITSClusterFinderV2SSD.cxx
@@ -185,11 +185,11 @@ void AliITSClusterFinderV2SSD::FindClustersSSD(TClonesArray *alldigits) {
   cout<<"this is module "<<fModule;
   cout<<endl;
   cout<<endl;
-  */
+ 
   Int_t layer = 4;
   if (fModule>fLastSSD1) 
     layer = 5;
-
+  */
   //--------------------------------------------------------
   // start 1D-clustering from the first digit in the digits array
   //
@@ -510,9 +510,10 @@ void AliITSClusterFinderV2SSD::FindClustersSSD(AliITSRawStreamSSD* input)
          continue;
        }
        
-       Int_t layer = 4;
+       /*      Int_t layer = 4;
        if (fModule>fLastSSD1) 
          layer = 5;
+       */
 
        AliITSCalibrationSSD* cal = (AliITSCalibrationSSD*)fDetTypeRec->GetCalibrationModel(fModule);
        if( !cal ){
@@ -716,7 +717,7 @@ void AliITSClusterFinderV2SSD::FindClustersSSD(AliITSRawStreamSSD* input)
 void AliITSClusterFinderV2SSD::
 FindClustersSSD(const Ali1Dcluster* neg, Int_t nn, 
                const Ali1Dcluster* pos, Int_t np,
-               const TClonesArray *clusters) {
+               TClonesArray *clusters) {
   //------------------------------------------------------------
   // Actual SSD cluster finder
   //------------------------------------------------------------
@@ -763,8 +764,8 @@ FindClustersSSD(const Ali1Dcluster* neg, Int_t nn,
 
   if ((np*nn) > fgPairsSize) {
 
-    if (fgPairs) delete [] fgPairs;
-    fgPairsSize = 4*np*nn;
+    delete [] fgPairs;
+    fgPairsSize = 2*np*nn;
     fgPairs = new Short_t[fgPairsSize];
   }
   memset(fgPairs,0,sizeof(Short_t)*np*nn);
@@ -1298,7 +1299,7 @@ FindClustersSSD(const Ali1Dcluster* neg, Int_t nn,
       //
       if ( (cnegative[ip]==2) && cpositive[negativepair[10*ip]]==2){ 
        Float_t minchargediff =4.;
-       Float_t minchargeratio =0.2;
+       //      Float_t minchargeratio =0.2;
 
        Int_t j=-1;
        for (Int_t di=0;di<cnegative[ip];di++){
@@ -1309,7 +1310,7 @@ FindClustersSSD(const Ali1Dcluster* neg, Int_t nn,
          if (TMath::Abs(ratio)<0.2){
            j =jc;
            minchargediff = TMath::Abs(chargedif);
-           minchargeratio = TMath::Abs(ratio);
+           //      minchargeratio = TMath::Abs(ratio);
          }
        }
        if (j<0) continue;  // not proper cluster