//-------------------------------------------------------------------------
// Implementation of the ITS tracker class
-// It reads AliITSclusterV2 clusters and creates AliITStrackV2 tracks
+// It reads AliITSRecPoint clusters and creates AliITStrackV2 tracks
// and fills with them the ESD
// Origin: Iouri Belikov, CERN, Jouri.Belikov@cern.ch
// dEdx analysis by: Boris Batyunya, JINR, Boris.Batiounia@cern.ch
//-------------------------------------------------------------------------
+#include <new>
+
#include <TFile.h>
#include <TTree.h>
#include <TRandom.h>
#include "AliITSgeom.h"
#include "AliITSRecPoint.h"
-#include "AliTPCtrack.h"
#include "AliESD.h"
-#include "AliITSclusterV2.h"
+#include "AliITSRecPoint.h"
#include "AliITStrackerV2.h"
ClassImp(AliITStrackerV2)
//--------------------------------------------------------------------
AliITSgeom *g=(AliITSgeom*)geom;
- Float_t x,y,z;
- Int_t i;
+ Float_t x,y,z; Int_t i;
for (i=1; i<kMaxLayer+1; i++) {
Int_t nlad=g->GetNladders(i);
Int_t ndet=g->GetNdetectors(i);
Double_t phi=TMath::ATan2(rot[1],rot[0])+TMath::Pi();
phi+=TMath::Pi()/2;
if (i==1) phi+=TMath::Pi();
+
+ if (phi<0) phi+=TMath::TwoPi();
+ else if (phi>=TMath::TwoPi()) phi-=TMath::TwoPi();
+
Double_t cp=TMath::Cos(phi), sp=TMath::Sin(phi);
Double_t r=x*cp+y*sp;
//--------------------------------------------------------------------
//This function loads ITS clusters
//--------------------------------------------------------------------
- TBranch *branch=cTree->GetBranch("Clusters");
+ TBranch *branch=cTree->GetBranch("ITSRecPoints");
if (!branch) {
Error("LoadClusters"," can't get the branch !\n");
return 1;
}
- TClonesArray dummy("AliITSclusterV2",10000), *clusters=&dummy;
+ TClonesArray dummy("AliITSRecPoint",10000), *clusters=&dummy;
branch->SetAddress(&clusters);
Int_t j=0;
for (Int_t i=0; i<kMaxLayer; i++) {
Int_t ndet=fgLayers[i].GetNdetectors();
Int_t jmax = j + fgLayers[i].GetNladders()*ndet;
+
+ Double_t r=fgLayers[i].GetR();
+ Double_t circ=TMath::TwoPi()*r;
+
for (; j<jmax; j++) {
if (!cTree->GetEvent(j)) continue;
Int_t ncl=clusters->GetEntriesFast();
while (ncl--) {
- AliITSclusterV2 *c=(AliITSclusterV2*)clusters->UncheckedAt(ncl);
- fgLayers[i].InsertCluster(new AliITSclusterV2(*c));
+ AliITSRecPoint *c=(AliITSRecPoint*)clusters->UncheckedAt(ncl);
+
+ Int_t idx=c->GetDetectorIndex();
+ Double_t y=r*fgLayers[i].GetDetector(idx).GetPhi()+c->GetY();
+ if (y>circ) y-=circ; else if (y<0) y+=circ;
+ c->SetPhiR(y);
+
+ fgLayers[i].InsertCluster(new AliITSRecPoint(*c));
}
clusters->Delete();
}
//Double_t x,y,z; t->GetGlobalXYZat(rr,x,y,z);
//if (TMath::Abs(y)<yyr) t->PropagateTo(rr,-dr,x0r);
if (!t->PropagateTo(rcd,-dcd,x0cd)) return 1;
- if (!t->PropagateTo(riw,-diw,x0iw)) return 1;
+ if (!t->PropagateTo(riw+0.001,-diw,x0iw)) return 1;
} else {
::Error("CorrectForDeadZoneMaterial","track is already in the dead zone !");
return 1;
while (nentr--) {
AliESDtrack *esd=event->GetTrack(nentr);
- if (esd->GetStatus() != AliESDtrack::kTPCin) continue;
+ if ((esd->GetStatus()&AliESDtrack::kTPCin)==0) continue;
+ if (esd->GetStatus()&AliESDtrack::kTPCout) continue;
+ if (esd->GetStatus()&AliESDtrack::kITSin) continue;
AliITStrackV2 *t=0;
try {
delete t;
continue;
}
- if (TMath::Abs(t->GetD())>4) continue;
+ if (TMath::Abs(t->GetD())>4) {
+ delete t;
+ continue;
+ }
if (CorrectForDeadZoneMaterial(t)!=0) {
Warning("Clusters2Tracks",
return 0;
}
-Int_t AliITStrackerV2::Clusters2Tracks(TTree *tpcTree, TTree *itsTree) {
- //--------------------------------------------------------------------
- // This functions reconstructs ITS tracks
- // The clusters must be already loaded !
- //--------------------------------------------------------------------
- Int_t nentr=0; TObjArray itsTracks(15000);
-
- Warning("Clusters2Tracks(TTree *, TTree *)",
- "Will be removed soon ! Use Clusters2Tracks(AliESD *) instead.");
-
- {/* Read TPC tracks */
- AliTPCtrack *itrack=new AliTPCtrack;
- TBranch *branch=tpcTree->GetBranch("tracks");
- if (!branch) {
- Error("Clusters2Tracks","Can't get the branch !");
- return 1;
- }
- tpcTree->SetBranchAddress("tracks",&itrack);
- nentr=(Int_t)tpcTree->GetEntries();
-
- Info("Clusters2Tracks","Number of TPC tracks: %d\n",nentr);
-
- for (Int_t i=0; i<nentr; i++) {
- tpcTree->GetEvent(i);
- AliITStrackV2 *t=0;
- try {
- t=new AliITStrackV2(*itrack);
- } catch (const Char_t *msg) {
- Warning("Clusters2Tracks",msg);
- delete t;
- continue;
- }
- if (TMath::Abs(t->GetD())>4) continue;
-
- if (CorrectForDeadZoneMaterial(t)!=0) {
- Warning("Clusters2Tracks",
- "failed to correct for the material in the dead zone !\n");
- continue;
- }
-
- itsTracks.AddLast(t);
- }
- delete itrack;
- }
- itsTracks.Sort();
- nentr=itsTracks.GetEntriesFast();
-
-
- AliITStrackV2 *otrack=&fBestTrack;
- TBranch *branch=itsTree->GetBranch("tracks");
- if (!branch) itsTree->Branch("tracks","AliITStrackV2",&otrack,32000,3);
- else branch->SetAddress(&otrack);
-
- for (fPass=0; fPass<2; fPass++) {
- Int_t &constraint=fConstraint[fPass]; if (constraint<0) continue;
- for (Int_t i=0; i<nentr; i++) {
- AliITStrackV2 *t=(AliITStrackV2*)itsTracks.UncheckedAt(i);
- if (t==0) continue; //this track has been already tracked
- Int_t tpcLabel=t->GetLabel(); //save the TPC track label
-
- ResetTrackToFollow(*t);
- ResetBestTrack();
-
- for (FollowProlongation(); fI<kMaxLayer; fI++) {
- while (TakeNextProlongation()) FollowProlongation();
- }
-
- if (fBestTrack.GetNumberOfClusters() == 0) continue;
-
- if (fConstraint[fPass]) {
- ResetTrackToFollow(*t);
- if (!RefitAt(3.7, &fTrackToFollow, &fBestTrack)) continue;
- ResetBestTrack();
- }
-
- fBestTrack.SetLabel(tpcLabel);
- fBestTrack.CookdEdx();
- CookLabel(&fBestTrack,0.); //For comparison only
- itsTree->Fill();
- UseClusters(&fBestTrack);
- delete itsTracks.RemoveAt(i);
- }
- }
-
- nentr=(Int_t)itsTree->GetEntries();
- Info("Clusters2Tracks","Number of prolonged tracks: %d\n",nentr);
-
- itsTracks.Delete();
-
- return 0;
-}
-
Int_t AliITStrackerV2::PropagateBack(AliESD *event) {
//--------------------------------------------------------------------
// This functions propagates reconstructed ITS tracks back
for (Int_t i=0; i<nentr; i++) {
AliESDtrack *esd=event->GetTrack(i);
- if (esd->GetStatus()!=(AliESDtrack::kTPCin|AliESDtrack::kITSin)) continue;
+ if ((esd->GetStatus()&AliESDtrack::kITSin)==0) continue;
+ if (esd->GetStatus()&AliESDtrack::kITSout) continue;
AliITStrackV2 *t=0;
try {
ResetTrackToFollow(*t);
// propagete to vertex [SR, GSI 17.02.2003]
- fTrackToFollow.PropagateTo(3.,0.0028,65.19);
- fTrackToFollow.PropagateToVertex();
-
- // Start Time measurement [SR, GSI 17.02.2003]
- fTrackToFollow.StartTimeIntegral();
- fTrackToFollow.PropagateTo(3.,-0.0028,65.19);
+ // Start Time measurement [SR, GSI 17.02.2003], corrected by I.Belikov
+ if (fTrackToFollow.PropagateTo(3.,0.0028,65.19)) {
+ if (fTrackToFollow.PropagateToVertex()) {
+ fTrackToFollow.StartTimeIntegral();
+ }
+ fTrackToFollow.PropagateTo(3.,-0.0028,65.19);
+ }
fTrackToFollow.ResetCovariance(); fTrackToFollow.ResetClusters();
if (RefitAt(49.,&fTrackToFollow,t)) {
continue;
}
fTrackToFollow.SetLabel(t->GetLabel());
- fTrackToFollow.CookdEdx();
+ //fTrackToFollow.CookdEdx();
CookLabel(&fTrackToFollow,0.); //For comparison only
fTrackToFollow.UpdateESDtrack(AliESDtrack::kITSout);
UseClusters(&fTrackToFollow);
for (Int_t i=0; i<nentr; i++) {
AliESDtrack *esd=event->GetTrack(i);
- ULong_t flags = AliESDtrack::kITSin | AliESDtrack::kTPCrefit;
-
- if ( (esd->GetStatus() & flags) != flags ) continue;
- if ( esd->GetStatus() & AliESDtrack::kITSrefit) continue;
+ if ((esd->GetStatus()&AliESDtrack::kITSout) == 0) continue;
+ if (esd->GetStatus()&AliESDtrack::kITSrefit) continue;
+ if (esd->GetStatus()&AliESDtrack::kTPCout)
+ if ((esd->GetStatus()&AliESDtrack::kTPCrefit)==0) continue;
AliITStrackV2 *t=0;
try {
fTrackToFollow.ResetClusters();
//Refitting...
- if (RefitAt(3.7, &fTrackToFollow, t)) {
+ if (RefitAt(3.7, &fTrackToFollow, t, kTRUE)) {
fTrackToFollow.SetLabel(t->GetLabel());
fTrackToFollow.CookdEdx();
CookLabel(&fTrackToFollow,0.); //For comparison only
- if (fTrackToFollow.PropagateTo(3.,0.0028,65.19)) //The beam pipe
- if (fTrackToFollow.PropagateToVertex()) {
- fTrackToFollow.UpdateESDtrack(AliESDtrack::kITSrefit);
- UseClusters(&fTrackToFollow);
- ntrk++;
- }
+ if (fTrackToFollow.PropagateTo(3.,0.0028,65.19)) {//The beam pipe
+ AliESDtrack *esdTrack =fTrackToFollow.GetESDtrack();
+ esdTrack->UpdateTrackParams(&fTrackToFollow,AliESDtrack::kITSrefit);
+ Float_t r[3]={0.,0.,0.};
+ Double_t maxD=3.;
+ esdTrack->RelateToVertex(event->GetVertex(),GetBz(r),maxD);
+ ntrk++;
+ }
}
delete t;
}
return;
}
+ fI--;
+
Double_t zmin=track.GetZ() - dz;
Double_t zmax=track.GetZ() + dz;
Double_t ymin=track.GetY() + r*phi - dy;
Double_t ymax=track.GetY() + r*phi + dy;
- layer.SelectClusters(zmin,zmax,ymin,ymax);
- fI--;
+ if (layer.SelectClusters(zmin,zmax,ymin,ymax)==0)
+ if (fLayersNotToSkip[fI]) return;
- //take another prolongation
if (!TakeNextProlongation())
if (fLayersNotToSkip[fI]) return;
dz=road*scz; dy=road*scy;
}
- const AliITSclusterV2 *c=0; Int_t ci=-1;
- Double_t chi2=12345.;
+ const AliITSRecPoint *c=0; Int_t ci=-1;
+ const AliITSRecPoint *cc=0; Int_t cci=-1;
+ Double_t chi2=kMaxChi2;
while ((c=layer.GetNextCluster(ci))!=0) {
Int_t idet=c->GetDetectorIndex();
if (TMath::Abs(fTrackToFollow.GetZ() - c->GetZ()) > dz) continue;
if (TMath::Abs(fTrackToFollow.GetY() - c->GetY()) > dy) continue;
- chi2=fTrackToFollow.GetPredictedChi2(c); if (chi2<kMaxChi2) break;
+ Double_t ch2=fTrackToFollow.GetPredictedChi2(c);
+ if (ch2 > chi2) continue;
+ chi2=ch2;
+ cc=c; cci=ci;
+ break;
}
- if (chi2>=kMaxChi2) return 0;
- if (!c) return 0;
+ if (!cc) return 0;
- if (!fTrackToFollow.Update(c,chi2,(fI<<28)+ci)) {
+ if (!fTrackToFollow.Update(cc,chi2,(fI<<28)+cci)) {
//Warning("TakeNextProlongation","filtering failed !\n");
return 0;
}
if (TMath::Abs(fTrackToFollow.GetD())>4) return 0;
fTrackToFollow.
- SetSampledEdx(c->GetQ(),fTrackToFollow.GetNumberOfClusters()-1); //b.b.
+ SetSampledEdx(cc->GetQ(),fTrackToFollow.GetNumberOfClusters()-1); //b.b.
{
Double_t x0;
//--------------------------------------------------------------------
//default AliITSlayer constructor
//--------------------------------------------------------------------
- fN=0;
+ fR=0.; fPhiOffset=0.; fZOffset=0.;
+ fNladders=0; fNdetectors=0;
fDetectors=0;
+
+ for (Int_t i=0; i<kNsector; i++) fN[i]=0;
+ fNsel=0;
+
+ fRoad=2*fR*TMath::Sqrt(3.14/1.);//assuming that there's only one cluster
}
AliITStrackerV2::AliITSlayer::
fNladders=nl; fNdetectors=nd;
fDetectors=new AliITSdetector[fNladders*fNdetectors];
- fN=0;
- fI=0;
+ for (Int_t i=0; i<kNsector; i++) fN[i]=0;
+ fNsel=0;
+
+ for (Int_t i=0; i<kMaxClusterPerLayer; i++) fClusters[i]=0;
fRoad=2*fR*TMath::Sqrt(3.14/1.);//assuming that there's only one cluster
}
// AliITSlayer destructor
//--------------------------------------------------------------------
delete[] fDetectors;
- for (Int_t i=0; i<fN; i++) delete fClusters[i];
+ ResetClusters();
}
void AliITStrackerV2::AliITSlayer::ResetClusters() {
//--------------------------------------------------------------------
// This function removes loaded clusters
//--------------------------------------------------------------------
- for (Int_t i=0; i<fN; i++) delete fClusters[i];
- fN=0;
- fI=0;
+ for (Int_t s=0; s<kNsector; s++) {
+ Int_t &n=fN[s];
+ while (n) {
+ n--;
+ delete fClusters[s*kMaxClusterPerSector+n];
+ }
+ }
}
void AliITStrackerV2::AliITSlayer::ResetRoad() {
// This function calculates the road defined by the cluster density
//--------------------------------------------------------------------
Int_t n=0;
- for (Int_t i=0; i<fN; i++) {
- if (TMath::Abs(fClusters[i]->GetZ())<fR) n++;
+ for (Int_t s=0; s<kNsector; s++) {
+ Int_t i=fN[s];
+ while (i--)
+ if (TMath::Abs(fClusters[s*kMaxClusterPerSector+i]->GetZ())<fR) n++;
}
if (n>1) fRoad=2*fR*TMath::Sqrt(3.14/n);
}
-Int_t AliITStrackerV2::AliITSlayer::InsertCluster(AliITSclusterV2 *c) {
+Int_t AliITStrackerV2::AliITSlayer::InsertCluster(AliITSRecPoint *c) {
//--------------------------------------------------------------------
- //This function adds a cluster to this layer
+ // This function inserts a cluster to this layer in increasing
+ // order of the cluster's fZ
//--------------------------------------------------------------------
- if (fN==kMaxClusterPerLayer) {
- ::Error("InsertCluster","Too many clusters !\n");
- return 1;
+ Float_t circ=TMath::TwoPi()*fR;
+ Int_t sec=Int_t(kNsector*c->GetPhiR()/circ);
+ if (sec>=kNsector) {
+ ::Error("InsertCluster","Wrong sector !\n");
+ return 1;
}
-
- if (fN==0) {fClusters[fN++]=c; return 0;}
- Int_t i=FindClusterIndex(c->GetZ());
- memmove(fClusters+i+1 ,fClusters+i,(fN-i)*sizeof(AliITSclusterV2*));
- fClusters[i]=c; fN++;
-
+ Int_t &n=fN[sec];
+ if (n>=kMaxClusterPerSector) {
+ ::Error("InsertCluster","Too many clusters !\n");
+ return 1;
+ }
+ if (n==0) fClusters[sec*kMaxClusterPerSector]=c;
+ else {
+ Int_t i=FindClusterIndex(c->GetZ(),sec);
+ Int_t k=n-i+sec*kMaxClusterPerSector;
+ memmove(fClusters+i+1 ,fClusters+i,k*sizeof(AliITSRecPoint*));
+ fClusters[i]=c;
+ }
+ n++;
return 0;
}
-Int_t AliITStrackerV2::AliITSlayer::FindClusterIndex(Double_t z) const {
+Int_t
+AliITStrackerV2::AliITSlayer::FindClusterIndex(Float_t z,Int_t s) const {
//--------------------------------------------------------------------
- // This function returns the index of the nearest cluster
+ // For the sector "s", this function returns the index of the first
+ // with its fZ >= "z".
//--------------------------------------------------------------------
- if (fN==0) return 0;
- if (z <= fClusters[0]->GetZ()) return 0;
- if (z > fClusters[fN-1]->GetZ()) return fN;
- Int_t b=0, e=fN-1, m=(b+e)/2;
+ Int_t nc=fN[s];
+ if (nc==0) return kMaxClusterPerSector*s;
+
+ Int_t b=kMaxClusterPerSector*s;
+ if (z <= fClusters[b]->GetZ()) return b;
+
+ Int_t e=b+nc-1;
+ if (z > fClusters[e]->GetZ()) return e+1;
+
+ Int_t m=(b+e)/2;
for (; b<e; m=(b+e)/2) {
if (z > fClusters[m]->GetZ()) b=m+1;
else e=m;
return m;
}
-void AliITStrackerV2::AliITSlayer::
-SelectClusters(Double_t zmin,Double_t zmax,Double_t ymin, Double_t ymax) {
+Int_t AliITStrackerV2::AliITSlayer::
+SelectClusters(Float_t zmin,Float_t zmax,Float_t ymin, Float_t ymax) {
//--------------------------------------------------------------------
- // This function sets the "window"
+ // This function selects clusters within the "window"
//--------------------------------------------------------------------
- fI=FindClusterIndex(zmin); fZmax=zmax;
- Double_t circle=2*TMath::Pi()*fR;
- if (ymax>circle) { ymax-=circle; ymin-=circle; }
- fYmin=ymin; fYmax=ymax;
+ Float_t circ=fR*TMath::TwoPi();
+
+ if (ymin>circ) ymin-=circ; else if (ymin<0) ymin+=circ;
+ if (ymax>circ) ymax-=circ; else if (ymax<0) ymax+=circ;
+
+ Int_t i1=Int_t(kNsector*ymin/circ); if (i1==kNsector) i1--;
+ if (fN[i1]!=0) {
+ Float_t ym = (ymax<ymin) ? ymax+circ : ymax;
+ Int_t i=FindClusterIndex(zmin,i1), imax=i1*kMaxClusterPerSector+fN[i1];
+ for (; i<imax; i++) {
+ AliITSRecPoint *c=fClusters[i];
+ if (c->IsUsed()) continue;
+ if (c->GetZ()>zmax) break;
+ if (c->GetPhiR()<=ymin) continue;
+ if (c->GetPhiR()>ym) continue;
+ fIndex[fNsel++]=i;
+ }
+ }
+
+ Int_t i2=Int_t(kNsector*ymax/circ); if (i2==kNsector) i2--;
+ if (i2==i1) return fNsel;
+
+ if (fN[i2]!=0) {
+ Float_t ym = (ymin>ymax) ? ymin-circ : ymin;
+ Int_t i=FindClusterIndex(zmin,i2), imax=i2*kMaxClusterPerSector+fN[i2];
+ for (; i<imax; i++) {
+ AliITSRecPoint *c=fClusters[i];
+ if (c->IsUsed()) continue;
+ if (c->GetZ()>zmax) break;
+ if (c->GetPhiR()<=ym) continue;
+ if (c->GetPhiR()>ymax) continue;
+ fIndex[fNsel++]=i;
+ }
+ }
+
+ return fNsel;
}
-const AliITSclusterV2 *AliITStrackerV2::AliITSlayer::GetNextCluster(Int_t &ci){
+const AliITSRecPoint *AliITStrackerV2::AliITSlayer::GetNextCluster(Int_t &ci){
//--------------------------------------------------------------------
// This function returns clusters within the "window"
//--------------------------------------------------------------------
- const AliITSclusterV2 *cluster=0;
- for (Int_t i=fI; i<fN; i++) {
- const AliITSclusterV2 *c=fClusters[i];
- if (c->GetZ() > fZmax) break;
- if (c->IsUsed()) continue;
- const AliITSdetector &det=GetDetector(c->GetDetectorIndex());
- Double_t y=fR*det.GetPhi() + c->GetY();
-
- if (y>2.*fR*TMath::Pi()) y -= 2*fR*TMath::Pi();
- if (y>1.*fR*TMath::Pi() && fYmax<y) y -= 2*fR*TMath::Pi();
-
- if (y<fYmin) continue;
- if (y>fYmax) continue;
- cluster=c; ci=i;
- fI=i+1;
- break;
+ AliITSRecPoint *c=0;
+ ci=-1;
+ if (fNsel) {
+ fNsel--;
+ ci=fIndex[fNsel];
+ c=fClusters[ci];
}
+ return c;
+}
- return cluster;
+Int_t AliITStrackerV2::AliITSlayer::GetNumberOfClusters() const {
+ Int_t n=0;
+ for (Int_t s=0; s<kNsector; s++) n+=fN[s];
+ return n;
}
-Int_t AliITStrackerV2::AliITSlayer::
-FindDetectorIndex(Double_t phi, Double_t z) const {
+Int_t
+AliITStrackerV2::AliITSlayer::FindDetectorIndex(Double_t phi,Double_t z)const {
//--------------------------------------------------------------------
//This function finds the detector crossed by the track
//--------------------------------------------------------------------
return d/(xn*xn);
}
-Int_t AliITStrackerV2::AliITSlayer::InRoad() const {
- //--------------------------------------------------------------------
- // This function returns number of clusters within the "window"
- //--------------------------------------------------------------------
- Int_t ncl=0;
- for (Int_t i=fI; i<fN; i++) {
- const AliITSclusterV2 *c=fClusters[i];
- if (c->GetZ() > fZmax) break;
- if (c->IsUsed()) continue;
- const AliITSdetector &det=GetDetector(c->GetDetectorIndex());
- Double_t y=fR*det.GetPhi() + c->GetY();
-
- if (y>2.*fR*TMath::Pi()) y -= 2*fR*TMath::Pi();
- if (y>1.*fR*TMath::Pi() && fYmax<y) y -= 2*fR*TMath::Pi();
-
- if (y<fYmin) continue;
- if (y>fYmax) continue;
- ncl++;
- }
- return ncl;
-}
-
-Bool_t
-AliITStrackerV2::RefitAt(Double_t xx,AliITStrackV2 *t,const AliITStrackV2 *c) {
+Bool_t AliITStrackerV2::RefitAt(Double_t xx,AliITStrackV2 *t,
+ const AliITStrackV2 *c, Bool_t extra) {
//--------------------------------------------------------------------
// This function refits the track "t" at the position "x" using
// the clusters from "c"
+ // If "extra"==kTRUE,
+ // the clusters from overlapped modules get attached to "t"
//--------------------------------------------------------------------
Int_t index[kMaxLayer];
Int_t k;
}
t->SetDetectorIndex(idet);
- const AliITSclusterV2 *cl=0;
+ const AliITSRecPoint *cl=0;
Double_t maxchi2=kMaxChi2;
Int_t idx=index[i];
if (idx>0) {
- const AliITSclusterV2 *c=(AliITSclusterV2 *)GetCluster(idx);
+ const AliITSRecPoint *c=(AliITSRecPoint *)GetCluster(idx);
if (idet != c->GetDetectorIndex()) {
idet=c->GetDetectorIndex();
const AliITSdetector &det=layer.GetDetector(idet);
return kFALSE;
}
}
- /*
- if (cl==0)
- if (t->GetNumberOfClusters()>2) {
- Double_t dz=4*TMath::Sqrt(t->GetSigmaZ2()+kSigmaZ2[i]);
- Double_t dy=4*TMath::Sqrt(t->GetSigmaY2()+kSigmaY2[i]);
- Double_t zmin=t->GetZ() - dz;
- Double_t zmax=t->GetZ() + dz;
- Double_t ymin=t->GetY() + phi*r - dy;
- Double_t ymax=t->GetY() + phi*r + dy;
- layer.SelectClusters(zmin,zmax,ymin,ymax);
-
- const AliITSclusterV2 *c=0; Int_t ci=-1;
- while ((c=layer.GetNextCluster(ci))!=0) {
- if (idet != c->GetDetectorIndex()) continue;
- Double_t chi2=t->GetPredictedChi2(c);
- if (chi2<maxchi2) { cl=c; maxchi2=chi2; idx=ci; }
- }
- }
- */
+
if (cl) {
if (!t->Update(cl,maxchi2,idx)) {
return kFALSE;
t->CorrectForMaterial(-step*d,x0);
}
+ if (extra) { //search for extra clusters
+ AliITStrackV2 tmp(*t);
+ Double_t dz=4*TMath::Sqrt(tmp.GetSigmaZ2()+kSigmaZ2[i]);
+ if (dz < 0.5*TMath::Abs(tmp.GetTgl())) dz=0.5*TMath::Abs(tmp.GetTgl());
+ Double_t dy=4*TMath::Sqrt(t->GetSigmaY2()+kSigmaY2[i]);
+ if (dy < 0.5*TMath::Abs(tmp.GetSnp())) dy=0.5*TMath::Abs(tmp.GetSnp());
+ Double_t zmin=t->GetZ() - dz;
+ Double_t zmax=t->GetZ() + dz;
+ Double_t ymin=t->GetY() + phi*r - dy;
+ Double_t ymax=t->GetY() + phi*r + dy;
+ layer.SelectClusters(zmin,zmax,ymin,ymax);
+
+ const AliITSRecPoint *c=0; Int_t ci=-1,cci=-1;
+ Double_t maxchi2=1000.*kMaxChi2, tolerance=0.1;
+ while ((c=layer.GetNextCluster(ci))!=0) {
+ if (idet == c->GetDetectorIndex()) continue;
+
+ const AliITSdetector &det=layer.GetDetector(c->GetDetectorIndex());
+
+ if (!tmp.Propagate(det.GetPhi(),det.GetR())) continue;
+
+ if (TMath::Abs(tmp.GetZ() - c->GetZ()) > tolerance) continue;
+ if (TMath::Abs(tmp.GetY() - c->GetY()) > tolerance) continue;
+
+ Double_t chi2=tmp.GetPredictedChi2(c);
+ if (chi2<maxchi2) { maxchi2=chi2; cci=ci; }
+ }
+ if (cci>=0) t->SetExtraCluster(i,(i<<28)+cci);
+ }
+
// track time update [SR, GSI 17.02.2003]
if (t->IsStartedTimeIntegral() && step==1) {
Double_t newX, newY, newZ;
//--------------------------------------------------------------------
AliTracker::UseClusters(t,from);
- AliITSclusterV2 *c=(AliITSclusterV2 *)GetCluster(t->GetClusterIndex(0));
- //if (c->GetQ()>2) c->Use();
- if (c->GetSigmaZ2()>0.1) c->Use();
- c=(AliITSclusterV2 *)GetCluster(t->GetClusterIndex(1));
- //if (c->GetQ()>2) c->Use();
- if (c->GetSigmaZ2()>0.1) c->Use();
+ Int_t clusterIndex = t->GetClusterIndex(0);
+ AliITSRecPoint *c= 0x0;
+
+ if (clusterIndex>-1)
+ c = (AliITSRecPoint *)GetCluster(clusterIndex);
+ if (c && c->GetSigmaZ2()>0.1) c->UnUse();
+
+ c = 0x0;
+ clusterIndex = t->GetClusterIndex(1);
+ if (clusterIndex>-1)
+ c=(AliITSRecPoint *)GetCluster(clusterIndex);
+ if (c && c->GetSigmaZ2()>0.1) c->UnUse();
}
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff