- 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.);
- Float_t max=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];
- if (TMath::Abs(b->GetQ())>max){
- 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 s2 = c.GetSigmaY2()/c.GetQ() - c.GetY()*c.GetY();
- Float_t w=par->GetPadPitchWidth(sec);
- c.SetSigmaY2(s2);
- if (s2 != 0.) {
- c.SetSigmaY2(c.GetSigmaY2()*0.108);
- if (sec<par->GetNInnerSector()) c.SetSigmaY2(c.GetSigmaY2()*2.07);
- }
- s2 = c.GetSigmaZ2()/c.GetQ() - c.GetZ()*c.GetZ();
- w=par->GetZWidth();
- c.SetSigmaZ2(s2);
-
- if (s2 != 0.) {
- c.SetSigmaZ2(c.GetSigmaZ2()*0.169);
- if (sec<par->GetNInnerSector()) c.SetSigmaZ2(c.GetSigmaZ2()*1.77);
+ 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);
+ }
+ }
+ }