increased number of channels used in the TOFFEElight data structure, from 157248...

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

diff --git a/ITS/AliITSClusterFinderV2SDD.cxx b/ITS/AliITSClusterFinderV2SDD.cxx
index 2aa8e9ed935ab04b81255f041faf60a50b4b071a..29eeb00a76c744645cf0abe85619ef24d8a3a3a9 100644 (file)
--- a/ITS/AliITSClusterFinderV2SDD.cxx
+++ b/ITS/AliITSClusterFinderV2SDD.cxx
@@ -187,8 +187,8 @@ FindClustersSDD(AliBin* bins[2], Int_t nMaxBin, Int_t nzBins,
        }
        Int_t maxi=0,mini=0,maxj=0,minj=0;
 
-       for (Int_t di=-2; di<=2;di++){
-         for (Int_t dj=-3;dj<=3;dj++){
+       for (Int_t di=-5; di<=5;di++){
+         for (Int_t dj=-10;dj<=10;dj++){
            Int_t index = idx[k]+di+dj*nzBins;
            if (index<0) continue;
            if (index>=nMaxBin) continue;
@@ -215,6 +215,13 @@ FindClustersSDD(AliBin* bins[2], Int_t nMaxBin, Int_t nzBins,
            }
          }
        }
+       Int_t clSizAnode=maxi-mini+1;
+       Int_t clSizTb=maxj-minj+1;
+       if(repa->GetUseSDDClusterSizeSelection()){
+         if(clSizTb==1) continue; // cut common mode noise spikes
+         if(clSizAnode>3)  continue; // cut common mode noise spikes
+         if(clSizTb>10)  continue; // cut clusters on noisy anodes
+       }
 
        AliITSresponseSDD* rsdd = fDetTypeRec->GetResponseSDD();
        Float_t y=c.GetY(),z=c.GetZ(), q=c.GetQ();
@@ -225,15 +232,18 @@ FindClustersSDD(AliBin* bins[2], Int_t nMaxBin, Int_t nzBins,
        Float_t zdet = GetSeg()->GetLocalZFromAnode(zAnode);
        Float_t driftTimeUncorr = GetSeg()->GetDriftTimeFromTb(timebin)+jitter*rsdd->GetCarlosRXClockPeriod();
        Float_t driftTime=driftTimeUncorr-rsdd->GetTimeZero(fModule);
-       Float_t driftPathMicron = cal->GetDriftPath(driftTime,zAnode);
+       Float_t driftSpeed = cal->GetDriftSpeedAtAnode(zAnode) + rsdd->GetDeltaVDrift(fModule);
+       Float_t driftPathMicron = driftTime*driftSpeed;
        const Double_t kMicronTocm = 1.0e-4; 
        Float_t xdet=(driftPathMicron-GetSeg()->Dx())*kMicronTocm; // xdet is negative
        if (s==0) xdet=-xdet; // left side has positive local x
        
-       Float_t corrx=0, corrz=0;
-       cal->GetCorrections(zdet,xdet,corrz,corrx,GetSeg());
-       zdet+=corrz;
-       xdet+=corrx;
+       if(repa->GetUseSDDCorrectionMaps()){
+         Float_t corrx=0, corrz=0;
+         cal->GetCorrections(zdet,xdet,corrz,corrx,GetSeg());
+         zdet+=corrz;
+         xdet+=corrx;
+       }
 
        Double_t loc[3]={xdet,0.,zdet},trk[3]={0.,0.,0.};
        mT2L->MasterToLocal(loc,trk);
@@ -241,8 +251,11 @@ FindClustersSDD(AliBin* bins[2], Int_t nMaxBin, Int_t nzBins,
        z=trk[2]; 
 
        q/=rsdd->GetADC2keV();  //to have MPV 1 MIP = 86.4 KeV
+       if(cal-> IsAMAt20MHz()) q*=2.; // account for 1/2 sampling freq.
+       if(q<repa->GetMinClusterChargeSDD()) continue; // remove noise clusters
+
        Float_t hit[5] = {y, z, 0.0030*0.0030, 0.0020*0.0020, q};
-       Int_t  info[3] = {maxj-minj+1, maxi-mini+1, fNlayer[fModule]};
+       Int_t  info[3] = {clSizTb, clSizAnode, fNlayer[fModule]};
        if (digits) {     
          //       AliBin *b=&bins[s][idx[k]];
          //       AliITSdigitSDD* d=(AliITSdigitSDD*)digits->UncheckedAt(b->GetIndex());
@@ -256,7 +269,6 @@ FindClustersSDD(AliBin* bins[2], Int_t nMaxBin, Int_t nzBins,
          }
        }
        milab[3]=fNdet[fModule];
-
        AliITSRecPoint cc(milab,hit,info);
        cc.SetType(npeaks);
        cc.SetDriftTime(driftTimeUncorr);