Update on JCORRAN:Dong Jo Kim

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

diff --git a/ITS/AliITSClusterFinderV2SSD.cxx b/ITS/AliITSClusterFinderV2SSD.cxx
index 5f69cd4c97b3cfa42908ed02eaf821be70b3e92c..2d8c9716bb51d8bbde86b8b411ca1a6211d08099 100644 (file)
--- a/ITS/AliITSClusterFinderV2SSD.cxx
+++ b/ITS/AliITSClusterFinderV2SSD.cxx
@@ -34,7 +34,6 @@
 #include "AliITSRecPoint.h"
 #include "AliITSRecPointContainer.h"
 #include "AliITSgeomTGeo.h"
-#include "AliITSDetTypeRec.h"
 #include "AliRawReader.h"
 #include "AliITSRawStreamSSD.h"
 #include <TClonesArray.h>
@@ -87,13 +86,13 @@ ClassImp(AliITSClusterFinderV2SSD)
       AliError("Cannot get magnetic field from TGeoGlobalMagField");
     }
     else {
-      Float_t Bfield = field->SolenoidField();
+      Float_t bField = field->SolenoidField();
       // NB: spatial shift has opposite sign for lay 5 and 6, but strip numbering also changes direction, so no sign-change 
       // Shift due to ExB on drift N-side, units: strip width 
-      fLorentzShiftP = -repa->GetTanLorentzAngleElectronsSSD() * 150.e-4/95.e-4 * Bfield / 5.0;
+      fLorentzShiftP = -repa->GetTanLorentzAngleElectronsSSD() * 150.e-4/95.e-4 * bField / 5.0;
       // Shift due to ExB on drift P-side, units: strip width 
-      fLorentzShiftN = -repa->GetTanLorentzAngleHolesSSD() * 150.e-4/95.e-4 * Bfield / 5.0;
-      AliDebug(1,Form("Bfield %f Lorentz Shift P-side %f N-side %f",Bfield,fLorentzShiftN,fLorentzShiftP));
+      fLorentzShiftN = -repa->GetTanLorentzAngleHolesSSD() * 150.e-4/95.e-4 * bField / 5.0;
+      AliDebug(1,Form("bField %f Lorentz Shift P-side %f N-side %f",bField,fLorentzShiftN,fLorentzShiftP));
     }
   }
 }
@@ -186,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
   //
@@ -511,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 ){
@@ -764,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);
@@ -1299,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++){
@@ -1310,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