* about the suitability of this software for any purpose. It is *
* provided "as is" without express or implied warranty. *
**************************************************************************/
+
+/* $Id$*/
+
////////////////////////////////////////////////////////////////////////////
// Implementation of the ITS clusterer V2 class //
// //
#include "AliITSClusterFinderV2SDD.h"
-#include "AliITSclusterV2.h"
+#include "AliITSRecPoint.h"
#include "AliITSDetTypeRec.h"
#include "AliRawReader.h"
#include "AliITSRawStreamSDD.h"
-
+#include "AliITSCalibrationSDD.h"
+#include "AliITSDetTypeRec.h"
+#include "AliITSsegmentationSDD.h"
#include <TClonesArray.h>
#include "AliITSdigitSDD.h"
-
+#include "AliITSgeomTGeo.h"
ClassImp(AliITSClusterFinderV2SDD)
-extern AliRun *gAlice;
-
-AliITSClusterFinderV2SDD::AliITSClusterFinderV2SDD(AliITSgeom* geom):AliITSClusterFinderV2(geom){
+AliITSClusterFinderV2SDD::AliITSClusterFinderV2SDD(AliITSDetTypeRec* dettyp):AliITSClusterFinderV2(dettyp),
+fNySDD(256),
+fNzSDD(256),
+fZpitchSDD(0.02940),
+fHwSDD(3.5085),
+fHlSDD(3.7632),
+fTimeOffsetSDD(0.){
//Default constructor
- fNySDD=256; fNzSDD=256;
- fYpitchSDD=0.01825;
- fZpitchSDD=0.02940;
- fHwSDD=3.5085; fHlSDD=3.7632;
- fYoffSDD=0.0425;
-
-
-
+ SetTimeOffset();
}
AliBin *bins[2];
bins[0]=new AliBin[kMAXBIN];
bins[1]=new AliBin[kMAXBIN];
-
+ AliITSCalibrationSDD* cal = (AliITSCalibrationSDD*)GetResp(fModule);
+ AliITSresponseSDD* res = (AliITSresponseSDD*)cal->GetResponse();
+ const char *option=res->ZeroSuppOption();
AliITSdigitSDD *d=0;
Int_t i, ndigits=digits->GetEntriesFast();
for (i=0; i<ndigits; i++) {
Int_t y=d->GetCoord2()+1; //y
Int_t z=d->GetCoord1()+1; //z
Int_t q=d->GetSignal();
- if (q<3) continue;
+ if(!((strstr(option,"1D")) || (strstr(option,"2D")))){
+ Float_t baseline = cal->GetBaseline(d->GetCoord1());
+ if(q>baseline) q-=(Int_t)baseline;
+ else q=0;
+ }
+ if(q<cal->GetThresholdAnode(d->GetCoord1())) continue;
+
+ //if (q<3) continue;
if (z <= fNzSDD) {
bins[0][y*kNzBins+z].SetQ(q);
//------------------------------------------------------------
// Actual SDD cluster finder
//------------------------------------------------------------
+
+ const TGeoHMatrix *mT2L=AliITSgeomTGeo::GetTracking2LocalMatrix(fModule);
+ 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];
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);
- }
+ 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);
- }
- */
-
- 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;
- //
- //Float_t s2 = c.GetSigmaY2()/c.GetQ() - y*y;
- // c.SetSigmaY2(s2);
- //s2 = c.GetSigmaZ2()/c.GetQ() - z*z;
- //c.SetSigmaZ2(s2);
- //
- y=(y-0.5)*fYpitchSDD;
- y-=fHwSDD;
- y-=fYoffSDD; //delay ?
- if (s) y=-y;
- z=(z-0.5)*fZpitchSDD;
- z-=fHlSDD;
- 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
+ Float_t yyyy = y;
- if (c.GetQ() < 20.) continue; //noise cluster
+ z=(z-0.5)*fZpitchSDD;
+ z-=fHlSDD;
+ Float_t zdet = z;
+ Float_t timebin = GetSeg()->Dpx(0);
+ Float_t driftTime = (yyyy-0.5)*timebin - fTimeOffsetSDD;
+ 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/=5.243; //to have MPV 1 MIP = 86.4 KeV --> this must go to calibr.
+ 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]];
//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 {
- fDetTypeRec->AddClusterV2(c);
+ fDetTypeRec->AddRecPoint(cc);
}
ncl++;
}
}
+
}
// 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();
nClustersSDD += nClusters;
- bins[0] = bins[1] = NULL;
-
+ bins[0] = bins[1] = NULL;
}
if (!next) break;
}
// fill the current digit into the bins array
- if(input->GetSignal()>=3) {
+ AliITSCalibrationSDD* cal = (AliITSCalibrationSDD*)GetResp(input->GetModuleID());
+ AliITSresponseSDD* res = (AliITSresponseSDD*)cal->GetResponse();
+ const char *option=res->ZeroSuppOption();
+ Int_t q=input->GetSignal();
+ if(!((strstr(option,"1D")) || (strstr(option,"2D")))){
+ Float_t baseline = cal->GetBaseline(input->GetCoord1());
+ if(q>baseline) q-=(Int_t)baseline;
+ else q=0;
+ }
+ if(q>=cal->GetThresholdAnode(input->GetCoord1())) {
Int_t iz = input->GetCoord1()+1;
- Int_t side = ((iz <= fNzSDD) ? 0 : 1);
- iz -= side*fNzSDD;
+ //Int_t side = ((iz <= fNzSDD) ? 0 : 1);
+ Int_t side = ((AliITSRawStreamSDD*)input)->GetChannel();
+ // iz -= side*fNzSDD;
Int_t index = (input->GetCoord2()+1) * kNzBins + iz;
- bins[side][index].SetQ(input->GetSignal());
+ bins[side][index].SetQ(q);
bins[side][index].SetMask(1);
bins[side][index].SetIndex(index);
}
delete[] binsSDDInit;
Info("FindClustersSDD", "found clusters in ITS SDD: %d", nClustersSDD);
-
}
+//_________________________________________________________________________
+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 knbint = cal->GetMapTimeNBin();
+ static const Int_t knbina = 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)(knbint/2.);
+ if(bint>knbint) AliError("Wrong bin number!");
+
+ Int_t bina = TMath::Abs((Int_t)(z/stepa));
+ if(z>=0) bina+=(Int_t)(knbina/2.);
+ if(bina>knbina) AliError("Wrong bin number!");
+
+ Float_t devz = cal->GetMapACell(bina,bint)/10000.;
+ Float_t devx = cal->GetMapTCell(bina,bint)/10000.;
+ z+=devz;
+ y+=devx;
+
+
+}
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff