* provided "as is" without express or implied warranty. *
**************************************************************************/
+/* $Id$ */
+
//-------------------------------------------------------------------------
// Implementation of the ITS tracker class
-// It reads AliITSclusterV2 clusters and creates AliITStrackMI tracks
+// It reads AliITSRecPoint clusters and creates AliITStrackMI tracks
// and fills with them the ESD
// Origin: Marian Ivanov, CERN, Marian.Ivanov@cern.ch
// dEdx analysis by: Boris Batyunya, JINR, Boris.Batiounia@cern.ch
//
//-------------------------------------------------------------------------
-#include "AliITSrecoV2.h"
+
+#include <TMatrixD.h>
#include <TTree.h>
-#include "AliITSgeom.h"
+#include <TTreeStream.h>
+#include <TTree.h>
+
#include "AliESD.h"
-#include "AliITSclusterV2.h"
-#include "AliITStrackerMI.h"
-#include "TMatrixD.h"
-#include "TFile.h"
-#include "TTree.h"
+#include "AliV0.h"
#include "AliHelix.h"
-#include "AliESDV0MI.h"
-#include "AliLog.h"
-#include "TTreeStream.h"
+#include "AliITSRecPoint.h"
+#include "AliITSgeomTGeo.h"
+#include "AliITStrackerMI.h"
+#include "AliTrackPointArray.h"
+#include "AliAlignObj.h"
ClassImp(AliITStrackerMI)
AliITStrackerMI::AliITSlayer AliITStrackerMI::fgLayers[kMaxLayer]; // ITS layers
+AliITStrackerMI::AliITStrackerMI():AliTracker(),
+fI(0),
+fBestTrack(),
+fTrackToFollow(),
+fTrackHypothesys(),
+fBestHypothesys(),
+fOriginal(),
+fCurrentEsdTrack(),
+fPass(0),
+fAfterV0(kFALSE),
+fLastLayerToTrackTo(0),
+fCoeficients(0),
+fEsd(0),
+fDebugStreamer(0){
+ //Default constructor
+}
+
-AliITStrackerMI::AliITStrackerMI(const AliITSgeom *geom) : AliTracker() {
+AliITStrackerMI::AliITStrackerMI(const Char_t *geom) : AliTracker(),
+fI(kMaxLayer),
+fBestTrack(),
+fTrackToFollow(),
+fTrackHypothesys(),
+fBestHypothesys(),
+fOriginal(),
+fCurrentEsdTrack(),
+fPass(0),
+fAfterV0(kFALSE),
+fLastLayerToTrackTo(kLastLayerToTrackTo),
+fCoeficients(0),
+fEsd(0),
+fDebugStreamer(0){
//--------------------------------------------------------------------
//This is the AliITStrackerMI constructor
//--------------------------------------------------------------------
+ if (geom) {
+ AliWarning("\"geom\" is actually a dummy argument !");
+ }
+
fCoeficients = 0;
fAfterV0 = kFALSE;
- AliITSgeom *g=(AliITSgeom*)geom;
- 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);
-
- g->GetTrans(i,1,1,x,y,z);
- Double_t r=TMath::Sqrt(x*x + y*y);
+
+ for (Int_t i=1; i<kMaxLayer+1; i++) {
+ Int_t nlad=AliITSgeomTGeo::GetNLadders(i);
+ Int_t ndet=AliITSgeomTGeo::GetNDetectors(i);
+
+ Double_t xyz[3], &x=xyz[0], &y=xyz[1], &z=xyz[2];
+ AliITSgeomTGeo::GetOrigTranslation(i,1,1,xyz);
Double_t poff=TMath::ATan2(y,x);
Double_t zoff=z;
+ Double_t r=TMath::Sqrt(x*x + y*y);
- g->GetTrans(i,1,2,x,y,z);
+ AliITSgeomTGeo::GetOrigTranslation(i,1,2,xyz);
r += TMath::Sqrt(x*x + y*y);
- g->GetTrans(i,2,1,x,y,z);
+ AliITSgeomTGeo::GetOrigTranslation(i,2,1,xyz);
r += TMath::Sqrt(x*x + y*y);
- g->GetTrans(i,2,2,x,y,z);
+ AliITSgeomTGeo::GetOrigTranslation(i,2,2,xyz);
r += TMath::Sqrt(x*x + y*y);
r*=0.25;
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);
+ TGeoHMatrix m; AliITSgeomTGeo::GetOrigMatrix(i,j,k,m);
+ const TGeoHMatrix *tm=AliITSgeomTGeo::GetTracking2LocalMatrix(i,j,k);
+ m.Multiply(tm);
+ Double_t txyz[3]={0.}, xyz[3]={0.};
+ m.LocalToMaster(txyz,xyz);
+ Double_t r=TMath::Sqrt(xyz[0]*xyz[0] + xyz[1]*xyz[1]);
+ Double_t phi=TMath::ATan2(xyz[1],xyz[0]);
- 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;
+ if (phi<0) phi+=TMath::TwoPi();
+ else if (phi>=TMath::TwoPi()) phi-=TMath::TwoPi();
AliITSdetector &det=fgLayers[i-1].GetDetector((j-1)*ndet + k-1);
new(&det) AliITSdetector(r,phi);
for (Int_t i=0;i<100000;i++){
fBestTrackIndex[i]=0;
}
+ //
+ fDebugStreamer = new TTreeSRedirector("ITSdebug.root");
+
+}
+
+AliITStrackerMI::AliITStrackerMI(const AliITStrackerMI &tracker):AliTracker(tracker),
+fI(tracker.fI),
+fBestTrack(tracker.fBestTrack),
+fTrackToFollow(tracker.fTrackToFollow),
+fTrackHypothesys(tracker.fTrackHypothesys),
+fBestHypothesys(tracker.fBestHypothesys),
+fOriginal(tracker.fOriginal),
+fCurrentEsdTrack(tracker.fCurrentEsdTrack),
+fPass(tracker.fPass),
+fAfterV0(tracker.fAfterV0),
+fLastLayerToTrackTo(tracker.fLastLayerToTrackTo),
+fCoeficients(tracker.fCoeficients),
+fEsd(tracker.fEsd),
+fDebugStreamer(tracker.fDebugStreamer){
+ //Copy constructor
}
+AliITStrackerMI & AliITStrackerMI::operator=(const AliITStrackerMI &tracker){
+ //Assignment operator
+ this->~AliITStrackerMI();
+ new(this) AliITStrackerMI(tracker);
+ return *this;
+}
+
+
AliITStrackerMI::~AliITStrackerMI()
{
//
//destructor
//
if (fCoeficients) delete []fCoeficients;
+ if (fDebugStreamer) {
+ //fDebugStreamer->Close();
+ delete fDebugStreamer;
+ }
}
void AliITStrackerMI::SetLayersNotToSkip(Int_t *l) {
//--------------------------------------------------------------------
//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;
if (!cTree->GetEvent(j)) continue;
Int_t ncl=clusters->GetEntriesFast();
SignDeltas(clusters,GetZ());
+
while (ncl--) {
- AliITSclusterV2 *c=(AliITSclusterV2*)clusters->UncheckedAt(ncl);
- detector = c->GetDetectorIndex();
- fgLayers[i].InsertCluster(new AliITSclusterV2(*c));
+ AliITSRecPoint *c=(AliITSRecPoint*)clusters->UncheckedAt(ncl);
+ detector=c->GetDetectorIndex();
+
+ if (!c->Misalign()) AliWarning("Can't misalign this cluster !");
+
+ fgLayers[i].InsertCluster(new AliITSRecPoint(*c));
}
clusters->Delete();
//add dead zone virtual "cluster"
if (i<2){
for (Float_t ydead = 0; ydead < 1.31 ; ydead+=(i+1.)*0.018){
Int_t lab[4] = {0,0,0,detector};
- Int_t info[3] = {0,0,0};
+ Int_t info[3] = {0,0,i};
Float_t hit[5]={0,0,0.004/12.,0.001/12.,0};
if (i==0) hit[0] =ydead-0.4;
if (i==1) hit[0]=ydead-3.75;
hit[1] =-0.04;
if (TMath::Abs(fgLayers[i].GetDetector(detector).GetZmax()-hit[1])<2.)
- fgLayers[i].InsertCluster(new AliITSclusterV2(lab, hit, info));
+ fgLayers[i].InsertCluster(new AliITSRecPoint(lab, hit, info));
hit[1]=-7.05;
if (TMath::Abs(fgLayers[i].GetDetector(detector).GetZmax()-hit[1])<2.)
- fgLayers[i].InsertCluster(new AliITSclusterV2(lab, hit, info));
+ fgLayers[i].InsertCluster(new AliITSRecPoint(lab, hit, info));
hit[1]=-7.15;
if (TMath::Abs(fgLayers[i].GetDetector(detector).GetZmax()-hit[1])<2.)
- fgLayers[i].InsertCluster(new AliITSclusterV2(lab, hit, info));
+ fgLayers[i].InsertCluster(new AliITSRecPoint(lab, hit, info));
hit[1] =0.06;
if (TMath::Abs(fgLayers[i].GetDetector(detector).GetZmax()-hit[1])<2.)
- fgLayers[i].InsertCluster(new AliITSclusterV2(lab, hit, info));
+ fgLayers[i].InsertCluster(new AliITSRecPoint(lab, hit, info));
hit[1]=7.05;
if (TMath::Abs(fgLayers[i].GetDetector(detector).GetZmax()-hit[1])<2.)
- fgLayers[i].InsertCluster(new AliITSclusterV2(lab, hit, info));
+ fgLayers[i].InsertCluster(new AliITSRecPoint(lab, hit, info));
hit[1]=7.25;
if (TMath::Abs(fgLayers[i].GetDetector(detector).GetZmax()-hit[1])<2.)
- fgLayers[i].InsertCluster(new AliITSclusterV2(lab, hit, info));
+ fgLayers[i].InsertCluster(new AliITSRecPoint(lab, hit, info));
}
}
//--------------------------------------------------------------------
TObjArray itsTracks(15000);
fOriginal.Clear();
+ fEsd = event; // store pointer to the esd
{/* Read ESD tracks */
Int_t nentr=event->GetNumberOfTracks();
Info("Clusters2Tracks", "Number of ESD tracks: %d\n", nentr);
delete t;
continue;
}
- t->fD[0] = t->GetD(GetX(),GetY());
- t->fD[1] = t->GetZat(GetX())-GetZ();
- Double_t vdist = TMath::Sqrt(t->fD[0]*t->fD[0]+t->fD[1]*t->fD[1]);
+ //t->fD[0] = t->GetD(GetX(),GetY());
+ //t->fD[1] = t->GetZat(GetX())-GetZ();
+ t->GetDZ(GetX(),GetY(),GetZ(),t->GetDP()); //I.B.
+ Double_t vdist = TMath::Sqrt(t->GetD(0)*t->GetD(0)+t->GetD(1)*t->GetD(1));
if (t->GetMass()<0.13) t->SetMass(0.13957); // MI look to the esd - mass hypothesys !!!!!!!!!!!
// write expected q
- t->fExpQ = TMath::Max(0.8*t->fESDtrack->GetTPCsignal(),30.);
+ t->SetExpQ(TMath::Max(0.8*t->GetESDtrack()->GetTPCsignal(),30.));
- if (TMath::Abs(t->fD[0])>10) {
- delete t;
- continue;
- }
-
- if (TMath::Abs(vdist)>20) {
- delete t;
- continue;
+ if (esd->GetV0Index(0)>0 && t->GetD(0)<30){
+ //track - can be V0 according to TPC
}
- if (TMath::Abs(1/t->Get1Pt())<0.120) {
- delete t;
- continue;
- }
-
- if (CorrectForDeadZoneMaterial(t)!=0) {
- //Warning("Clusters2Tracks",
- // "failed to correct for the material in the dead zone !\n");
- delete t;
- continue;
+ else{
+ if (TMath::Abs(t->GetD(0))>10) {
+ delete t;
+ continue;
+ }
+
+ if (TMath::Abs(vdist)>20) {
+ delete t;
+ continue;
+ }
+ if (TMath::Abs(1/t->Get1Pt())<0.120) {
+ delete t;
+ continue;
+ }
+
+ if (CorrectForDeadZoneMaterial(t)!=0) {
+ //Warning("Clusters2Tracks",
+ // "failed to correct for the material in the dead zone !\n");
+ delete t;
+ continue;
+ }
}
- t->fReconstructed = kFALSE;
+ t->SetReconstructed(kFALSE);
itsTracks.AddLast(t);
fOriginal.AddLast(t);
}
fOriginal.Sort();
Int_t nentr=itsTracks.GetEntriesFast();
fTrackHypothesys.Expand(nentr);
+ fBestHypothesys.Expand(nentr);
MakeCoeficients(nentr);
Int_t ntrk=0;
for (fPass=0; fPass<2; fPass++) {
fCurrentEsdTrack = i;
AliITStrackMI *t=(AliITStrackMI*)itsTracks.UncheckedAt(i);
if (t==0) continue; //this track has been already tracked
- if (t->fReconstructed&&(t->fNUsed<1.5)) continue; //this track was already "succesfully" reconstructed
- if ( (TMath::Abs(t->GetD(GetX(),GetY())) >3.) && fConstraint[fPass]) continue;
- if ( (TMath::Abs(t->GetZat(GetX())-GetZ())>3.) && fConstraint[fPass]) continue;
+ if (t->GetReconstructed()&&(t->GetNUsed()<1.5)) continue; //this track was already "succesfully" reconstructed
+ //if ( (TMath::Abs(t->GetD(GetX(),GetY())) >3.) && fConstraint[fPass]) continue;
+ //if ( (TMath::Abs(t->GetZat(GetX())-GetZ())>3.) && fConstraint[fPass]) continue;
+ Float_t dz[2]; t->GetDZ(GetX(),GetY(),GetZ(),dz); //I.B.
+ if ( (TMath::Abs(dz[0])>3.) && fConstraint[fPass]) continue;
+ if ( (TMath::Abs(dz[1])>3.) && fConstraint[fPass]) continue;
Int_t tpcLabel=t->GetLabel(); //save the TPC track label
fI = 6;
ResetTrackToFollow(*t);
ResetBestTrack();
-
- FollowProlongationTree(t,i);
-
+ FollowProlongationTree(t,i,fConstraint[fPass]);
SortTrackHypothesys(fCurrentEsdTrack,20,0); //MI change
//
besttrack->SetLabel(tpcLabel);
// besttrack->CookdEdx();
CookdEdx(besttrack);
- besttrack->fFakeRatio=1.;
+ besttrack->SetFakeRatio(1.);
CookLabel(besttrack,0.); //For comparison only
UpdateESDtrack(besttrack,AliESDtrack::kITSin);
if (fConstraint[fPass]&&(!besttrack->IsGoldPrimary())) continue; //to be tracked also without vertex constrain
- t->fReconstructed = kTRUE;
+ t->SetReconstructed(kTRUE);
ntrk++;
}
GetBestHypothesysMIP(itsTracks);
}
//GetBestHypothesysMIP(itsTracks);
- FindV0(event);
+ UpdateTPCV0(event);
+ FindV02(event);
fAfterV0 = kTRUE;
//GetBestHypothesysMIP(itsTracks);
//
}
fTrackHypothesys.Delete();
+ fBestHypothesys.Delete();
fOriginal.Clear();
delete []fCoeficients;
fCoeficients=0;
delete t;
continue;
}
- t->fExpQ = TMath::Max(0.8*t->fESDtrack->GetTPCsignal(),30.);
+ t->SetExpQ(TMath::Max(0.8*t->GetESDtrack()->GetTPCsignal(),30.));
ResetTrackToFollow(*t);
// 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()) {
+ if (fTrackToFollow.PropagateToVertex(event->GetVertex())) {
fTrackToFollow.StartTimeIntegral();
}
fTrackToFollow.PropagateTo(3.,-0.0028,65.19);
}
- fTrackToFollow.ResetCovariance(); fTrackToFollow.ResetClusters();
+ fTrackToFollow.ResetCovariance(10.); fTrackToFollow.ResetClusters();
if (RefitAt(49.,&fTrackToFollow,t)) {
if (CorrectForDeadZoneMaterial(&fTrackToFollow)!=0) {
//Warning("PropagateBack",
// "inward propagated" TPC tracks
// The clusters must be loaded !
//--------------------------------------------------------------------
+ RefitV02(event);
Int_t nentr=event->GetNumberOfTracks();
Info("RefitInward", "Number of ESD tracks: %d\n", nentr);
delete t;
continue;
}
- t->fExpQ = TMath::Max(0.8*t->fESDtrack->GetTPCsignal(),30.);
+ t->SetExpQ(TMath::Max(0.8*t->GetESDtrack()->GetTPCsignal(),30.));
if (CorrectForDeadZoneMaterial(t)!=0) {
//Warning("RefitInward",
// "failed to correct for the material in the dead zone !\n");
fTrackToFollow.ResetClusters();
if ((esd->GetStatus()&AliESDtrack::kTPCin)==0)
- fTrackToFollow.ResetCovariance();
+ fTrackToFollow.ResetCovariance(10.);
//Refitting...
- if (RefitAt(3.7, &fTrackToFollow, t)) {
+ if (RefitAt(3.7, &fTrackToFollow, t,kTRUE)) {
fTrackToFollow.SetLabel(t->GetLabel());
// fTrackToFollow.CookdEdx();
CookdEdx(&fTrackToFollow);
CookLabel(&fTrackToFollow,0.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);
- //Double_t chi2=GetPredictedChi2MI(&fTrackToFollow,&c,fI);
- if (chi2<kMaxChi2)
- if (fTrackToFollow.Update(&c,-chi2,0))
- //if (UpdateMI(&fTrackToFollow,&c,-chi2,0))
- fTrackToFollow.SetConstrainedESDtrack(chi2);
- }
- ntrk++;
- }
+ 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 fgLayers[l].GetCluster(c);
}
+Bool_t AliITStrackerMI::GetTrackPoint(Int_t index, AliTrackPoint& p) const {
+ //
+ // Get track space point with index i
+ //
+
+ Int_t l=(index & 0xf0000000) >> 28;
+ Int_t c=(index & 0x0fffffff) >> 00;
+ AliITSRecPoint *cl = fgLayers[l].GetCluster(c);
+ Int_t idet = cl->GetDetectorIndex();
+
+ Float_t xyz[3];
+ Float_t cov[6];
+ cl->GetGlobalXYZ(xyz);
+ cl->GetGlobalCov(cov);
+ p.SetXYZ(xyz, cov);
+
+ AliGeomManager::ELayerID iLayer = AliGeomManager::kInvalidLayer;
+ switch (l) {
+ case 0:
+ iLayer = AliGeomManager::kSPD1;
+ break;
+ case 1:
+ iLayer = AliGeomManager::kSPD2;
+ break;
+ case 2:
+ iLayer = AliGeomManager::kSDD1;
+ break;
+ case 3:
+ iLayer = AliGeomManager::kSDD2;
+ break;
+ case 4:
+ iLayer = AliGeomManager::kSSD1;
+ break;
+ case 5:
+ iLayer = AliGeomManager::kSSD2;
+ break;
+ default:
+ AliWarning(Form("Wrong layer index in ITS (%d) !",l));
+ break;
+ };
+ UShort_t volid = AliGeomManager::LayerToVolUID(iLayer,idet);
+ p.SetVolumeID((UShort_t)volid);
+ return kTRUE;
+}
-void AliITStrackerMI::FollowProlongationTree(AliITStrackMI * otrack, Int_t esdindex)
+void AliITStrackerMI::FollowProlongationTree(AliITStrackMI * otrack, Int_t esdindex, Bool_t constrain)
{
//--------------------------------------------------------------------
// Follow prolongation tree
//--------------------------------------------------------------------
+ //
+ AliESDtrack * esd = otrack->GetESDtrack();
+ if (esd->GetV0Index(0)>0){
+ //
+ // TEMPORARY SOLLUTION: map V0 indexes to point to proper track
+ // mapping of esd track is different as its track in Containers
+ // Need something more stable
+ // Indexes are set back againg to the ESD track indexes in UpdateTPCV0
+ for (Int_t i=0;i<3;i++){
+ Int_t index = esd->GetV0Index(i);
+ if (index==0) break;
+ AliESDv0 * vertex = fEsd->GetV0(index);
+ if (vertex->GetStatus()<0) continue; // rejected V0
+ //
+ if (esd->GetSign()>0) {
+ vertex->SetIndex(0,esdindex);
+ }
+ else{
+ vertex->SetIndex(1,esdindex);
+ }
+ }
+ }
+ TObjArray *bestarray = (TObjArray*)fBestHypothesys.At(esdindex);
+ if (!bestarray){
+ bestarray = new TObjArray(5);
+ fBestHypothesys.AddAt(bestarray,esdindex);
+ }
+ //
//setup tree of the prolongations
//
static AliITStrackMI tracks[7][100];
Int_t nindexes[7][100];
Float_t normalizedchi2[100];
for (Int_t ilayer=0;ilayer<6;ilayer++) ntracks[ilayer]=0;
- otrack->fNSkipped=0;
+ otrack->SetNSkipped(0);
new (&(tracks[6][0])) AliITStrackMI(*otrack);
ntracks[6]=1;
- nindexes[6][0]=0;
+ for (Int_t i=0;i<7;i++) nindexes[i][0]=0;
//
//
// follow prolongations
for (Int_t itrack =0;itrack<ntracks[ilayer+1];itrack++){
//set current track
if (ntracks[ilayer]>=100) break;
- if (tracks[ilayer+1][nindexes[ilayer+1][itrack]].fNSkipped>0) nskipped++;
- if (tracks[ilayer+1][nindexes[ilayer+1][itrack]].fNUsed>2.) nused++;
+ if (tracks[ilayer+1][nindexes[ilayer+1][itrack]].GetNSkipped()>0) nskipped++;
+ if (tracks[ilayer+1][nindexes[ilayer+1][itrack]].GetNUsed()>2.) nused++;
if (ntracks[ilayer]>15+ilayer){
- if (itrack>1&&tracks[ilayer+1][nindexes[ilayer+1][itrack]].fNSkipped>0 && nskipped>4+ilayer) continue;
- if (itrack>1&&tracks[ilayer+1][nindexes[ilayer+1][itrack]].fNUsed>2. && nused>3) continue;
+ if (itrack>1&&tracks[ilayer+1][nindexes[ilayer+1][itrack]].GetNSkipped()>0 && nskipped>4+ilayer) continue;
+ if (itrack>1&&tracks[ilayer+1][nindexes[ilayer+1][itrack]].GetNUsed()>2. && nused>3) continue;
}
new(¤ttrack1) AliITStrackMI(tracks[ilayer+1][nindexes[ilayer+1][itrack]]);
continue;
}
}
- //
- //find intersection with layer
- Double_t x,y,z;
- if (!currenttrack1.GetGlobalXYZat(r,x,y,z)) {
- continue;
- }
- Double_t phi=TMath::ATan2(y,x);
+
+ Double_t phi,z;
+ if (!currenttrack1.GetPhiZat(r,phi,z)) continue;
+
Int_t idet=layer.FindDetectorIndex(phi,z);
if (idet<0) {
continue;
//
Double_t msz=1./((currenttrack1.GetSigmaZ2() + 16.*kSigmaZ2[ilayer]));
Double_t msy=1./((currenttrack1.GetSigmaY2() + 16.*kSigmaY2[ilayer]));
- if (fConstraint[fPass]){
+ if (constrain){
msy/=60; msz/=60.;
}
else{
msy/=50; msz/=50.;
}
//
- const AliITSclusterV2 *c=0; Int_t ci=-1;
+ const AliITSRecPoint *c=0; Int_t ci=-1;
Double_t chi2=12345.;
Int_t deadzone=0;
currenttrack = ¤ttrack1;
if (c->GetQ()==0) deadzone=1; // take dead zone only once
if (ntracks[ilayer]>=100) continue;
AliITStrackMI * updatetrack = new (&tracks[ilayer][ntracks[ilayer]]) AliITStrackMI(*currenttrack);
- updatetrack->fClIndex[ilayer]=0;
+ updatetrack->SetClIndex(ilayer,0);
if (change){
new (¤ttrack2) AliITStrackMI(backuptrack);
}
updatetrack->SetSampledEdx(c->GetQ(),updatetrack->GetNumberOfClusters()-1); //b.b.
}
else {
- updatetrack->fNDeadZone++;
- updatetrack->fDeadZoneProbability=GetDeadZoneProbability(updatetrack->GetZ(),TMath::Sqrt(updatetrack->GetSigmaZ2()));
+ updatetrack->SetNDeadZone(updatetrack->GetNDeadZone()+1);
+ updatetrack->SetDeadZoneProbability(GetDeadZoneProbability(updatetrack->GetZ(),TMath::Sqrt(updatetrack->GetSigmaZ2())));
}
if (c->IsUsed()){
- updatetrack->fNUsed++;
+ updatetrack->IncrementNUsed();
}
Double_t x0;
Double_t d=layer.GetThickness(updatetrack->GetY(),updatetrack->GetZ(),x0);
updatetrack->CorrectForMaterial(d,x0);
- if (fConstraint[fPass]) {
- updatetrack->fConstrain = fConstraint[fPass];
+ if (constrain) {
+ updatetrack->SetConstrain(constrain);
fI = ilayer;
Double_t d=GetEffectiveThickness(0,0); //Think of this !!!!
Double_t xyz[]={GetX(),GetY(),GetZ()};
Double_t ers[]={GetSigmaX()*ptfactor,GetSigmaY()*ptfactor,GetSigmaZ()};
Bool_t isPrim = kTRUE;
if (ilayer<4){
- updatetrack->fD[0] = updatetrack->GetD(GetX(),GetY());
- updatetrack->fD[1] = updatetrack->GetZat(GetX())-GetZ();
- if ( TMath::Abs(updatetrack->fD[0]/(1.+ilayer))>0.4 || TMath::Abs(updatetrack->fD[1]/(1.+ilayer))>0.4) isPrim=kFALSE;
+ //updatetrack->fD[0] = updatetrack->GetD(GetX(),GetY());
+ //updatetrack->fD[1] = updatetrack->GetZat(GetX())-GetZ();
+ updatetrack->GetDZ(GetX(),GetY(),GetZ(),updatetrack->GetDP()); //I.B.
+ if ( TMath::Abs(updatetrack->GetD(0)/(1.+ilayer))>0.4 || TMath::Abs(updatetrack->GetD(1)/(1.+ilayer))>0.4) isPrim=kFALSE;
}
if (isPrim) updatetrack->Improve(d,xyz,ers);
} //apply vertex constrain
ntracks[ilayer]++;
} // create new hypothesy
} // loop over possible cluster prolongation
- // if (fConstraint[fPass]&&itrack<2&¤ttrack1.fNSkipped==0 && deadzone==0){
- if (fConstraint[fPass]&&itrack<2&¤ttrack1.fNSkipped==0 && deadzone==0&&ntracks[ilayer]<100){
+ // if (constrain&&itrack<2&¤ttrack1.fNSkipped==0 && deadzone==0){
+ if (constrain&&itrack<2&¤ttrack1.GetNSkipped()==0 && deadzone==0&&ntracks[ilayer]<100){
AliITStrackMI* vtrack = new (&tracks[ilayer][ntracks[ilayer]]) AliITStrackMI(currenttrack1);
- vtrack->fClIndex[ilayer]=0;
+ vtrack->SetClIndex(ilayer,0);
fI = ilayer;
Double_t d=GetEffectiveThickness(0,0); //Think of this !!!!
Double_t xyz[]={GetX(),GetY(),GetZ()};
Double_t ers[]={GetSigmaX(),GetSigmaY(),GetSigmaZ()};
vtrack->Improve(d,xyz,ers);
- vtrack->fNSkipped++;
+ vtrack->IncrementNSkipped();
ntracks[ilayer]++;
}
- if (fConstraint[fPass]&&itrack<1&&TMath::Abs(currenttrack1.fP3)>1.1){ //big theta -- for low mult. runs
+ if (constrain&&itrack<1&&TMath::Abs(currenttrack1.GetTgl())>1.1){ //big theta -- for low mult. runs
AliITStrackMI* vtrack = new (&tracks[ilayer][ntracks[ilayer]]) AliITStrackMI(currenttrack1);
- vtrack->fClIndex[ilayer]=0;
+ vtrack->SetClIndex(ilayer,0);
fI = ilayer;
Double_t d=GetEffectiveThickness(0,0); //Think of this !!!!
Double_t xyz[]={GetX(),GetY(),GetZ()};
Double_t ers[]={GetSigmaX(),GetSigmaY(),GetSigmaZ()};
vtrack->Improve(d,xyz,ers);
- vtrack->fNDeadZone++;
+ vtrack->SetNDeadZone(vtrack->GetNDeadZone()+1);
ntracks[ilayer]++;
}
if ( normalizedchi2[itrack]<3+0.5*ilayer) golds++;
if (ilayer>4) accepted++;
else{
- if ( fConstraint[fPass] && normalizedchi2[itrack]<kMaxNormChi2C[ilayer]+1) accepted++;
- if (!fConstraint[fPass] && normalizedchi2[itrack]<kMaxNormChi2NonC[ilayer]+1) accepted++;
+ if ( constrain && normalizedchi2[itrack]<kMaxNormChi2C[ilayer]+1) accepted++;
+ if (!constrain && normalizedchi2[itrack]<kMaxNormChi2NonC[ilayer]+1) accepted++;
}
}
TMath::Sort(ntracks[ilayer],normalizedchi2,nindexes[ilayer],kFALSE);
if (ntracks[ilayer]>90) ntracks[ilayer]=90;
} //loop over layers
//printf("%d\t%d\t%d\t%d\t%d\t%d\n",ntracks[0],ntracks[1],ntracks[2],ntracks[3],ntracks[4],ntracks[5]);
- Int_t max = fConstraint[fPass]? 20: 5;
+ Int_t max = constrain? 20: 5;
for (Int_t i=0;i<TMath::Min(max,ntracks[0]);i++) {
AliITStrackMI & track= tracks[0][nindexes[0][i]];
if (track.GetNumberOfClusters()<2) continue;
- if (!fConstraint[fPass]&&track.fNormChi2[0]>7.)continue;
+ if (!constrain&&track.GetNormChi2(0)>7.)continue;
AddTrackHypothesys(new AliITStrackMI(track), esdindex);
}
for (Int_t i=0;i<TMath::Min(2,ntracks[1]);i++) {
AliITStrackMI & track= tracks[1][nindexes[1][i]];
if (track.GetNumberOfClusters()<4) continue;
- if (!fConstraint[fPass]&&track.fNormChi2[1]>7.)continue;
- if (fConstraint[fPass]) track.fNSkipped+=1;
- if (!fConstraint[fPass]) {
- track.fD[0] = track.GetD(GetX(),GetY());
- track.fNSkipped+=4./(4.+8.*TMath::Abs(track.fD[0]));
- if (track.fN+track.fNDeadZone+track.fNSkipped>6) {
- track.fNSkipped = 6-track.fN+track.fNDeadZone;
+ if (!constrain&&track.GetNormChi2(1)>7.)continue;
+ if (constrain) track.IncrementNSkipped();
+ if (!constrain) {
+ track.SetD(0,track.GetD(GetX(),GetY()));
+ track.SetNSkipped(track.GetNSkipped()+4./(4.+8.*TMath::Abs(track.GetD(0))));
+ if (track.GetNumberOfClusters()+track.GetNDeadZone()+track.GetNSkipped()>6) {
+ track.SetNSkipped(6-track.GetNumberOfClusters()+track.GetNDeadZone());
}
}
AddTrackHypothesys(new AliITStrackMI(track), esdindex);
}
//}
- if (!fConstraint[fPass]){
+ if (!constrain){
for (Int_t i=0;i<TMath::Min(2,ntracks[2]);i++) {
AliITStrackMI & track= tracks[2][nindexes[2][i]];
if (track.GetNumberOfClusters()<3) continue;
- if (!fConstraint[fPass]&&track.fNormChi2[2]>7.)continue;
- if (fConstraint[fPass]) track.fNSkipped+=2;
- if (!fConstraint[fPass]){
- track.fD[0] = track.GetD(GetX(),GetY());
- track.fNSkipped+= 7./(7.+8.*TMath::Abs(track.fD[0]));
- if (track.fN+track.fNDeadZone+track.fNSkipped>6) {
- track.fNSkipped = 6-track.fN+track.fNDeadZone;
+ if (!constrain&&track.GetNormChi2(2)>7.)continue;
+ if (constrain) track.SetNSkipped(track.GetNSkipped()+2);
+ if (!constrain){
+ track.SetD(0,track.GetD(GetX(),GetY()));
+ track.SetNSkipped(track.GetNSkipped()+7./(7.+8.*TMath::Abs(track.GetD(0))));
+ if (track.GetNumberOfClusters()+track.GetNDeadZone()+track.GetNSkipped()>6) {
+ track.SetNSkipped(6-track.GetNumberOfClusters()+track.GetNDeadZone());
}
}
AddTrackHypothesys(new AliITStrackMI(track), esdindex);
}
}
+
+ if (!constrain){
+ //
+ // register best tracks - important for V0 finder
+ //
+ for (Int_t ilayer=0;ilayer<5;ilayer++){
+ if (ntracks[ilayer]==0) continue;
+ AliITStrackMI & track= tracks[ilayer][nindexes[ilayer][0]];
+ if (track.GetNumberOfClusters()<1) continue;
+ CookLabel(&track,0);
+ bestarray->AddAt(new AliITStrackMI(track),ilayer);
+ }
+ }
+ //
+ // update TPC V0 information
+ //
+ if (otrack->GetESDtrack()->GetV0Index(0)>0){
+ Float_t fprimvertex[3]={GetX(),GetY(),GetZ()};
+ for (Int_t i=0;i<3;i++){
+ Int_t index = otrack->GetESDtrack()->GetV0Index(i);
+ if (index==0) break;
+ AliV0 * vertex = (AliV0*)fEsd->GetV0(index);
+ if (vertex->GetStatus()<0) continue; // rejected V0
+ //
+ if (otrack->GetSign()>0) {
+ vertex->SetIndex(0,esdindex);
+ }
+ else{
+ vertex->SetIndex(1,esdindex);
+ }
+ //find nearest layer with track info
+ Double_t xrp[3]; vertex->GetXYZ(xrp[0],xrp[1],xrp[2]); //I.B.
+ Int_t nearestold = GetNearestLayer(xrp); //I.B.
+ Int_t nearest = nearestold;
+ for (Int_t ilayer =nearest;ilayer<8;ilayer++){
+ if (ntracks[nearest]==0){
+ nearest = ilayer;
+ }
+ }
+ //
+ AliITStrackMI & track= tracks[nearest][nindexes[nearest][0]];
+ if (nearestold<5&&nearest<5){
+ Bool_t accept = track.GetNormChi2(nearest)<10;
+ if (accept){
+ if (track.GetSign()>0) {
+ vertex->SetParamP(track);
+ vertex->Update(fprimvertex);
+ // vertex->SetIndex(0,track.fESDtrack->GetID());
+ if (track.GetNumberOfClusters()>2) AddTrackHypothesys(new AliITStrackMI(track), esdindex);
+ }else{
+ vertex->SetParamN(track);
+ vertex->Update(fprimvertex);
+ //vertex->SetIndex(1,track.fESDtrack->GetID());
+ if (track.GetNumberOfClusters()>2) AddTrackHypothesys(new AliITStrackMI(track), esdindex);
+ }
+ vertex->SetStatus(vertex->GetStatus()+1);
+ }else{
+ // vertex->SetStatus(-2); // reject V0 - not enough clusters
+ }
+ }
+ // if (nearestold>3){
+// Int_t indexlayer = (ntracks[0]>0)? 0:1;
+// if (ntracks[indexlayer]>0){
+// AliITStrackMI & track= tracks[indexlayer][nindexes[indexlayer][0]];
+// if (track.GetNumberOfClusters()>4&&track.fNormChi2[indexlayer]<4){
+// vertex->SetStatus(-1); // reject V0 - clusters before
+// }
+// }
+// }
+ }
+ }
}
//
return fgLayers[layer];
}
-AliITStrackerMI::AliITSlayer::AliITSlayer() {
+
+AliITStrackerMI::AliITSlayer::AliITSlayer():
+fR(0),
+fPhiOffset(0),
+fNladders(0),
+fZOffset(0),
+fNdetectors(0),
+fDetectors(0),
+fN(0),
+fDy5(0),
+fDy10(0),
+fDy20(0),
+fClustersCs(0),
+fClusterIndexCs(0),
+fYcs(0),
+fZcs(0),
+fNcs(0),
+fCurrentSlice(-1),
+fZmax(0),
+fYmin(0),
+fYmax(0),
+fI(0),
+fImax(0),
+fSkip(0),
+fAccepted(0),
+fRoad(0){
//--------------------------------------------------------------------
//default AliITSlayer constructor
//--------------------------------------------------------------------
- fN=0;
- fDetectors=0;
- fSkip = 0;
- fCurrentSlice=-1;
for (Int_t i=0; i<kMaxClusterPerLayer;i++) {
fClusterWeight[i]=0;
fClusterTracks[0][i]=-1;
}
AliITStrackerMI::AliITSlayer::
-AliITSlayer(Double_t r,Double_t p,Double_t z,Int_t nl,Int_t nd) {
+AliITSlayer(Double_t r,Double_t p,Double_t z,Int_t nl,Int_t nd):
+fR(r),
+fPhiOffset(p),
+fNladders(nl),
+fZOffset(z),
+fNdetectors(nd),
+fDetectors(0),
+fN(0),
+fDy5(0),
+fDy10(0),
+fDy20(0),
+fClustersCs(0),
+fClusterIndexCs(0),
+fYcs(0),
+fZcs(0),
+fNcs(0),
+fCurrentSlice(-1),
+fZmax(0),
+fYmin(0),
+fYmax(0),
+fI(0),
+fImax(0),
+fSkip(0),
+fAccepted(0),
+fRoad(0) {
//--------------------------------------------------------------------
//main AliITSlayer constructor
//--------------------------------------------------------------------
- fR=r; fPhiOffset=p; fZOffset=z;
- fNladders=nl; fNdetectors=nd;
fDetectors=new AliITSdetector[fNladders*fNdetectors];
-
- fN=0;
- fI=0;
- fSkip = 0;
fRoad=2*fR*TMath::Sqrt(3.14/1.);//assuming that there's only one cluster
}
+AliITStrackerMI::AliITSlayer::AliITSlayer(const AliITSlayer& layer):
+fR(layer.fR),
+fPhiOffset(layer.fPhiOffset),
+fNladders(layer.fNladders),
+fZOffset(layer.fZOffset),
+fNdetectors(layer.fNdetectors),
+fDetectors(layer.fDetectors),
+fN(layer.fN),
+fDy5(layer.fDy5),
+fDy10(layer.fDy10),
+fDy20(layer.fDy20),
+fClustersCs(layer.fClustersCs),
+fClusterIndexCs(layer.fClusterIndexCs),
+fYcs(layer.fYcs),
+fZcs(layer.fZcs),
+fNcs(layer.fNcs),
+fCurrentSlice(layer.fCurrentSlice),
+fZmax(layer.fZmax),
+fYmin(layer.fYmin),
+fYmax(layer.fYmax),
+fI(layer.fI),
+fImax(layer.fImax),
+fSkip(layer.fSkip),
+fAccepted(layer.fAccepted),
+fRoad(layer.fRoad){
+ //Copy constructor
+}
+
+
AliITStrackerMI::AliITSlayer::~AliITSlayer() {
//--------------------------------------------------------------------
// AliITSlayer destructor
fClusterTracks[3][i]=-1;
}
for (Int_t i=0; i<fN;i++) {
- AliITSclusterV2 * cl = (AliITSclusterV2*)GetCluster(i);
+ AliITSRecPoint * cl = (AliITSRecPoint*)GetCluster(i);
if (cl&&cl->IsUsed()) cl->Use();
}
}
-Int_t AliITStrackerMI::AliITSlayer::InsertCluster(AliITSclusterV2 *c) {
+Int_t AliITStrackerMI::AliITSlayer::InsertCluster(AliITSRecPoint *c) {
//--------------------------------------------------------------------
//This function adds a cluster to this layer
//--------------------------------------------------------------------
//
//sort clusters
//
- AliITSclusterV2 **clusters = new AliITSclusterV2*[fN];
+ AliITSRecPoint **clusters = new AliITSRecPoint*[fN];
Float_t *z = new Float_t[fN];
Int_t * index = new Int_t[fN];
//
//--------------------------------------------------------------------
//This function finds the detector crossed by the track
//--------------------------------------------------------------------
- Double_t dphi=-(phi-fPhiOffset);
+ Double_t dphi;
+ if (fZOffset<0) // old geometry
+ dphi = -(phi-fPhiOffset);
+ else // new geometry
+ 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);
}
-const AliITSclusterV2 *AliITStrackerMI::AliITSlayer::GetNextCluster(Int_t &ci){
+const AliITSRecPoint *AliITStrackerMI::AliITSlayer::GetNextCluster(Int_t &ci){
//--------------------------------------------------------------------
// This function returns clusters within the "window"
//--------------------------------------------------------------------
//--------------------------------------------------------------------
Int_t ncl=0;
for (Int_t i=fI; i<fN; i++) {
- const AliITSclusterV2 *c=fClusters[i];
+ const AliITSRecPoint *c=fClusters[i];
if (c->GetZ() > fZmax) break;
if (c->IsUsed()) continue;
const AliITSdetector &det=GetDetector(c->GetDetectorIndex());
return ncl;
}
-Bool_t
-AliITStrackerMI::RefitAt(Double_t xx,AliITStrackMI *t,const AliITStrackMI *c) {
+Bool_t AliITStrackerMI::RefitAt(Double_t xx,AliITStrackMI *t,
+ const AliITStrackMI *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;
}
//
- Double_t x,y,z;
- if (!t->GetGlobalXYZat(r,x,y,z)) {
+ Double_t phi,z;
+ if (!t->GetPhiZat(r,phi,z)) return kFALSE;
+
+ Int_t idet=layer.FindDetectorIndex(phi,z);
+ if (idet<0) {
+ return kFALSE;
+ }
+
+ const AliITSdetector &det=layer.GetDetector(idet);
+ phi=det.GetPhi();
+ if (!t->Propagate(phi,det.GetR())) {
return kFALSE;
}
- Double_t phi=TMath::ATan2(y,x);
+ t->SetDetectorIndex(idet);
+
+ const AliITSRecPoint *cl=0;
+ Double_t maxchi2=1000.*kMaxChi2;
+
+ Int_t idx=index[i];
+ if (idx>=0) {
+ const AliITSRecPoint *c=(AliITSRecPoint *)GetCluster(idx);
+ if (c){
+ if (idet != c->GetDetectorIndex()) {
+ idet=c->GetDetectorIndex();
+ const AliITSdetector &det=layer.GetDetector(idet);
+ if (!t->Propagate(det.GetPhi(),det.GetR())) {
+ return kFALSE;
+ }
+ t->SetDetectorIndex(idet);
+ }
+ //Double_t chi2=t->GetPredictedChi2(c);
+ Int_t layer = (idx & 0xf0000000) >> 28;;
+ Double_t chi2=GetPredictedChi2MI(t,c,layer);
+ if (chi2<maxchi2) {
+ cl=c;
+ maxchi2=chi2;
+ } else {
+ return kFALSE;
+ }
+ }
+ }
+
+ if (cl) {
+ //if (!t->Update(cl,maxchi2,idx)) {
+ if (!UpdateMI(t,cl,maxchi2,idx)) {
+ return kFALSE;
+ }
+ t->SetSampledEdx(cl->GetQ(),t->GetNumberOfClusters()-1);
+ }
+
+ {
+ Double_t x0;
+ Double_t d=layer.GetThickness(t->GetY(),t->GetZ(),x0);
+ 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;
+ 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(xx,0.,0.)) return kFALSE;
+ return kTRUE;
+}
+
+Bool_t
+AliITStrackerMI::RefitAt(Double_t xx,AliITStrackMI *t,const Int_t *clindex) {
+ //--------------------------------------------------------------------
+ // This function refits the track "t" at the position "x" using
+ // the clusters from array
+ //--------------------------------------------------------------------
+ Int_t index[kMaxLayer];
+ Int_t k;
+ for (k=0; k<kMaxLayer; k++) index[k]=-1;
+ //
+ for (k=0; k<kMaxLayer; k++) {
+ index[k]=clindex[k];
+ }
+
+ Int_t from, to, step;
+ if (xx > t->GetX()) {
+ from=0; to=kMaxLayer;
+ step=+1;
+ } else {
+ from=kMaxLayer-1; to=-1;
+ step=-1;
+ }
+
+ for (Int_t i=from; i != to; i += step) {
+ AliITSlayer &layer=fgLayers[i];
+ Double_t r=layer.GetR();
+ if (step<0 && xx>r) break; //
+ {
+ Double_t hI=i-0.5*step;
+ 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 (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 phi,z;
+ if (!t->GetPhiZat(r,phi,z)) return kFALSE;
+
Int_t idet=layer.FindDetectorIndex(phi,z);
if (idet<0) {
return kFALSE;
}
t->SetDetectorIndex(idet);
- const AliITSclusterV2 *cl=0;
+ const AliITSRecPoint *cl=0;
Double_t maxchi2=1000.*kMaxChi2;
Int_t idx=index[i];
- if (idx>0) {
- const AliITSclusterV2 *c=(AliITSclusterV2 *)GetCluster(idx);
- if (idet != c->GetDetectorIndex()) {
- idet=c->GetDetectorIndex();
- const AliITSdetector &det=layer.GetDetector(idet);
- if (!t->Propagate(det.GetPhi(),det.GetR())) {
- return kFALSE;
- }
- t->SetDetectorIndex(idet);
- }
- //Double_t chi2=t->GetPredictedChi2(c);
- Int_t layer = (idx & 0xf0000000) >> 28;;
- Double_t chi2=GetPredictedChi2MI(t,c,layer);
- if (chi2<maxchi2) {
- cl=c;
- maxchi2=chi2;
- } else {
- return kFALSE;
+ if (idx>=0) {
+ const AliITSRecPoint *c=(AliITSRecPoint *)GetCluster(idx);
+ if (c){
+ if (idet != c->GetDetectorIndex()) {
+ idet=c->GetDetectorIndex();
+ const AliITSdetector &det=layer.GetDetector(idet);
+ if (!t->Propagate(det.GetPhi(),det.GetR())) {
+ return kFALSE;
+ }
+ t->SetDetectorIndex(idet);
+ }
+ //Double_t chi2=t->GetPredictedChi2(c);
+ Int_t layer = (idx & 0xf0000000) >> 28;;
+ Double_t chi2=GetPredictedChi2MI(t,c,layer);
+ if (chi2<maxchi2) {
+ cl=c;
+ maxchi2=chi2;
+ } else {
+ return kFALSE;
+ }
}
}
/*
Double_t ymax=t->GetY() + phi*r + dy;
layer.SelectClusters(zmin,zmax,ymin,ymax);
- const AliITSclusterV2 *c=0; Int_t ci=-1;
+ const AliITSRecPoint *c=0; Int_t ci=-1;
while ((c=layer.GetNextCluster(ci))!=0) {
if (idet != c->GetDetectorIndex()) continue;
Double_t chi2=t->GetPredictedChi2(c);
return kTRUE;
}
-
Double_t AliITStrackerMI::GetNormalizedChi2(AliITStrackMI * track, Int_t mode)
{
//
Float_t *ny = GetNy(fCurrentEsdTrack), *nz = GetNz(fCurrentEsdTrack);
if (mode<100){
for (Int_t i = 0;i<6;i++){
- if (track->fClIndex[i]>0){
+ if (track->GetClIndex(i)>0){
Float_t cerry, cerrz;
if (ny[i]>0) {cerry = erry[i]; cerrz=errz[i];}
else
- { cerry= track->fSigmaY[i]; cerrz = track->fSigmaZ[i];}
+ { cerry= track->GetSigmaY(i); cerrz = track->GetSigmaZ(i);}
cerry*=cerry;
cerrz*=cerrz;
- Float_t cchi2 = (track->fDy[i]*track->fDy[i]/cerry)+(track->fDz[i]*track->fDz[i]/cerrz);
+ Float_t cchi2 = (track->GetDy(i)*track->GetDy(i)/cerry)+(track->GetDz(i)*track->GetDz(i)/cerrz);
if (i>1){
- Float_t ratio = track->fNormQ[i]/track->fExpQ;
+ Float_t ratio = track->GetNormQ(i)/track->GetExpQ();
if (ratio<0.5) {
cchi2+=(0.5-ratio)*10.;
//track->fdEdxMismatch+=(0.5-ratio)*10.;
}
}
if (i<2 ||i>3){
- AliITSclusterV2 * cl = (AliITSclusterV2*)GetCluster( track->fClIndex[i]);
+ AliITSRecPoint * cl = (AliITSRecPoint*)GetCluster( track->GetClIndex(i));
Double_t delta = cl->GetNy()+cl->GetNz()-ny[i]-nz[i];
if (delta>1) chi2 +=0.5*TMath::Min(delta/2,2.);
if (i<2) chi2+=2*cl->GetDeltaProbability();
sum++;
}
}
- if (TMath::Abs(track->fdEdxMismatch-dedxmismatch)>0.0001){
- track->fdEdxMismatch = dedxmismatch;
+ if (TMath::Abs(track->GetdEdxMismatch()-dedxmismatch)>0.0001){
+ track->SetdEdxMismatch(dedxmismatch);
}
}
else{
for (Int_t i = 0;i<4;i++){
- if (track->fClIndex[i]>0){
+ if (track->GetClIndex(i)>0){
Float_t cerry, cerrz;
if (ny[i]>0) {cerry = erry[i]; cerrz=errz[i];}
- else { cerry= track->fSigmaY[i]; cerrz = track->fSigmaZ[i];}
+ else { cerry= track->GetSigmaY(i); cerrz = track->GetSigmaZ(i);}
cerry*=cerry;
cerrz*=cerrz;
- chi2+= (track->fDy[i]*track->fDy[i]/cerry);
- chi2+= (track->fDz[i]*track->fDz[i]/cerrz);
+ chi2+= (track->GetDy(i)*track->GetDy(i)/cerry);
+ chi2+= (track->GetDz(i)*track->GetDz(i)/cerrz);
sum++;
}
}
for (Int_t i = 4;i<6;i++){
- if (track->fClIndex[i]>0){
+ if (track->GetClIndex(i)>0){
Float_t cerry, cerrz;
if (ny[i]>0) {cerry = erry[i]; cerrz=errz[i];}
- else { cerry= track->fSigmaY[i]; cerrz = track->fSigmaZ[i];}
+ else { cerry= track->GetSigmaY(i); cerrz = track->GetSigmaZ(i);}
cerry*=cerry;
cerrz*=cerrz;
Float_t cerryb, cerrzb;
if (ny[i+6]>0) {cerryb = erry[i+6]; cerrzb=errz[i+6];}
- else { cerryb= track->fSigmaY[i+6]; cerrzb = track->fSigmaZ[i+6];}
+ else { cerryb= track->GetSigmaY(i+6); cerrzb = track->GetSigmaZ(i+6);}
cerryb*=cerryb;
cerrzb*=cerrzb;
- chi2+= TMath::Min((track->fDy[i+6]*track->fDy[i+6]/cerryb),track->fDy[i]*track->fDy[i]/cerry);
- chi2+= TMath::Min((track->fDz[i+6]*track->fDz[i+6]/cerrzb),track->fDz[i]*track->fDz[i]/cerrz);
+ chi2+= TMath::Min((track->GetDy(i+6)*track->GetDy(i+6)/cerryb),track->GetDy(i)*track->GetDy(i)/cerry);
+ chi2+= TMath::Min((track->GetDz(i+6)*track->GetDz(i+6)/cerrzb),track->GetDz(i)*track->GetDz(i)/cerrz);
sum++;
}
}
}
- if (track->fESDtrack->GetTPCsignal()>85){
- Float_t ratio = track->fdEdx/track->fESDtrack->GetTPCsignal();
+ if (track->GetESDtrack()->GetTPCsignal()>85){
+ Float_t ratio = track->GetdEdx()/track->GetESDtrack()->GetTPCsignal();
if (ratio<0.5) {
chi2+=(0.5-ratio)*5.;
}
}
}
//
- Double_t match = TMath::Sqrt(track->fChi22);
- if (track->fConstrain) match/=track->GetNumberOfClusters();
- if (!track->fConstrain) match/=track->GetNumberOfClusters()-2.;
+ Double_t match = TMath::Sqrt(track->GetChi22());
+ if (track->GetConstrain()) match/=track->GetNumberOfClusters();
+ if (!track->GetConstrain()) match/=track->GetNumberOfClusters()-2.;
if (match<0) match=0;
- Float_t deadzonefactor = (track->fNDeadZone>0) ? 3*(1.1-track->fDeadZoneProbability):0.;
- Double_t normchi2 = 2*track->fNSkipped+match+deadzonefactor+(1+(2*track->fNSkipped+deadzonefactor)/track->GetNumberOfClusters())*
- (chi2)/TMath::Max(double(sum-track->fNSkipped),
- 1./(1.+track->fNSkipped));
+ Float_t deadzonefactor = (track->GetNDeadZone()>0) ? 3*(1.1-track->GetDeadZoneProbability()):0.;
+ Double_t normchi2 = 2*track->GetNSkipped()+match+deadzonefactor+(1+(2*track->GetNSkipped()+deadzonefactor)/track->GetNumberOfClusters())*
+ (chi2)/TMath::Max(double(sum-track->GetNSkipped()),
+ 1./(1.+track->GetNSkipped()));
return normchi2;
}
AliITStrackMI track3(*track2);
track3.Propagate(track1->GetAlpha(),track1->GetX());
TMatrixD vec(5,1);
- vec(0,0)=track1->fP0-track3.fP0;
- vec(1,0)=track1->fP1-track3.fP1;
- vec(2,0)=track1->fP2-track3.fP2;
- vec(3,0)=track1->fP3-track3.fP3;
- vec(4,0)=track1->fP4-track3.fP4;
+ vec(0,0)=track1->GetY() - track3.GetY();
+ vec(1,0)=track1->GetZ() - track3.GetZ();
+ vec(2,0)=track1->GetSnp() - track3.GetSnp();
+ vec(3,0)=track1->GetTgl() - track3.GetTgl();
+ vec(4,0)=track1->Get1Pt() - track3.Get1Pt();
//
TMatrixD cov(5,5);
- cov(0,0) = track1->fC00+track3.fC00;
- cov(1,1) = track1->fC11+track3.fC11;
- cov(2,2) = track1->fC22+track3.fC22;
- cov(3,3) = track1->fC33+track3.fC33;
- cov(4,4) = track1->fC44+track3.fC44;
+ cov(0,0) = track1->GetSigmaY2()+track3.GetSigmaY2();
+ cov(1,1) = track1->GetSigmaZ2()+track3.GetSigmaZ2();
+ cov(2,2) = track1->GetSigmaSnp2()+track3.GetSigmaSnp2();
+ cov(3,3) = track1->GetSigmaTgl2()+track3.GetSigmaTgl2();
+ cov(4,4) = track1->GetSigma1Pt2()+track3.GetSigma1Pt2();
- cov(0,1)=cov(1,0) = track1->fC10+track3.fC10;
- cov(0,2)=cov(2,0) = track1->fC20+track3.fC20;
- cov(0,3)=cov(3,0) = track1->fC30+track3.fC30;
- cov(0,4)=cov(4,0) = track1->fC40+track3.fC40;
+ cov(0,1)=cov(1,0) = track1->GetSigmaZY()+track3.GetSigmaZY();
+ cov(0,2)=cov(2,0) = track1->GetSigmaSnpY()+track3.GetSigmaSnpY();
+ cov(0,3)=cov(3,0) = track1->GetSigmaTglY()+track3.GetSigmaTglY();
+ cov(0,4)=cov(4,0) = track1->GetSigma1PtY()+track3.GetSigma1PtY();
//
- cov(1,2)=cov(2,1) = track1->fC21+track3.fC21;
- cov(1,3)=cov(3,1) = track1->fC31+track3.fC31;
- cov(1,4)=cov(4,1) = track1->fC41+track3.fC41;
+ cov(1,2)=cov(2,1) = track1->GetSigmaSnpZ()+track3.GetSigmaSnpZ();
+ cov(1,3)=cov(3,1) = track1->GetSigmaTglZ()+track3.GetSigmaTglZ();
+ cov(1,4)=cov(4,1) = track1->GetSigma1PtZ()+track3.GetSigma1PtZ();
//
- cov(2,3)=cov(3,2) = track1->fC32+track3.fC32;
- cov(2,4)=cov(4,2) = track1->fC42+track3.fC42;
+ cov(2,3)=cov(3,2) = track1->GetSigmaTglSnp()+track3.GetSigmaTglSnp();
+ cov(2,4)=cov(4,2) = track1->GetSigma1PtSnp()+track3.GetSigma1PtSnp();
//
- cov(3,4)=cov(4,3) = track1->fC43+track3.fC43;
+ cov(3,4)=cov(4,3) = track1->GetSigma1PtTgl()+track3.GetSigma1PtTgl();
cov.Invert();
TMatrixD vec2(cov,TMatrixD::kMult,vec);
Float_t *erry = GetErrY(fCurrentEsdTrack), *errz = GetErrZ(fCurrentEsdTrack);
Float_t ncl = 0;
for (Int_t i = 0;i<6;i++){
- if (TMath::Abs(track->fDy[i])>0){
- chi2[i]= (track->fDy[i]/erry[i])*(track->fDy[i]/erry[i]);
- chi2[i]+= (track->fDz[i]/errz[i])*(track->fDz[i]/errz[i]);
+ if (TMath::Abs(track->GetDy(i))>0){
+ chi2[i]= (track->GetDy(i)/erry[i])*(track->GetDy(i)/erry[i]);
+ chi2[i]+= (track->GetDz(i)/errz[i])*(track->GetDz(i)/errz[i]);
ncl++;
}
else{chi2[i]=10000;}
Int_t npoints = 0;
Double_t res =0;
for (Int_t i=0;i<6;i++){
- if ( (backtrack->fSigmaY[i]<0.000000001) || (forwardtrack->fSigmaY[i]<0.000000001)) continue;
- Double_t sy1 = forwardtrack->fSigmaY[i];
- Double_t sz1 = forwardtrack->fSigmaZ[i];
- Double_t sy2 = backtrack->fSigmaY[i];
- Double_t sz2 = backtrack->fSigmaZ[i];
+ if ( (backtrack->GetSigmaY(i)<0.000000001) || (forwardtrack->GetSigmaY(i)<0.000000001)) continue;
+ Double_t sy1 = forwardtrack->GetSigmaY(i);
+ Double_t sz1 = forwardtrack->GetSigmaZ(i);
+ Double_t sy2 = backtrack->GetSigmaY(i);
+ Double_t sz2 = backtrack->GetSigmaZ(i);
if (i<2){ sy2=1000.;sz2=1000;}
//
- Double_t dy0 = (forwardtrack->fDy[i]/(sy1*sy1) +backtrack->fDy[i]/(sy2*sy2))/(1./(sy1*sy1)+1./(sy2*sy2));
- Double_t dz0 = (forwardtrack->fDz[i]/(sz1*sz1) +backtrack->fDz[i]/(sz2*sz2))/(1./(sz1*sz1)+1./(sz2*sz2));
+ Double_t dy0 = (forwardtrack->GetDy(i)/(sy1*sy1) +backtrack->GetDy(i)/(sy2*sy2))/(1./(sy1*sy1)+1./(sy2*sy2));
+ Double_t dz0 = (forwardtrack->GetDz(i)/(sz1*sz1) +backtrack->GetDz(i)/(sz2*sz2))/(1./(sz1*sz1)+1./(sz2*sz2));
//
Double_t nz0 = dz0*TMath::Sqrt((1./(sz1*sz1)+1./(sz2*sz2)));
Double_t ny0 = dy0*TMath::Sqrt((1./(sy1*sy1)+1./(sy2*sy2)));
if (npoints>1) return
TMath::Max(TMath::Abs(0.3*forwardtrack->Get1Pt())-0.5,0.)+
//2*forwardtrack->fNUsed+
- res/TMath::Max(double(npoints-forwardtrack->fNSkipped),
- 1./(1.+forwardtrack->fNSkipped));
+ res/TMath::Max(double(npoints-forwardtrack->GetNSkipped()),
+ 1./(1.+forwardtrack->GetNSkipped()));
return 1000;
}
//---------------------------------------------
// register track to the list
//
- if (track->fESDtrack->GetKinkIndex(0)!=0) return; //don't register kink tracks
+ if (track->GetESDtrack()->GetKinkIndex(0)!=0) return; //don't register kink tracks
//
//
for (Int_t icluster=0;icluster<track->GetNumberOfClusters();icluster++){
Int_t index = track->GetClusterIndex(icluster);
Int_t l=(index & 0xf0000000) >> 28;
Int_t c=(index & 0x0fffffff) >> 00;
- if (c>fgLayers[l].fN) continue;
+ if (c>fgLayers[l].GetNumberOfClusters()) continue;
for (Int_t itrack=0;itrack<4;itrack++){
- if (fgLayers[l].fClusterTracks[itrack][c]<0){
- fgLayers[l].fClusterTracks[itrack][c]=id;
+ if (fgLayers[l].GetClusterTracks(itrack,c)<0){
+ fgLayers[l].SetClusterTracks(itrack,c,id);
break;
}
}
Int_t index = track->GetClusterIndex(icluster);
Int_t l=(index & 0xf0000000) >> 28;
Int_t c=(index & 0x0fffffff) >> 00;
- if (c>fgLayers[l].fN) continue;
+ if (c>fgLayers[l].GetNumberOfClusters()) continue;
for (Int_t itrack=0;itrack<4;itrack++){
- if (fgLayers[l].fClusterTracks[itrack][c]==id){
- fgLayers[l].fClusterTracks[itrack][c]=-1;
+ if (fgLayers[l].GetClusterTracks(itrack,c)==id){
+ fgLayers[l].SetClusterTracks(itrack,c,-1);
}
}
}
}
-Float_t AliITStrackerMI::GetNumberOfSharedClusters(AliITStrackMI* track,Int_t id, Int_t list[6], AliITSclusterV2 *clist[6])
+Float_t AliITStrackerMI::GetNumberOfSharedClusters(AliITStrackMI* track,Int_t id, Int_t list[6], AliITSRecPoint *clist[6])
{
//-------------------------------------------------------------
//get number of shared clusters
Int_t index = track->GetClusterIndex(icluster);
Int_t l=(index & 0xf0000000) >> 28;
Int_t c=(index & 0x0fffffff) >> 00;
- if (c>fgLayers[l].fN) continue;
+ if (c>fgLayers[l].GetNumberOfClusters()) continue;
if (ny[l]==0){
printf("problem\n");
}
- AliITSclusterV2 *cl = (AliITSclusterV2*)GetCluster(index);
+ AliITSRecPoint *cl = (AliITSRecPoint*)GetCluster(index);
Float_t weight=1;
//
Float_t deltan = 0;
if (l>3&&cl->GetNy()+cl->GetNz()>6) continue;
- if (l>2&&track->fNormQ[l]/track->fExpQ>3.5) continue;
+ if (l>2&&track->GetNormQ(l)/track->GetExpQ()>3.5) continue;
if (l<2 || l>3){
deltan = (cl->GetNy()+cl->GetNz()-ny[l]-nz[l]);
}
weight = 2./TMath::Max(3.+deltan,2.);
//
for (Int_t itrack=0;itrack<4;itrack++){
- if (fgLayers[l].fClusterTracks[itrack][c]>=0 && fgLayers[l].fClusterTracks[itrack][c]!=id){
+ if (fgLayers[l].GetClusterTracks(itrack,c)>=0 && fgLayers[l].GetClusterTracks(itrack,c)!=id){
list[l]=index;
- clist[l] = (AliITSclusterV2*)GetCluster(index);
+ clist[l] = (AliITSRecPoint*)GetCluster(index);
shared+=weight;
break;
}
}
}
- track->fNUsed=shared;
+ track->SetNUsed(shared);
return shared;
}
if (ny[l]==0){
printf("problem\n");
}
- if (c>fgLayers[l].fN) continue;
+ if (c>fgLayers[l].GetNumberOfClusters()) continue;
//if (l>3) continue;
- AliITSclusterV2 *cl = (AliITSclusterV2*)GetCluster(index);
+ AliITSRecPoint *cl = (AliITSRecPoint*)GetCluster(index);
//
Float_t deltan = 0;
if (l>3&&cl->GetNy()+cl->GetNz()>6) continue;
- if (l>2&&track->fNormQ[l]/track->fExpQ>3.5) continue;
+ if (l>2&&track->GetNormQ(l)/track->GetExpQ()>3.5) continue;
if (l<2 || l>3){
deltan = (cl->GetNy()+cl->GetNz()-ny[l]-nz[l]);
}
if (deltan>2.0) continue; // extended - highly probable shared cluster
//
for (Int_t itrack=3;itrack>=0;itrack--){
- if (fgLayers[l].fClusterTracks[itrack][c]<0) continue;
- if (fgLayers[l].fClusterTracks[itrack][c]!=trackID){
- tracks[trackindex] = fgLayers[l].fClusterTracks[itrack][c];
+ if (fgLayers[l].GetClusterTracks(itrack,c)<0) continue;
+ if (fgLayers[l].GetClusterTracks(itrack,c)!=trackID){
+ tracks[trackindex] = fgLayers[l].GetClusterTracks(itrack,c);
trackindex++;
}
}
Int_t index = clusterlist[icluster];
Int_t l=(index & 0xf0000000) >> 28;
Int_t c=(index & 0x0fffffff) >> 00;
- if (c>fgLayers[l].fN) continue;
- AliITSclusterV2 *cl = (AliITSclusterV2*)GetCluster(index);
+ if (c>fgLayers[l].GetNumberOfClusters()) continue;
+ AliITSRecPoint *cl = (AliITSRecPoint*)GetCluster(index);
if (l==0 || l==1){
if (cl->GetNy()>2) continue;
if (cl->GetNz()>2) continue;
}
//
for (Int_t itrack=3;itrack>=0;itrack--){
- if (fgLayers[l].fClusterTracks[itrack][c]<0) continue;
- if (fgLayers[l].fClusterTracks[itrack][c]==sharedtrack){
+ if (fgLayers[l].GetClusterTracks(itrack,c)<0) continue;
+ if (fgLayers[l].GetClusterTracks(itrack,c)==sharedtrack){
overlist[l]=index;
shared++;
}
Double_t w1,w2;
Int_t list1[6],list2[6];
- AliITSclusterV2 *clist1[6], *clist2[6] ;
+ AliITSRecPoint *clist1[6], *clist2[6] ;
RegisterClusterTracks(track10,trackID1);
RegisterClusterTracks(track20,trackID2);
Float_t conflict1 = GetNumberOfSharedClusters(track10,trackID1,list1,clist1);
nerry[i] = TMath::Max(erry1[i],erry2[i]);
nerrz[i] = TMath::Max(errz1[i],errz2[i]);
}
- if (TMath::Abs(track10->fDy[i])>0.000000000000001){
- chi21 += track10->fDy[i]*track10->fDy[i]/(nerry[i]*nerry[i]);
- chi21 += track10->fDz[i]*track10->fDz[i]/(nerrz[i]*nerrz[i]);
+ if (TMath::Abs(track10->GetDy(i))>0.000000000000001){
+ chi21 += track10->GetDy(i)*track10->GetDy(i)/(nerry[i]*nerry[i]);
+ chi21 += track10->GetDz(i)*track10->GetDz(i)/(nerrz[i]*nerrz[i]);
ncl1++;
}
- if (TMath::Abs(track20->fDy[i])>0.000000000000001){
- chi22 += track20->fDy[i]*track20->fDy[i]/(nerry[i]*nerry[i]);
- chi22 += track20->fDz[i]*track20->fDz[i]/(nerrz[i]*nerrz[i]);
+ if (TMath::Abs(track20->GetDy(i))>0.000000000000001){
+ chi22 += track20->GetDy(i)*track20->GetDy(i)/(nerry[i]*nerry[i]);
+ chi22 += track20->GetDz(i)*track20->GetDz(i)/(nerrz[i]*nerrz[i]);
ncl2++;
}
}
chi22/=ncl2;
//
//
- Float_t d1 = TMath::Sqrt(track10->fD[0]*track10->fD[0]+track10->fD[1]*track10->fD[1])+0.1;
- Float_t d2 = TMath::Sqrt(track20->fD[0]*track20->fD[0]+track20->fD[1]*track20->fD[1])+0.1;
+ Float_t d1 = TMath::Sqrt(track10->GetD(0)*track10->GetD(0)+track10->GetD(1)*track10->GetD(1))+0.1;
+ Float_t d2 = TMath::Sqrt(track20->GetD(0)*track20->GetD(0)+track20->GetD(1)*track20->GetD(1))+0.1;
Float_t s1 = TMath::Sqrt(track10->GetSigmaY2()*track10->GetSigmaZ2());
Float_t s2 = TMath::Sqrt(track20->GetSigmaY2()*track20->GetSigmaZ2());
//
Float_t nskipped=0;
RegisterClusterTracks(track2,trackID2);
Int_t list1[6],list2[6];
- AliITSclusterV2 *clist1[6], *clist2[6] ;
+ AliITSRecPoint *clist1[6], *clist2[6] ;
Float_t cconflict1 = GetNumberOfSharedClusters(track1,trackID1,list1,clist1);
Float_t cconflict2 = GetNumberOfSharedClusters(track2,trackID2,list2,clist2);
UnRegisterClusterTracks(track2,trackID2);
//
- if (track1->fConstrain) nskipped+=w1*track1->fNSkipped;
- if (track2->fConstrain) nskipped+=w2*track2->fNSkipped;
+ if (track1->GetConstrain()) nskipped+=w1*track1->GetNSkipped();
+ if (track2->GetConstrain()) nskipped+=w2*track2->GetNSkipped();
if (nskipped>0.5) continue;
//
//if ( w1*conflict1+w2*conflict2>maxconflicts0) continue;
}
//
Double_t chi21=0,chi22=0;
- if (TMath::Abs(track1->fDy[i])>0.) {
- chi21 = (track1->fDy[i]/track1->fSigmaY[i])*(track1->fDy[i]/track1->fSigmaY[i])+
- (track1->fDz[i]/track1->fSigmaZ[i])*(track1->fDz[i]/track1->fSigmaZ[i]);
+ if (TMath::Abs(track1->GetDy(i))>0.) {
+ chi21 = (track1->GetDy(i)/track1->GetSigmaY(i))*(track1->GetDy(i)/track1->GetSigmaY(i))+
+ (track1->GetDz(i)/track1->GetSigmaZ(i))*(track1->GetDz(i)/track1->GetSigmaZ(i));
//chi21 = (track1->fDy[i]*track1->fDy[i])/(nerry[i]*nerry[i])+
- // (track1->fDz[i]*track1->fDz[i])/(nerrz[i]*nerrz[i]);
+ // (track1->GetDz(i)*track1->GetDz(i))/(nerrz[i]*nerrz[i]);
}else{
- if (TMath::Abs(track1->fSigmaY[i]>0.)) c1=1;
+ if (TMath::Abs(track1->GetSigmaY(i)>0.)) c1=1;
}
//
- if (TMath::Abs(track2->fDy[i])>0.) {
- chi22 = (track2->fDy[i]/track2->fSigmaY[i])*(track2->fDy[i]/track2->fSigmaY[i])+
- (track2->fDz[i]/track2->fSigmaZ[i])*(track2->fDz[i]/track2->fSigmaZ[i]);
+ if (TMath::Abs(track2->GetDy(i))>0.) {
+ chi22 = (track2->GetDy(i)/track2->GetSigmaY(i))*(track2->GetDy(i)/track2->GetSigmaY(i))+
+ (track2->GetDz(i)/track2->GetSigmaZ(i))*(track2->GetDz(i)/track2->GetSigmaZ(i));
//chi22 = (track2->fDy[i]*track2->fDy[i])/(nerry[i]*nerry[i])+
// (track2->fDz[i]*track2->fDz[i])/(nerrz[i]*nerrz[i]);
}
else{
- if (TMath::Abs(track2->fSigmaY[i]>0.)) c2=1;
+ if (TMath::Abs(track2->GetSigmaY(i)>0.)) c2=1;
}
sumchi2+=w1*(1.+c1)*(1+c1)*(chi21+c1)+w2*(1.+c2)*(1+c2)*(chi22+c2);
if (chi21>0) sum+=w1;
if (chi22>0) sum+=w2;
conflict+=(c1+c2);
}
- Double_t norm = sum-w1*track1->fNSkipped-w2*track2->fNSkipped;
- if (norm<0) norm =1/(w1*track1->fNSkipped+w2*track2->fNSkipped);
+ Double_t norm = sum-w1*track1->GetNSkipped()-w2*track2->GetNSkipped();
+ if (norm<0) norm =1/(w1*track1->GetNSkipped()+w2*track2->GetNSkipped());
Double_t normchi2 = 2*conflict+sumchi2/sum;
if ( normchi2 <maxchi2 ){
index1 = itrack1;
//
// if (maxconflicts<4 && maxchi2<th0){
if (maxchi2<th0*2.){
- Float_t orig = track10->fFakeRatio*track10->GetNumberOfClusters();
+ Float_t orig = track10->GetFakeRatio()*track10->GetNumberOfClusters();
AliITStrackMI* track1=(AliITStrackMI*) arr1->UncheckedAt(index1);
- track1->fChi2MIP[5] = maxconflicts;
- track1->fChi2MIP[6] = maxchi2;
- track1->fChi2MIP[7] = 0.01+orig-(track1->fFakeRatio*track1->GetNumberOfClusters());
+ track1->SetChi2MIP(5,maxconflicts);
+ track1->SetChi2MIP(6,maxchi2);
+ track1->SetChi2MIP(7,0.01+orig-(track1->GetFakeRatio()*track1->GetNumberOfClusters()));
// track1->UpdateESDtrack(AliESDtrack::kITSin);
- track1->fChi2MIP[8] = index1;
+ track1->SetChi2MIP(8,index1);
fBestTrackIndex[trackID1] =index1;
UpdateESDtrack(track1, AliESDtrack::kITSin);
}
- else if (track10->fChi2MIP[0]<th1){
- track10->fChi2MIP[5] = maxconflicts;
- track10->fChi2MIP[6] = maxchi2;
+ else if (track10->GetChi2MIP(0)<th1){
+ track10->SetChi2MIP(5,maxconflicts);
+ track10->SetChi2MIP(6,maxchi2);
// track10->UpdateESDtrack(AliESDtrack::kITSin);
UpdateESDtrack(track10,AliESDtrack::kITSin);
}
UnRegisterClusterTracks(track,trackID2);
}
- if (track10->fConstrain&&track10->fChi2MIP[0]<kMaxChi2PerCluster[0]&&track10->fChi2MIP[1]<kMaxChi2PerCluster[1]
- &&track10->fChi2MIP[2]<kMaxChi2PerCluster[2]&&track10->fChi2MIP[3]<kMaxChi2PerCluster[3]){
+ if (track10->GetConstrain()&&track10->GetChi2MIP(0)<kMaxChi2PerCluster[0]&&track10->GetChi2MIP(1)<kMaxChi2PerCluster[1]
+ &&track10->GetChi2MIP(2)<kMaxChi2PerCluster[2]&&track10->GetChi2MIP(3)<kMaxChi2PerCluster[3]){
// if (track10->fChi2MIP[0]<kMaxChi2PerCluster[0]&&track10->fChi2MIP[1]<kMaxChi2PerCluster[1]
// &&track10->fChi2MIP[2]<kMaxChi2PerCluster[2]&&track10->fChi2MIP[3]<kMaxChi2PerCluster[3]){
RegisterClusterTracks(track10,trackID1);
}
- if (track20->fConstrain&&track20->fChi2MIP[0]<kMaxChi2PerCluster[0]&&track20->fChi2MIP[1]<kMaxChi2PerCluster[1]
- &&track20->fChi2MIP[2]<kMaxChi2PerCluster[2]&&track20->fChi2MIP[3]<kMaxChi2PerCluster[3]){
+ if (track20->GetConstrain()&&track20->GetChi2MIP(0)<kMaxChi2PerCluster[0]&&track20->GetChi2MIP(1)<kMaxChi2PerCluster[1]
+ &&track20->GetChi2MIP(2)<kMaxChi2PerCluster[2]&&track20->GetChi2MIP(3)<kMaxChi2PerCluster[3]){
//if (track20->fChi2MIP[0]<kMaxChi2PerCluster[0]&&track20->fChi2MIP[1]<kMaxChi2PerCluster[1]
// &&track20->fChi2MIP[2]<kMaxChi2PerCluster[2]&&track20->fChi2MIP[3]<kMaxChi2PerCluster[3]){
RegisterClusterTracks(track20,trackID2);
//--------------------------------------------------------------------
AliTracker::UseClusters(t,from);
- AliITSclusterV2 *c=(AliITSclusterV2 *)GetCluster(t->GetClusterIndex(0));
+ AliITSRecPoint *c=(AliITSRecPoint *)GetCluster(t->GetClusterIndex(0));
//if (c->GetQ()>2) c->Use();
if (c->GetSigmaZ2()>0.1) c->Use();
- c=(AliITSclusterV2 *)GetCluster(t->GetClusterIndex(1));
+ c=(AliITSRecPoint *)GetCluster(t->GetClusterIndex(1));
//if (c->GetQ()>2) c->Use();
if (c->GetSigmaZ2()>0.1) c->Use();
if (!track) continue;
Float_t chi2 = NormalizedChi2(track,0);
//
- Int_t tpcLabel=track->fESDtrack->GetTPCLabel();
+ Int_t tpcLabel=track->GetESDtrack()->GetTPCLabel();
track->SetLabel(tpcLabel);
CookdEdx(track);
- track->fFakeRatio=1.;
+ track->SetFakeRatio(1.);
CookLabel(track,0.); //For comparison only
//
//if (chi2<kMaxChi2PerCluster[0]&&track->fFakeRatio==0){
}
}
else{
- if (track->fConstrain || track->fN>5){ //keep best short tracks - without vertex constrain
+ if (track->GetConstrain() || track->GetNumberOfClusters()>5){ //keep best short tracks - without vertex constrain
delete array->RemoveAt(itrack);
}
}
Float_t *erry = GetErrY(esdindex), *errz = GetErrZ(esdindex);
Float_t *ny = GetNy(esdindex), *nz = GetNz(esdindex);
for (Int_t i=0;i<6;i++) {
- if (besttrack->fClIndex[i]>0){
- erry[i] = besttrack->fSigmaY[i]; erry[i+6] = besttrack->fSigmaY[i+6];
- errz[i] = besttrack->fSigmaZ[i]; errz[i+6] = besttrack->fSigmaZ[i+6];
- ny[i] = besttrack->fNy[i];
- nz[i] = besttrack->fNz[i];
+ if (besttrack->GetClIndex(i)>0){
+ erry[i] = besttrack->GetSigmaY(i); erry[i+6] = besttrack->GetSigmaY(i+6);
+ errz[i] = besttrack->GetSigmaZ(i); errz[i+6] = besttrack->GetSigmaZ(i+6);
+ ny[i] = besttrack->GetNy(i);
+ nz[i] = besttrack->GetNz(i);
}
}
//
for (Int_t itrack=0;itrack<entries;itrack++){
AliITStrackMI * track = (AliITStrackMI*)array->At(itrack);
if (track){
- track->fChi2MIP[0] = GetNormalizedChi2(track, mode);
- if (track->fChi2MIP[0]<kMaxChi2PerCluster[0])
- chi2[itrack] = track->fChi2MIP[0];
+ track->SetChi2MIP(0,GetNormalizedChi2(track, mode));
+ if (track->GetChi2MIP(0)<kMaxChi2PerCluster[0])
+ chi2[itrack] = track->GetChi2MIP(0);
else{
- if (track->fConstrain || track->fN>5){ //keep best short tracks - without vertex constrain
+ if (track->GetConstrain() || track->GetNumberOfClusters()>5){ //keep best short tracks - without vertex constrain
delete array->RemoveAt(itrack);
}
}
//
TMath::Sort(entries,chi2,index,kFALSE);
besttrack = (AliITStrackMI*)array->At(index[0]);
- if (besttrack&&besttrack->fChi2MIP[0]<kMaxChi2PerCluster[0]){
+ if (besttrack&&besttrack->GetChi2MIP(0)<kMaxChi2PerCluster[0]){
for (Int_t i=0;i<6;i++){
- if (besttrack->fClIndex[i]>0){
- erry[i] = besttrack->fSigmaY[i]; erry[i+6] = besttrack->fSigmaY[i+6];
- errz[i] = besttrack->fSigmaZ[i]; erry[i+6] = besttrack->fSigmaY[i+6];
- ny[i] = besttrack->fNy[i];
- nz[i] = besttrack->fNz[i];
+ if (besttrack->GetClIndex(i)>0){
+ erry[i] = besttrack->GetSigmaY(i); erry[i+6] = besttrack->GetSigmaY(i+6);
+ errz[i] = besttrack->GetSigmaZ(i); erry[i+6] = besttrack->GetSigmaY(i+6);
+ ny[i] = besttrack->GetNy(i);
+ nz[i] = besttrack->GetNz(i);
}
}
}
for (Int_t itrack=0;itrack<entries;itrack++){
AliITStrackMI * track = (AliITStrackMI*)array->At(itrack);
if (track){
- track->fChi2MIP[0] = GetNormalizedChi2(track,mode);
- if (track->fChi2MIP[0]<kMaxChi2PerCluster[0])
- chi2[itrack] = track->fChi2MIP[0]-0*(track->GetNumberOfClusters()+track->fNDeadZone);
+ track->SetChi2MIP(0,GetNormalizedChi2(track,mode));
+ if (track->GetChi2MIP(0)<kMaxChi2PerCluster[0])
+ chi2[itrack] = track->GetChi2MIP(0)-0*(track->GetNumberOfClusters()+track->GetNDeadZone());
else
{
- if (track->fConstrain || track->fN>5){ //keep best short tracks - without vertex constrain
+ if (track->GetConstrain() || track->GetNumberOfClusters()>5){ //keep best short tracks - without vertex constrain
delete array->RemoveAt(itrack);
}
}
if (besttrack){
//
for (Int_t i=0;i<6;i++){
- if (besttrack->fNz[i]>0&&besttrack->fNy[i]>0){
- erry[i] = besttrack->fSigmaY[i]; erry[i+6] = besttrack->fSigmaY[i+6];
- errz[i] = besttrack->fSigmaZ[i]; errz[i+6] = besttrack->fSigmaZ[i+6];
- ny[i] = besttrack->fNy[i];
- nz[i] = besttrack->fNz[i];
+ if (besttrack->GetNz(i)>0&&besttrack->GetNy(i)>0){
+ erry[i] = besttrack->GetSigmaY(i); erry[i+6] = besttrack->GetSigmaY(i+6);
+ errz[i] = besttrack->GetSigmaZ(i); errz[i+6] = besttrack->GetSigmaZ(i+6);
+ ny[i] = besttrack->GetNy(i);
+ nz[i] = besttrack->GetNz(i);
}
}
- besttrack->fChi2MIP[0] = GetNormalizedChi2(besttrack,mode);
- Float_t minchi2 = TMath::Min(besttrack->fChi2MIP[0]+5.+besttrack->fNUsed, double(kMaxChi2PerCluster[0]));
+ besttrack->SetChi2MIP(0,GetNormalizedChi2(besttrack,mode));
+ Float_t minchi2 = TMath::Min(besttrack->GetChi2MIP(0)+5.+besttrack->GetNUsed(), double(kMaxChi2PerCluster[0]));
Float_t minn = besttrack->GetNumberOfClusters()-3;
Int_t accepted=0;
for (Int_t i=0;i<entries;i++){
AliITStrackMI * track = (AliITStrackMI*)array->At(index[i]);
if (!track) continue;
if (accepted>maxcut) break;
- track->fChi2MIP[0] = GetNormalizedChi2(track,mode);
- if (track->fConstrain || track->fN>5){ //keep best short tracks - without vertex constrain
- if (track->GetNumberOfClusters()<6 && (track->fChi2MIP[0]+track->fNUsed>minchi2)){
+ track->SetChi2MIP(0,GetNormalizedChi2(track,mode));
+ if (track->GetConstrain() || track->GetNumberOfClusters()>5){ //keep best short tracks - without vertex constrain
+ if (track->GetNumberOfClusters()<6 && (track->GetChi2MIP(0)+track->GetNUsed()>minchi2)){
delete array->RemoveAt(index[i]);
continue;
}
}
- Bool_t shortbest = !track->fConstrain && track->fN<6;
- if ((track->fChi2MIP[0]+track->fNUsed<minchi2 && track->GetNumberOfClusters()>=minn) ||shortbest){
+ Bool_t shortbest = !track->GetConstrain() && track->GetNumberOfClusters()<6;
+ if ((track->GetChi2MIP(0)+track->GetNUsed()<minchi2 && track->GetNumberOfClusters()>=minn) ||shortbest){
if (!shortbest) accepted++;
//
newarray->AddLast(array->RemoveAt(index[i]));
for (Int_t i=0;i<6;i++){
if (nz[i]==0){
- erry[i] = track->fSigmaY[i]; erry[i+6] = track->fSigmaY[i+6];
- errz[i] = track->fSigmaZ[i]; errz[i] = track->fSigmaZ[i+6];
- ny[i] = track->fNy[i];
- nz[i] = track->fNz[i];
+ erry[i] = track->GetSigmaY(i); erry[i+6] = track->GetSigmaY(i+6);
+ errz[i] = track->GetSigmaZ(i); errz[i] = track->GetSigmaZ(i+6);
+ ny[i] = track->GetNy(i);
+ nz[i] = track->GetNz(i);
}
}
}
if (!track) continue;
Float_t sigmarfi,sigmaz;
GetDCASigma(track,sigmarfi,sigmaz);
- track->fDnorm[0] = sigmarfi;
- track->fDnorm[1] = sigmaz;
+ track->SetDnorm(0,sigmarfi);
+ track->SetDnorm(1,sigmaz);
//
- track->fChi2MIP[1] = 1000000;
- track->fChi2MIP[2] = 1000000;
- track->fChi2MIP[3] = 1000000;
+ track->SetChi2MIP(1,1000000);
+ track->SetChi2MIP(2,1000000);
+ track->SetChi2MIP(3,1000000);
//
// backtrack
backtrack = new(backtrack) AliITStrackMI(*track);
- if (track->fConstrain){
+ if (track->GetConstrain()){
if (!backtrack->PropagateTo(3.,0.0028,65.19)) continue;
if (!backtrack->Improve(0,xyzv,ersv)) continue;
- if (!backtrack->PropagateTo(2.,0.0028,0)) continue;
- if (!backtrack->Improve(0,xyzv,ersv)) continue;
- if (!backtrack->PropagateTo(1.,0.0028,0)) continue;
- if (!backtrack->Improve(0,xyzv,ersv)) continue;
- if (!backtrack->PropagateToVertex()) continue;
- backtrack->ResetCovariance();
- if (!backtrack->Improve(0,xyzv,ersv)) continue;
+ //if (!backtrack->PropagateTo(2.,0.0028,0)) continue; // This
+ //if (!backtrack->Improve(0,xyzv,ersv)) continue; // is
+ //if (!backtrack->PropagateTo(1.,0.0028,0)) continue; // an over-kill
+ //if (!backtrack->Improve(0,xyzv,ersv)) continue; // (I.B.)
+ //if (!backtrack->PropagateToVertex()) continue; //
+ backtrack->ResetCovariance(10.);
+ //if (!backtrack->Improve(0,xyzv,ersv)) continue;
}else{
- backtrack->ResetCovariance();
+ backtrack->ResetCovariance(10.);
}
backtrack->ResetClusters();
Double_t x = original->GetX();
if (!RefitAt(x,backtrack,track)) continue;
//
- track->fChi2MIP[1] = NormalizedChi2(backtrack,0);
+ track->SetChi2MIP(1,NormalizedChi2(backtrack,0));
//for (Int_t i=2;i<6;i++){track->fDy[i]+=backtrack->fDy[i]; track->fDz[i]+=backtrack->fDz[i];}
- if (track->fChi2MIP[1]>kMaxChi2PerCluster[1]*6.) continue;
- track->fChi22 = GetMatchingChi2(backtrack,original);
+ if (track->GetChi2MIP(1)>kMaxChi2PerCluster[1]*6.) continue;
+ track->SetChi22(GetMatchingChi2(backtrack,original));
- if ((track->fConstrain) && track->fChi22>90.) continue;
- if ((!track->fConstrain) && track->fChi22>30.) continue;
- if ( track->fChi22/track->GetNumberOfClusters()>11.) continue;
+ if ((track->GetConstrain()) && track->GetChi22()>90.) continue;
+ if ((!track->GetConstrain()) && track->GetChi22()>30.) continue;
+ if ( track->GetChi22()/track->GetNumberOfClusters()>11.) continue;
- if (!(track->fConstrain)&&track->fChi2MIP[1]>kMaxChi2PerCluster[1]) continue;
+ if (!(track->GetConstrain())&&track->GetChi2MIP(1)>kMaxChi2PerCluster[1]) continue;
Bool_t isOK=kTRUE;
if(!isOK) continue;
//
forwardtrack->ResetClusters();
x = track->GetX();
RefitAt(x,forwardtrack,track);
- track->fChi2MIP[2] = NormalizedChi2(forwardtrack,0);
- if (track->fChi2MIP[2]>kMaxChi2PerCluster[2]*6.0) continue;
- if (!(track->fConstrain)&&track->fChi2MIP[2]>kMaxChi2PerCluster[2]) continue;
+ track->SetChi2MIP(2,NormalizedChi2(forwardtrack,0));
+ if (track->GetChi2MIP(2)>kMaxChi2PerCluster[2]*6.0) continue;
+ if (!(track->GetConstrain())&&track->GetChi2MIP(2)>kMaxChi2PerCluster[2]) continue;
- track->fD[0] = forwardtrack->GetD(GetX(),GetY());
- track->fD[1] = forwardtrack->GetZat(GetX())-GetZ();
- forwardtrack->fD[0] = track->fD[0];
- forwardtrack->fD[1] = track->fD[1];
+ //track->fD[0] = forwardtrack->GetD(GetX(),GetY());
+ //track->fD[1] = forwardtrack->GetZat(GetX())-GetZ();
+ forwardtrack->GetDZ(GetX(),GetY(),GetZ(),track->GetDP()); //I.B.
+ forwardtrack->SetD(0,track->GetD(0));
+ forwardtrack->SetD(1,track->GetD(1));
{
Int_t list[6];
- AliITSclusterV2* clist[6];
- track->fChi2MIP[4] = GetNumberOfSharedClusters(track,esdindex,list,clist);
- if ( (!track->fConstrain) && track->fChi2MIP[4]>1.0) continue;
+ AliITSRecPoint* clist[6];
+ track->SetChi2MIP(4,GetNumberOfSharedClusters(track,esdindex,list,clist));
+ if ( (!track->GetConstrain()) && track->GetChi2MIP(4)>1.0) continue;
}
- track->fChi2MIP[3] = GetInterpolatedChi2(forwardtrack,backtrack);
- if ( (track->fChi2MIP[3]>6.*kMaxChi2PerCluster[3])) continue;
- if ( (!track->fConstrain) && (track->fChi2MIP[3]>2*kMaxChi2PerCluster[3])) {
- track->fChi2MIP[3]=1000;
+ track->SetChi2MIP(3,GetInterpolatedChi2(forwardtrack,backtrack));
+ if ( (track->GetChi2MIP(3)>6.*kMaxChi2PerCluster[3])) continue;
+ if ( (!track->GetConstrain()) && (track->GetChi2MIP(3)>2*kMaxChi2PerCluster[3])) {
+ track->SetChi2MIP(3,1000);
continue;
}
- Double_t chi2 = track->fChi2MIP[0]+track->fNUsed;
+ Double_t chi2 = track->GetChi2MIP(0)+track->GetNUsed();
//
for (Int_t ichi=0;ichi<5;ichi++){
- forwardtrack->fChi2MIP[ichi] = track->fChi2MIP[ichi];
+ forwardtrack->SetChi2MIP(ichi, track->GetChi2MIP(ichi));
}
if (chi2 < minchi2){
//besttrack = new AliITStrackMI(*forwardtrack);
besttrack = track;
besttrack->SetLabel(track->GetLabel());
- besttrack->fFakeRatio = track->fFakeRatio;
+ besttrack->SetFakeRatio(track->GetFakeRatio());
minchi2 = chi2;
- original->fD[0] = forwardtrack->GetD(GetX(),GetY());
- original->fD[1] = forwardtrack->GetZat(GetX())-GetZ();
+ //original->fD[0] = forwardtrack->GetD(GetX(),GetY());
+ //original->fD[1] = forwardtrack->GetZat(GetX())-GetZ();
+ forwardtrack->GetDZ(GetX(),GetY(),GetZ(),original->GetDP()); //I.B.
}
}
delete backtrack;
AliITStrackMI * track = (AliITStrackMI*)array->At(i);
if (!track) continue;
- if (accepted>checkmax || track->fChi2MIP[3]>kMaxChi2PerCluster[3]*6. ||
+ if (accepted>checkmax || track->GetChi2MIP(3)>kMaxChi2PerCluster[3]*6. ||
(track->GetNumberOfClusters()<besttrack->GetNumberOfClusters()-1.)||
- track->fChi2MIP[0]>besttrack->fChi2MIP[0]+2.*besttrack->fNUsed+3.){
- if (track->fConstrain || track->fN>5){ //keep best short tracks - without vertex constrain
+ track->GetChi2MIP(0)>besttrack->GetChi2MIP(0)+2.*besttrack->GetNUsed()+3.){
+ if (track->GetConstrain() || track->GetNumberOfClusters()>5){ //keep best short tracks - without vertex constrain
delete array->RemoveAt(i);
continue;
}
array->Compress();
SortTrackHypothesys(esdindex,checkmax,1);
array = (TObjArray*) fTrackHypothesys.At(esdindex);
+ if (!array) return 0; // PH What can be the reason? Check SortTrackHypothesys
besttrack = (AliITStrackMI*)array->At(0);
if (!besttrack) return 0;
- besttrack->fChi2MIP[8]=0;
+ besttrack->SetChi2MIP(8,0);
fBestTrackIndex[esdindex]=0;
entries = array->GetEntriesFast();
AliITStrackMI *longtrack =0;
minchi2 =1000;
- Float_t minn=besttrack->GetNumberOfClusters()+besttrack->fNDeadZone;
+ Float_t minn=besttrack->GetNumberOfClusters()+besttrack->GetNDeadZone();
for (Int_t itrack=entries-1;itrack>0;itrack--){
AliITStrackMI * track = (AliITStrackMI*)array->At(itrack);
- if (!track->fConstrain) continue;
- if (track->GetNumberOfClusters()+track->fNDeadZone<minn) continue;
- if (track->fChi2MIP[0]-besttrack->fChi2MIP[0]>0.0) continue;
- if (track->fChi2MIP[0]>4.) continue;
- minn = track->GetNumberOfClusters()+track->fNDeadZone;
+ if (!track->GetConstrain()) continue;
+ if (track->GetNumberOfClusters()+track->GetNDeadZone()<minn) continue;
+ if (track->GetChi2MIP(0)-besttrack->GetChi2MIP(0)>0.0) continue;
+ if (track->GetChi2MIP(0)>4.) continue;
+ minn = track->GetNumberOfClusters()+track->GetNDeadZone();
longtrack =track;
}
//if (longtrack) besttrack=longtrack;
Int_t list[6];
- AliITSclusterV2 * clist[6];
+ AliITSRecPoint * clist[6];
Float_t shared = GetNumberOfSharedClusters(besttrack,esdindex,list,clist);
- if (besttrack->fConstrain&&besttrack->fChi2MIP[0]<kMaxChi2PerCluster[0]&&besttrack->fChi2MIP[1]<kMaxChi2PerCluster[1]
- &&besttrack->fChi2MIP[2]<kMaxChi2PerCluster[2]&&besttrack->fChi2MIP[3]<kMaxChi2PerCluster[3]){
+ if (besttrack->GetConstrain()&&besttrack->GetChi2MIP(0)<kMaxChi2PerCluster[0]&&besttrack->GetChi2MIP(1)<kMaxChi2PerCluster[1]
+ &&besttrack->GetChi2MIP(2)<kMaxChi2PerCluster[2]&&besttrack->GetChi2MIP(3)<kMaxChi2PerCluster[3]){
RegisterClusterTracks(besttrack,esdindex);
}
//
// Don't sign clusters if not gold track
//
if (!besttrack->IsGoldPrimary()) return besttrack;
- if (besttrack->fESDtrack->GetKinkIndex(0)!=0) return besttrack; //track belong to kink
+ if (besttrack->GetESDtrack()->GetKinkIndex(0)!=0) return besttrack; //track belong to kink
//
if (fConstraint[fPass]){
//
//
Float_t *ny = GetNy(esdindex), *nz = GetNz(esdindex);
for (Int_t i=0;i<6;i++){
- Int_t index = besttrack->fClIndex[i];
+ Int_t index = besttrack->GetClIndex(i);
if (index<=0) continue;
Int_t ilayer = (index & 0xf0000000) >> 28;
- if (besttrack->fSigmaY[ilayer]<0.00000000001) continue;
- AliITSclusterV2 *c = (AliITSclusterV2*)GetCluster(index);
+ if (besttrack->GetSigmaY(ilayer)<0.00000000001) continue;
+ AliITSRecPoint *c = (AliITSRecPoint*)GetCluster(index);
if (!c) continue;
if (ilayer>3&&c->GetNy()+c->GetNz()>6) continue;
if ( (c->GetNy()+c->GetNz() )> ny[i]+nz[i]+0.7) continue; //shared track
if ( c->GetNz()> nz[i]+0.7) continue; //shared track
- if ( ilayer>2&& besttrack->fNormQ[ilayer]/besttrack->fExpQ>1.5) continue;
+ if ( ilayer>2&& besttrack->GetNormQ(ilayer)/besttrack->GetExpQ()>1.5) continue;
//if ( c->GetNy()> ny[i]+0.7) continue; //shared track
Bool_t cansign = kTRUE;
for (Int_t itrack=0;itrack<entries; itrack++){
AliITStrackMI * track = (AliITStrackMI*)array->At(i);
if (!track) continue;
- if (track->fChi2MIP[0]>besttrack->fChi2MIP[0]+2.*shared+1.) break;
- if ( (track->fClIndex[ilayer]>0) && (track->fClIndex[ilayer]!=besttrack->fClIndex[ilayer])){
+ if (track->GetChi2MIP(0)>besttrack->GetChi2MIP(0)+2.*shared+1.) break;
+ if ( (track->GetClIndex(ilayer)>0) && (track->GetClIndex(ilayer)!=besttrack->GetClIndex(ilayer))){
cansign = kFALSE;
break;
}
}
if (cansign){
- if (TMath::Abs(besttrack->fDy[ilayer]/besttrack->fSigmaY[ilayer])>3.) continue;
- if (TMath::Abs(besttrack->fDz[ilayer]/besttrack->fSigmaZ[ilayer])>3.) continue;
+ if (TMath::Abs(besttrack->GetDy(ilayer)/besttrack->GetSigmaY(ilayer))>3.) continue;
+ if (TMath::Abs(besttrack->GetDz(ilayer)/besttrack->GetSigmaZ(ilayer))>3.) continue;
if (!c->IsUsed()) c->Use();
}
}
for (Int_t j=0;j<array->GetEntriesFast();j++){
AliITStrackMI* track = (AliITStrackMI*)array->At(j);
if (!track) continue;
- if (track->fGoldV0) {
+ if (track->GetGoldV0()) {
longtrack = track; //gold V0 track taken
break;
}
- if (track->GetNumberOfClusters()+track->fNDeadZone<minn) continue;
- Float_t chi2 = track->fChi2MIP[0];
+ if (track->GetNumberOfClusters()+track->GetNDeadZone()<minn) continue;
+ Float_t chi2 = track->GetChi2MIP(0);
if (fAfterV0){
- if (!track->fGoldV0&&track->fConstrain==kFALSE) chi2+=5;
+ if (!track->GetGoldV0()&&track->GetConstrain()==kFALSE) chi2+=5;
}
- if (track->GetNumberOfClusters()+track->fNDeadZone>minn) maxchi2 = track->fChi2MIP[0];
+ if (track->GetNumberOfClusters()+track->GetNDeadZone()>minn) maxchi2 = track->GetChi2MIP(0);
//
if (chi2 > maxchi2) continue;
- minn= track->GetNumberOfClusters()+track->fNDeadZone;
+ minn= track->GetNumberOfClusters()+track->GetNDeadZone();
maxchi2 = chi2;
longtrack=track;
}
//
if (besttrack){
Int_t list[6];
- AliITSclusterV2 * clist[6];
+ AliITSRecPoint * clist[6];
Float_t shared = GetNumberOfSharedClusters(longtrack,i,list,clist);
//
- track->fNUsed = shared;
- track->fNSkipped = besttrack->fNSkipped;
- track->fChi2MIP[0] = besttrack->fChi2MIP[0];
+ track->SetNUsed(shared);
+ track->SetNSkipped(besttrack->GetNSkipped());
+ track->SetChi2MIP(0,besttrack->GetChi2MIP(0));
if (shared>0){
Int_t nshared;
Int_t overlist[6];
UpdateESDtrack(besttrack,AliESDtrack::kITSin);
//if (besttrack&&besttrack->fConstrain)
// UpdateESDtrack(besttrack,AliESDtrack::kITSin);
- if (besttrack->fChi2MIP[0]+besttrack->fNUsed>1.5){
- if ( (TMath::Abs(besttrack->fD[0])>0.1) && fConstraint[fPass]) {
- track->fReconstructed= kFALSE;
+ if (besttrack->GetChi2MIP(0)+besttrack->GetNUsed()>1.5){
+ if ( (TMath::Abs(besttrack->GetD(0))>0.1) && fConstraint[fPass]) {
+ track->SetReconstructed(kFALSE);
}
- if ( (TMath::Abs(besttrack->fD[1])>0.1) && fConstraint[fPass]){
- track->fReconstructed= kFALSE;
+ if ( (TMath::Abs(besttrack->GetD(1))>0.1) && fConstraint[fPass]){
+ track->SetReconstructed(kFALSE);
}
}
//--------------------------------------------------------------------
Int_t tpcLabel=-1;
- if ( track->fESDtrack) tpcLabel = TMath::Abs(track->fESDtrack->GetTPCLabel());
+ if ( track->GetESDtrack()) tpcLabel = TMath::Abs(track->GetESDtrack()->GetTPCLabel());
- track->fChi2MIP[9]=0;
+ track->SetChi2MIP(9,0);
Int_t nwrong=0;
for (Int_t i=0;i<track->GetNumberOfClusters();i++){
Int_t cindex = track->GetClusterIndex(i);
Int_t l=(cindex & 0xf0000000) >> 28;
- AliITSclusterV2 *cl = (AliITSclusterV2*)GetCluster(cindex);
+ AliITSRecPoint *cl = (AliITSRecPoint*)GetCluster(cindex);
Int_t isWrong=1;
for (Int_t ind=0;ind<3;ind++){
if (tpcLabel>0)
if (cl->GetLabel(ind)==tpcLabel) isWrong=0;
}
- track->fChi2MIP[9]+=isWrong*(2<<l);
+ track->SetChi2MIP(9,track->GetChi2MIP(9)+isWrong*(2<<l));
nwrong+=isWrong;
}
- track->fFakeRatio = double(nwrong)/double(track->GetNumberOfClusters());
+ track->SetFakeRatio(double(nwrong)/double(track->GetNumberOfClusters()));
if (tpcLabel>0){
- if (track->fFakeRatio>wrong) track->fLab = -tpcLabel;
+ if (track->GetFakeRatio()>wrong) track->SetLabel(-tpcLabel);
else
- track->fLab = tpcLabel;
+ track->SetLabel(tpcLabel);
}
}
//
//
// Int_t list[6];
- //AliITSclusterV2 * clist[6];
+ //AliITSRecPoint * clist[6];
// Int_t shared = GetNumberOfSharedClusters(track,index,list,clist);
Float_t dedx[4];
Int_t accepted=0;
- track->fChi2MIP[9]=0;
+ track->SetChi2MIP(9,0);
for (Int_t i=0;i<track->GetNumberOfClusters();i++){
Int_t cindex = track->GetClusterIndex(i);
Int_t l=(cindex & 0xf0000000) >> 28;
- AliITSclusterV2 *cl = (AliITSclusterV2*)GetCluster(cindex);
- Int_t lab = TMath::Abs(track->fESDtrack->GetTPCLabel());
+ AliITSRecPoint *cl = (AliITSRecPoint*)GetCluster(cindex);
+ Int_t lab = TMath::Abs(track->GetESDtrack()->GetTPCLabel());
Int_t isWrong=1;
for (Int_t ind=0;ind<3;ind++){
if (cl->GetLabel(ind)==lab) isWrong=0;
}
- track->fChi2MIP[9]+=isWrong*(2<<l);
+ track->SetChi2MIP(9,track->GetChi2MIP(9)+isWrong*(2<<l));
if (l<2) continue;
//if (l>3 && (cl->GetNy()>4) || (cl->GetNz()>4)) continue; //shared track
//if (l>3&& !(cl->GetType()==1||cl->GetType()==10)) continue;
//if (l<4&& !(cl->GetType()==1)) continue;
- dedx[accepted]= track->fdEdxSample[i];
+ dedx[accepted]= track->GetSampledEdx(i);
//dedx[accepted]= track->fNormQ[l];
accepted++;
}
}
-Double_t AliITStrackerMI::GetPredictedChi2MI(AliITStrackMI* track, const AliITSclusterV2 *cluster,Int_t layer)
+Double_t AliITStrackerMI::GetPredictedChi2MI(AliITStrackMI* track, const AliITSRecPoint *cluster,Int_t layer)
{
//
//
Float_t theta = track->GetTgl();
Float_t phi = track->GetSnp();
phi = TMath::Sqrt(phi*phi/(1.-phi*phi));
- GetError(layer,cluster,theta,phi,track->fExpQ,erry,errz);
+ GetError(layer,cluster,theta,phi,track->GetExpQ(),erry,errz);
Double_t chi2 = track->GetPredictedChi2MI(cluster->GetY(),cluster->GetZ(),erry,errz);
Float_t ny,nz;
GetNTeor(layer,cluster, theta,phi,ny,nz);
chi2+=2.*cluster->GetDeltaProbability();
}
//
- track->fNy[layer] =ny;
- track->fNz[layer] =nz;
- track->fSigmaY[layer] = erry;
- track->fSigmaZ[layer] = errz;
+ track->SetNy(layer,ny);
+ track->SetNz(layer,nz);
+ track->SetSigmaY(layer,erry);
+ track->SetSigmaZ(layer, errz);
//track->fNormQ[layer] = cluster->GetQ()/TMath::Sqrt(1+theta*theta+phi*phi);
- track->fNormQ[layer] = cluster->GetQ()/TMath::Sqrt((1.+ track->fP3*track->fP3)/(1.- track->fP2*track->fP2));
+ track->SetNormQ(layer,cluster->GetQ()/TMath::Sqrt((1.+ track->GetTgl()*track->GetTgl())/(1.- track->GetSnp()*track->GetSnp())));
return chi2;
}
-Int_t AliITStrackerMI::UpdateMI(AliITStrackMI* track, const AliITSclusterV2* cl,Double_t chi2,Int_t index) const
+Int_t AliITStrackerMI::UpdateMI(AliITStrackMI* track, const AliITSRecPoint* cl,Double_t chi2,Int_t index) const
{
//
//
//
Int_t layer = (index & 0xf0000000) >> 28;
- track->fClIndex[layer] = index;
- if ( (layer>1) &&track->fNormQ[layer]/track->fExpQ<0.5 ) {
- chi2+= (0.5-track->fNormQ[layer]/track->fExpQ)*10.;
- track->fdEdxMismatch+=(0.5-track->fNormQ[layer]/track->fExpQ)*10.;
+ track->SetClIndex(layer, index);
+ if ( (layer>1) &&track->GetNormQ(layer)/track->GetExpQ()<0.5 ) {
+ chi2+= (0.5-track->GetNormQ(layer)/track->GetExpQ())*10.;
+ track->SetdEdxMismatch(track->GetdEdxMismatch()+(0.5-track->GetNormQ(layer)/track->GetExpQ())*10.);
}
- return track->UpdateMI(cl->GetY(),cl->GetZ(),track->fSigmaY[layer],track->fSigmaZ[layer],chi2,index);
+
+ if (cl->GetQ()<=0) return 0; // ingore the "virtual" clusters
+
+ // Take into account the mis-alignment
+ Double_t x=track->GetX()+cl->GetX();
+ if (!track->PropagateTo(x,0.,0.)) return 0;
+
+ return track->UpdateMI(cl->GetY(),cl->GetZ(),track->GetSigmaY(layer),track->GetSigmaZ(layer),chi2,index);
}
-void AliITStrackerMI::GetNTeor(Int_t layer, const AliITSclusterV2* /*cl*/, Float_t theta, Float_t phi, Float_t &ny, Float_t &nz)
+void AliITStrackerMI::GetNTeor(Int_t layer, const AliITSRecPoint* /*cl*/, Float_t theta, Float_t phi, Float_t &ny, Float_t &nz)
{
//
//get "mean shape"
-Int_t AliITStrackerMI::GetError(Int_t layer, const AliITSclusterV2*cl, Float_t theta, Float_t phi,Float_t expQ, Float_t &erry, Float_t &errz)
+Int_t AliITStrackerMI::GetError(Int_t layer, const AliITSRecPoint*cl, Float_t theta, Float_t phi,Float_t expQ, Float_t &erry, Float_t &errz)
{
//calculate cluster position error
//
//to be paramterized using external parameters in future
//
//
- sigmarfi = 0.004+1.4 *TMath::Abs(track->fP4)+332.*track->fP4*track->fP4;
- sigmaz = 0.011+4.37*TMath::Abs(track->fP4);
-
+ sigmarfi = 0.004+1.4 *TMath::Abs(track->GetC())+332.*track->GetC()*track->GetC();
+ sigmaz = 0.011+4.37*TMath::Abs(track->GetC());
}
//
Int_t entries = ClusterArray->GetEntriesFast();
if (entries<4) return;
- AliITSclusterV2* cluster = (AliITSclusterV2*)ClusterArray->At(0);
+ AliITSRecPoint* cluster = (AliITSRecPoint*)ClusterArray->At(0);
Int_t layer = cluster->GetLayer();
if (layer>1) return;
Int_t index[10000];
Float_t r = (layer>0)? 7:4;
//
for (Int_t i=0;i<entries;i++){
- AliITSclusterV2* cl0 = (AliITSclusterV2*)ClusterArray->At(i);
+ AliITSRecPoint* cl0 = (AliITSRecPoint*)ClusterArray->At(i);
Float_t nz = 1+TMath::Abs((cl0->GetZ()-vz)/r);
if (cl0->GetNy()+cl0->GetNz()<=5+2*layer+nz) continue;
index[ncandidates] = i; //candidate to belong to delta electron track
//
//
for (Int_t i=0;i<ncandidates;i++){
- AliITSclusterV2* cl0 = (AliITSclusterV2*)ClusterArray->At(index[i]);
+ AliITSRecPoint* cl0 = (AliITSRecPoint*)ClusterArray->At(index[i]);
if (cl0->GetDeltaProbability()>0.8) continue;
//
Int_t ncl = 0;
sumy=sumz=sumy2=sumyz=sumw=0.0;
for (Int_t j=0;j<ncandidates;j++){
if (i==j) continue;
- AliITSclusterV2* cl1 = (AliITSclusterV2*)ClusterArray->At(index[j]);
+ AliITSRecPoint* cl1 = (AliITSRecPoint*)ClusterArray->At(index[j]);
//
Float_t dz = cl0->GetZ()-cl1->GetZ();
Float_t dy = cl0->GetY()-cl1->GetY();
//
//
track->UpdateESDtrack(flags);
- AliITStrackMI * oldtrack = (AliITStrackMI*)(track->fESDtrack->GetITStrack());
+ AliITStrackMI * oldtrack = (AliITStrackMI*)(track->GetESDtrack()->GetITStrack());
if (oldtrack) delete oldtrack;
- track->fESDtrack->SetITStrack(new AliITStrackMI(*track));
- if (TMath::Abs(track->fDnorm[1])<0.000000001){
+ track->GetESDtrack()->SetITStrack(new AliITStrackMI(*track));
+ if (TMath::Abs(track->GetDnorm(1))<0.000000001){
printf("Problem\n");
}
}
+Int_t AliITStrackerMI::GetNearestLayer(const Double_t *xr) const{
+ //
+ //Get nearest upper layer close to the point xr.
+ // rough approximation
+ //
+ const Float_t kRadiuses[6]={4,6.5,15.03,24.,38.5,43.7};
+ Float_t radius = TMath::Sqrt(xr[0]*xr[0]+xr[1]*xr[1]);
+ Int_t res =6;
+ for (Int_t i=0;i<6;i++){
+ if (radius<kRadiuses[i]){
+ res =i;
+ break;
+ }
+ }
+ return res;
+}
+void AliITStrackerMI::UpdateTPCV0(AliESD *event){
+ //
+ //try to update, or reject TPC V0s
+ //
+ Int_t nv0s = event->GetNumberOfV0s();
+ Int_t nitstracks = fTrackHypothesys.GetEntriesFast();
+ for (Int_t i=0;i<nv0s;i++){
+ AliESDv0 * vertex = event->GetV0(i);
+ Int_t ip = vertex->GetIndex(0);
+ Int_t im = vertex->GetIndex(1);
+ //
+ TObjArray * arrayp = (ip<nitstracks) ? (TObjArray*)fTrackHypothesys.At(ip):0;
+ TObjArray * arraym = (im<nitstracks) ? (TObjArray*)fTrackHypothesys.At(im):0;
+ AliITStrackMI * trackp = (arrayp!=0) ? (AliITStrackMI*)arrayp->At(0):0;
+ AliITStrackMI * trackm = (arraym!=0) ? (AliITStrackMI*)arraym->At(0):0;
+ //
+ //
+ if (trackp){
+ if (trackp->GetNumberOfClusters()+trackp->GetNDeadZone()>5.5){
+ if (trackp->GetConstrain()&&trackp->GetChi2MIP(0)<3) vertex->SetStatus(-100);
+ if (!trackp->GetConstrain()&&trackp->GetChi2MIP(0)<2) vertex->SetStatus(-100);
+ }
+ }
+
+ if (trackm){
+ if (trackm->GetNumberOfClusters()+trackm->GetNDeadZone()>5.5){
+ if (trackm->GetConstrain()&&trackm->GetChi2MIP(0)<3) vertex->SetStatus(-100);
+ if (!trackm->GetConstrain()&&trackm->GetChi2MIP(0)<2) vertex->SetStatus(-100);
+ }
+ }
+ if (vertex->GetStatus()==-100) continue;
+ //
+ Double_t xrp[3]; vertex->GetXYZ(xrp[0],xrp[1],xrp[2]); //I.B.
+ Int_t clayer = GetNearestLayer(xrp); //I.B.
+ vertex->SetNBefore(clayer); //
+ vertex->SetChi2Before(9*clayer); //
+ vertex->SetNAfter(6-clayer); //
+ vertex->SetChi2After(0); //
+ //
+ if (clayer >1 ){ // calculate chi2 before vertex
+ Float_t chi2p = 0, chi2m=0;
+ //
+ if (trackp){
+ for (Int_t ilayer=0;ilayer<clayer;ilayer++){
+ if (trackp->GetClIndex(ilayer)>0){
+ chi2p+=trackp->GetDy(ilayer)*trackp->GetDy(ilayer)/(trackp->GetSigmaY(ilayer)*trackp->GetSigmaY(ilayer))+
+ trackp->GetDz(ilayer)*trackp->GetDz(ilayer)/(trackp->GetSigmaZ(ilayer)*trackp->GetSigmaZ(ilayer));
+ }
+ else{
+ chi2p+=9;
+ }
+ }
+ }else{
+ chi2p = 9*clayer;
+ }
+ //
+ if (trackm){
+ for (Int_t ilayer=0;ilayer<clayer;ilayer++){
+ if (trackm->GetClIndex(ilayer)>0){
+ chi2m+=trackm->GetDy(ilayer)*trackm->GetDy(ilayer)/(trackm->GetSigmaY(ilayer)*trackm->GetSigmaY(ilayer))+
+ trackm->GetDz(ilayer)*trackm->GetDz(ilayer)/(trackm->GetSigmaZ(ilayer)*trackm->GetSigmaZ(ilayer));
+ }
+ else{
+ chi2m+=9;
+ }
+ }
+ }else{
+ chi2m = 9*clayer;
+ }
+ vertex->SetChi2Before(TMath::Min(chi2p,chi2m));
+ if (TMath::Min(chi2p,chi2m)/Float_t(clayer)<4) vertex->SetStatus(-10); // track exist before vertex
+ }
+
+ if (clayer < 5 ){ // calculate chi2 after vertex
+ Float_t chi2p = 0, chi2m=0;
+ //
+ if (trackp&&TMath::Abs(trackp->GetTgl())<1.){
+ for (Int_t ilayer=clayer;ilayer<6;ilayer++){
+ if (trackp->GetClIndex(ilayer)>0){
+ chi2p+=trackp->GetDy(ilayer)*trackp->GetDy(ilayer)/(trackp->GetSigmaY(ilayer)*trackp->GetSigmaY(ilayer))+
+ trackp->GetDz(ilayer)*trackp->GetDz(ilayer)/(trackp->GetSigmaZ(ilayer)*trackp->GetSigmaZ(ilayer));
+ }
+ else{
+ chi2p+=9;
+ }
+ }
+ }else{
+ chi2p = 0;
+ }
+ //
+ if (trackm&&TMath::Abs(trackm->GetTgl())<1.){
+ for (Int_t ilayer=clayer;ilayer<6;ilayer++){
+ if (trackm->GetClIndex(ilayer)>0){
+ chi2m+=trackm->GetDy(ilayer)*trackm->GetDy(ilayer)/(trackm->GetSigmaY(ilayer)*trackm->GetSigmaY(ilayer))+
+ trackm->GetDz(ilayer)*trackm->GetDz(ilayer)/(trackm->GetSigmaZ(ilayer)*trackm->GetSigmaZ(ilayer));
+ }
+ else{
+ chi2m+=9;
+ }
+ }
+ }else{
+ chi2m = 0;
+ }
+ vertex->SetChi2After(TMath::Max(chi2p,chi2m));
+ if (TMath::Max(chi2m,chi2p)/Float_t(6-clayer)>9) vertex->SetStatus(-20); // track not found in ITS
+ }
+ }
+ //
+}
-void AliITStrackerMI::FindV0(AliESD *event)
+
+void AliITStrackerMI::FindV02(AliESD *event)
{
//
- // fast V0 finder
+ // V0 finder
//
- //TTreeSRedirector cstream("itsv0.root");
- Int_t centries=0;
- AliHelix helixes[30000];
- TObjArray trackarray(30000);
- TObjArray trackarrayc(30000);
- Float_t dist[30000];
- Float_t normdist0[30000];
- Float_t normdist1[30000];
- Float_t normdist[30000];
- Float_t norm[30000];
- AliESDV0MI *vertexarray = new AliESDV0MI[100000];
- AliESDV0MI *pvertex = &vertexarray[0];
- AliITStrackMI * dummy=0;
+ // Cuts on DCA - R dependent
+ // max distance DCA between 2 tracks cut
+ // maxDist = TMath::Min(kMaxDist,kMaxDist0+pvertex->GetRr()*kMaxDist);
//
+ const Float_t kMaxDist0 = 0.1;
+ const Float_t kMaxDist1 = 0.1;
+ const Float_t kMaxDist = 1;
+ const Float_t kMinPointAngle = 0.85;
+ const Float_t kMinPointAngle2 = 0.99;
+ const Float_t kMinR = 0.5;
+ const Float_t kMaxR = 220;
+ //const Float_t kCausality0Cut = 0.19;
+ //const Float_t kLikelihood01Cut = 0.25;
+ //const Float_t kPointAngleCut = 0.9996;
+ const Float_t kCausality0Cut = 0.19;
+ const Float_t kLikelihood01Cut = 0.45;
+ const Float_t kLikelihood1Cut = 0.5;
+ const Float_t kCombinedCut = 0.55;
+
//
- Int_t entries = fTrackHypothesys.GetEntriesFast();
- for (Int_t i=0;i<entries;i++){
- TObjArray * array = (TObjArray*)fTrackHypothesys.At(i);
- if (!array) continue;
- // get best track without vertex constrain
- Int_t hentries = array->GetEntriesFast();
+ //
+ TTreeSRedirector &cstream = *fDebugStreamer;
+ Int_t ntracks = event->GetNumberOfTracks();
+ Int_t nitstracks = fTrackHypothesys.GetEntriesFast();
+ fOriginal.Expand(ntracks);
+ fTrackHypothesys.Expand(ntracks);
+ fBestHypothesys.Expand(ntracks);
+ //
+ AliHelix * helixes = new AliHelix[ntracks+2];
+ TObjArray trackarray(ntracks+2); //array with tracks - with vertex constrain
+ TObjArray trackarrayc(ntracks+2); //array of "best tracks" - without vertex constrain
+ TObjArray trackarrayl(ntracks+2); //array of "longest tracks" - without vertex constrain
+ Bool_t * forbidden = new Bool_t [ntracks+2];
+ Int_t *itsmap = new Int_t [ntracks+2];
+ Float_t *dist = new Float_t[ntracks+2];
+ Float_t *normdist0 = new Float_t[ntracks+2];
+ Float_t *normdist1 = new Float_t[ntracks+2];
+ Float_t *normdist = new Float_t[ntracks+2];
+ Float_t *norm = new Float_t[ntracks+2];
+ Float_t *maxr = new Float_t[ntracks+2];
+ Float_t *minr = new Float_t[ntracks+2];
+ Float_t *minPointAngle= new Float_t[ntracks+2];
+ //
+ AliV0 *pvertex = new AliV0;
+ AliITStrackMI * dummy= new AliITStrackMI;
+ dummy->SetLabel(0);
+ AliITStrackMI trackat0; //temporary track for DCA calculation
+ //
+ Float_t primvertex[3]={GetX(),GetY(),GetZ()};
+ //
+ // make its - esd map
+ //
+ for (Int_t itrack=0;itrack<ntracks+2;itrack++) {
+ itsmap[itrack] = -1;
+ forbidden[itrack] = kFALSE;
+ maxr[itrack] = kMaxR;
+ minr[itrack] = kMinR;
+ minPointAngle[itrack] = kMinPointAngle;
+ }
+ for (Int_t itrack=0;itrack<nitstracks;itrack++){
+ AliITStrackMI * original = (AliITStrackMI*)(fOriginal.At(itrack));
+ Int_t esdindex = original->GetESDtrack()->GetID();
+ itsmap[esdindex] = itrack;
+ }
+ //
+ // create its tracks from esd tracks if not done before
+ //
+ for (Int_t itrack=0;itrack<ntracks;itrack++){
+ if (itsmap[itrack]>=0) continue;
+ AliITStrackMI * tpctrack = new AliITStrackMI(*(event->GetTrack(itrack)));
+ //tpctrack->fD[0] = tpctrack->GetD(GetX(),GetY());
+ //tpctrack->fD[1] = tpctrack->GetZat(GetX())-GetZ();
+ tpctrack->GetDZ(GetX(),GetY(),GetZ(),tpctrack->GetDP()); //I.B.
+ if (tpctrack->GetD(0)<20 && tpctrack->GetD(1)<20){
+ // tracks which can reach inner part of ITS
+ // propagate track to outer its volume - with correction for material
+ CorrectForDeadZoneMaterial(tpctrack);
+ }
+ itsmap[itrack] = nitstracks;
+ fOriginal.AddAt(tpctrack,nitstracks);
+ nitstracks++;
+ }
+ //
+ // fill temporary arrays
+ //
+ for (Int_t itrack=0;itrack<ntracks;itrack++){
+ AliESDtrack * esdtrack = event->GetTrack(itrack);
+ Int_t itsindex = itsmap[itrack];
+ AliITStrackMI *original = (AliITStrackMI*)fOriginal.At(itsmap[itrack]);
+ if (!original) continue;
+ AliITStrackMI *bestConst = 0;
+ AliITStrackMI *bestLong = 0;
+ AliITStrackMI *best = 0;
+ //
//
- // best with vertex constrain
- AliITStrackMI * trackc = (AliITStrackMI*)array->At(0);
- if (trackc&&trackc->fConstrain&&trackc->fN==6&&trackc->fNormChi2[0]<2.) continue;
- trackc=0;
+ TObjArray * array = (TObjArray*) fTrackHypothesys.At(itsindex);
+ Int_t hentries = (array==0) ? 0 : array->GetEntriesFast();
+ // Get best track with vertex constrain
for (Int_t ih=0;ih<hentries;ih++){
AliITStrackMI * trackh = (AliITStrackMI*)array->At(ih);
- if (!trackh->fConstrain) continue;
- if (trackh->fN<6) continue;
- trackc = trackh;
- if (!dummy) dummy = trackc;
- dummy->SetLabel(0);
+ if (!trackh->GetConstrain()) continue;
+ if (!bestConst) bestConst = trackh;
+ if (trackh->GetNumberOfClusters()>5.0){
+ bestConst = trackh; // full track - with minimal chi2
+ break;
+ }
+ if (trackh->GetNumberOfClusters()+trackh->GetNDeadZone()<=bestConst->GetNumberOfClusters()+bestConst->GetNDeadZone()) continue;
+ bestConst = trackh;
break;
- }
- //
- // best without vertex
- AliITStrackMI * track = 0;
+ }
+ // Get best long track without vertex constrain and best track without vertex constrain
for (Int_t ih=0;ih<hentries;ih++){
AliITStrackMI * trackh = (AliITStrackMI*)array->At(ih);
- if (trackh->fConstrain) continue;
- track = trackh;
- break;
+ if (trackh->GetConstrain()) continue;
+ if (!best) best = trackh;
+ if (!bestLong) bestLong = trackh;
+ if (trackh->GetNumberOfClusters()>5.0){
+ bestLong = trackh; // full track - with minimal chi2
+ break;
+ }
+ if (trackh->GetNumberOfClusters()+trackh->GetNDeadZone()<=bestLong->GetNumberOfClusters()+bestLong->GetNDeadZone()) continue;
+ bestLong = trackh;
}
- if (trackc&&track){
- if (trackc->fChi2MIP[1]<2.) continue;
- if (trackc->fChi2MIP[0]<2. && trackc->fChi2MIP[1]<2.) continue;
- trackarrayc.AddAt(trackc,i);
- if (trackc->fN==6&&track->fN&&trackc->fNormChi2[0] < track->fNormChi2[0]-2) continue;
+ if (!best) {
+ best = original;
+ bestLong = original;
}
+ //I.B. trackat0 = *bestLong;
+ new (&trackat0) AliITStrackMI(*bestLong);
+ Double_t xx,yy,zz,alpha;
+ bestLong->GetGlobalXYZat(bestLong->GetX(),xx,yy,zz);
+ alpha = TMath::ATan2(yy,xx);
+ trackat0.Propagate(alpha,0);
+ // calculate normalized distances to the vertex
//
+ Float_t ptfac = (1.+100.*TMath::Abs(trackat0.GetC()));
+ if ( bestLong->GetNumberOfClusters()>3 ){
+ dist[itsindex] = trackat0.GetY();
+ norm[itsindex] = ptfac*TMath::Sqrt(trackat0.GetSigmaY2());
+ normdist0[itsindex] = TMath::Abs(trackat0.GetY()/norm[itsindex]);
+ normdist1[itsindex] = TMath::Abs((trackat0.GetZ()-primvertex[2])/(ptfac*TMath::Sqrt(trackat0.GetSigmaZ2())));
+ normdist[itsindex] = TMath::Sqrt(normdist0[itsindex]*normdist0[itsindex]+normdist1[itsindex]*normdist1[itsindex]);
+ if (!bestConst){
+ if (bestLong->GetNumberOfClusters()+bestLong->GetNDeadZone()<6) normdist[itsindex]*=2.;
+ if (bestLong->GetNumberOfClusters()+bestLong->GetNDeadZone()<5) normdist[itsindex]*=2.;
+ if (bestLong->GetNumberOfClusters()+bestLong->GetNDeadZone()<4) normdist[itsindex]*=2.;
+ }else{
+ if (bestConst->GetNumberOfClusters()+bestConst->GetNDeadZone()<6) normdist[itsindex]*=1.5;
+ if (bestConst->GetNumberOfClusters()+bestConst->GetNDeadZone()<5) normdist[itsindex]*=1.5;
+ }
+ }
+ else{
+ if (bestConst&&bestConst->GetNumberOfClusters()+bestConst->GetNDeadZone()>4.5){
+ dist[itsindex] = bestConst->GetD(0);
+ norm[itsindex] = bestConst->GetDnorm(0);
+ normdist0[itsindex] = TMath::Abs(bestConst->GetD(0)/norm[itsindex]);
+ normdist1[itsindex] = TMath::Abs(bestConst->GetD(0)/norm[itsindex]);
+ normdist[itsindex] = TMath::Sqrt(normdist0[itsindex]*normdist0[itsindex]+normdist1[itsindex]*normdist1[itsindex]);
+ }else{
+ dist[itsindex] = trackat0.GetY();
+ norm[itsindex] = ptfac*TMath::Sqrt(trackat0.GetSigmaY2());
+ normdist0[itsindex] = TMath::Abs(trackat0.GetY()/norm[itsindex]);
+ normdist1[itsindex] = TMath::Abs((trackat0.GetZ()-primvertex[2])/(ptfac*TMath::Sqrt(trackat0.GetSigmaZ2())));
+ normdist[itsindex] = TMath::Sqrt(normdist0[itsindex]*normdist0[itsindex]+normdist1[itsindex]*normdist1[itsindex]);
+ if (TMath::Abs(trackat0.GetTgl())>1.05){
+ if (normdist[itsindex]<3) forbidden[itsindex]=kTRUE;
+ if (normdist[itsindex]>3) {
+ minr[itsindex] = TMath::Max(Float_t(40.),minr[itsindex]);
+ }
+ }
+ }
+ }
//
+ //-----------------------------------------------------------
+ //Forbid primary track candidates -
//
- if (track){
- dist[i] = TMath::Sqrt(track->fD[0]*track->fD[0]+track->fD[1]*track->fD[1]);
- norm[i] = track->fDnorm[0];
- normdist0[i] = TMath::Abs(track->fD[0]/track->fDnorm[0]);
- normdist1[i] = TMath::Abs(track->fD[1]/track->fDnorm[1]);
- normdist[i] = TMath::Sqrt(normdist0[i]*normdist0[i]+normdist1[i]*normdist1[i]);
- if (track->IsGoldPrimary()) continue; //primary track
- if (track->fD[0]<0.02 && (track->fN+track->fNDeadZone>5.8)){
- if (normdist[i]<3.) continue; // primary track - cutoff 3 sigma
- if (normdist0[i]<2.) continue; //DCA normalized cut 2 sigma
+ //treetr->SetAlias("forbidden0","Tr0.fN<4&&Tr1.fN+Tr1.fNDeadZone>4.5");
+ //treetr->SetAlias("forbidden1","ND<3&&Tr1.fN+Tr1.fNDeadZone>5.5");
+ //treetr->SetAlias("forbidden2","ND<2&&Tr1.fClIndex[0]>0&&Tr1.fClIndex[0]>0");
+ //treetr->SetAlias("forbidden3","ND<1&&Tr1.fClIndex[0]>0");
+ //treetr->SetAlias("forbidden4","ND<4&&Tr1.fNormChi2[0]<2");
+ //treetr->SetAlias("forbidden5","ND<5&&Tr1.fNormChi2[0]<1");
+ //-----------------------------------------------------------
+ if (bestConst){
+ if (bestLong->GetNumberOfClusters()<4 && bestConst->GetNumberOfClusters()+bestConst->GetNDeadZone()>4.5) forbidden[itsindex]=kTRUE;
+ if (normdist[itsindex]<3 && bestConst->GetNumberOfClusters()+bestConst->GetNDeadZone()>5.5) forbidden[itsindex]=kTRUE;
+ if (normdist[itsindex]<2 && bestConst->GetClIndex(0)>0 && bestConst->GetClIndex(1)>0 ) forbidden[itsindex]=kTRUE;
+ if (normdist[itsindex]<1 && bestConst->GetClIndex(0)>0) forbidden[itsindex]=kTRUE;
+ if (normdist[itsindex]<4 && bestConst->GetNormChi2(0)<2) forbidden[itsindex]=kTRUE;
+ if (normdist[itsindex]<5 && bestConst->GetNormChi2(0)<1) forbidden[itsindex]=kTRUE;
+ if (bestConst->GetNormChi2(0)<2.5) {
+ minPointAngle[itsindex]= 0.9999;
+ maxr[itsindex] = 10;
}
- trackarray.AddAt(track,i);
- new (&helixes[i]) AliHelix(*track);
}
+ //
+ //forbid daughter kink candidates
+ //
+ if (esdtrack->GetKinkIndex(0)>0) forbidden[itsindex] = kTRUE;
+ Bool_t isElectron = kTRUE;
+ Bool_t isProton = kTRUE;
+ Double_t pid[5];
+ esdtrack->GetESDpid(pid);
+ for (Int_t i=1;i<5;i++){
+ if (pid[0]<pid[i]) isElectron= kFALSE;
+ if (pid[4]<pid[i]) isProton= kFALSE;
+ }
+ if (isElectron){
+ forbidden[itsindex]=kFALSE;
+ normdist[itsindex]*=-1;
+ }
+ if (isProton){
+ if (normdist[itsindex]>2) forbidden[itsindex]=kFALSE;
+ normdist[itsindex]*=-1;
+ }
+
+ //
+ // Causality cuts in TPC volume
+ //
+ if (esdtrack->GetTPCdensity(0,10) >0.6) maxr[itsindex] = TMath::Min(Float_t(110),maxr[itsindex]);
+ if (esdtrack->GetTPCdensity(10,30)>0.6) maxr[itsindex] = TMath::Min(Float_t(120),maxr[itsindex]);
+ if (esdtrack->GetTPCdensity(20,40)>0.6) maxr[itsindex] = TMath::Min(Float_t(130),maxr[itsindex]);
+ if (esdtrack->GetTPCdensity(30,50)>0.6) maxr[itsindex] = TMath::Min(Float_t(140),maxr[itsindex]);
+ //
+ if (esdtrack->GetTPCdensity(0,60)<0.4&&bestLong->GetNumberOfClusters()<3) minr[itsindex]=100;
+ //
+ //
+ if (kFALSE){
+ cstream<<"Track"<<
+ "Tr0.="<<best<<
+ "Tr1.="<<((bestConst)? bestConst:dummy)<<
+ "Tr2.="<<bestLong<<
+ "Tr3.="<<&trackat0<<
+ "Esd.="<<esdtrack<<
+ "Dist="<<dist[itsindex]<<
+ "ND0="<<normdist0[itsindex]<<
+ "ND1="<<normdist1[itsindex]<<
+ "ND="<<normdist[itsindex]<<
+ "Pz="<<primvertex[2]<<
+ "Forbid="<<forbidden[itsindex]<<
+ "\n";
+ //
+ }
+ trackarray.AddAt(best,itsindex);
+ trackarrayc.AddAt(bestConst,itsindex);
+ trackarrayl.AddAt(bestLong,itsindex);
+ new (&helixes[itsindex]) AliHelix(*best);
}
//
//
- // Int_t multifound=0;
- Int_t vertexall =0;
- AliESDV0MI tempvertex;
- Float_t primvertex[3]={GetX(),GetY(),GetZ()};
-
-
- for (Int_t itrack0=0;itrack0<entries;itrack0++){
- //
- AliITStrackMI * track0 = (AliITStrackMI*)trackarray.At(itrack0);
- if (!track0) continue;
- if (track0->fP4>0) continue;
+ //
+ // first iterration of V0 finder
+ //
+ for (Int_t iesd0=0;iesd0<ntracks;iesd0++){
+ Int_t itrack0 = itsmap[iesd0];
+ if (forbidden[itrack0]) continue;
+ AliITStrackMI * btrack0 = (AliITStrackMI*)trackarray.At(itrack0);
+ if (!btrack0) continue;
+ if (btrack0->GetSign()>0) continue;
AliITStrackMI *trackc0 = (AliITStrackMI*)trackarrayc.At(itrack0);
//
- TObjArray * array0 = (TObjArray*)fTrackHypothesys.At(itrack0);
- //
- Int_t vertexes =0;
- for (Int_t itrack1=0;itrack1<entries;itrack1++){
- AliITStrackMI * track1 = (AliITStrackMI*)trackarray.At(itrack1);
- if (!track1) continue;
- if (track1->fP4<0) continue;
- AliITStrackMI *trackc1 = (AliITStrackMI*)trackarrayc.At(itrack1);
- if (trackc0&&trackc1){
- if (TMath::Min(trackc0->fChi2MIP[1],trackc1->fChi2MIP[1])<2.) continue;
+ for (Int_t iesd1=0;iesd1<ntracks;iesd1++){
+ Int_t itrack1 = itsmap[iesd1];
+ if (forbidden[itrack1]) continue;
+
+ AliITStrackMI * btrack1 = (AliITStrackMI*)trackarray.At(itrack1);
+ if (!btrack1) continue;
+ if (btrack1->GetSign()<0) continue;
+ Bool_t isGold = kFALSE;
+ if (TMath::Abs(TMath::Abs(btrack0->GetLabel())-TMath::Abs(btrack1->GetLabel()))==1){
+ isGold = kTRUE;
}
- if (track1->fNDeadZone+track0->fNDeadZone>1.1) continue;
- TObjArray * array1 = (TObjArray*)fTrackHypothesys.At(itrack1);
- //
- //if (normdist0[itrack0]+normdist0[itrack1]<3) continue;
- //if (normdist[itrack0]+normdist[itrack1]<4) continue;
- //
+ AliITStrackMI *trackc1 = (AliITStrackMI*)trackarrayc.At(itrack1);
+ AliHelix &h1 = helixes[itrack0];
+ AliHelix &h2 = helixes[itrack1];
//
- AliHelix *h1 = &helixes[itrack0];
- AliHelix *h2 = &helixes[itrack1];
+ // find linear distance
Double_t rmin =0;
- Double_t distance = TestV0(h1,h2,pvertex,rmin);
//
- if (distance>0.4) continue;
- if (pvertex->GetRr()<0.3) continue;
- if (pvertex->GetRr()>20.) continue;
- pvertex->SetM(*track0);
- pvertex->SetP(*track1);
- pvertex->Update(primvertex);
- if (pvertex->GetRr()<0.3) continue;
- if (pvertex->GetRr()>20.) continue;
- if (track1->fNDeadZone+track0->fNDeadZone>0.5 &&distance>0.12) continue;
-
//
-
- if ( TMath::Abs((TMath::Abs(track0->GetLabel())-TMath::Abs(track1->GetLabel())))<2
- ||(centries<5000&&(pvertex->GetPointAngle()>0.95))){
- //cstream<<"Iter0"<<track0<<track1<<pvertex<<normdist[itrack0]<<normdist[itrack1]<<"\n";
- centries++;
+ //
+ Double_t phase[2][2],radius[2];
+ Int_t points = h1.GetRPHIintersections(h2, phase, radius);
+ if (points==0) continue;
+ Double_t delta[2]={1000000,1000000};
+ rmin = radius[0];
+ h1.ParabolicDCA(h2,phase[0][0],phase[0][1],radius[0],delta[0]);
+ if (points==2){
+ if (radius[1]<rmin) rmin = radius[1];
+ h1.ParabolicDCA(h2,phase[1][0],phase[1][1],radius[1],delta[1]);
}
+ rmin = TMath::Sqrt(rmin);
+ Double_t distance = 0;
+ Double_t radiusC = 0;
+ Int_t iphase = 0;
+ if (points==1 || delta[0]<delta[1]){
+ distance = TMath::Sqrt(delta[0]);
+ radiusC = TMath::Sqrt(radius[0]);
+ }else{
+ distance = TMath::Sqrt(delta[1]);
+ radiusC = TMath::Sqrt(radius[1]);
+ iphase=1;
+ }
+ if (radiusC<TMath::Max(minr[itrack0],minr[itrack1])) continue;
+ if (radiusC>TMath::Min(maxr[itrack0],maxr[itrack1])) continue;
+ Float_t maxDist = TMath::Min(kMaxDist,Float_t(kMaxDist0+radiusC*kMaxDist1));
+ if (distance>maxDist) continue;
+ Float_t pointAngle = h1.GetPointAngle(h2,phase[iphase],primvertex);
+ if (pointAngle<TMath::Max(minPointAngle[itrack0],minPointAngle[itrack1])) continue;
+ //
//
+ // Double_t distance = TestV0(h1,h2,pvertex,rmin);
//
- if (pvertex->GetPointAngle()<0.85) continue;
- // if (normdist[itrack0]+normdist[itrack1]<6&&pvertex->GetPointAngle()<0.99) continue;
+ // if (distance>maxDist) continue;
+ // if (pvertex->GetRr()<kMinR) continue;
+ // if (pvertex->GetRr()>kMaxR) continue;
+ AliITStrackMI * track0=btrack0;
+ AliITStrackMI * track1=btrack1;
+ // if (pvertex->GetRr()<3.5){
+ if (radiusC<3.5){
+ //use longest tracks inside the pipe
+ track0 = (AliITStrackMI*)trackarrayl.At(itrack0);
+ track1 = (AliITStrackMI*)trackarrayl.At(itrack1);
+ }
//
//
- pvertex->SetLab(0,track0->GetLabel());
- pvertex->SetLab(1,track1->GetLabel());
+ pvertex->SetParamN(*track0);
+ pvertex->SetParamP(*track1);
+ pvertex->Update(primvertex);
+ pvertex->SetClusters(track0->ClIndex(),track1->ClIndex()); // register clusters
+
+ if (pvertex->GetRr()<kMinR) continue;
+ if (pvertex->GetRr()>kMaxR) continue;
+ if (pvertex->GetV0CosineOfPointingAngle()<kMinPointAngle) continue;
+//Bo: if (pvertex->GetDist2()>maxDist) continue;
+ if (pvertex->GetDcaV0Daughters()>maxDist) continue;
+//Bo: pvertex->SetLab(0,track0->GetLabel());
+//Bo: pvertex->SetLab(1,track1->GetLabel());
pvertex->SetIndex(0,track0->GetESDtrack()->GetID());
pvertex->SetIndex(1,track1->GetESDtrack()->GetID());
- // calculate chi2s
+ //
+ AliITStrackMI * htrackc0 = trackc0 ? trackc0:dummy;
+ AliITStrackMI * htrackc1 = trackc1 ? trackc1:dummy;
+
+ //
+ //
+ TObjArray * array0b = (TObjArray*)fBestHypothesys.At(itrack0);
+ if (!array0b&&pvertex->GetRr()<40 && TMath::Abs(track0->GetTgl())<1.1)
+ FollowProlongationTree((AliITStrackMI*)fOriginal.At(itrack0),itrack0, kFALSE);
+ TObjArray * array1b = (TObjArray*)fBestHypothesys.At(itrack1);
+ if (!array1b&&pvertex->GetRr()<40 && TMath::Abs(track1->GetTgl())<1.1)
+ FollowProlongationTree((AliITStrackMI*)fOriginal.At(itrack1),itrack1, kFALSE);
//
- pvertex->SetChi2After(0);
- pvertex->SetChi2Before(0);
- pvertex->SetNBefore(0);
- pvertex->SetNAfter(0);
+ AliITStrackMI * track0b = (AliITStrackMI*)fOriginal.At(itrack0);
+ AliITStrackMI * track1b = (AliITStrackMI*)fOriginal.At(itrack1);
+ AliITStrackMI * track0l = (AliITStrackMI*)fOriginal.At(itrack0);
+ AliITStrackMI * track1l = (AliITStrackMI*)fOriginal.At(itrack1);
- for (Int_t i=0;i<6;i++){
- Float_t radius = fgLayers[i].GetR();
- if (pvertex->GetRr()>radius+0.5){
- pvertex->SetNBefore(pvertex->GetNBefore()+2.);
- //
- if (track0->fClIndex[i]<=0) {
- pvertex->SetChi2Before(pvertex->GetChi2Before()+9);
- }else{
- Float_t chi2 = track0->fDy[i]*track0->fDy[i]/(track0->fSigmaY[i]*track0->fSigmaY[i])+
- track0->fDz[i]*track0->fDz[i]/(track0->fSigmaZ[i]*track0->fSigmaZ[i]);
- pvertex->SetChi2Before(pvertex->GetChi2Before()+chi2);
- }
-
- if (track1->fClIndex[i]<=0) {
- pvertex->SetChi2Before(pvertex->GetChi2Before()+9);
-
- }else{
- Float_t chi2 = track1->fDy[i]*track1->fDy[i]/(track1->fSigmaY[i]*track1->fSigmaY[i])+
- track1->fDz[i]*track1->fDz[i]/(track1->fSigmaZ[i]*track1->fSigmaZ[i]);
- // pvertex->fChi2Before+=chi2;
- pvertex->SetChi2Before(pvertex->GetChi2Before()+chi2);
+ Float_t minchi2before0=16;
+ Float_t minchi2before1=16;
+ Float_t minchi2after0 =16;
+ Float_t minchi2after1 =16;
+ Double_t xrp[3]; pvertex->GetXYZ(xrp[0],xrp[1],xrp[2]); //I.B.
+ Int_t maxLayer = GetNearestLayer(xrp); //I.B.
+
+ if (array0b) for (Int_t i=0;i<5;i++){
+ // best track after vertex
+ AliITStrackMI * btrack = (AliITStrackMI*)array0b->At(i);
+ if (!btrack) continue;
+ if (btrack->GetNumberOfClusters()>track0l->GetNumberOfClusters()) track0l = btrack;
+ // if (btrack->fX<pvertex->GetRr()-2.-0.5/(0.1+pvertex->GetAnglep()[2])) {
+ if (btrack->GetX()<pvertex->GetRr()-2.) {
+ if ( (maxLayer>i+2|| (i==0)) && btrack->GetNumberOfClusters()==(6-i)&&i<3){
+ Float_t sumchi2= 0;
+ Float_t sumn = 0;
+ if (maxLayer<3){ // take prim vertex as additional measurement
+ if (normdist[itrack0]>0 && htrackc0){
+ sumchi2 += TMath::Min((3.-maxLayer)*normdist[itrack0]*normdist[itrack0],16.);
+ }else{
+ sumchi2 += TMath::Min((3.-maxLayer)*(3*normdist[itrack0]*normdist[itrack0]+3.),16.);
+ }
+ sumn += 3-maxLayer;
+ }
+ for (Int_t ilayer=i;ilayer<maxLayer;ilayer++){
+ sumn+=1.;
+ if (!btrack->GetClIndex(ilayer)){
+ sumchi2+=25;
+ continue;
+ }else{
+ Int_t c=( btrack->GetClIndex(ilayer) & 0x0fffffff);
+ for (Int_t itrack=0;itrack<4;itrack++){
+ if (fgLayers[ilayer].GetClusterTracks(itrack,c)>=0 && fgLayers[ilayer].GetClusterTracks(itrack,c)!=itrack0){
+ sumchi2+=18.; //shared cluster
+ break;
+ }
+ }
+ sumchi2+=btrack->GetDy(ilayer)*btrack->GetDy(ilayer)/(btrack->GetSigmaY(ilayer)*btrack->GetSigmaY(ilayer));
+ sumchi2+=btrack->GetDz(ilayer)*btrack->GetDz(ilayer)/(btrack->GetSigmaZ(ilayer)*btrack->GetSigmaZ(ilayer));
+ }
+ }
+ sumchi2/=sumn;
+ if (sumchi2<minchi2before0) minchi2before0=sumchi2;
}
+ continue; //safety space - Geo manager will give exact layer
}
-
- if (pvertex->GetRr()<radius-0.5){
- pvertex->SetNAfter(pvertex->GetNAfter()+2.);
- //
- if (track0->fClIndex[i]<=0) {
- pvertex->SetChi2After(pvertex->GetChi2After()+9);
- }else{
- Float_t chi2 = track0->fDy[i]*track0->fDy[i]/(track0->fSigmaY[i]*track0->fSigmaY[i])+
- track0->fDz[i]*track0->fDz[i]/(track0->fSigmaZ[i]*track0->fSigmaZ[i]);
- pvertex->SetChi2After(pvertex->GetChi2After()+chi2);
- }
-
- if (track1->fClIndex[i]<=0) {
- pvertex->SetChi2After(pvertex->GetChi2After()+9.);
- }else{
- Float_t chi2 = track1->fDy[i]*track1->fDy[i]/(track1->fSigmaY[i]*track1->fSigmaY[i])+
- track1->fDz[i]*track1->fDz[i]/(track1->fSigmaZ[i]*track1->fSigmaZ[i]);
- pvertex->SetChi2After(pvertex->GetChi2After()+chi2);
+ track0b = btrack;
+ minchi2after0 = btrack->GetNormChi2(i);
+ break;
+ }
+ if (array1b) for (Int_t i=0;i<5;i++){
+ // best track after vertex
+ AliITStrackMI * btrack = (AliITStrackMI*)array1b->At(i);
+ if (!btrack) continue;
+ if (btrack->GetNumberOfClusters()>track1l->GetNumberOfClusters()) track1l = btrack;
+ // if (btrack->fX<pvertex->GetRr()-2-0.5/(0.1+pvertex->GetAnglep()[2])){
+ if (btrack->GetX()<pvertex->GetRr()-2){
+ if ((maxLayer>i+2 || (i==0))&&btrack->GetNumberOfClusters()==(6-i)&&(i<3)){
+ Float_t sumchi2= 0;
+ Float_t sumn = 0;
+ if (maxLayer<3){ // take prim vertex as additional measurement
+ if (normdist[itrack1]>0 && htrackc1){
+ sumchi2 += TMath::Min((3.-maxLayer)*normdist[itrack1]*normdist[itrack1],16.);
+ }else{
+ sumchi2 += TMath::Min((3.-maxLayer)*(3*normdist[itrack1]*normdist[itrack1]+3.),16.);
+ }
+ sumn += 3-maxLayer;
+ }
+ for (Int_t ilayer=i;ilayer<maxLayer;ilayer++){
+ sumn+=1.;
+ if (!btrack->GetClIndex(ilayer)){
+ sumchi2+=30;
+ continue;
+ }else{
+ Int_t c=( btrack->GetClIndex(ilayer) & 0x0fffffff);
+ for (Int_t itrack=0;itrack<4;itrack++){
+ if (fgLayers[ilayer].GetClusterTracks(itrack,c)>=0 && fgLayers[ilayer].GetClusterTracks(itrack,c)!=itrack1){
+ sumchi2+=18.; //shared cluster
+ break;
+ }
+ }
+ sumchi2+=btrack->GetDy(ilayer)*btrack->GetDy(ilayer)/(btrack->GetSigmaY(ilayer)*btrack->GetSigmaY(ilayer));
+ sumchi2+=btrack->GetDz(ilayer)*btrack->GetDz(ilayer)/(btrack->GetSigmaZ(ilayer)*btrack->GetSigmaZ(ilayer));
+ }
+ }
+ sumchi2/=sumn;
+ if (sumchi2<minchi2before1) minchi2before1=sumchi2;
}
+ continue; //safety space - Geo manager will give exact layer
}
+ track1b = btrack;
+ minchi2after1 = btrack->GetNormChi2(i);
+ break;
}
- if (pvertex->GetNBefore()>2){
- if (pvertex->GetChi2Before()/pvertex->GetNBefore()<4.) continue; //have clusters before vetex
- }
- Int_t ibest0=0,ibest1=0;
- AliITStrackMI * ntrack0 = track0;
- AliITStrackMI * ntrack1 = track1;
- //
- //
- //PH Float_t oldistance = pvertex->GetDist2();
- Bool_t improve = FindBestPair(itrack0,itrack1,pvertex,ibest0,ibest1); // try to improve vertex
- if (pvertex->GetPointAngle()<0.5) continue;
- distance = pvertex->GetDist2();
- if (improve){
- ntrack0 = (AliITStrackMI*)array0->At(ibest0);
- ntrack1 = (AliITStrackMI*)array1->At(ibest1);
- }
- Bool_t accept0 = kFALSE; // accept ==> because of pointing angle
- if (pvertex->GetPointAngle()>0.999){
- if (pvertex->GetRr()<3.5 && (ntrack0->fN+ntrack0->fNDeadZone+ntrack1->fN+ntrack1->fNDeadZone)<11.5) continue;
- if (pvertex->GetRr()>3.5&& pvertex->GetDistNorm()<12) accept0 = kTRUE;
- if (pvertex->GetRr()>1 && pvertex->GetDist2()<0.1 && pvertex->GetDistNorm()<12) accept0 = kTRUE;
- if (pvertex->GetPointAngle()>0.9995&&pvertex->GetRr()>5.) accept0 = kTRUE;
- }
- Bool_t reject1= kFALSE; // reject ==> bad kinematic
//
- reject1 |= TMath::Abs(ntrack0->fN+ntrack0->fNDeadZone-ntrack1->fN-ntrack1->fNDeadZone)>1.02 ||
- TMath::Abs(ntrack0->fN-ntrack1->fN)>1.02; // cut1
- reject1 |= ntrack0->fNUsed+ntrack1->fNUsed>1.01; // cut2
- reject1 |= pvertex->GetDistNorm()>12; // cut3
- reject1 |= pvertex->GetDist2()>0.1 && improve; // cut4
- reject1 |= (TMath::Abs(ntrack0->fD[0])+TMath::Abs(ntrack1->fD[0]))/pvertex->GetDist2()<5; //cut5
- reject1 |= TMath::Abs(ntrack0->fD[0]/pvertex->GetDist2())<2 || TMath::Abs(ntrack1->fD[0]/pvertex->GetDist2())<2; //cut 6
- //
- // small radii cuts
- Bool_t reject2 = kFALSE;
- if (pvertex->GetRr()<3.6){
- reject2 |= (TMath::Abs(ntrack0->fN+ntrack0->fNDeadZone-ntrack1->fN-ntrack1->fNDeadZone)>0.01); // cut7
- reject2 |= ntrack0->fNUsed+ntrack1->fNUsed>0.01; // cut8
- reject2 |= ntrack0->fN+ntrack0->fNDeadZone+ntrack1->fN+ntrack1->fNDeadZone<11.5; // cut9
- reject2 |= (ntrack0->fN+ntrack1->fN<11.5)&&pvertex->GetRr()<2; // cut10
- reject2 |= pvertex->GetDist2()>0.1; // cut11
- }
- //PH AliITStrackMI * htrackc0 = trackc0 ? trackc0:dummy;
- //PH AliITStrackMI * htrackc1 = trackc1 ? trackc1:dummy;
- //
- //
- //
- if ( TMath::Abs((TMath::Abs(track0->GetLabel())-TMath::Abs(track1->GetLabel())))<2
- ||(centries<500000)){
- /*
- cstream<<"It1"<<"Tr0.="<<ntrack0<<"TR1.="<<ntrack1<<"V0.="<<pvertex<<"ND0.="<<normdist[itrack0]<<"ND1.="<<
- normdist[itrack1]<<"D.="<<distance<<"DistOld="<<oldistance<<"Imp.="<<improve<<
- "A0="<<accept0<<"R1="<<reject1<<"R2="<<reject2<<"Rmin.="<<rmin<<
- "TrC0.="<<htrackc0<<"TRC1.="<<htrackc1<<"\n";
- */
- centries++;
+ // position resolution - used for DCA cut
+ Float_t sigmad = track0b->GetSigmaY2()+track0b->GetSigmaZ2()+track1b->GetSigmaY2()+track1b->GetSigmaZ2()+
+ (track0b->GetX()-pvertex->GetRr())*(track0b->GetX()-pvertex->GetRr())*(track0b->GetSigmaSnp2()+track0b->GetSigmaTgl2())+
+ (track1b->GetX()-pvertex->GetRr())*(track1b->GetX()-pvertex->GetRr())*(track1b->GetSigmaSnp2()+track1b->GetSigmaTgl2());
+ sigmad =TMath::Sqrt(sigmad)+0.04;
+ if (pvertex->GetRr()>50){
+ Double_t cov0[15],cov1[15];
+ track0b->GetESDtrack()->GetInnerExternalCovariance(cov0);
+ track1b->GetESDtrack()->GetInnerExternalCovariance(cov1);
+ sigmad = cov0[0]+cov0[2]+cov1[0]+cov1[2]+
+ (80.-pvertex->GetRr())*(80.-pvertex->GetRr())*(cov0[5]+cov0[9])+
+ (80.-pvertex->GetRr())*(80.-pvertex->GetRr())*(cov1[5]+cov1[9]);
+ sigmad =TMath::Sqrt(sigmad)+0.05;
}
-
- if (!accept0 && (reject1 || reject2)) continue;
-
-// if (distance>0.5) continue;
-// distance = pvertex->GetDist2();
-// if (pvertex->GetRr()>25 || pvertex->GetRr()<0.2) continue;
-// if (pvertex->GetRr()/pvertex->fDistSigma<1) continue;
-// if (pvertex->GetDistNorm()>10) continue;
-// if (pvertex->GetPointAngle()<0.85) continue;
-// if ((normdist[itrack0]<3||normdist[itrack1]<3)){
-// if (pvertex->GetPointAngle()<0.99||pvertex->GetDist2()>0.15) continue;
-// }
-// if (distance>0.05*(0.8+0.2*(0.5+pvertex->GetRr()))) continue;
-// if (pvertex->GetRr()<0.3) continue;
-// if (pvertex->GetRr()>27.) continue;
-
-
-
+ //
+ AliV0 vertex2;
+ vertex2.SetParamN(*track0b);
+ vertex2.SetParamP(*track1b);
+ vertex2.Update(primvertex);
+ //Bo: if (vertex2.GetDist2()<=pvertex->GetDist2()&&(vertex2.GetV0CosineOfPointingAngle()>=pvertex->GetV0CosineOfPointingAngle())){
+ if (vertex2.GetDcaV0Daughters()<=pvertex->GetDcaV0Daughters()&&(vertex2.GetV0CosineOfPointingAngle()>=pvertex->GetV0CosineOfPointingAngle())){
+ pvertex->SetParamN(*track0b);
+ pvertex->SetParamP(*track1b);
+ pvertex->Update(primvertex);
+ pvertex->SetClusters(track0b->ClIndex(),track1b->ClIndex()); // register clusters
+ pvertex->SetIndex(0,track0->GetESDtrack()->GetID());
+ pvertex->SetIndex(1,track1->GetESDtrack()->GetID());
+ }
+ pvertex->SetDistSigma(sigmad);
+ //Bo: pvertex->SetDistNorm(pvertex->GetDist2()/sigmad);
+ pvertex->SetNormDCAPrim(normdist[itrack0],normdist[itrack1]);
//
- if (distance<0.3 &&pvertex->GetPointAngle()>0.998){
- track0->fGoldV0 = kTRUE;
- track1->fGoldV0 = kTRUE;
+ // define likelihhod and causalities
+ //
+ Float_t pa0=1, pa1=1, pb0=0.26, pb1=0.26;
+ if (maxLayer<1){
+ Float_t fnorm0 = normdist[itrack0];
+ if (fnorm0<0) fnorm0*=-3;
+ Float_t fnorm1 = normdist[itrack1];
+ if (fnorm1<0) fnorm1*=-3;
+ if (pvertex->GetAnglep()[2]>0.1 || (pvertex->GetRr()<10.5)&& pvertex->GetAnglep()[2]>0.05 || pvertex->GetRr()<3){
+ pb0 = TMath::Exp(-TMath::Min(fnorm0,Float_t(16.))/12.);
+ pb1 = TMath::Exp(-TMath::Min(fnorm1,Float_t(16.))/12.);
+ }
+ pvertex->SetChi2Before(normdist[itrack0]);
+ pvertex->SetChi2After(normdist[itrack1]);
+ pvertex->SetNAfter(0);
+ pvertex->SetNBefore(0);
+ }else{
+ pvertex->SetChi2Before(minchi2before0);
+ pvertex->SetChi2After(minchi2before1);
+ if (pvertex->GetAnglep()[2]>0.1 || ( pvertex->GetRr()<10.5 && pvertex->GetAnglep()[2]>0.05) || pvertex->GetRr()<3){
+ pb0 = TMath::Exp(-TMath::Min(minchi2before0,Float_t(16))/12.);
+ pb1 = TMath::Exp(-TMath::Min(minchi2before1,Float_t(16))/12.);
+ }
+ pvertex->SetNAfter(maxLayer);
+ pvertex->SetNBefore(maxLayer);
}
- vertexes++;
- vertexall++;
- if (vertexall>=100000) break;
- pvertex = &vertexarray[vertexall];
- }
- }
- // printf("\n\n\nMultifound\t%d\n\n\n",multifound);
- //
- // sort vertices according quality
- Float_t quality[40000];
- Int_t indexes[40000];
- Int_t trackvertices[40000];
- for (Int_t i=0;i<entries;i++) trackvertices[i]=0;
- for (Int_t i=0;i<vertexall;i++) {
- Float_t norm = 1.-0.999*TMath::Abs(vertexarray[i].GetPointAngle());
- Float_t fnormdist = 1./(1+vertexarray[i].GetRr());
- quality[i] = norm*fnormdist;
- }
- //
- TMath::Sort(vertexall,quality,indexes,kFALSE);
-
- for (Int_t i=0;i<vertexall;i++){
- pvertex= &vertexarray[indexes[i]];
- Int_t index0 = vertexarray[indexes[i]].GetIndex(0);
- Int_t index1 = vertexarray[indexes[i]].GetIndex(1);
- vertexarray[indexes[i]].SetOrder(2,i);
- vertexarray[indexes[i]].SetOrder(1,trackvertices[index1]);
- vertexarray[indexes[i]].SetOrder(0,trackvertices[index0]);
- Int_t v0index = event->AddV0MI(&vertexarray[indexes[i]]);
- //
- if (trackvertices[index1]+trackvertices[index0]>5) continue;
- if (trackvertices[index0]>2) continue;
- if (trackvertices[index1]>2) continue;
-
- if (trackvertices[index1]+trackvertices[index0]>0) {
- // if (pvertex->GetPointAngle()<0.995) continue;
- }
- trackvertices[index0]++;
- trackvertices[index1]++;
-
- AliESDtrack * ptrack0 = event->GetTrack(vertexarray[indexes[i]].GetIndex(0));
- AliESDtrack * ptrack1 = event->GetTrack(vertexarray[indexes[i]].GetIndex(1));
- if (!ptrack0 || !ptrack1){
- printf("BBBBBBBUUUUUUUUUUGGGGGGGGGG\n");
- }
- Int_t v0index0[3]={ptrack0->GetV0Index(0),ptrack0->GetV0Index(1),ptrack0->GetV0Index(2)};
- Int_t v0index1[3]={ptrack1->GetV0Index(0),ptrack1->GetV0Index(1),ptrack1->GetV0Index(2)};
- for (Int_t i=0;i<3;i++){
- if (v0index0[i]<0) {
- v0index0[i]=v0index;
- ptrack0->SetV0Indexes(v0index0);
- break;
+ if (pvertex->GetRr()<90){
+ pa0 *= TMath::Min(track0->GetESDtrack()->GetTPCdensity(0,60),Float_t(1.));
+ pa1 *= TMath::Min(track1->GetESDtrack()->GetTPCdensity(0,60),Float_t(1.));
}
- }
- for (Int_t i=0;i<3;i++){
- if (v0index1[i]<0) {
- v0index1[i]=v0index;
- ptrack1->SetV0Indexes(v0index1);
- break;
+ if (pvertex->GetRr()<20){
+ pa0 *= (0.2+TMath::Exp(-TMath::Min(minchi2after0,Float_t(16))/8.))/1.2;
+ pa1 *= (0.2+TMath::Exp(-TMath::Min(minchi2after1,Float_t(16))/8.))/1.2;
}
- }
- }
- delete[] vertexarray;
-}
-
-
-
-Bool_t AliITStrackerMI::FindBestPair(Int_t esdtrack0, Int_t esdtrack1, AliESDV0MI *vertex, Int_t &i0, Int_t &i1)
-{
- //
- // try to find best pair from the tree of track hyp.
- //
- TObjArray * array0 = (TObjArray*)fTrackHypothesys.At(esdtrack0);
- Int_t entries0 = array0->GetEntriesFast();
- TObjArray * array1 = (TObjArray*)fTrackHypothesys.At(esdtrack1);
- Int_t entries1 = array1->GetEntriesFast();
- // AliITStrackMI *orig0 = (AliITStrackMI*)fOriginal.At(esdtrack0);
- //AliITStrackMI *orig1 = (AliITStrackMI*)fOriginal.At(esdtrack1);
- Double_t criticalradius = vertex->GetRr();
- AliITStrackMI * track0= 0;
- AliITStrackMI * track1= 0;
- i0 = -1;
- i1 = -1;
- //
- //
- Float_t rfirst0[2000]; //radius position of the first cluster - track0
- Float_t rfirst1[2000]; // - track1
- Float_t maxlocalx0=0; //local x for first track
- Float_t maxlocalx1=0; //local x for second track
- Float_t cs0=1, sn0=0; //rotations
- Float_t cs1=1, sn1=0; //rotations
-
- //
- for (Int_t itrack0=0;itrack0<entries0;itrack0++){
- rfirst0[itrack0]=-1.;
- AliITStrackMI * htrack0 = (AliITStrackMI*)array0->At(itrack0);
- if (!htrack0) continue;
- if (htrack0->fConstrain) continue;
- if (i0<0){
- i0 = itrack0;
- track0 = htrack0;
- }
- Double_t cs = TMath::Cos(htrack0->fAlpha);
- Double_t sn = TMath::Sin(htrack0->fAlpha);
- Double_t x = htrack0->fX*cs - htrack0->fP0*sn;
- Double_t y = htrack0->fX*sn + htrack0->fP0*cs;
- Double_t radius = TMath::Sqrt(x*x+y*y);
- if (criticalradius<3 && radius>6&&htrack0->fNDeadZone<0.2) continue; // all cluster required
- if (criticalradius>10 && radius<6) continue; // causality
- Double_t localx = TMath::Abs(vertex->GetXr(0)*cs + vertex->GetXr(1)*sn);
- if (localx>maxlocalx0) {
- maxlocalx0=localx;
- cs0 = cs; sn0=sn;
- }
- rfirst0[itrack0] = radius;
- }
- for (Int_t itrack1=0;itrack1<entries1;itrack1++){
- rfirst1[itrack1]=-1.;
- AliITStrackMI * htrack1 = (AliITStrackMI*)array1->At(itrack1);
- if (!htrack1) continue;
- if (htrack1->fConstrain) continue;
- if (i1<0){
- i1 = itrack1;
- track1 = htrack1;
- }
- Double_t cs = TMath::Cos(htrack1->fAlpha);
- Double_t sn = TMath::Sin(htrack1->fAlpha);
- //
- //
- Double_t x = htrack1->fX*cs - htrack1->fP0*sn;
- Double_t y = htrack1->fX*sn + htrack1->fP0*cs;
- Double_t radius = TMath::Sqrt(x*x+y*y);
- if (criticalradius<3 && radius>6&&htrack1->fNDeadZone<0.2) continue; //all clusters required
- if (criticalradius>10 && radius<6) continue; //causality
- Double_t localx = TMath::Abs(vertex->GetXr(0)*cs + vertex->GetXr(1)*sn);
- if (localx>maxlocalx1) {
- maxlocalx1=localx;
- cs1 = cs; sn1=sn;
- }
- rfirst1[itrack1] = radius;
- }
- //
- //
- //
- const Float_t radiuses[4]={4,6.5,15.03,24.};
- //
- //
- // find the best tracks after decay point
- Float_t bestquality =100000;
- Float_t bestradius=0;
- AliESDV0MI v0;
- Double_t vpos[3];
- Float_t v[3]={GetX(),GetY(),GetZ()};
- //
- //
- for (Int_t itrack0=0;itrack0<entries0;itrack0++){
- if (rfirst0[itrack0]<0) continue;
- AliITStrackMI * htrack0 = (AliITStrackMI*)array0->At(itrack0);
- if (!htrack0) continue;
- //
- for (Int_t itrack1=0;itrack1<entries1;itrack1++){
- if (rfirst1[itrack1]<0) continue;
- AliITStrackMI * htrack1 = (AliITStrackMI*)array1->At(itrack1);
- if (!htrack1) continue;
- if (TMath::Abs(rfirst0[itrack0]-rfirst1[itrack1])>1.) continue;
- if (htrack0->fClIndex[6-htrack0->fN]==htrack1->fClIndex[6-htrack1->fN]) continue; //sharing of last cluster not allowe
//
- if (htrack0->fNUsed+htrack1->fNUsed>0) continue; //sharing of clusters not allowed
+ pvertex->SetCausality(pb0,pb1,pa0,pa1);
//
- //
- v0.SetM(*htrack0);
- v0.SetP(*htrack1);
- // if (v0.Update(v)==0) continue;
- v0.Update(v);
- if (TMath::Min(rfirst0[itrack0],rfirst1[itrack1]) <v0.GetRr()-0.3) continue;
+ // Likelihood calculations - apply cuts
+ //
+ Bool_t v0OK = kTRUE;
+ Float_t p12 = pvertex->GetParamP()->GetParameter()[4]*pvertex->GetParamP()->GetParameter()[4];
+ p12 += pvertex->GetParamN()->GetParameter()[4]*pvertex->GetParamN()->GetParameter()[4];
+ p12 = TMath::Sqrt(p12); // "mean" momenta
+ Float_t sigmap0 = 0.0001+0.001/(0.1+pvertex->GetRr());
+ Float_t sigmap = 0.5*sigmap0*(0.6+0.4*p12); // "resolution: of point angle - as a function of radius and momenta
+
+ Float_t causalityA = (1.0-pvertex->GetCausalityP()[0])*(1.0-pvertex->GetCausalityP()[1]);
+ Float_t causalityB = TMath::Sqrt(TMath::Min(pvertex->GetCausalityP()[2],Float_t(0.7))*
+ TMath::Min(pvertex->GetCausalityP()[3],Float_t(0.7)));
//
+ //Bo: Float_t likelihood0 = (TMath::Exp(-pvertex->GetDistNorm())+0.1) *(pvertex->GetDist2()<0.5)*(pvertex->GetDistNorm()<5);
+ Float_t lDistNorm = pvertex->GetDcaV0Daughters()/pvertex->GetDistSigma();
+ Float_t likelihood0 = (TMath::Exp(-lDistNorm)+0.1) *(pvertex->GetDcaV0Daughters()<0.5)*(lDistNorm<5);
+
+ Float_t likelihood1 = TMath::Exp(-(1.0001-pvertex->GetV0CosineOfPointingAngle())/sigmap)+
+ 0.4*TMath::Exp(-(1.0001-pvertex->GetV0CosineOfPointingAngle())/(4.*sigmap))+
+ 0.4*TMath::Exp(-(1.0001-pvertex->GetV0CosineOfPointingAngle())/(8.*sigmap))+
+ 0.1*TMath::Exp(-(1.0001-pvertex->GetV0CosineOfPointingAngle())/0.01);
//
- if (v0.GetDist2()>0.3) continue;
- if (v0.GetRr()<radiuses[1] && ( TMath::Abs(htrack0->fN+htrack0->fNDeadZone-htrack1->fN-htrack1->fNDeadZone)>0.5)) continue;
+ if (causalityA<kCausality0Cut) v0OK = kFALSE;
+ if (TMath::Sqrt(likelihood0*likelihood1)<kLikelihood01Cut) v0OK = kFALSE;
+ if (likelihood1<kLikelihood1Cut) v0OK = kFALSE;
+ if (TMath::Power(likelihood0*likelihood1*causalityB,0.33)<kCombinedCut) v0OK = kFALSE;
+
//
- //if (v0.GetRr()<3. && (htrack0->fN+htrack0->fNDeadZone+htrack1->fN+htrack1->fNDeadZone)<11.7) continue;
- //if (v0.GetRr()<6. && (htrack0->fN+htrack0->fNDeadZone+htrack1->fN+htrack1->fNDeadZone)<9.7) continue;
- if (v0.GetRr()<3. && (htrack0->fN+htrack1->fN)<11.7) continue;
- if (v0.GetRr()<6. && (htrack0->fN+htrack1->fN)<9.7) continue;
- Double_t localx0=v0.GetXr(0)*cs0+v0.GetXr(1)*sn0;
- Double_t localx1=v0.GetXr(0)*cs1+v0.GetXr(1)*sn1;
- Double_t maxlocalx = TMath::Max(localx0,localx1);
- if (maxlocalx<3.4 && (htrack0->fN+htrack1->fN)<11.7) continue;
- if (maxlocalx<6.1 && (htrack0->fN+htrack1->fN)<9.7) continue;
//
- Float_t fnormdist = v0.GetDist2()/0.05;
- fnormdist +=(htrack0->fNormChi2[6-htrack0->fN]+htrack1->fNormChi2[6-htrack1->fN]);
- fnormdist +=3*(htrack0->fNUsed+htrack1->fNUsed);
- if (TMath::Min(rfirst0[itrack0],rfirst1[itrack1]) <v0.GetRr()+0.2){
- fnormdist +=(v0.GetRr()+0.2-TMath::Min(rfirst0[itrack0],rfirst1[itrack1]))/0.1;
- }
+ if (kFALSE){
+ Bool_t gold = TMath::Abs(TMath::Abs(track0->GetLabel())-TMath::Abs(track1->GetLabel()))==1;
+ cstream<<"It0"<<
+ "Tr0.="<<track0<< //best without constrain
+ "Tr1.="<<track1<< //best without constrain
+ "Tr0B.="<<track0b<< //best without constrain after vertex
+ "Tr1B.="<<track1b<< //best without constrain after vertex
+ "Tr0C.="<<htrackc0<< //best with constrain if exist
+ "Tr1C.="<<htrackc1<< //best with constrain if exist
+ "Tr0L.="<<track0l<< //longest best
+ "Tr1L.="<<track1l<< //longest best
+ "Esd0.="<<track0->GetESDtrack()<< // esd track0 params
+ "Esd1.="<<track1->GetESDtrack()<< // esd track1 params
+ "V0.="<<pvertex<< //vertex properties
+ "V0b.="<<&vertex2<< //vertex properties at "best" track
+ "ND0="<<normdist[itrack0]<< //normalize distance for track0
+ "ND1="<<normdist[itrack1]<< //normalize distance for track1
+ "Gold="<<gold<< //
+ // "RejectBase="<<rejectBase<< //rejection in First itteration
+ "OK="<<v0OK<<
+ "rmin="<<rmin<<
+ "sigmad="<<sigmad<<
+ "\n";
+ }
+ //if (rejectBase) continue;
//
- Float_t quality = fnormdist;
- if (quality<bestquality && v0.GetDist2()<vertex->GetDist2()){
- i0=itrack0;
- i1=itrack1;
- track0 =htrack0;
- track1 =htrack1;
- bestquality = quality;
- bestradius = v0.GetRr();
- vpos[0] = v0.GetXr(0);
- vpos[1] = v0.GetXr(1);
- vpos[2] = v0.GetXr(2);
+ pvertex->SetStatus(0);
+ // if (rejectBase) {
+ // pvertex->SetStatus(-100);
+ //}
+ if (pvertex->GetV0CosineOfPointingAngle()>kMinPointAngle2) {
+ //Bo: pvertex->SetESDindexes(track0->GetESDtrack()->GetID(),track1->GetESDtrack()->GetID());
+ pvertex->SetIndex(0,track0->GetESDtrack()->GetID());//Bo: consistency 0 for neg
+ pvertex->SetIndex(1,track1->GetESDtrack()->GetID());//Bo: consistency 1 for pos
+ if (v0OK){
+ // AliV0vertex vertexjuri(*track0,*track1);
+ // vertexjuri.SetESDindexes(track0->fESDtrack->GetID(),track1->fESDtrack->GetID());
+ // event->AddV0(&vertexjuri);
+ pvertex->SetStatus(100);
+ }
+ pvertex->SetOnFlyStatus(kTRUE);
+ pvertex->ChangeMassHypothesis(kK0Short);
+ event->AddV0(pvertex);
}
}
}
//
//
- if (!track0||!track1) return kFALSE;
- if (track0->fNUsed+track1->fNUsed>0) return kFALSE; // sharing of clusters not allowed
- //
- //propagate to vertex
-
- Double_t alpha = TMath::ATan2(vpos[1],vpos[0]);
- //
- AliITStrackMI track0p = *track0;
- AliITStrackMI track1p = *track1;
- //
- // RefitAt(bestradius+0.5,&track0p,track0);
- //RefitAt(bestradius+0.5,&track1p,track1);
-
- if ( track0p.Propagate(alpha,bestradius+0.2)) {
- track0= &track0p;
- }
- if (track1p.Propagate(alpha,bestradius+0.2)){
- track1 = &track1p;
- }
- //
- v0.SetM(*track0);
- v0.SetP(*track1);
- v0.Update(v);
- if (v0.GetDist2()<vertex->GetDist2() && v0.GetRr()<20){
- vertex->SetM(*track0);
- vertex->SetP(*track1);
- vertex->Update(v);
- return kTRUE;
- }
- return kFALSE;
+ // delete temporary arrays
+ //
+ delete[] minPointAngle;
+ delete[] maxr;
+ delete[] minr;
+ delete[] norm;
+ delete[] normdist;
+ delete[] normdist1;
+ delete[] normdist0;
+ delete[] dist;
+ delete[] itsmap;
+ delete[] helixes;
+ delete pvertex;
}
-
-
-Double_t AliITStrackerMI::TestV0(AliHelix *helix1, AliHelix *helix2, AliESDV0MI *vertex, Double_t &rmin)
+void AliITStrackerMI::RefitV02(AliESD *event)
{
//
- // test the helixes for the distnce calculate vertex characteristic
- //
- rmin =0;
- Float_t distance1,distance2;
- AliHelix & dhelix1 = *helix1;
- Double_t pp[3],xx[3];
- dhelix1.GetMomentum(0,pp,0);
- dhelix1.Evaluate(0,xx);
- AliHelix &mhelix = *helix2;
- //
- //find intersection linear
- //
- Double_t phase[2][2],radius[2];
- Int_t points = dhelix1.GetRPHIintersections(mhelix, phase, radius);
- Double_t delta1=10000,delta2=10000;
-
- if (points>0){
- rmin = radius[0];
- dhelix1.LinearDCA(mhelix,phase[0][0],phase[0][1],radius[0],delta1);
- dhelix1.LinearDCA(mhelix,phase[0][0],phase[0][1],radius[0],delta1);
- dhelix1.LinearDCA(mhelix,phase[0][0],phase[0][1],radius[0],delta1);
- }
- if (points==2){
- if (radius[1]<rmin) rmin = radius[1];
- dhelix1.LinearDCA(mhelix,phase[1][0],phase[1][1],radius[1],delta2);
- dhelix1.LinearDCA(mhelix,phase[1][0],phase[1][1],radius[1],delta2);
- dhelix1.LinearDCA(mhelix,phase[1][0],phase[1][1],radius[1],delta2);
- }
- rmin = TMath::Sqrt(rmin);
- distance1 = TMath::Min(delta1,delta2);
- vertex->SetDist1(TMath::Sqrt(distance1));
-
+ //try to refit V0s in the third path of the reconstruction
//
- //find intersection parabolic
+ TTreeSRedirector &cstream = *fDebugStreamer;
//
- points = dhelix1.GetRPHIintersections(mhelix, phase, radius);
- delta1=10000,delta2=10000;
-
- if (points>0){
- dhelix1.ParabolicDCA(mhelix,phase[0][0],phase[0][1],radius[0],delta1);
- }
- if (points==2){
- dhelix1.ParabolicDCA(mhelix,phase[1][0],phase[1][1],radius[1],delta2);
- }
-
- distance2 = TMath::Min(delta1,delta2);
- vertex->SetDist2(TMath::Sqrt(distance2));
- if (distance2<100){
- if (delta1<delta2){
- //get V0 info
- dhelix1.Evaluate(phase[0][0],vertex->GetXrp());
- dhelix1.GetMomentum(phase[0][0],vertex->GetPPp());
- mhelix.GetMomentum(phase[0][1],vertex->GetPMp());
- dhelix1.GetAngle(phase[0][0],mhelix,phase[0][1],vertex->GetAnglep());
- vertex->SetRr(TMath::Sqrt(radius[0]));
+ Int_t nv0s = event->GetNumberOfV0s();
+ Float_t primvertex[3]={GetX(),GetY(),GetZ()};
+ AliV0 v0temp;
+ for (Int_t iv0 = 0; iv0<nv0s;iv0++){
+ AliV0 * v0mi = (AliV0*)event->GetV0(iv0);
+ if (!v0mi) continue;
+ Int_t itrack0 = v0mi->GetIndex(0);
+ Int_t itrack1 = v0mi->GetIndex(1);
+ AliESDtrack *esd0 = event->GetTrack(itrack0);
+ AliESDtrack *esd1 = event->GetTrack(itrack1);
+ if (!esd0||!esd1) continue;
+ AliITStrackMI tpc0(*esd0);
+ AliITStrackMI tpc1(*esd1);
+ Double_t x,y,z; v0mi->GetXYZ(x,y,z); //I.B.
+ Double_t alpha =TMath::ATan2(y,x); //I.B.
+ if (v0mi->GetRr()>85){
+ if (tpc0.Propagate(alpha,v0mi->GetRr())&&tpc1.Propagate(alpha,v0mi->GetRr())){
+ v0temp.SetParamN(tpc0);
+ v0temp.SetParamP(tpc1);
+ v0temp.Update(primvertex);
+ if (kFALSE) cstream<<"Refit"<<
+ "V0.="<<v0mi<<
+ "V0refit.="<<&v0temp<<
+ "Tr0.="<<&tpc0<<
+ "Tr1.="<<&tpc1<<
+ "\n";
+ //Bo: if (v0temp.GetDist2()<v0mi->GetDist2() || v0temp.GetV0CosineOfPointingAngle()>v0mi->GetV0CosineOfPointingAngle()){
+ if (v0temp.GetDcaV0Daughters()<v0mi->GetDcaV0Daughters() || v0temp.GetV0CosineOfPointingAngle()>v0mi->GetV0CosineOfPointingAngle()){
+ v0mi->SetParamN(tpc0);
+ v0mi->SetParamP(tpc1);
+ v0mi->Update(primvertex);
+ }
+ }
+ continue;
}
- else{
- dhelix1.Evaluate(phase[1][0],vertex->GetXrp());
- dhelix1.GetMomentum(phase[1][0],vertex->GetPPp());
- mhelix.GetMomentum(phase[1][1],vertex->GetPMp());
- dhelix1.GetAngle(phase[1][0],mhelix,phase[1][1],vertex->GetAnglep());
- vertex->SetRr(TMath::Sqrt(radius[1]));
+ if (v0mi->GetRr()>35){
+ CorrectForDeadZoneMaterial(&tpc0);
+ CorrectForDeadZoneMaterial(&tpc1);
+ if (tpc0.Propagate(alpha,v0mi->GetRr())&&tpc1.Propagate(alpha,v0mi->GetRr())){
+ v0temp.SetParamN(tpc0);
+ v0temp.SetParamP(tpc1);
+ v0temp.Update(primvertex);
+ if (kFALSE) cstream<<"Refit"<<
+ "V0.="<<v0mi<<
+ "V0refit.="<<&v0temp<<
+ "Tr0.="<<&tpc0<<
+ "Tr1.="<<&tpc1<<
+ "\n";
+ //Bo: if (v0temp.GetDist2()<v0mi->GetDist2() || v0temp.GetV0CosineOfPointingAngle()>v0mi->GetV0CosineOfPointingAngle()){
+ if (v0temp.GetDcaV0Daughters()<v0mi->GetDcaV0Daughters() || v0temp.GetV0CosineOfPointingAngle()>v0mi->GetV0CosineOfPointingAngle()){
+ v0mi->SetParamN(tpc0);
+ v0mi->SetParamP(tpc1);
+ v0mi->Update(primvertex);
+ }
+ }
+ continue;
}
+ CorrectForDeadZoneMaterial(&tpc0);
+ CorrectForDeadZoneMaterial(&tpc1);
+ // if (tpc0.Propagate(alpha,v0mi->GetRr())&&tpc1.Propagate(alpha,v0mi->GetRr())){
+ if (RefitAt(v0mi->GetRr(),&tpc0, v0mi->GetClusters(0)) && RefitAt(v0mi->GetRr(),&tpc1, v0mi->GetClusters(1))){
+ v0temp.SetParamN(tpc0);
+ v0temp.SetParamP(tpc1);
+ v0temp.Update(primvertex);
+ if (kFALSE) cstream<<"Refit"<<
+ "V0.="<<v0mi<<
+ "V0refit.="<<&v0temp<<
+ "Tr0.="<<&tpc0<<
+ "Tr1.="<<&tpc1<<
+ "\n";
+ //Bo: if (v0temp.GetDist2()<v0mi->GetDist2() || v0temp.GetV0CosineOfPointingAngle()>v0mi->GetV0CosineOfPointingAngle()){
+ if (v0temp.GetDcaV0Daughters()<v0mi->GetDcaV0Daughters() || v0temp.GetV0CosineOfPointingAngle()>v0mi->GetV0CosineOfPointingAngle()){
+ v0mi->SetParamN(tpc0);
+ v0mi->SetParamP(tpc1);
+ v0mi->Update(primvertex);
+ }
+ }
}
- //
- //
- return vertex->GetDist2();
}
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff