//-------------------------------------------------------------------------
// Implementation of the ITS tracker class
-//
+// It reads AliITSclusterV2 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 "AliITStrackerV2.h"
ClassImp(AliITStrackerV2)
-AliITStrackerV2::AliITSlayer AliITStrackerV2::fLayers[kMaxLayer]; // ITS layers
+AliITStrackerV2::AliITSlayer AliITStrackerV2::fgLayers[kMaxLayer]; // ITS layers
AliITStrackerV2::AliITStrackerV2(const AliITSgeom *geom) : AliTracker() {
//--------------------------------------------------------------------
r += TMath::Sqrt(x*x + y*y);
r*=0.25;
- new (fLayers+i-1) AliITSlayer(r,poff,zoff,nlad,ndet);
+ new (fgLayers+i-1) AliITSlayer(r,poff,zoff,nlad,ndet);
for (Int_t j=1; j<nlad+1; j++) {
for (Int_t k=1; k<ndet+1; k++) { //Fill this layer with detectors
Float_t x,y,zshift; g->GetTrans(i,j,k,x,y,zshift);
Double_t rot[9]; g->GetRotMatrix(i,j,k,rot);
- Double_t r =-x*rot[1] + y*rot[0]; if (i==1) r=-r;
- Double_t phi=TMath::ATan2(rot[1],rot[0]); if (i==1) phi-=3.1415927;
- phi+=0.5*TMath::Pi(); if (phi<0) phi += 2*TMath::Pi();
- AliITSdetector &det=fLayers[i-1].GetDetector((j-1)*ndet + k-1);
+ Double_t phi=TMath::ATan2(rot[1],rot[0])+TMath::Pi();
+ phi+=TMath::Pi()/2;
+ if (i==1) phi+=TMath::Pi();
+ Double_t cp=TMath::Cos(phi), sp=TMath::Sin(phi);
+ Double_t r=x*cp+y*sp;
+ AliITSdetector &det=fgLayers[i-1].GetDetector((j-1)*ndet + k-1);
new(&det) AliITSdetector(r,phi);
}
}
fI=kMaxLayer;
fPass=0;
- fConstraint[0]=1; fConstraint[1]=0;
+ fConstraint[0]=1; fConstraint[1]=0;//-1;
Double_t xyz[]={kXV,kYV,kZV}, ers[]={kSigmaXV,kSigmaYV,kSigmaZV};
SetVertex(xyz,ers);
+
+ for (Int_t i=0; i<kMaxLayer; i++) fLayersNotToSkip[i]=kLayersNotToSkip[i];
+ fLastLayerToTrackTo=kLastLayerToTrackTo;
+
+}
+
+void AliITStrackerV2::SetLayersNotToSkip(Int_t *l) {
+ //--------------------------------------------------------------------
+ //This function set masks of the layers which must be not skipped
+ //--------------------------------------------------------------------
+ for (Int_t i=0; i<kMaxLayer; i++) fLayersNotToSkip[i]=l[i];
}
-Int_t AliITStrackerV2::LoadClusters() {
+Int_t AliITStrackerV2::LoadClusters(TTree *cTree) {
//--------------------------------------------------------------------
//This function loads ITS clusters
//--------------------------------------------------------------------
- char cname[100];
- sprintf(cname,"TreeC_ITS_%d",GetEventNumber());
- TTree *cTree=(TTree*)gDirectory->Get(cname);
- if (!cTree) {
- Error("LoadClusters"," can't get cTree !\n");
- return 1;
- }
TBranch *branch=cTree->GetBranch("Clusters");
if (!branch) {
- Error("LoadClusters"," can't get Clusters branch !\n");
+ Error("LoadClusters"," can't get the branch !\n");
return 1;
}
Int_t j=0;
for (Int_t i=0; i<kMaxLayer; i++) {
- Int_t ndet=fLayers[i].GetNdetectors();
- Int_t jmax = j + fLayers[i].GetNladders()*ndet;
+ Int_t ndet=fgLayers[i].GetNdetectors();
+ Int_t jmax = j + fgLayers[i].GetNladders()*ndet;
for (; j<jmax; j++) {
if (!cTree->GetEvent(j)) continue;
Int_t ncl=clusters->GetEntriesFast();
while (ncl--) {
AliITSclusterV2 *c=(AliITSclusterV2*)clusters->UncheckedAt(ncl);
- fLayers[i].InsertCluster(new AliITSclusterV2(*c));
+ fgLayers[i].InsertCluster(new AliITSclusterV2(*c));
}
clusters->Delete();
}
- fLayers[i].ResetRoad(); //road defined by the cluster density
+ fgLayers[i].ResetRoad(); //road defined by the cluster density
}
- delete cTree; //Thanks to Mariana Bondila
return 0;
}
//--------------------------------------------------------------------
//This function unloads ITS clusters
//--------------------------------------------------------------------
- for (Int_t i=0; i<kMaxLayer; i++) fLayers[i].ResetClusters();
+ for (Int_t i=0; i<kMaxLayer; i++) fgLayers[i].ResetClusters();
}
-Int_t AliITStrackerV2::Clusters2Tracks(const TFile *inp, TFile *out) {
+static Int_t CorrectForDeadZoneMaterial(AliITStrackV2 *t) {
+ //--------------------------------------------------------------------
+ // Correction for the material between the TPC and the ITS
+ // (should it belong to the TPC code ?)
+ //--------------------------------------------------------------------
+ Double_t riw=80., diw=0.0053, x0iw=30; // TPC inner wall ?
+ Double_t rcd=61., dcd=0.0053, x0cd=30; // TPC "central drum" ?
+ Double_t yr=12.8, dr=0.03; // rods ?
+ Double_t zm=0.2, dm=0.40; // membrane
+ //Double_t rr=52., dr=0.19, x0r=24., yyr=7.77; //rails
+ Double_t rs=50., ds=0.001; // something belonging to the ITS (screen ?)
+
+ if (t->GetX() > riw) {
+ if (!t->PropagateTo(riw,diw,x0iw)) return 1;
+ if (TMath::Abs(t->GetY())>yr) t->CorrectForMaterial(dr);
+ if (TMath::Abs(t->GetZ())<zm) t->CorrectForMaterial(dm);
+ if (!t->PropagateTo(rcd,dcd,x0cd)) return 1;
+ //Double_t x,y,z; t->GetGlobalXYZat(rr,x,y,z);
+ //if (TMath::Abs(y)<yyr) t->PropagateTo(rr,dr,x0r);
+ if (!t->PropagateTo(rs,ds)) return 1;
+ } else if (t->GetX() < rs) {
+ if (!t->PropagateTo(rs,-ds)) return 1;
+ //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+0.001,-diw,x0iw)) return 1;
+ } else {
+ ::Error("CorrectForDeadZoneMaterial","track is already in the dead zone !");
+ return 1;
+ }
+
+ return 0;
+}
+
+Int_t AliITStrackerV2::Clusters2Tracks(AliESD *event) {
//--------------------------------------------------------------------
- //This functions reconstructs ITS tracks
+ // This functions reconstructs ITS tracks
+ // The clusters must be already loaded !
//--------------------------------------------------------------------
- TFile *in=(TFile*)inp;
- TDirectory *savedir=gDirectory;
+ TObjArray itsTracks(15000);
- if (LoadClusters()!=0) return 1;
+ {/* Read ESD tracks */
+ Int_t nentr=event->GetNumberOfTracks();
+ Info("Clusters2Tracks", "Number of ESD tracks: %d\n", nentr);
+ while (nentr--) {
+ AliESDtrack *esd=event->GetTrack(nentr);
- if (!in->IsOpen()) {
- Error("Clusters2Tracks","file with TPC tracks is not open !\n");
- return 1;
- }
+ if ((esd->GetStatus()&AliESDtrack::kTPCin)==0) continue;
+ if (esd->GetStatus()&AliESDtrack::kTPCout) continue;
+ if (esd->GetStatus()&AliESDtrack::kITSin) continue;
- if (!out->IsOpen()) {
- Error("Clusters2Tracks","file for ITS tracks is not open !\n");
- return 2;
- }
+ AliITStrackV2 *t=0;
+ try {
+ t=new AliITStrackV2(*esd);
+ } catch (const Char_t *msg) {
+ Warning("Clusters2Tracks",msg);
+ delete t;
+ continue;
+ }
+ if (TMath::Abs(t->GetD())>4) {
+ delete t;
+ continue;
+ }
- in->cd();
-
- Char_t tname[100];
- Int_t nentr=0; TObjArray itsTracks(15000);
-
- {/* Read TPC tracks */
- sprintf(tname,"TreeT_TPC_%d",GetEventNumber());
- TTree *tpcTree=(TTree*)in->Get(tname);
- if (!tpcTree) {
- Error("Clusters2Tracks","can't get a tree with TPC tracks !\n");
- return 3;
+ if (CorrectForDeadZoneMaterial(t)!=0) {
+ Warning("Clusters2Tracks",
+ "failed to correct for the material in the dead zone !\n");
+ delete t;
+ continue;
+ }
+ itsTracks.AddLast(t);
}
- AliTPCtrack *itrack=new AliTPCtrack;
- tpcTree->SetBranchAddress("tracks",&itrack);
- nentr=(Int_t)tpcTree->GetEntries();
- 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;
-
- t->PropagateTo(80.,0.0053,30);
- if (TMath::Abs(t->GetY())>12.8) t->CorrectForMaterial(0.03);
- if (TMath::Abs(t->GetZ())<0.2) t->CorrectForMaterial(0.40);
- t->PropagateTo(61.,0.0053,30);
- //Double_t xk=52.,x,y,z; t->GetGlobalXYZat(xk,x,y,z);
- //if (TMath::Abs(y)<7.77) t->PropagateTo(xk,0.19,24.);
- t->PropagateTo(50.,0.001);
+ } /* End Read ESD tracks */
- itsTracks.AddLast(t);
- }
- delete tpcTree; //Thanks to Mariana Bondila
- delete itrack;
- }
itsTracks.Sort();
+ Int_t nentr=itsTracks.GetEntriesFast();
- out->cd();
-
- sprintf(tname,"TreeT_ITS_%d",GetEventNumber());
- TTree itsTree(tname,"Tree with ITS tracks");
- AliITStrackV2 *otrack=&fBestTrack;
- itsTree.Branch("tracks","AliITStrackV2",&otrack,32000,0);
-
+ Int_t ntrk=0;
for (fPass=0; fPass<2; fPass++) {
Int_t &constraint=fConstraint[fPass]; if (constraint<0) continue;
for (Int_t i=0; i<nentr; i++) {
while (TakeNextProlongation()) FollowProlongation();
}
- if (fBestTrack.GetNumberOfClusters() < kMaxLayer-kLayersToSkip)continue;
+ if (fBestTrack.GetNumberOfClusters() == 0) continue;
if (fConstraint[fPass]) {
- Int_t index[kMaxLayer];
- Int_t k;
- for (k=0; k<kMaxLayer; k++) index[k]=-1;
- Int_t nc=fBestTrack.GetNumberOfClusters();
- for (k=0; k<nc; k++) {
- Int_t idx=fBestTrack.GetClusterIndex(k),nl=(idx&0xf0000000)>>28;
- index[nl]=idx;
- }
- fBestTrack.~AliITStrackV2(); new(&fBestTrack) AliITStrackV2(*t);
- if (!RefitAt(3.7, &fBestTrack, index)) continue;
+ ResetTrackToFollow(*t);
+ if (!RefitAt(3.7, &fTrackToFollow, &fBestTrack)) continue;
+ ResetBestTrack();
}
fBestTrack.SetLabel(tpcLabel);
fBestTrack.CookdEdx();
CookLabel(&fBestTrack,0.); //For comparison only
- itsTree.Fill();
+ fBestTrack.UpdateESDtrack(AliESDtrack::kITSin);
UseClusters(&fBestTrack);
delete itsTracks.RemoveAt(i);
-
+ ntrk++;
}
}
- Info("Clusters2Tracks","Number of TPC tracks: %d\n",nentr);
- Info("Clusters2Tracks","Number of prolonged tracks: %d\n",
- (Int_t)itsTree.GetEntries());
-
- itsTree.Write();
-
itsTracks.Delete();
- UnloadClusters();
+ Info("Clusters2Tracks","Number of prolonged tracks: %d\n",ntrk);
- savedir->cd();
return 0;
}
-Int_t AliITStrackerV2::PropagateBack(const TFile *inp, TFile *out) {
+Int_t AliITStrackerV2::PropagateBack(AliESD *event) {
//--------------------------------------------------------------------
- //This functions propagates reconstructed ITS tracks back
+ // This functions propagates reconstructed ITS tracks back
+ // The clusters must be loaded !
//--------------------------------------------------------------------
- TFile *in=(TFile*)inp;
- TDirectory *savedir=gDirectory;
+ Int_t nentr=event->GetNumberOfTracks();
+ Info("PropagateBack", "Number of ESD tracks: %d\n", nentr);
- if (LoadClusters()!=0) return 1;
+ Int_t ntrk=0;
+ for (Int_t i=0; i<nentr; i++) {
+ AliESDtrack *esd=event->GetTrack(i);
+
+ if ((esd->GetStatus()&AliESDtrack::kITSin)==0) continue;
+ if (esd->GetStatus()&AliESDtrack::kITSout) continue;
+
+ AliITStrackV2 *t=0;
+ try {
+ t=new AliITStrackV2(*esd);
+ } catch (const Char_t *msg) {
+ Warning("PropagateBack",msg);
+ delete t;
+ continue;
+ }
- if (!in->IsOpen()) {
- Error("PropagateBack","file with ITS tracks is not open !\n");
- return 1;
- }
+ ResetTrackToFollow(*t);
- if (!out->IsOpen()) {
- Error("PropagateBack","file for back propagated ITS tracks is not open !\n");
- return 2;
- }
-
- in->cd();
+ // propagete to vertex [SR, GSI 17.02.2003]
+ // 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);
+ }
- Char_t tname[100];
- sprintf(tname,"TreeT_ITS_%d",GetEventNumber());
- TTree *itsTree=(TTree*)in->Get(tname);
- if (!itsTree) {
- Error("PropagateBack","can't get a tree with ITS tracks !\n");
- return 3;
+ fTrackToFollow.ResetCovariance(); fTrackToFollow.ResetClusters();
+ if (RefitAt(49.,&fTrackToFollow,t)) {
+ if (CorrectForDeadZoneMaterial(&fTrackToFollow)!=0) {
+ Warning("PropagateBack",
+ "failed to correct for the material in the dead zone !\n");
+ delete t;
+ continue;
+ }
+ fTrackToFollow.SetLabel(t->GetLabel());
+ //fTrackToFollow.CookdEdx();
+ CookLabel(&fTrackToFollow,0.); //For comparison only
+ fTrackToFollow.UpdateESDtrack(AliESDtrack::kITSout);
+ UseClusters(&fTrackToFollow);
+ ntrk++;
+ }
+ delete t;
}
- AliITStrackV2 *itrack=new AliITStrackV2;
- itsTree->SetBranchAddress("tracks",&itrack);
- out->cd();
+ Info("PropagateBack","Number of back propagated ITS tracks: %d\n",ntrk);
- sprintf(tname,"TreeT_ITSb_%d",GetEventNumber());
- TTree backTree(tname,"Tree with back propagated ITS tracks");
- AliTPCtrack *otrack=0;
- backTree.Branch("tracks","AliTPCtrack",&otrack,32000,2);
+ return 0;
+}
- Int_t ntrk=0;
+Int_t AliITStrackerV2::RefitInward(AliESD *event) {
+ //--------------------------------------------------------------------
+ // This functions refits ITS tracks using the
+ // "inward propagated" TPC tracks
+ // The clusters must be loaded !
+ //--------------------------------------------------------------------
+ Int_t nentr=event->GetNumberOfTracks();
+ Info("RefitInward", "Number of ESD tracks: %d\n", nentr);
- Int_t nentr=(Int_t)itsTree->GetEntries();
+ Int_t ntrk=0;
for (Int_t i=0; i<nentr; i++) {
- itsTree->GetEvent(i);
- ResetTrackToFollow(*itrack);
-
- // 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);
- //
+ AliESDtrack *esd=event->GetTrack(i);
- fTrackToFollow.ResetCovariance(); fTrackToFollow.ResetClusters();
-
- Int_t itsLabel=fTrackToFollow.GetLabel(); //save the ITS track label
+ 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 {
- Int_t nc=itrack->GetNumberOfClusters();
- Int_t idx=0, l=0;
- const AliITSclusterV2 *c=0;
- if (nc--) {
- idx=itrack->GetClusterIndex(nc); l=(idx&0xf0000000)>>28;
- c=(AliITSclusterV2*)GetCluster(idx);
- }
- for (fI=0; fI<kMaxLayer; fI++) {
- AliITSlayer &layer=fLayers[fI];
- Double_t r=layer.GetR();
- if (fI==2 || fI==4) {
- Double_t rs=0.5*(fLayers[fI-1].GetR() + r);
- Double_t d=0.0034, x0=38.6;
- if (fI==2) {rs=9.; d=0.0097; x0=42.;}
- if (!fTrackToFollow.PropagateTo(rs,-d,x0)) throw "";
- }
-
- // remember old position [SR, GSI 18.02.2003]
- Double_t oldX, oldY, oldZ;
- fTrackToFollow.GetGlobalXYZat(fTrackToFollow.GetX(),oldX,oldY,oldZ);
- //
-
- Double_t x,y,z;
- if (!fTrackToFollow.GetGlobalXYZat(r,x,y,z))
- throw "AliITStrackerV2::PropagateBack: failed to estimate track !";
- Double_t phi=TMath::ATan2(y,x);
- Int_t idet=layer.FindDetectorIndex(phi,z);
- if (idet<0)
- throw "AliITStrackerV2::PropagateBack: failed to find a detector !\n";
- const AliITSdetector &det=layer.GetDetector(idet);
- r=det.GetR(); phi=det.GetPhi();
- if (!fTrackToFollow.Propagate(phi,r)) throw "";
- fTrackToFollow.SetDetectorIndex(idet);
-
- const AliITSclusterV2 *cl=0;
- Int_t index=0;
- Double_t maxchi2=kMaxChi2;
-
- if (l==fI) {
- idet=c->GetDetectorIndex();
- if (idet != fTrackToFollow.GetDetectorIndex()) {
- const AliITSdetector &det=layer.GetDetector(idet);
- r=det.GetR(); phi=det.GetPhi();
- if (!fTrackToFollow.Propagate(phi,r)) throw "";
- fTrackToFollow.SetDetectorIndex(idet);
- }
- Double_t chi2=fTrackToFollow.GetPredictedChi2(c);
- if (chi2<kMaxChi2) {
- cl=c; maxchi2=chi2; index=idx;
- }
- if (nc--) {
- idx=itrack->GetClusterIndex(nc); l=(idx&0xf0000000)>>28;
- c=(AliITSclusterV2*)GetCluster(idx);
- }
- }
+ t=new AliITStrackV2(*esd);
+ } catch (const Char_t *msg) {
+ Warning("RefitInward",msg);
+ delete t;
+ continue;
+ }
- if (fTrackToFollow.GetNumberOfClusters()>2) {
- Double_t dz=3*TMath::Sqrt(fTrackToFollow.GetSigmaZ2()+kSigmaZ2[fI]);
- Double_t dy=3*TMath::Sqrt(fTrackToFollow.GetSigmaY2()+kSigmaY2[fI]);
- Double_t zmin=fTrackToFollow.GetZ() - dz;
- Double_t zmax=fTrackToFollow.GetZ() + dz;
- Double_t ymin=fTrackToFollow.GetY() + phi*r - dy;
- Double_t ymax=fTrackToFollow.GetY() + phi*r + dy;
- layer.SelectClusters(zmin,zmax,ymin,ymax);
-
- const AliITSclusterV2 *cc=0; Int_t ci;
- while ((cc=layer.GetNextCluster(ci))!=0) {
- idet=cc->GetDetectorIndex();
- if (idet != fTrackToFollow.GetDetectorIndex()) continue;
- Double_t chi2=fTrackToFollow.GetPredictedChi2(cc);
- if (chi2<maxchi2) {
- cl=cc; index=(fI<<28)+ci; maxchi2=chi2;
- }
- }
- }
+ if (CorrectForDeadZoneMaterial(t)!=0) {
+ Warning("RefitInward",
+ "failed to correct for the material in the dead zone !\n");
+ delete t;
+ continue;
+ }
- if (cl) {
- if (!fTrackToFollow.Update(cl,maxchi2,index))
- Info("PropagateBack","filtering failed !\n");
- }
- {
- Double_t x0;
- x=layer.GetThickness(fTrackToFollow.GetY(),fTrackToFollow.GetZ(),x0);
- fTrackToFollow.CorrectForMaterial(-x,x0);
+ ResetTrackToFollow(*t);
+ fTrackToFollow.ResetClusters();
+
+ //Refitting...
+ if (RefitAt(3.7, &fTrackToFollow, t)) {
+ fTrackToFollow.SetLabel(t->GetLabel());
+ fTrackToFollow.CookdEdx();
+ CookLabel(&fTrackToFollow,0.); //For comparison only
+
+ if (fTrackToFollow.PropagateTo(3.,0.0028,65.19)) {//The beam pipe
+ Double_t a=fTrackToFollow.GetAlpha();
+ Double_t cs=TMath::Cos(a),sn=TMath::Sin(a);
+ Double_t xv= GetX()*cs + GetY()*sn;
+ Double_t yv=-GetX()*sn + GetY()*cs;
+
+ Double_t c=fTrackToFollow.GetC(), snp=fTrackToFollow.GetSnp();
+ Double_t x=fTrackToFollow.GetX(), y=fTrackToFollow.GetY();
+ Double_t tgfv=-(c*(x-xv)-snp)/(c*(y-yv) + TMath::Sqrt(1.-snp*snp));
+ Double_t fv=TMath::ATan(tgfv);
+
+ cs=TMath::Cos(fv); sn=TMath::Sin(fv);
+ x = xv*cs + yv*sn;
+ yv=-xv*sn + yv*cs; xv=x;
+
+ if (fTrackToFollow.Propagate(fv+a,xv)) {
+ fTrackToFollow.UpdateESDtrack(AliESDtrack::kITSrefit);
+ UseClusters(&fTrackToFollow);
+ {
+ AliITSclusterV2 c; c.SetY(yv); c.SetZ(GetZ());
+ c.SetSigmaY2(GetSigmaY()*GetSigmaY());
+ c.SetSigmaZ2(GetSigmaZ()*GetSigmaZ());
+ Double_t chi2=fTrackToFollow.GetPredictedChi2(&c);
+ if (chi2<kMaxChi2)
+ if (fTrackToFollow.Update(&c,-chi2,0))
+ fTrackToFollow.SetConstrainedESDtrack(chi2);
+ }
+ ntrk++;
}
-
- // track time update [SR, GSI 17.02.2003]
- Double_t newX, newY, newZ;
- fTrackToFollow.GetGlobalXYZat(fTrackToFollow.GetX(),newX,newY,newZ);
- Double_t dL2 = (oldX-newX)*(oldX-newX) + (oldY-newY)*(oldY-newY) +
- (oldZ-newZ)*(oldZ-newZ);
- fTrackToFollow.AddTimeStep(TMath::Sqrt(dL2));
- //
-
}
-
- fTrackToFollow.PropagateTo(50.,-0.001);
- //Double_t xk=52.,x,y,z; fTrackToFollow.GetGlobalXYZat(xk,x,y,z);
- //if (TMath::Abs(y)<7.77) fTrackToFollow.PropagateTo(xk,-0.19,24.);
- fTrackToFollow.PropagateTo(61,-0.0053,30);
- fTrackToFollow.PropagateTo(80.,-0.0053,30);
-
- fTrackToFollow.SetLabel(itsLabel);
- otrack=new AliTPCtrack(fTrackToFollow,fTrackToFollow.GetAlpha());
- backTree.Fill(); delete otrack;
- UseClusters(&fTrackToFollow);
- ntrk++;
- }
- catch (const Char_t *msg) {
- Warning("PropagateBack",msg);
}
+ delete t;
}
- backTree.Write();
-
- Info("PropagateBack","Number of ITS tracks: %d\n",nentr);
- Info("PropagateBack","Number of back propagated ITS tracks: %d\n",ntrk);
-
- delete itrack;
-
- delete itsTree; //Thanks to Mariana Bondila
-
- UnloadClusters();
-
- savedir->cd();
+ Info("RefitInward","Number of refitted tracks: %d\n",ntrk);
return 0;
}
//--------------------------------------------------------------------
Int_t l=(index & 0xf0000000) >> 28;
Int_t c=(index & 0x0fffffff) >> 00;
- return fLayers[l].GetCluster(c);
+ return fgLayers[l].GetCluster(c);
}
//--------------------------------------------------------------------
//This function finds a track prolongation
//--------------------------------------------------------------------
- Int_t tryAgain=kLayersToSkip;
-
- while (fI) {
+ while (fI>fLastLayerToTrackTo) {
Int_t i=fI-1;
- AliITSlayer &layer=fLayers[i];
+ AliITSlayer &layer=fgLayers[i];
AliITStrackV2 &track=fTracks[i];
Double_t r=layer.GetR();
if (i==3 || i==1) {
- Double_t rs=0.5*(fLayers[i+1].GetR() + r);
+ Double_t rs=0.5*(fgLayers[i+1].GetR() + r);
Double_t d=0.0034, x0=38.6;
if (i==1) {rs=9.; d=0.0097; x0=42;}
if (!fTrackToFollow.PropagateTo(rs,d,x0)) {
//Warning("FollowProlongation","propagation failed !\n");
- break;
+ return;
}
}
Double_t x,y,z;
if (!fTrackToFollow.GetGlobalXYZat(r,x,y,z)) {
//Warning("FollowProlongation","failed to estimate track !\n");
- break;
+ return;
}
Double_t phi=TMath::ATan2(y,x);
+
Int_t idet=layer.FindDetectorIndex(phi,z);
if (idet<0) {
//Warning("FollowProlongation","failed to find a detector !\n");
- break;
+ return;
}
//propagate to the intersection
phi=det.GetPhi();
if (!fTrackToFollow.Propagate(phi,det.GetR())) {
//Warning("FollowProlongation","propagation failed !\n");
- break;
+ return;
}
fTrackToFollow.SetDetectorIndex(idet);
if (dz < 0.5*TMath::Abs(track.GetTgl())) dz=0.5*TMath::Abs(track.GetTgl());
if (dz > kMaxRoad) {
//Warning("FollowProlongation","too broad road in Z !\n");
- break;
+ return;
}
- if (TMath::Abs(fTrackToFollow.GetZ()-GetZ()) > r+dz) break;
+ if (TMath::Abs(fTrackToFollow.GetZ()-GetZ()) > r+dz) return;
//Double_t dy=4*TMath::Sqrt(track.GetSigmaY2() + kSigmaY2[i]);
if (dy < 0.5*TMath::Abs(track.GetSnp())) dy=0.5*TMath::Abs(track.GetSnp());
if (dy > kMaxRoad) {
//Warning("FollowProlongation","too broad road in Y !\n");
- break;
+ return;
}
Double_t zmin=track.GetZ() - dz;
fI--;
//take another prolongation
- if (!TakeNextProlongation()) if (!tryAgain--) break;
- tryAgain=kLayersToSkip;
+ if (!TakeNextProlongation())
+ if (fLayersNotToSkip[fI]) return;
}
//
// dEdx analysis by: Boris Batyunya, JINR, Boris.Batiounia@cern.ch
//--------------------------------------------------------------------
- AliITSlayer &layer=fLayers[fI];
+ AliITSlayer &layer=fgLayers[fI];
ResetTrackToFollow(fTracks[fI]);
Double_t dz=7*TMath::Sqrt(fTrackToFollow.GetSigmaZ2() + kSigmaZ2[fI]);
SetSampledEdx(c->GetQ(),fTrackToFollow.GetNumberOfClusters()-1); //b.b.
{
- Double_t x0;
+ Double_t x0;
Double_t d=layer.GetThickness(fTrackToFollow.GetY(),fTrackToFollow.GetZ(),x0);
- fTrackToFollow.CorrectForMaterial(d,x0);
+ fTrackToFollow.CorrectForMaterial(d,x0);
}
if (fConstraint[fPass]) {
//--------------------------------------------------------------------
//This function finds the detector crossed by the track
//--------------------------------------------------------------------
- Double_t dphi=phi-fPhiOffset;
+ Double_t dphi=-(phi-fPhiOffset);
if (dphi < 0) dphi += 2*TMath::Pi();
else if (dphi >= 2*TMath::Pi()) dphi -= 2*TMath::Pi();
Int_t np=Int_t(dphi*fNladders*0.5/TMath::Pi()+0.5);
Double_t d=0.0028*3*3; //beam pipe
Double_t x0=0;
- Double_t xn=fLayers[fI].GetR();
+ Double_t xn=fgLayers[fI].GetR();
for (Int_t i=0; i<fI; i++) {
- Double_t xi=fLayers[i].GetR();
- d+=fLayers[i].GetThickness(y,z,x0)*xi*xi;
+ Double_t xi=fgLayers[i].GetR();
+ d+=fgLayers[i].GetThickness(y,z,x0)*xi*xi;
}
if (fI>1) {
}
if (fI>3) {
- Double_t xi=0.5*(fLayers[3].GetR()+fLayers[4].GetR());
+ Double_t xi=0.5*(fgLayers[3].GetR()+fgLayers[4].GetR());
d+=0.0034*xi*xi;
}
return ncl;
}
-Bool_t AliITStrackerV2::RefitAt(Double_t x, AliITStrackV2 *t, Int_t *index) {
+Bool_t
+AliITStrackerV2::RefitAt(Double_t xx,AliITStrackV2 *t,const AliITStrackV2 *c) {
//--------------------------------------------------------------------
- // This function refits a track at a given position
+ // This function refits the track "t" at the position "x" using
+ // the clusters from "c"
//--------------------------------------------------------------------
+ Int_t index[kMaxLayer];
+ Int_t k;
+ for (k=0; k<kMaxLayer; k++) index[k]=-1;
+ Int_t nc=c->GetNumberOfClusters();
+ for (k=0; k<nc; k++) {
+ Int_t idx=c->GetClusterIndex(k),nl=(idx&0xf0000000)>>28;
+ index[nl]=idx;
+ }
+
Int_t from, to, step;
- if (x > t->GetX()) {
+ if (xx > t->GetX()) {
from=0; to=kMaxLayer;
step=+1;
} else {
}
for (Int_t i=from; i != to; i += step) {
- AliITSlayer &layer=fLayers[i];
+ AliITSlayer &layer=fgLayers[i];
Double_t r=layer.GetR();
{
Double_t hI=i-0.5*step;
- if (hI==1.5 || hI==3.5) {
- Double_t rs=0.5*(fLayers[i-step].GetR() + r);
+ if (TMath::Abs(hI-1.5)<0.01 || TMath::Abs(hI-3.5)<0.01) {
+ Double_t rs=0.5*(fgLayers[i-step].GetR() + r);
Double_t d=0.0034, x0=38.6;
- if (hI==1.5) {rs=9.; d=0.0097; x0=42;}
- if (!t->PropagateTo(rs,d,x0)) {
+ if (TMath::Abs(hI-1.5)<0.01) {rs=9.; d=0.0097; x0=42;}
+ if (!t->PropagateTo(rs,-step*d,x0)) {
return kFALSE;
}
}
}
+ // remember old position [SR, GSI 18.02.2003]
+ Double_t oldX=0., oldY=0., oldZ=0.;
+ if (t->IsStartedTimeIntegral() && step==1) {
+ t->GetGlobalXYZat(t->GetX(),oldX,oldY,oldZ);
+ }
+ //
+
Double_t x,y,z;
if (!t->GetGlobalXYZat(r,x,y,z)) {
return kFALSE;
t->SetDetectorIndex(idet);
}
Double_t chi2=t->GetPredictedChi2(c);
- if (chi2<maxchi2) { cl=c; maxchi2=chi2; }
- else return kFALSE;
+ if (chi2<maxchi2) {
+ cl=c;
+ maxchi2=chi2;
+ } else {
+ return kFALSE;
+ }
}
-
/*
if (cl==0)
if (t->GetNumberOfClusters()>2) {
}
}
*/
-
if (cl) {
if (!t->Update(cl,maxchi2,idx)) {
return kFALSE;
}
+ t->SetSampledEdx(cl->GetQ(),t->GetNumberOfClusters()-1);
}
{
Double_t d=layer.GetThickness(t->GetY(),t->GetZ(),x0);
t->CorrectForMaterial(-step*d,x0);
}
+
+ // track time update [SR, GSI 17.02.2003]
+ if (t->IsStartedTimeIntegral() && step==1) {
+ Double_t newX, newY, newZ;
+ t->GetGlobalXYZat(t->GetX(),newX,newY,newZ);
+ Double_t dL2 = (oldX-newX)*(oldX-newX) + (oldY-newY)*(oldY-newY) +
+ (oldZ-newZ)*(oldZ-newZ);
+ t->AddTimeStep(TMath::Sqrt(dL2));
+ }
+ //
}
- if (!t->PropagateTo(x,0.,0.)) return kFALSE;
+ if (!t->PropagateTo(xx,0.,0.)) return kFALSE;
return kTRUE;
}
// This function marks clusters assigned to the track
//--------------------------------------------------------------------
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();
- */
+
}
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff