- for (Int_t s=0; s<2; s++)
- for (Int_t i=0; i<nMaxBin; i++) {
- 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);
-
- if (npeaks>30) continue;
- if (npeaks==0) continue;
-
- Int_t k,l;
- for (k=0; k<npeaks-1; k++){//mark adjacent peaks
- if (idx[k] < 0) continue; //this peak is already removed
- for (l=k+1; l<npeaks; l++) {
- if (idx[l] < 0) continue; //this peak is already removed
- Int_t ki=idx[k]/nzBins, kj=idx[k] - ki*nzBins;
- Int_t li=idx[l]/nzBins, lj=idx[l] - li*nzBins;
- Int_t di=TMath::Abs(ki - li);
- Int_t dj=TMath::Abs(kj - lj);
- if (di>1 || dj>1) continue;
- if (bins[s][idx[k]].GetQ() > bins[s][idx[l]].GetQ()) {
- msk[l]=msk[k];
- idx[l]*=-1;
- } else {
- msk[k]=msk[l];
- idx[k]*=-1;
- break;
- }
- }
- }
-
- for (k=0; k<npeaks; k++) {
- MarkPeak(TMath::Abs(idx[k]), nzBins, bins[s], msk[k]);
- }
-
- for (k=0; k<npeaks; k++) {
- if (idx[k] < 0) continue; //removed peak
- AliITSRecPoint c;
- MakeCluster(idx[k], nzBins, bins[s], msk[k], c);
- //mi change
- Int_t milab[10];
- for (Int_t ilab=0;ilab<10;ilab++){
- 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++){
- Int_t index = idx[k]+di+dj*nzBins;
- if (index<0) continue;
- if (index>=nMaxBin) continue;
- AliBin *b=&bins[s][index];
- Int_t nAnode=index%nzBins-1;
- Int_t adcSignal=b->GetQ();
- if(adcSignal>cal->GetThresholdAnode(nAnode)){
- if (di>maxi) maxi=di;
- if (di<mini) mini=di;
- if (dj>maxj) maxj=dj;
- if (dj<minj) minj=dj;
- }
- //
- if(digits) {
- if (TMath::Abs(di)<2&&TMath::Abs(dj)<2){
- AliITSdigitSDD* d=(AliITSdigitSDD*)digits->UncheckedAt(b->GetIndex());
- for (Int_t itrack=0;itrack<10;itrack++){
- Int_t track = (d->GetTracks())[itrack];
- if (track>=0) {
- AddLabel(milab, track);
- }
- }
- }
- }
- }
- }
-
-
- Float_t y=c.GetY(),z=c.GetZ(), q=c.GetQ();
- y/=q; z/=q;
-
-
- Float_t yyyy = y;
-
- z=(z-0.5)*fZpitchSDD;
- z-=fHlSDD;
- Float_t zdet = z;
- Float_t timebin = GetSeg()->Dpx(0);
- Float_t driftTime = (yyyy-0.5)*timebin - cal->GetTimeOffset();
- Float_t xdet = cal->GetDriftPath(driftTime,0);
- xdet=xdet/10000.-fHwSDD;
- if (s) xdet=-xdet;
-
- CorrectPosition(zdet,xdet);
-
- {
- Double_t loc[3]={xdet,0.,zdet},trk[3]={0.,0.,0.};
- mT2L->MasterToLocal(loc,trk);
- y=trk[1];
- z=trk[2];
- }
- q/=cal->GetADC2keV(); //to have MPV 1 MIP = 86.4 KeV
- 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]};
- if (digits) {
- // AliBin *b=&bins[s][idx[k]];
- // AliITSdigitSDD* d=(AliITSdigitSDD*)digits->UncheckedAt(b->GetIndex());
- {
- //Int_t lab[3];
- //lab[0]=(d->GetTracks())[0];
- //lab[1]=(d->GetTracks())[1];
- //lab[2]=(d->GetTracks())[2];
- //CheckLabels(lab);
- CheckLabels2(milab);
- }
- }
- milab[3]=fNdet[fModule];
-
- AliITSRecPoint cc(milab,hit,info);
- cc.SetType(npeaks);
-
- if(clusters) new (cl[ncl]) AliITSRecPoint(cc);
- else {
- fDetTypeRec->AddRecPoint(cc);
- }
- ncl++;
+ for (Int_t s=0; s<2; s++){
+ for(Int_t iAnode=0; iAnode<GetSeg()->NpzHalf(); iAnode++){
+ if(anodeFired[s]->TestBitNumber(iAnode)==kFALSE) continue;
+ for(Int_t iTimeBin=0; iTimeBin<GetSeg()->Npx(); iTimeBin++){
+ Int_t index=(iTimeBin+1)*fNZbins+(iAnode+1);
+ if (bins[s][index].IsUsed()) continue;
+ if(NoiseSuppress(index,s,bins[s],cal)) continue;
+ Int_t idx[32]; UInt_t msk[32]; Int_t npeaks=0;
+ FindPeaks(index, fNZbins, bins[s], idx, msk, npeaks);
+
+ if (npeaks>30) continue;
+ if (npeaks==0) continue;
+
+ Int_t k,l;
+ Int_t nClust;
+ if(repa->GetUseUnfoldingInClusterFinderSDD()){
+ for (k=0; k<npeaks-1; k++){//mark adjacent peaks
+ if (idx[k] < 0) continue; //this peak is already removed
+ for (l=k+1; l<npeaks; l++) {
+ if (idx[l] < 0) continue; //this peak is already removed
+ Int_t ki=idx[k]/fNZbins, kj=idx[k] - ki*fNZbins;
+ Int_t li=idx[l]/fNZbins, lj=idx[l] - li*fNZbins;
+ Int_t di=TMath::Abs(ki - li);
+ Int_t dj=TMath::Abs(kj - lj);
+ if (di>1 || dj>1) continue;
+ if (bins[s][idx[k]].GetQ() > bins[s][idx[l]].GetQ()) {
+ msk[l]=msk[k];
+ idx[l]*=-1;
+ } else {
+ msk[k]=msk[l];
+ idx[k]*=-1;
+ break;
+ }
+ }
+ }
+ nClust=npeaks;
+ }else{
+ for (k=1; k<npeaks; k++) msk[k]=msk[0];
+ nClust=1;
+ }
+ Float_t maxADC=0;
+ for (k=0; k<npeaks; k++) {
+ if(idx[k]>0. && bins[s][idx[k]].GetQ() > maxADC) maxADC=bins[s][idx[k]].GetQ();
+ MarkPeak(TMath::Abs(idx[k]), fNZbins, bins[s], msk[k]);
+ }
+ if(maxADC<fCutOnPeakLoose) continue;
+
+ for (k=0; k<nClust; k++) {
+ if (idx[k] < 0) continue; //removed peak
+ AliITSRecPoint c;
+ MakeCluster(idx[k], fNZbins, bins[s], msk[k], c);
+ //mi change
+ Int_t milab[10];
+ for (Int_t ilab=0;ilab<10;ilab++){
+ milab[ilab]=-2;
+ }
+
+ if(digits) {
+ for (Int_t di=-2; di<=2;di++){
+ for (Int_t dj=-2;dj<=2;dj++){
+ index = idx[k]+di+dj*fNZbins;
+ if (index<0) continue;
+ if (index>=kMaxBin) continue;
+ AliBin *b=&bins[s][index];
+ if(b->GetQ()<0.1) continue;
+ AliITSdigitSDD* d=(AliITSdigitSDD*)digits->UncheckedAt(b->GetIndex());
+ for (Int_t itrack=0;itrack<10;itrack++){
+ Int_t track = (d->GetTracks())[itrack];
+ if (track>=0) {
+ AddLabel(milab, track);
+ }
+ }
+ }
+ }
+ }
+ else { // raw data
+ if (fRawID2ClusID) milab[0] = fNClusters+1; // RS: store clID+1 as a reference to the cluster
+ }
+
+
+ Int_t clSizAnode=fZmax-fZmin+1;
+ Int_t clSizTb=fXmax-fXmin+1;
+ if(repa->GetUseSDDClusterSizeSelection()){
+ if(clSizTb==1) continue; // cut common mode noise spikes
+ if(clSizAnode>5) continue; // cut common mode noise spikes
+ if(clSizTb>10) continue; // cut clusters on noisy anodes
+ if(cal-> IsAMAt20MHz() && clSizTb>8) continue; // cut clusters on noisy anodes
+ }
+
+ AliITSresponseSDD* rsdd = fDetTypeRec->GetResponseSDD();
+ Float_t y=c.GetY(),z=c.GetZ(), q=c.GetQ();
+ y/=q; z/=q;
+ Float_t zAnode=z-0.5; // to have anode in range 0.-255. and centered on the mid of the pitch
+ Float_t timebin=y-0.5; // to have time bin in range 0.-255. amd centered on the mid of the bin
+ 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->GetTimeZero(fModule);
+ if(driftTime<fMaxDrTimeForTightCut && maxADC<fCutOnPeakTight) continue;
+
+ Float_t driftSpeed = cal->GetDriftSpeedAtAnode(zAnode) + rsdd->GetDeltaVDrift(fModule,zAnode>255);
+ 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
+
+ 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);
+ y=trk[1];
+ z=trk[2];
+
+ q+=(driftTime*rsdd->GetADCvsDriftTime(fModule)); // correction for zero supp.
+ q/=rsdd->GetADCtokeV(fModule);
+ if(cal-> IsAMAt20MHz()) q*=2.; // account for 1/2 sampling freq.
+ if(q<repa->GetMinClusterChargeSDD()) continue; // remove noise clusters
+
+ Float_t hit[6] = {y, z, 0.0030*0.0030, 0.0020*0.0020, q, 0.};
+ Int_t info[3] = {clSizTb, clSizAnode, fNlayer[fModule]};
+ if (digits) CheckLabels2(milab);
+ milab[3]=fNdet[fModule];
+ AliITSRecPoint cc(milab,hit,info);
+ cc.SetType(nClust*100+npeaks);
+ cc.SetDriftTime(driftTimeUncorr);
+ cc.SetDriftSide(s);
+ cc.SetChargeRatio(maxADC);
+ if(clusters) new (cl[ncl]) AliITSRecPoint(cc);
+ else {
+ fDetTypeRec->AddRecPoint(cc);
+ }
+ fNClusters++; // RS
+ ncl++;
+ }