Fix warnings from Cerello

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

diff --git a/ITS/AliITSClusterFinderV2SDD.cxx b/ITS/AliITSClusterFinderV2SDD.cxx
index 234b9225b8c826f8853752b4bf57405c506e518e..9e6fbf93032dcb357bce1980171638c2d561e0e6 100644 (file)
--- a/ITS/AliITSClusterFinderV2SDD.cxx
+++ b/ITS/AliITSClusterFinderV2SDD.cxx
@@ -41,7 +41,7 @@
 
 ClassImp(AliITSClusterFinderV2SDD)
 
-AliITSClusterFinderV2SDD::AliITSClusterFinderV2SDD(AliITSDetTypeRec* dettyp):AliITSClusterFinderV2(dettyp)
+AliITSClusterFinderV2SDD::AliITSClusterFinderV2SDD(AliITSDetTypeRec* dettyp):AliITSClusterFinder(dettyp)
 {
 
   //Default constructor
@@ -142,7 +142,7 @@ FindClustersSDD(AliBin* bins[2], Int_t nMaxBin, Int_t nzBins,
   TClonesArray &cl=*clusters;
   for (Int_t s=0; s<2; s++)
     for (Int_t i=0; i<nMaxBin; i++) {
-      NoiseSuppress(i,s,nzBins,bins[s],cal);
+      if(NoiseSuppress(i,s,nzBins,bins[s],cal)) continue;
       if (bins[s][i].IsUsed()) continue;
       Int_t idx[32]; UInt_t msk[32]; Int_t npeaks=0;
       FindPeaks(i, nzBins, bins[s], idx, msk, npeaks);
@@ -186,11 +186,9 @@ FindClustersSDD(AliBin* bins[2], Int_t nMaxBin, Int_t nzBins,
          milab[ilab]=-2;
        }
        Int_t maxi=0,mini=0,maxj=0,minj=0;
-       //AliBin *bmax=&bins[s][idx[k]];
-       //Float_t max = TMath::Max(TMath::Abs(bmax->GetQ())/5.,3.);
-       
-       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;
@@ -217,7 +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();
@@ -227,7 +231,7 @@ FindClustersSDD(AliBin* bins[2], Int_t nMaxBin, Int_t nzBins,
        if(s==1) zAnode += GetSeg()->NpzHalf();  // right side has anodes from 256. to 511.
        Float_t zdet = GetSeg()->GetLocalZFromAnode(zAnode);
        Float_t driftTimeUncorr = GetSeg()->GetDriftTimeFromTb(timebin)+jitter*rsdd->GetCarlosRXClockPeriod();
-       Float_t driftTime=driftTimeUncorr-rsdd->GetTimeOffset();
+       Float_t driftTime=driftTimeUncorr-rsdd->GetTimeZero(fModule);
        Float_t driftPathMicron = cal->GetDriftPath(driftTime,zAnode);
        const Double_t kMicronTocm = 1.0e-4; 
        Float_t xdet=(driftPathMicron-GetSeg()->Dx())*kMicronTocm; // xdet is negative
@@ -244,8 +248,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());
@@ -259,7 +266,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);
@@ -400,15 +406,16 @@ void AliITSClusterFinderV2SDD::FindClustersSDD(AliITSRawStream* input,
 }
 
 //______________________________________________________________________
-void AliITSClusterFinderV2SDD::NoiseSuppress(Int_t k, Int_t sid,Int_t nzBins, AliBin* bins, AliITSCalibrationSDD* cal) const {
+Bool_t AliITSClusterFinderV2SDD::NoiseSuppress(Int_t k, Int_t sid,Int_t nzBins, AliBin* bins, AliITSCalibrationSDD* cal) const {
   // applies zero suppression using the measured noise of each anode
   // threshold values from ALICE-INT-1999-28 V10
+  // returns kTRUE if the digit should eb noise suppressed, kFALSE if it should be kept
   Float_t xfactL=2.2; 
   Float_t xfactH=4.0;
   //
 
   Int_t iAn=(k%nzBins)-1;
-  if(iAn<0 || iAn>255) return;
+  if(iAn<0 || iAn>255) return kTRUE;
   if(sid==1) iAn+=256;
   Int_t nLow=0, nHigh=0;
   Float_t noise=cal->GetNoiseAfterElectronics(iAn);
@@ -422,11 +429,11 @@ void AliITSClusterFinderV2SDD::NoiseSuppress(Int_t k, Int_t sid,Int_t nzBins, Al
   Float_t tHp1=noisep1*xfactH;
   Float_t tLm1=noisem1*xfactL;
   Float_t tHm1=noisem1*xfactH;
-  Float_t cC=bins[k].GetQ();
+  Int_t cC=bins[k].GetQ();
   if(cC<=tL){
     bins[k].SetQ(0);
     bins[k].SetMask(0xFFFFFFFE);
-    return;
+    return kTRUE;;
   }
   nLow++; // cC is greater than tL
   if(cC>tH) nHigh++;
@@ -442,10 +449,8 @@ void AliITSClusterFinderV2SDD::NoiseSuppress(Int_t k, Int_t sid,Int_t nzBins, Al
   Int_t wW=bins[k+nzBins].GetQ();
   if(wW>tL) nLow++;
   if(wW>tH) nHigh++;
-  if(nLow<3 || nHigh<1){
-    bins[k].SetQ(0);
-    bins[k].SetMask(0xFFFFFFFE);
-  }
+  if(nLow<3 || nHigh<1) return kTRUE;
+  else return kFALSE;
 }