///////////////////////////////////////////////////////////////////////////
-#include "AliRun.h"
#include "AliITSClusterFinderV2SDD.h"
-#include "AliITSclusterV2.h"
+#include "AliITSRecPoint.h"
+#include "AliITSDetTypeRec.h"
#include "AliRawReader.h"
-#include "AliITSRawStreamSDD.h"
-
+#include "AliITSRawStreamSDDv3.h"
+#include "AliITSCalibrationSDD.h"
+#include "AliITSDetTypeRec.h"
+#include "AliITSsegmentationSDD.h"
#include <TClonesArray.h>
-#include "AliITS.h"
-#include "AliITSgeom.h"
#include "AliITSdigitSDD.h"
ClassImp(AliITSClusterFinderV2SDD)
-extern AliRun *gAlice;
-
-AliITSClusterFinderV2SDD::AliITSClusterFinderV2SDD():AliITSClusterFinderV2(){
+AliITSClusterFinderV2SDD::AliITSClusterFinderV2SDD(AliITSDetTypeRec* dettyp):AliITSClusterFinderV2(dettyp),
+fNySDD(256),
+fNzSDD(256),
+fYpitchSDD(0.01825),
+fZpitchSDD(0.02940),
+fHwSDD(3.5085),
+fHlSDD(3.7632),
+fYoffSDD(0.0425){
//Default constructor
- fNySDD=256; fNzSDD=256;
- fYpitchSDD=0.01825;
- fZpitchSDD=0.02940;
- fHwSDD=3.5085; fHlSDD=3.7632;
- fYoffSDD=0.0425;
-
-
}
AliBin *bins[2];
bins[0]=new AliBin[kMAXBIN];
bins[1]=new AliBin[kMAXBIN];
-
+ AliITSCalibrationSDD* cal = (AliITSCalibrationSDD*)GetResp(fModule);
+
AliITSdigitSDD *d=0;
Int_t i, ndigits=digits->GetEntriesFast();
for (i=0; i<ndigits; i++) {
d=(AliITSdigitSDD*)digits->UncheckedAt(i);
+ Float_t baseline = cal->GetBaseline(d->GetCoord1());
+
Int_t y=d->GetCoord2()+1; //y
Int_t z=d->GetCoord1()+1; //z
Int_t q=d->GetSignal();
- if (q<3) continue;
+
+ if(q<cal->GetThresholdAnode(d->GetCoord1())) continue;
+ if(q>baseline) q-=(Int_t)baseline;
+ else q=0;
+
+ //if (q<3) continue;
if (z <= fNzSDD) {
bins[0][y*kNzBins+z].SetQ(q);
//------------------------------------------------------------
// Actual SDD cluster finder
//------------------------------------------------------------
+ AliITSCalibrationSDD* cal = (AliITSCalibrationSDD*)GetResp(fModule);
Int_t ncl=0;
TClonesArray &cl=*clusters;
for (Int_t s=0; s<2; s++)
for (k=0; k<npeaks; k++) {
if (idx[k] < 0) continue; //removed peak
- AliITSclusterV2 c;
+ AliITSRecPoint c;
MakeCluster(idx[k], nzBins, bins[s], msk[k], c);
//mi change
Int_t milab[10];
}
*/
- c.SetSigmaY2(0.0030*0.0030);
- c.SetSigmaZ2(0.0020*0.0020);
- c.SetDetectorIndex(fNdet[fModule]);
-
Float_t y=c.GetY(),z=c.GetZ(), q=c.GetQ();
y/=q; z/=q;
//
//s2 = c.GetSigmaZ2()/c.GetQ() - z*z;
//c.SetSigmaZ2(s2);
//
- y=(y-0.5)*fYpitchSDD;
- y-=fHwSDD;
- y-=fYoffSDD; //delay ?
- if (s) y=-y;
+
+ Float_t yyyy = y;
+ //y=(y-0.5)*fYpitchSDD;
+ //y-=fHwSDD;
+ //y-=fYoffSDD; //delay ?
+ //if (s) y=-y;
z=(z-0.5)*fZpitchSDD;
z-=fHlSDD;
+ Float_t zdet = z;
+ // y=-(-y+fYshift[fModule]);
+ // z= -z+fZshift[fModule];
+ // c.SetY(y);
+ // c.SetZ(z);
+ Float_t xdet = cal->GetDriftPath((yyyy-0.5)*25,0);
+ xdet=xdet/10000.-fHwSDD-fYoffSDD;
+ if (s) xdet=-xdet;
+
+ CorrectPosition(zdet,xdet);
- y=-(-y+fYshift[fModule]);
- z= -z+fZshift[fModule];
- c.SetY(y);
- c.SetZ(z);
- c.SetNy(maxj-minj+1);
- c.SetNz(maxi-mini+1);
- c.SetType(npeaks);
- c.SetQ(q/12.7); //to be consistent with the SSD charges
+ y=-(-xdet+fYshift[fModule]);
+ z= -zdet+fZshift[fModule];
+
+ q/=12.7; //this WAS consistent with SSD. To be reassessed
+ // 23-MAR-2007
+ 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 (c.GetQ() < 20.) continue; //noise cluster
+ //if (c.GetQ() < 20.) continue; //noise cluster
if (digits) {
// AliBin *b=&bins[s][idx[k]];
//lab[2]=(d->GetTracks())[2];
//CheckLabels(lab);
CheckLabels2(milab);
- c.SetLabel(milab[0],0);
- c.SetLabel(milab[1],1);
- c.SetLabel(milab[2],2);
- c.SetLayer(fNlayer[fModule]);
}
}
- if(clusters) new (cl[ncl]) AliITSclusterV2(c);
+ milab[3]=fNdet[fModule];
+
+ AliITSRecPoint cc(milab,hit,info);
+ cc.SetType(npeaks);
+
+ if(clusters) new (cl[ncl]) AliITSRecPoint(cc);
else {
- fITS->AddClusterV2(c);
+ fDetTypeRec->AddRecPoint(cc);
}
ncl++;
}
// This function creates ITS clusters from raw data
//------------------------------------------------------------
rawReader->Reset();
- AliITSRawStreamSDD inputSDD(rawReader);
+ AliITSRawStreamSDDv3 inputSDD(rawReader);
FindClustersSDD(&inputSDD,clusters);
}
// when all data from a module was read, search for clusters
if (bins[0]) {
- clusters[iModule] = new TClonesArray("AliITSclusterV2");
+ clusters[iModule] = new TClonesArray("AliITSRecPoint");
fModule = iModule;
FindClustersSDD(bins, kMaxBin, kNzBins, NULL, clusters[iModule]);
Int_t nClusters = clusters[iModule]->GetEntriesFast();
}
+//_________________________________________________________________________
+void AliITSClusterFinderV2SDD::CorrectPosition(Float_t &z, Float_t&y){
+
+ //correction of coordinates using the maps stored in the DB
+
+ AliITSCalibrationSDD* cal = (AliITSCalibrationSDD*)GetResp(fModule);
+ static const Int_t nbint = cal->GetMapTimeNBin();
+ static const Int_t nbina = cal->Chips()*cal->Channels();
+ Float_t stepa = (GetSeg()->Dpz(0))/10000.; //anode pitch in cm
+ Float_t stept = (GetSeg()->Dx()/cal->GetMapTimeNBin()/2.)/10.;
+
+ Int_t bint = TMath::Abs((Int_t)(y/stept));
+ if(y>=0) bint+=(Int_t)(nbint/2.);
+ if(bint>nbint) AliError("Wrong bin number!");
+
+ Int_t bina = TMath::Abs((Int_t)(z/stepa));
+ if(z>=0) bina+=(Int_t)(nbina/2.);
+ if(bina>nbina) AliError("Wrong bin number!");
+
+ Float_t devz = cal->GetMapACell(bina,bint)/10000.;
+ Float_t devx = cal->GetMapTCell(bina,bint)/10000.;
+ z+=devz;
+ y+=devx;
+
+
+}