X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ITS%2FAliITStrackerMI.cxx;h=0323d1f4ac46e8b043d0bf9415d242fb868beb03;hb=0653282c95410596b63395e356246ee385ee0fb9;hp=14ce03e00cd419b53b9b87ad745a52615e068c66;hpb=2a03f17046c02b14a2d7f469e29f77fff35e8ae2;p=u%2Fmrichter%2FAliRoot.git diff --git a/ITS/AliITStrackerMI.cxx b/ITS/AliITStrackerMI.cxx index 14ce03e00cd..0323d1f4ac4 100644 --- a/ITS/AliITStrackerMI.cxx +++ b/ITS/AliITStrackerMI.cxx @@ -13,56 +13,93 @@ * provided "as is" without express or implied warranty. * **************************************************************************/ +/* $Id$ */ + //------------------------------------------------------------------------- // Implementation of the ITS tracker class -// It reads AliITSclusterV2 clusters and creates AliITStrackV2 tracks +// It reads AliITSRecPoint clusters and creates AliITStrackMI tracks // and fills with them the ESD -// Origin: Iouri Belikov, CERN, Jouri.Belikov@cern.ch -// Marian Ivanov, CERN, Marian.Ivanov@cern.ch +// Origin: Marian Ivanov, CERN, Marian.Ivanov@cern.ch // dEdx analysis by: Boris Batyunya, JINR, Boris.Batiounia@cern.ch // //------------------------------------------------------------------------- -#include "AliITSrecoV2.h" + +#include +#include +#include #include -#include "AliITSgeom.h" -#include "AliTPCtrack.h" + #include "AliESD.h" -#include "AliITSclusterV2.h" -#include "AliITStrackerMI.h" -#include "TMatrixD.h" +#include "AliV0.h" #include "AliHelix.h" - - +#include "AliITSRecPoint.h" +#include "AliITSgeomTGeo.h" +#include "AliITStrackerMI.h" +#include "AliTrackPointArray.h" +#include "AliAlignObj.h" ClassImp(AliITStrackerMI) -ClassImp(AliITSRecV0Info) 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 //-------------------------------------------------------------------- - AliITSgeom *g=(AliITSgeom*)geom; + if (geom) { + AliWarning("\"geom\" is actually a dummy argument !"); + } - Float_t x,y,z; - Int_t i; - for (i=1; iGetNladders(i); - Int_t ndet=g->GetNdetectors(i); + fCoeficients = 0; + fAfterV0 = kFALSE; - g->GetTrans(i,1,1,x,y,z); - Double_t r=TMath::Sqrt(x*x + y*y); + for (Int_t i=1; iGetTrans(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; @@ -70,14 +107,16 @@ AliITStrackerMI::AliITStrackerMI(const AliITSgeom *geom) : AliTracker() { for (Int_t j=1; jGetTrans(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); @@ -96,7 +135,49 @@ AliITStrackerMI::AliITStrackerMI(const AliITSgeom *geom) : AliTracker() { for (Int_t i=0; i~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) { @@ -110,13 +191,13 @@ Int_t AliITStrackerMI::LoadClusters(TTree *cTree) { //-------------------------------------------------------------------- //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; @@ -128,38 +209,42 @@ Int_t AliITStrackerMI::LoadClusters(TTree *cTree) { 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)); } } @@ -179,7 +264,7 @@ void AliITStrackerMI::UnloadClusters() { for (Int_t i=0; iGetNumberOfTracks(); Info("Clusters2Tracks", "Number of ESD tracks: %d\n", nentr); @@ -229,50 +315,59 @@ Int_t AliITStrackerMI::Clusters2Tracks(AliESD *event) { if ((esd->GetStatus()&AliESDtrack::kTPCin)==0) continue; if (esd->GetStatus()&AliESDtrack::kTPCout) continue; if (esd->GetStatus()&AliESDtrack::kITSin) continue; - - AliITStrackV2 *t=0; + if (esd->GetKinkIndex(0)>0) continue; //kink daughter + AliITStrackMI *t=0; try { - t=new AliITStrackV2(*esd); + t=new AliITStrackMI(*esd); } catch (const Char_t *msg) { - Warning("Clusters2Tracks",msg); + //Warning("Clusters2Tracks",msg); 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 (esd->GetV0Index(0)>0 && t->GetD(0)<30){ + //track - can be V0 according to TPC } - - 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; + 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); } } /* End Read ESD tracks */ itsTracks.Sort(); + 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++) { @@ -280,49 +375,55 @@ Int_t AliITStrackerMI::Clusters2Tracks(AliESD *event) { for (Int_t i=0; ifReconstructed&&(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 // - AliITStrackV2 * besttrack = GetBestHypothesys(fCurrentEsdTrack,t,15); + AliITStrackMI * besttrack = GetBestHypothesys(fCurrentEsdTrack,t,15); if (!besttrack) continue; besttrack->SetLabel(tpcLabel); // besttrack->CookdEdx(); CookdEdx(besttrack); - besttrack->fFakeRatio=1.; + besttrack->SetFakeRatio(1.); CookLabel(besttrack,0.); //For comparison only - // besttrack->UpdateESDtrack(AliESDtrack::kITSin); - // - UpdateESDtrack(besttrack,AliESDtrack::kITSin); - - if ( besttrack->GetNumberOfClusters()<5 && fConstraint[fPass]) { + + /* + if ( besttrack->GetNumberOfClusters()<6 && fConstraint[fPass]) { continue; } if (besttrack->fChi2MIP[0]+besttrack->fNUsed>3.5) continue; if ( (TMath::Abs(besttrack->fD[0]*besttrack->fD[0]+besttrack->fD[1]*besttrack->fD[1])>0.1) && fConstraint[fPass]) continue; //delete itsTracks.RemoveAt(i); - t->fReconstructed = kTRUE; + */ + if (fConstraint[fPass]&&(!besttrack->IsGoldPrimary())) continue; //to be tracked also without vertex constrain + + + t->SetReconstructed(kTRUE); ntrk++; } GetBestHypothesysMIP(itsTracks); } //GetBestHypothesysMIP(itsTracks); - //FindV0(event); - + UpdateTPCV0(event); + FindV02(event); + fAfterV0 = kTRUE; + //GetBestHypothesysMIP(itsTracks); + // itsTracks.Delete(); // Int_t entries = fTrackHypothesys.GetEntriesFast(); @@ -333,112 +434,16 @@ Int_t AliITStrackerMI::Clusters2Tracks(AliESD *event) { } fTrackHypothesys.Delete(); + fBestHypothesys.Delete(); + fOriginal.Clear(); + delete []fCoeficients; + fCoeficients=0; Info("Clusters2Tracks","Number of prolonged tracks: %d\n",ntrk); - + return 0; } - -Int_t AliITStrackerMI::Clusters2Tracks(TTree *tpcTree, TTree *itsTree) { - //-------------------------------------------------------------------- - // This functions reconstructs ITS tracks - // The clusters must be already loaded ! - //-------------------------------------------------------------------- - Int_t nentr=0; TObjArray itsTracks(15000); - - Warning("Clusters2Tracks(TTree *, TTree *)", - "Will be removed soon ! Use Clusters2Tracks(AliESD *) instead."); - - {/* Read TPC tracks */ - AliTPCtrack *itrack=new AliTPCtrack; - TBranch *branch=tpcTree->GetBranch("tracks"); - if (!branch) { - Error("Clusters2Tracks","Can't get the branch !"); - return 1; - } - tpcTree->SetBranchAddress("tracks",&itrack); - nentr=(Int_t)tpcTree->GetEntries(); - - Info("Clusters2Tracks","Number of TPC tracks: %d\n",nentr); - - for (Int_t i=0; iGetEvent(i); - AliITStrackV2 *t=0; - try { - t=new AliITStrackV2(*itrack); - } catch (const Char_t *msg) { - Warning("Clusters2Tracks",msg); - delete t; - continue; - } - if (TMath::Abs(t->GetD())>4) { - delete t; - continue; - } - - if (CorrectForDeadZoneMaterial(t)!=0) { - Warning("Clusters2Tracks", - "failed to correct for the material in the dead zone !\n"); - delete t; - continue; - } - - itsTracks.AddLast(t); - } - delete itrack; - } - itsTracks.Sort(); - nentr=itsTracks.GetEntriesFast(); - - - AliITStrackV2 *otrack=&fBestTrack; - TBranch *branch=itsTree->GetBranch("tracks"); - if (!branch) itsTree->Branch("tracks","AliITStrackV2",&otrack,32000,3); - else branch->SetAddress(&otrack); - - for (fPass=0; fPass<2; fPass++) { - Int_t &constraint=fConstraint[fPass]; if (constraint<0) continue; - for (Int_t i=0; iGetLabel(); //save the TPC track label - - ResetTrackToFollow(*t); - ResetBestTrack(); - /* - for (FollowProlongation(); fIFill(); - //UseClusters(&fBestTrack); - delete itsTracks.RemoveAt(i); - } - } - - nentr=(Int_t)itsTree->GetEntries(); - Info("Clusters2Tracks","Number of prolonged tracks: %d\n",nentr); - - itsTracks.Delete(); - - return 0; -} - Int_t AliITStrackerMI::PropagateBack(AliESD *event) { //-------------------------------------------------------------------- // This functions propagates reconstructed ITS tracks back @@ -454,32 +459,32 @@ Int_t AliITStrackerMI::PropagateBack(AliESD *event) { if ((esd->GetStatus()&AliESDtrack::kITSin)==0) continue; if (esd->GetStatus()&AliESDtrack::kITSout) continue; - AliITStrackV2 *t=0; + AliITStrackMI *t=0; try { - t=new AliITStrackV2(*esd); + t=new AliITStrackMI(*esd); } catch (const Char_t *msg) { - Warning("PropagateBack",msg); + //Warning("PropagateBack",msg); 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", - "failed to correct for the material in the dead zone !\n"); + //Warning("PropagateBack", + // "failed to correct for the material in the dead zone !\n"); delete t; continue; } @@ -504,6 +509,7 @@ Int_t AliITStrackerMI::RefitInward(AliESD *event) { // "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); @@ -516,18 +522,18 @@ Int_t AliITStrackerMI::RefitInward(AliESD *event) { if (esd->GetStatus()&AliESDtrack::kTPCout) if ((esd->GetStatus()&AliESDtrack::kTPCrefit)==0) continue; - AliITStrackV2 *t=0; + AliITStrackMI *t=0; try { - t=new AliITStrackV2(*esd); + t=new AliITStrackMI(*esd); } catch (const Char_t *msg) { - Warning("RefitInward",msg); + //Warning("RefitInward",msg); 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"); + //Warning("RefitInward", + // "failed to correct for the material in the dead zone !\n"); delete t; continue; } @@ -536,10 +542,10 @@ Int_t AliITStrackerMI::RefitInward(AliESD *event) { 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); @@ -547,36 +553,12 @@ Int_t AliITStrackerMI::RefitInward(AliESD *event) { 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 (chi2UpdateTrackParams(&fTrackToFollow,AliESDtrack::kITSrefit); + Float_t r[3]={0.,0.,0.}; + Double_t maxD=3.; + esdTrack->RelateToVertex(event->GetVertex(),GetBz(r),maxD); + ntrk++; } } delete t; @@ -596,28 +578,100 @@ AliCluster *AliITStrackerMI::GetCluster(Int_t index) const { return fgLayers[l].GetCluster(c); } +Bool_t AliITStrackerMI::GetTrackPoint(Int_t index, AliTrackPoint& p) const { + // + // Get track space point with index i + // -void AliITStrackerMI::FollowProlongationTree(AliITStrackV2 * otrack, Int_t esdindex) + 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); + + AliAlignObj::ELayerID iLayer = AliAlignObj::kInvalidLayer; + switch (l) { + case 0: + iLayer = AliAlignObj::kSPD1; + break; + case 1: + iLayer = AliAlignObj::kSPD2; + break; + case 2: + iLayer = AliAlignObj::kSDD1; + break; + case 3: + iLayer = AliAlignObj::kSDD2; + break; + case 4: + iLayer = AliAlignObj::kSSD1; + break; + case 5: + iLayer = AliAlignObj::kSSD2; + break; + default: + AliWarning(Form("Wrong layer index in ITS (%d) !",l)); + break; + }; + UShort_t volid = AliAlignObj::LayerToVolUID(iLayer,idet); + p.SetVolumeID((UShort_t)volid); + return kTRUE; +} + +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 AliITStrackV2 tracks[7][100]; - AliITStrackV2 *currenttrack; - static AliITStrackV2 currenttrack1; - static AliITStrackV2 currenttrack2; - static AliITStrackV2 backuptrack; + static AliITStrackMI tracks[7][100]; + AliITStrackMI *currenttrack; + static AliITStrackMI currenttrack1; + static AliITStrackMI currenttrack2; + static AliITStrackMI backuptrack; Int_t ntracks[7]; Int_t nindexes[7][100]; Float_t normalizedchi2[100]; for (Int_t ilayer=0;ilayer<6;ilayer++) ntracks[ilayer]=0; - otrack->fNSkipped=0; - new (&(tracks[6][0])) AliITStrackV2(*otrack); + 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 @@ -633,14 +687,14 @@ void AliITStrackerMI::FollowProlongationTree(AliITStrackV2 * otrack, Int_t esdin for (Int_t itrack =0;itrack=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) AliITStrackV2(tracks[ilayer+1][nindexes[ilayer+1][itrack]]); + new(¤ttrack1) AliITStrackMI(tracks[ilayer+1][nindexes[ilayer+1][itrack]]); if (ilayer==3 || ilayer==1) { Double_t rs=0.5*(fgLayers[ilayer+1].GetR() + r); Double_t d=0.0034, x0=38.6; @@ -649,13 +703,10 @@ void AliITStrackerMI::FollowProlongationTree(AliITStrackV2 * otrack, Int_t esdin 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; @@ -663,7 +714,7 @@ void AliITStrackerMI::FollowProlongationTree(AliITStrackV2 * otrack, Int_t esdin //propagate to the intersection const AliITSdetector &det=layer.GetDetector(idet); phi=det.GetPhi(); - new(¤ttrack2) AliITStrackV2(currenttrack1); + new(¤ttrack2) AliITStrackMI(currenttrack1); if (!currenttrack1.Propagate(phi,det.GetR())) { continue; } @@ -703,14 +754,14 @@ void AliITStrackerMI::FollowProlongationTree(AliITStrackV2 * otrack, Int_t esdin // 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; @@ -726,11 +777,11 @@ void AliITStrackerMI::FollowProlongationTree(AliITStrackV2 * otrack, Int_t esdin Float_t pz = (z - c->GetZ()) , py=(y - c->GetY()); if (pz*pz*msz+py*py*msy>1.) continue; // - new (&backuptrack) AliITStrackV2(currenttrack2); + new (&backuptrack) AliITStrackMI(currenttrack2); change = kTRUE; currenttrack =¤ttrack2; if (!currenttrack->Propagate(det.GetPhi(),det.GetR())) { - new (currenttrack) AliITStrackV2(backuptrack); + new (currenttrack) AliITStrackMI(backuptrack); change = kFALSE; continue; } @@ -745,27 +796,27 @@ void AliITStrackerMI::FollowProlongationTree(AliITStrackV2 * otrack, Int_t esdin if (chi2GetQ()==0) deadzone=1; // take dead zone only once if (ntracks[ilayer]>=100) continue; - AliITStrackV2 * updatetrack = new (&tracks[ilayer][ntracks[ilayer]]) AliITStrackV2(*currenttrack); - updatetrack->fClIndex[ilayer]=0; + AliITStrackMI * updatetrack = new (&tracks[ilayer][ntracks[ilayer]]) AliITStrackMI(*currenttrack); + updatetrack->SetClIndex(ilayer,0); if (change){ - new (¤ttrack2) AliITStrackV2(backuptrack); + new (¤ttrack2) AliITStrackMI(backuptrack); } if (c->GetQ()!=0){ if (!UpdateMI(updatetrack,c,chi2,(ilayer<<28)+ci)) continue; 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()}; @@ -773,27 +824,41 @@ void AliITStrackerMI::FollowProlongationTree(AliITStrackV2 * otrack, Int_t esdin 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 (itrack<2&¤ttrack1.fNSkipped==0 && deadzone==0&&ntracks[ilayer]<100){ - AliITStrackV2* vtrack = new (&tracks[ilayer][ntracks[ilayer]]) AliITStrackV2(currenttrack1); - vtrack->fClIndex[ilayer]=0; + // 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->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->IncrementNSkipped(); + ntracks[ilayer]++; + } + + 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->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->SetNDeadZone(vtrack->GetNDeadZone()+1); ntracks[ilayer]++; } + } //loop over track candidates // @@ -806,8 +871,8 @@ void AliITStrackerMI::FollowProlongationTree(AliITStrackV2 * otrack, Int_t esdin if ( normalizedchi2[itrack]<3+0.5*ilayer) golds++; if (ilayer>4) accepted++; else{ - if ( fConstraint[fPass] && normalizedchi2[itrack]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 = constrain? 20: 5; - for (Int_t i=0;i7.)continue; - AddTrackHypothesys(new AliITStrackV2(track), esdindex); + for (Int_t i=0;i7.)continue; + AddTrackHypothesys(new AliITStrackMI(track), esdindex); } - for (Int_t i=0;i7.)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 AliITStrackV2(track), esdindex); + AddTrackHypothesys(new AliITStrackMI(track), esdindex); } //} - if (!fConstraint[fPass]){ - for (Int_t i=0;i7.)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){ + for (Int_t i=0;i7.)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 AliITStrackV2(track), esdindex); + 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 +// } +// } +// } + } + } } @@ -864,14 +1002,35 @@ AliITStrackerMI::AliITSlayer & AliITStrackerMI::GetLayer(Int_t layer) const // 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; iIsUsed()) cl->Use(); } @@ -958,7 +1164,8 @@ void AliITStrackerMI::AliITSlayer::ResetRoad() { if (n>1) fRoad=2*fR*TMath::Sqrt(3.14/n); } -Int_t AliITStrackerMI::AliITSlayer::InsertCluster(AliITSclusterV2 *c) { + +Int_t AliITStrackerMI::AliITSlayer::InsertCluster(AliITSRecPoint *c) { //-------------------------------------------------------------------- //This function adds a cluster to this layer //-------------------------------------------------------------------- @@ -967,18 +1174,9 @@ Int_t AliITStrackerMI::AliITSlayer::InsertCluster(AliITSclusterV2 *c) { return 1; } fCurrentSlice=-1; - if (fN==0) {fClusters[fN++]=c; return 0;} - Int_t i=FindClusterIndex(c->GetZ()); - memmove(fClusters+i+1 ,fClusters+i,(fN-i)*sizeof(AliITSclusterV2*)); - memmove(fY+i+1 ,fY+i,(fN-i)*sizeof(Float_t)); - memmove(fZ+i+1 ,fZ+i,(fN-i)*sizeof(Float_t)); - fClusters[i]=c; fN++; - // + fClusters[fN]=c; + fN++; AliITSdetector &det=GetDetector(c->GetDetectorIndex()); - Double_t y=fR*det.GetPhi() + c->GetY(); - if (y>2.*fR*TMath::Pi()) y -= 2.*fR*TMath::Pi(); - fY[i] = y; - fZ[i] = c->GetZ(); if (c->GetY()GetY()); if (c->GetY()>det.GetYmax()) det.SetYmax(c->GetY()); if (c->GetZ()GetZ()); @@ -992,6 +1190,31 @@ void AliITStrackerMI::AliITSlayer::SortClusters() // //sort clusters // + AliITSRecPoint **clusters = new AliITSRecPoint*[fN]; + Float_t *z = new Float_t[fN]; + Int_t * index = new Int_t[fN]; + // + for (Int_t i=0;iGetZ(); + } + TMath::Sort(fN,z,index,kFALSE); + for (Int_t i=0;iGetZ(); + AliITSdetector &det=GetDetector(fClusters[i]->GetDetectorIndex()); + Double_t y=fR*det.GetPhi() + fClusters[i]->GetY(); + if (y>2.*fR*TMath::Pi()) y -= 2.*fR*TMath::Pi(); + fY[i] = y; + } + delete[] index; + delete[] z; + delete[] clusters; + // + fYB[0]=10000000; fYB[1]=-10000000; for (Int_t i=0;ifYB[1]+fDy5) continue; - // - // slice 10 - if (TMath::Abs(fYB[1]-fYB[0])<=0) continue; - Float_t fslice = TMath::Nint(10.*(curY-fYB[0])/(fYB[1]-fYB[0])); - Float_t ymiddle = fYB[0]+fslice*fDy10; - for (Int_t di =-1;di<=1;di++){ - if (TMath::Abs(curY-(ymiddle+(float)di*fDy10))<0.75*fDy10){ - // - Int_t slice = int(fslice+21.0001)-21+di; - if (slice<0) continue; - if (slice>10) continue; - if (fN10[slice]>=kMaxClusterPerLayer10) break; - fClusters10[slice][fN10[slice]] = fClusters[i]; - fY10[slice][fN10[slice]] = curY; - fZ10[slice][fN10[slice]] = fZ[i]; - fClusterIndex10[slice][fN10[slice]]=i; - fN10[slice]++; + for (Int_t i=0;i5) continue; - if (fN5[slice]>=kMaxClusterPerLayer5) break; - fClusters5[slice][fN5[slice]] = fClusters[i]; - fY5[slice][fN5[slice]] = curY; - fZ5[slice][fN5[slice]] = fZ[i]; - fClusterIndex5[slice][fN5[slice]]=i; - fN5[slice]++; + // slice 10 + for (Int_t slice=0; slice<11;slice++){ + if (fBy10[slice][0]20) continue; - if (fN20[slice]>=kMaxClusterPerLayer20) break; - fClusters20[slice][fN20[slice]] = fClusters[i]; - fY20[slice][fN20[slice]] = curY; - fZ20[slice][fN20[slice]] = fZ[i]; - fClusterIndex20[slice][fN20[slice]]=i; - fN20[slice]++; - } + + // + // consistency check + // + for (Int_t i=0;ifZ[i+1]){ + printf("Bugg\n"); + } + } + // + for (Int_t slice=0;slice<21;slice++) + for (Int_t i=0;ifZ20[slice][i+1]){ + printf("Bugg\n"); } } -} +} Int_t AliITStrackerMI::AliITSlayer::FindClusterIndex(Float_t z) const { @@ -1102,20 +1315,6 @@ Int_t AliITStrackerMI::AliITSlayer::FindClusterIndex(Float_t z) const { } return m; } -/* -void AliITStrackerMI::AliITSlayer:: -SelectClusters(Double_t zmin,Double_t zmax,Double_t ymin, Double_t ymax) { - //-------------------------------------------------------------------- - // This function sets the "window" - //-------------------------------------------------------------------- - fI=FindClusterIndex(zmin); fZmax=zmax; - fImax = TMath::Min(FindClusterIndex(zmax)+1,fN); - Double_t circle=2*TMath::Pi()*fR; - if (ymax>circle) { ymax-=circle; ymin-=circle; } - fYmin=ymin; fYmax=ymax; - fSkip = 0; -} -*/ void AliITStrackerMI::AliITSlayer:: @@ -1194,33 +1393,36 @@ SelectClusters(Double_t zmin,Double_t zmax,Double_t ymin, Double_t ymax) { fAccepted =0; } -/* -const AliITSclusterV2 *AliITStrackerMI::AliITSlayer::GetNextCluster(Int_t &ci){ + + + +Int_t AliITStrackerMI::AliITSlayer:: +FindDetectorIndex(Double_t phi, Double_t z) const { //-------------------------------------------------------------------- - // This function returns clusters within the "window" + //This function finds the detector crossed by the track //-------------------------------------------------------------------- - const AliITSclusterV2 *cluster=0; - for (Int_t i=fI; iGetZ() > fZmax) break; - // if (c->IsUsed()) continue; - const AliITSdetector &det=GetDetector(c->GetDetectorIndex()); - Double_t y=fR*det.GetPhi() + c->GetY(); + Double_t dphi; + if (fZOffset<0) // old geometry + dphi = -(phi-fPhiOffset); + else // new geometry + dphi = phi-fPhiOffset; - if (y>2.*fR*TMath::Pi()) y -= 2*fR*TMath::Pi(); - if (y>1.*fR*TMath::Pi() && fYmax= 2*TMath::Pi()) dphi -= 2*TMath::Pi(); + Int_t np=Int_t(dphi*fNladders*0.5/TMath::Pi()+0.5); + if (np>=fNladders) np-=fNladders; + if (np<0) np+=fNladders; - if (yfYmax) continue; - cluster=c; ci=i; - fI=i+1; - break; - } - return cluster; + Double_t dz=fZOffset-z; + Int_t nz=Int_t(dz*(fNdetectors-1)*0.5/fZOffset+0.5); + if (nz>=fNdetectors) return -1; + if (nz<0) return -1; + + return np*fNdetectors + nz; } -*/ -const AliITSclusterV2 *AliITStrackerMI::AliITSlayer::GetNextCluster(Int_t &ci){ + +const AliITSRecPoint *AliITStrackerMI::AliITSlayer::GetNextCluster(Int_t &ci){ //-------------------------------------------------------------------- // This function returns clusters within the "window" //-------------------------------------------------------------------- @@ -1230,6 +1432,7 @@ const AliITSclusterV2 *AliITStrackerMI::AliITSlayer::GetNextCluster(Int_t &ci){ for (Int_t i=fI; iy) y += rpi2; if (yfYmax) continue; if (fClusters[i]->GetQ()==0&&fSkip==2) continue; @@ -1253,26 +1456,6 @@ const AliITSclusterV2 *AliITStrackerMI::AliITSlayer::GetNextCluster(Int_t &ci){ -Int_t AliITStrackerMI::AliITSlayer:: -FindDetectorIndex(Double_t phi, Double_t z) const { - //-------------------------------------------------------------------- - //This function finds the detector crossed by the track - //-------------------------------------------------------------------- - Double_t dphi=-(phi-fPhiOffset); - if (dphi < 0) dphi += 2*TMath::Pi(); - else if (dphi >= 2*TMath::Pi()) dphi -= 2*TMath::Pi(); - Int_t np=Int_t(dphi*fNladders*0.5/TMath::Pi()+0.5); - if (np>=fNladders) np-=fNladders; - if (np<0) np+=fNladders; - - Double_t dz=fZOffset-z; - Int_t nz=Int_t(dz*(fNdetectors-1)*0.5/fZOffset+0.5); - if (nz>=fNdetectors) return -1; - if (nz<0) return -1; - - return np*fNdetectors + nz; -} - Double_t AliITStrackerMI::AliITSlayer::GetThickness(Double_t y,Double_t z,Double_t &x0) const { //-------------------------------------------------------------------- @@ -1406,7 +1589,7 @@ Int_t AliITStrackerMI::AliITSlayer::InRoad() const { //-------------------------------------------------------------------- Int_t ncl=0; for (Int_t i=fI; iGetZ() > fZmax) break; if (c->IsUsed()) continue; const AliITSdetector &det=GetDetector(c->GetDetectorIndex()); @@ -1422,11 +1605,13 @@ Int_t AliITStrackerMI::AliITSlayer::InRoad() const { return ncl; } -Bool_t -AliITStrackerMI::RefitAt(Double_t xx,AliITStrackV2 *t,const AliITStrackV2 *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; @@ -1469,11 +1654,156 @@ AliITStrackerMI::RefitAt(Double_t xx,AliITStrackV2 *t,const AliITStrackV2 *c) { } // - 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; } - Double_t phi=TMath::ATan2(y,x); + + const AliITSdetector &det=layer.GetDetector(idet); + phi=det.GetPhi(); + if (!t->Propagate(phi,det.GetR())) { + return kFALSE; + } + 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 (chi2Update(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=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 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; @@ -1485,28 +1815,30 @@ AliITStrackerMI::RefitAt(Double_t xx,AliITStrackV2 *t,const AliITStrackV2 *c) { } 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=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 (chi2GetY() + 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); @@ -1558,8 +1890,7 @@ AliITStrackerMI::RefitAt(Double_t xx,AliITStrackV2 *t,const AliITStrackV2 *c) { return kTRUE; } - -Double_t AliITStrackerMI::GetNormalizedChi2(AliITStrackV2 * track, Int_t mode) +Double_t AliITStrackerMI::GetNormalizedChi2(AliITStrackMI * track, Int_t mode) { // // calculate normalized chi2 @@ -1572,16 +1903,16 @@ Double_t AliITStrackerMI::GetNormalizedChi2(AliITStrackV2 * 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.; @@ -1589,7 +1920,7 @@ Double_t AliITStrackerMI::GetNormalizedChi2(AliITStrackV2 * track, Int_t mode) } } 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(); @@ -1598,43 +1929,43 @@ Double_t AliITStrackerMI::GetNormalizedChi2(AliITStrackV2 * track, Int_t mode) 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.; } @@ -1643,52 +1974,52 @@ Double_t AliITStrackerMI::GetNormalizedChi2(AliITStrackV2 * track, Int_t mode) } } // - 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; } -Double_t AliITStrackerMI::GetMatchingChi2(AliITStrackV2 * track1, AliITStrackV2 * track2) +Double_t AliITStrackerMI::GetMatchingChi2(AliITStrackMI * track1, AliITStrackMI * track2) { // // return matching chi2 between two tracks - AliITStrackV2 track3(*track2); + 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); @@ -1720,7 +2051,7 @@ Double_t AliITStrackerMI::GetDeadZoneProbability(Double_t zpos, Double_t zerr) } -Double_t AliITStrackerMI::GetTruncatedChi2(AliITStrackV2 * track, Float_t fac) +Double_t AliITStrackerMI::GetTruncatedChi2(AliITStrackMI * track, Float_t fac) { // // calculate normalized chi2 @@ -1728,9 +2059,9 @@ Double_t AliITStrackerMI::GetTruncatedChi2(AliITStrackV2 * track, Float_t fac) 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;} @@ -1749,7 +2080,7 @@ Double_t AliITStrackerMI::GetTruncatedChi2(AliITStrackV2 * track, Float_t fac) } -Double_t AliITStrackerMI::GetInterpolatedChi2(AliITStrackV2 * forwardtrack, AliITStrackV2 * backtrack) +Double_t AliITStrackerMI::GetInterpolatedChi2(AliITStrackMI * forwardtrack, AliITStrackMI * backtrack) { // // calculate normalized chi2 @@ -1757,15 +2088,15 @@ Double_t AliITStrackerMI::GetInterpolatedChi2(AliITStrackV2 * forwardtrack, AliI 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))); @@ -1776,8 +2107,8 @@ Double_t AliITStrackerMI::GetInterpolatedChi2(AliITStrackV2 * forwardtrack, AliI 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; } @@ -1794,24 +2125,28 @@ Float_t *AliITStrackerMI::GetWeight(Int_t index) { return fgLayers[l].GetWeight(c); } -void AliITStrackerMI::RegisterClusterTracks(AliITStrackV2* track,Int_t id) +void AliITStrackerMI::RegisterClusterTracks(AliITStrackMI* track,Int_t id) { //--------------------------------------------- // register track to the list + // + if (track->GetESDtrack()->GetKinkIndex(0)!=0) return; //don't register kink tracks + // + // for (Int_t icluster=0;iclusterGetNumberOfClusters();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; } } } } -void AliITStrackerMI::UnRegisterClusterTracks(AliITStrackV2* track, Int_t id) +void AliITStrackerMI::UnRegisterClusterTracks(AliITStrackMI* track, Int_t id) { //--------------------------------------------- // unregister track from the list @@ -1819,15 +2154,15 @@ void AliITStrackerMI::UnRegisterClusterTracks(AliITStrackV2* track, Int_t id) 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(AliITStrackV2* 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 @@ -1842,16 +2177,16 @@ Float_t AliITStrackerMI::GetNumberOfSharedClusters(AliITStrackV2* track,Int_t id 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]); } @@ -1862,19 +2197,19 @@ Float_t AliITStrackerMI::GetNumberOfSharedClusters(AliITStrackV2* track,Int_t id 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; } -Int_t AliITStrackerMI::GetOverlapTrack(AliITStrackV2 *track, Int_t trackID, Int_t &shared, Int_t clusterlist[6],Int_t overlist[6]) +Int_t AliITStrackerMI::GetOverlapTrack(AliITStrackMI *track, Int_t trackID, Int_t &shared, Int_t clusterlist[6],Int_t overlist[6]) { // // find first shared track @@ -1895,13 +2230,13 @@ Int_t AliITStrackerMI::GetOverlapTrack(AliITStrackV2 *track, Int_t trackID, Int_ 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]); } @@ -1911,9 +2246,9 @@ Int_t AliITStrackerMI::GetOverlapTrack(AliITStrackV2 *track, Int_t trackID, Int_ 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++; } } @@ -1961,8 +2296,8 @@ Int_t AliITStrackerMI::GetOverlapTrack(AliITStrackV2 *track, Int_t trackID, Int_ 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; @@ -1973,8 +2308,8 @@ Int_t AliITStrackerMI::GetOverlapTrack(AliITStrackV2 *track, Int_t trackID, Int_ } // 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++; } @@ -1984,28 +2319,28 @@ Int_t AliITStrackerMI::GetOverlapTrack(AliITStrackV2 *track, Int_t trackID, Int_ } -AliITStrackV2 * AliITStrackerMI::GetBest2Tracks(Int_t trackID1, Int_t trackID2, Float_t th0, Float_t th1){ +AliITStrackMI * AliITStrackerMI::GetBest2Tracks(Int_t trackID1, Int_t trackID2, Float_t th0, Float_t th1){ // // try to find track hypothesys without conflicts // with minimal chi2; TClonesArray *arr1 = (TClonesArray*)fTrackHypothesys.At(trackID1); Int_t entries1 = arr1->GetEntriesFast(); TClonesArray *arr2 = (TClonesArray*)fTrackHypothesys.At(trackID2); - if (!arr2) return (AliITStrackV2*) arr1->UncheckedAt(0); + if (!arr2) return (AliITStrackMI*) arr1->UncheckedAt(0); Int_t entries2 = arr2->GetEntriesFast(); - if (entries2<=0) return (AliITStrackV2*) arr1->UncheckedAt(0); + if (entries2<=0) return (AliITStrackMI*) arr1->UncheckedAt(0); // - AliITStrackV2 * track10=(AliITStrackV2*) arr1->UncheckedAt(0); - AliITStrackV2 * track20=(AliITStrackV2*) arr2->UncheckedAt(0); + AliITStrackMI * track10=(AliITStrackMI*) arr1->UncheckedAt(0); + AliITStrackMI * track20=(AliITStrackMI*) arr2->UncheckedAt(0); if (TMath::Abs(1./track10->Get1Pt())>0.5+TMath::Abs(1/track20->Get1Pt())) return track10; for (Int_t itrack=0;itrackUncheckedAt(itrack); + AliITStrackMI * track=(AliITStrackMI*) arr1->UncheckedAt(itrack); UnRegisterClusterTracks(track,trackID1); } // for (Int_t itrack=0;itrackUncheckedAt(itrack); + AliITStrackMI * track=(AliITStrackMI*) arr2->UncheckedAt(itrack); UnRegisterClusterTracks(track,trackID2); } Int_t index1=0; @@ -2017,7 +2352,7 @@ AliITStrackV2 * AliITStrackerMI::GetBest2Tracks(Int_t trackID1, Int_t trackID2, 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); @@ -2038,14 +2373,14 @@ AliITStrackV2 * AliITStrackerMI::GetBest2Tracks(Int_t trackID1, Int_t trackID2, 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++; } } @@ -2053,8 +2388,8 @@ AliITStrackV2 * AliITStrackerMI::GetBest2Tracks(Int_t trackID1, Int_t trackID2, 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()); // @@ -2083,24 +2418,24 @@ AliITStrackV2 * AliITStrackerMI::GetBest2Tracks(Int_t trackID1, Int_t trackID2, Float_t * ny2 = GetNy(trackID2), * nz2 = GetNz(trackID2); for (Int_t itrack1=0;itrack1UncheckedAt(itrack1); + AliITStrackMI * track1=(AliITStrackMI*) arr1->UncheckedAt(itrack1); //if (track1->fFakeRatio>0) continue; RegisterClusterTracks(track1,trackID1); for (Int_t itrack2=0;itrack2UncheckedAt(itrack2); + AliITStrackMI * track2=(AliITStrackMI*) arr2->UncheckedAt(itrack2); // Float_t current = w1*track1->fChi2MIP[0]+w2*track2->fChi2MIP[0]; //if (track2->fFakeRatio>0) continue; 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; @@ -2151,31 +2486,31 @@ AliITStrackV2 * AliITStrackerMI::GetBest2Tracks(Int_t trackID1, Int_t trackID2, } // 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 fFakeRatio*track10->GetNumberOfClusters(); - AliITStrackV2* track1=(AliITStrackV2*) arr1->UncheckedAt(index1); - track1->fChi2MIP[5] = maxconflicts; - track1->fChi2MIP[6] = maxchi2; - track1->fChi2MIP[7] = 0.01+orig-(track1->fFakeRatio*track1->GetNumberOfClusters()); + Float_t orig = track10->GetFakeRatio()*track10->GetNumberOfClusters(); + AliITStrackMI* track1=(AliITStrackMI*) arr1->UncheckedAt(index1); + 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]fChi2MIP[5] = maxconflicts; - track10->fChi2MIP[6] = maxchi2; + else if (track10->GetChi2MIP(0)SetChi2MIP(5,maxconflicts); + track10->SetChi2MIP(6,maxchi2); // track10->UpdateESDtrack(AliESDtrack::kITSin); UpdateESDtrack(track10,AliESDtrack::kITSin); } for (Int_t itrack=0;itrackUncheckedAt(itrack); + AliITStrackMI * track=(AliITStrackMI*) arr1->UncheckedAt(itrack); UnRegisterClusterTracks(track,trackID1); } // for (Int_t itrack=0;itrackUncheckedAt(itrack); + AliITStrackMI * track=(AliITStrackMI*) arr2->UncheckedAt(itrack); UnRegisterClusterTracks(track,trackID2); } - if (track10->fConstrain&&track10->fChi2MIP[0]fChi2MIP[1]fChi2MIP[2]fChi2MIP[3]GetConstrain()&&track10->GetChi2MIP(0)GetChi2MIP(1)GetChi2MIP(2)GetChi2MIP(3)fChi2MIP[0]fChi2MIP[1]fChi2MIP[2]fChi2MIP[3]fConstrain&&track20->fChi2MIP[0]fChi2MIP[1]fChi2MIP[2]fChi2MIP[3]GetConstrain()&&track20->GetChi2MIP(0)GetChi2MIP(1)GetChi2MIP(2)GetChi2MIP(3)fChi2MIP[0]fChi2MIP[1]fChi2MIP[2]fChi2MIP[3]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(); } -void AliITStrackerMI::AddTrackHypothesys(AliITStrackV2 * track, Int_t esdindex) +void AliITStrackerMI::AddTrackHypothesys(AliITStrackMI * track, Int_t esdindex) { //------------------------------------------------------------------ // add track to the list of hypothesys @@ -2278,16 +2613,16 @@ void AliITStrackerMI::SortTrackHypothesys(Int_t esdindex, Int_t maxcut, Int_t mo //- find preliminary besttrack as a reference Float_t minchi2=10000; Int_t maxn=0; - AliITStrackV2 * besttrack=0; + AliITStrackMI * besttrack=0; for (Int_t itrack=0;itrackGetEntriesFast();itrack++){ - AliITStrackV2 * track = (AliITStrackV2*)array->At(itrack); + AliITStrackMI * track = (AliITStrackMI*)array->At(itrack); 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 (chi2fFakeRatio==0){ @@ -2300,7 +2635,9 @@ void AliITStrackerMI::SortTrackHypothesys(Int_t esdindex, Int_t maxcut, Int_t mo } } else{ - delete array->RemoveAt(itrack); + if (track->GetConstrain() || track->GetNumberOfClusters()>5){ //keep best short tracks - without vertex constrain + delete array->RemoveAt(itrack); + } } } if (!besttrack) return; @@ -2310,11 +2647,11 @@ void AliITStrackerMI::SortTrackHypothesys(Int_t esdindex, Int_t maxcut, Int_t mo 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); } } // @@ -2324,25 +2661,28 @@ void AliITStrackerMI::SortTrackHypothesys(Int_t esdindex, Int_t maxcut, Int_t mo Int_t * index = new Int_t[entries]; for (Int_t i=0;iAt(itrack); + AliITStrackMI * track = (AliITStrackMI*)array->At(itrack); if (track){ - track->fChi2MIP[0] = GetNormalizedChi2(track, mode); - if (track->fChi2MIP[0]fChi2MIP[0]; - else - delete array->RemoveAt(itrack); + track->SetChi2MIP(0,GetNormalizedChi2(track, mode)); + if (track->GetChi2MIP(0)GetChi2MIP(0); + else{ + if (track->GetConstrain() || track->GetNumberOfClusters()>5){ //keep best short tracks - without vertex constrain + delete array->RemoveAt(itrack); + } + } } } // TMath::Sort(entries,chi2,index,kFALSE); - besttrack = (AliITStrackV2*)array->At(index[0]); - if (besttrack&&besttrack->fChi2MIP[0]At(index[0]); + if (besttrack&&besttrack->GetChi2MIP(0)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); } } } @@ -2350,54 +2690,62 @@ void AliITStrackerMI::SortTrackHypothesys(Int_t esdindex, Int_t maxcut, Int_t mo // calculate one more time with updated normalized errors for (Int_t i=0;iAt(itrack); + AliITStrackMI * track = (AliITStrackMI*)array->At(itrack); if (track){ - track->fChi2MIP[0] = GetNormalizedChi2(track,mode); - if (track->fChi2MIP[0]fChi2MIP[0]-0*(track->GetNumberOfClusters()+track->fNDeadZone); - else - delete array->RemoveAt(itrack); + track->SetChi2MIP(0,GetNormalizedChi2(track,mode)); + if (track->GetChi2MIP(0)GetChi2MIP(0)-0*(track->GetNumberOfClusters()+track->GetNDeadZone()); + else + { + if (track->GetConstrain() || track->GetNumberOfClusters()>5){ //keep best short tracks - without vertex constrain + delete array->RemoveAt(itrack); + } + } } } entries = array->GetEntriesFast(); // + // if (entries>0){ TObjArray * newarray = new TObjArray(); TMath::Sort(entries,chi2,index,kFALSE); - besttrack = (AliITStrackV2*)array->At(index[0]); + besttrack = (AliITStrackMI*)array->At(index[0]); 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;iAt(index[i]); + AliITStrackMI * track = (AliITStrackMI*)array->At(index[i]); if (!track) continue; if (accepted>maxcut) break; - track->fChi2MIP[0] = GetNormalizedChi2(track,mode); - if (track->GetNumberOfClusters()<6 && (track->fChi2MIP[0]+track->fNUsed>minchi2)){ - delete array->RemoveAt(index[i]); - continue; + 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; + } } - if (track->fChi2MIP[0]+track->fNUsedGetNumberOfClusters()>=minn){ - accepted++; + Bool_t shortbest = !track->GetConstrain() && track->GetNumberOfClusters()<6; + if ((track->GetChi2MIP(0)+track->GetNUsed()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); } } } @@ -2420,7 +2768,7 @@ void AliITStrackerMI::SortTrackHypothesys(Int_t esdindex, Int_t maxcut, Int_t mo -AliITStrackV2 * AliITStrackerMI::GetBestHypothesys(Int_t esdindex, AliITStrackV2 * original, Int_t checkmax) +AliITStrackMI * AliITStrackerMI::GetBestHypothesys(Int_t esdindex, AliITStrackMI * original, Int_t checkmax) { //------------------------------------------------------------- // try to find best hypothesy @@ -2432,116 +2780,116 @@ AliITStrackV2 * AliITStrackerMI::GetBestHypothesys(Int_t esdindex, AliITStrackV2 Int_t entries = array->GetEntriesFast(); if (!entries) return 0; Float_t minchi2 = 100000; - AliITStrackV2 * besttrack=0; + AliITStrackMI * besttrack=0; // - AliITStrackV2 * backtrack = new AliITStrackV2(*original); - AliITStrackV2 * forwardtrack = new AliITStrackV2(*original); + AliITStrackMI * backtrack = new AliITStrackMI(*original); + AliITStrackMI * forwardtrack = new AliITStrackMI(*original); + Double_t xyzv[]={GetX(),GetY(),GetZ()}; + Double_t ersv[]={GetSigmaX()/3.,GetSigmaY()/3.,GetSigmaZ()/3.}; // for (Int_t i=0;iAt(i); + AliITStrackMI * track = (AliITStrackMI*)array->At(i); if (!track) continue; - track->fChi2MIP[1] = 1000000; - track->fChi2MIP[2] = 1000000; - track->fChi2MIP[3] = 1000000; + Float_t sigmarfi,sigmaz; + GetDCASigma(track,sigmarfi,sigmaz); + track->SetDnorm(0,sigmarfi); + track->SetDnorm(1,sigmaz); + // + track->SetChi2MIP(1,1000000); + track->SetChi2MIP(2,1000000); + track->SetChi2MIP(3,1000000); // // backtrack - backtrack = new(backtrack) AliITStrackV2(*track); - backtrack->ResetCovariance(); - backtrack->ResetCovariance(); + backtrack = new(backtrack) AliITStrackMI(*track); + 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; // 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(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; - /* - for (Int_t i=0;i<6;i++){ - if (track->fClIndex[i]>0){ - Double_t dy1 = (track->fDy[i]/track->fSigmaY[i]); - Double_t dz1 = (track->fDz[i]/track->fSigmaZ[i]); - Double_t dy2 = (backtrack->fDy[i]/backtrack->fSigmaY[i]); - Double_t dz2 = (backtrack->fDz[i]/backtrack->fSigmaZ[i]); - if (TMath::Min(dy1*dy1+dz1*dz1,dy2*dy2+dz2*dz2)> kMaxChi2sR[i]) isOK =kFALSE; - track->fDy[i+6] = backtrack->fDy[i]; - track->fDz[i+6] = backtrack->fDz[i]; - track->fSigmaY[i+6] = backtrack->fSigmaY[i]; - track->fSigmaZ[i+6] = backtrack->fSigmaZ[i]; - } - else{ - if (i==5){ - if (track->fClIndex[i-1]>0){ - Double_t dy2 = (backtrack->fDy[i-1]/backtrack->fSigmaY[i-1]); - Double_t dz2 = (backtrack->fDz[i-1]/backtrack->fSigmaZ[i-1]); - if (dy2*dy2+dz2*dz2> kMaxChi2sR[i]) isOK =kFALSE; - } - else isOK = kFALSE; - } - } - } - */ if(!isOK) continue; // //forward track - without constraint - forwardtrack = new(forwardtrack) AliITStrackV2(*original); + forwardtrack = new(forwardtrack) AliITStrackMI(*original); forwardtrack->ResetClusters(); x = track->GetX(); - if (!RefitAt(x,forwardtrack,track)) continue; - track->fChi2MIP[2] = NormalizedChi2(forwardtrack,0); - if (track->fChi2MIP[2]>kMaxChi2PerCluster[2]*6.0) continue; - if (!(track->fConstrain)&&track->fChi2MIP[2]>kMaxChi2PerCluster[2]) continue; + RefitAt(x,forwardtrack,track); + 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 AliITStrackV2(*forwardtrack); + //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; delete forwardtrack; Int_t accepted=0; for (Int_t i=0;iAt(i); + 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()GetNumberOfClusters()-1.)|| - track->fChi2MIP[0]>besttrack->fChi2MIP[0]+2.*besttrack->fNUsed+3.){ - delete array->RemoveAt(i); - continue; + 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; + } } else{ accepted++; @@ -2551,32 +2899,31 @@ AliITStrackV2 * AliITStrackerMI::GetBestHypothesys(Int_t esdindex, AliITStrackV2 array->Compress(); SortTrackHypothesys(esdindex,checkmax,1); array = (TObjArray*) fTrackHypothesys.At(esdindex); - besttrack = (AliITStrackV2*)array->At(0); + 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(); - AliITStrackV2 *longtrack =0; + 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--){ - AliITStrackV2 * track = (AliITStrackV2*)array->At(itrack); - if (!track->fConstrain) continue; - if (track->GetNumberOfClusters()+track->fNDeadZonefChi2MIP[0]-besttrack->fChi2MIP[0]>0.0) continue; - if (track->fChi2MIP[0]>4.) continue; - minn = track->GetNumberOfClusters()+track->fNDeadZone; + AliITStrackMI * track = (AliITStrackMI*)array->At(itrack); + if (!track->GetConstrain()) continue; + if (track->GetNumberOfClusters()+track->GetNDeadZone()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]fChi2MIP[1]fChi2MIP[2]fChi2MIP[3]fChi2MIP[0]fChi2MIP[1]fChi2MIP[2]fChi2MIP[3]GetConstrain()&&besttrack->GetChi2MIP(0)GetChi2MIP(1)GetChi2MIP(2)GetChi2MIP(3)2.5) return 0; if (shared>1.0) return besttrack; // - // don't sign clusters if not gold track - Double_t deltad = besttrack->GetD(GetX(),GetY()); - Double_t deltaz = besttrack->GetZat(GetX()) - GetZ(); - Double_t deltaprim = TMath::Sqrt(deltad*deltad+deltaz*deltaz); - if (deltaprim>0.1 && (fConstraint[fPass])) return besttrack; - if (TMath::Abs(deltad)>0.1) return besttrack; - if (TMath::Abs(deltaz)>0.1) return besttrack; - if (besttrack->fChi2MIP[0]>4.) return besttrack; - if (besttrack->fChi2MIP[1]>4.) return besttrack; - if (besttrack->fChi2MIP[2]>4.) return besttrack; - if (besttrack->fChi2MIP[3]>4.) return besttrack; + // Don't sign clusters if not gold track + // + if (!besttrack->IsGoldPrimary()) return besttrack; + if (besttrack->GetESDtrack()->GetKinkIndex(0)!=0) return besttrack; //track belong to kink + // if (fConstraint[fPass]){ // // sign clusters // 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;itrackAt(i); + 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(); } } @@ -2653,42 +2994,53 @@ void AliITStrackerMI::GetBestHypothesysMIP(TObjArray &itsTracks) { // // get "best" hypothesys - //for (Int_t ilayer=0;ilayer<6;ilayer++) fgLayers[ilayer].ResetWeights(); - + // Int_t nentries = itsTracks.GetEntriesFast(); for (Int_t i=0;iGetEntriesFast()<=0) continue; // - AliITStrackV2* longtrack=0; + AliITStrackMI* longtrack=0; Float_t minn=0; Float_t maxchi2=1000; for (Int_t j=0;jGetEntriesFast();j++){ - AliITStrackV2* track = (AliITStrackV2*)array->At(j); + AliITStrackMI* track = (AliITStrackMI*)array->At(j); if (!track) continue; - if (track->GetNumberOfClusters()+track->fNDeadZoneGetNumberOfClusters()+track->fNDeadZone>minn) maxchi2 = track->fChi2MIP[0]; - if (track->fChi2MIP[0]>maxchi2) continue; - minn= track->GetNumberOfClusters()+track->fNDeadZone; - maxchi2 = track->fChi2MIP[0]; + if (track->GetGoldV0()) { + longtrack = track; //gold V0 track taken + break; + } + if (track->GetNumberOfClusters()+track->GetNDeadZone()GetChi2MIP(0); + if (fAfterV0){ + if (!track->GetGoldV0()&&track->GetConstrain()==kFALSE) chi2+=5; + } + if (track->GetNumberOfClusters()+track->GetNDeadZone()>minn) maxchi2 = track->GetChi2MIP(0); + // + if (chi2 > maxchi2) continue; + minn= track->GetNumberOfClusters()+track->GetNDeadZone(); + maxchi2 = chi2; longtrack=track; - break; } - AliITStrackV2 * besttrack = (AliITStrackV2*)array->At(0); + // + // + // + AliITStrackMI * besttrack = (AliITStrackMI*)array->At(0); if (!longtrack) {longtrack = besttrack;} else besttrack= longtrack; + // 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]; @@ -2699,16 +3051,19 @@ void AliITStrackerMI::GetBestHypothesysMIP(TObjArray &itsTracks) besttrack = GetBest2Tracks(i,sharedtrack,10,5.5); } } + if (besttrack&&fAfterV0){ + UpdateESDtrack(besttrack,AliESDtrack::kITSin); + } if (besttrack&&fConstraint[fPass]) 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); } } @@ -2717,64 +3072,64 @@ void AliITStrackerMI::GetBestHypothesysMIP(TObjArray &itsTracks) } -void AliITStrackerMI::CookLabel(AliITStrackV2 *track,Float_t wrong) const { +void AliITStrackerMI::CookLabel(AliITStrackMI *track,Float_t wrong) const { //-------------------------------------------------------------------- //This function "cooks" a track label. If label<0, this track is fake. //-------------------------------------------------------------------- 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;iGetNumberOfClusters();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<SetChi2MIP(9,track->GetChi2MIP(9)+isWrong*(2<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); } } -void AliITStrackerMI::CookdEdx(AliITStrackV2* track) +void AliITStrackerMI::CookdEdx(AliITStrackMI* track) { // // // 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;iGetNumberOfClusters();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<SetChi2MIP(9,track->GetChi2MIP(9)+isWrong*(2<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++; } @@ -2803,12 +3158,13 @@ void AliITStrackerMI::CookdEdx(AliITStrackV2* track) void AliITStrackerMI::MakeCoeficients(Int_t ntracks){ // // + if (fCoeficients) delete []fCoeficients; fCoeficients = new Float_t[ntracks*48]; for (Int_t i=0;iGetTgl(); 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); @@ -2827,31 +3183,38 @@ Double_t AliITStrackerMI::GetPredictedChi2MI(AliITStrackV2* track, const AliITSc 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(AliITStrackV2* 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" @@ -2878,7 +3241,7 @@ void AliITStrackerMI::GetNTeor(Int_t layer, const AliITSclusterV2* /*cl*/, Float -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 // @@ -2912,14 +3275,17 @@ Int_t AliITStrackerMI::GetError(Int_t layer, const AliITSclusterV2*cl, Float_t t //STRIPS if (layer>3){ + //factor 1.8 appears in new simulation + // + Float_t scale=1.8; if (cl->GetNy()==100||cl->GetNz()==100){ - erry = 0.004; - errz = 0.2; + erry = 0.004*scale; + errz = 0.2*scale; return 100; } if (cl->GetNy()+cl->GetNz()>12){ - erry = 0.06; - errz = 0.57; + erry = 0.06*scale; + errz = 0.57*scale; return 100; } Float_t normq = cl->GetQ()/(TMath::Sqrt(1+theta*theta+phi*phi)); @@ -2927,39 +3293,39 @@ Int_t AliITStrackerMI::GetError(Int_t layer, const AliITSclusterV2*cl, Float_t t // if (cl->GetType()==1 || cl->GetType()==10 ){ if (chargematch<1.0 || (cl->GetNy()+cl->GetNz()GetNy()+cl->GetNz()GetNy()+cl->GetNz()-nz+ny),0.15); + erry = 0.0027*scale; + errz = TMath::Min(0.028*(chargematch+cl->GetNy()+cl->GetNz()-nz+ny),0.15)*scale; return 103; } if (cl->GetType()==2 || cl->GetType()==11 ){ - erry = TMath::Min(0.0010*(1+chargematch+cl->GetNy()+cl->GetNz()-nz+ny),0.05); - errz = TMath::Min(0.025*(1+chargematch+cl->GetNy()+cl->GetNz()-nz+ny),0.5); + erry = TMath::Min(0.0010*(1+chargematch+cl->GetNy()+cl->GetNz()-nz+ny),0.05)*scale; + errz = TMath::Min(0.025*(1+chargematch+cl->GetNy()+cl->GetNz()-nz+ny),0.5)*scale; return 104; } if (cl->GetType()>100 ){ if ((chargematch+cl->GetNy()+cl->GetNz()-nz-ny<1.5)){ - errz = 0.05; - erry = 0.00096; + errz = 0.05*scale; + erry = 0.00096*scale; return 105; } if (cl->GetNy()+cl->GetNz()-nz-ny<1){ - errz = 0.10; - erry = 0.0025; + errz = 0.10*scale; + erry = 0.0025*scale; return 106; } - errz = TMath::Min(0.05*(chargematch+cl->GetNy()+cl->GetNz()-nz-ny),0.4); - erry = TMath::Min(0.003*(chargematch+cl->GetNy()+cl->GetNz()-nz-ny),0.05); + errz = TMath::Min(0.05*(chargematch+cl->GetNy()+cl->GetNz()-nz-ny),0.4)*scale; + erry = TMath::Min(0.003*(chargematch+cl->GetNy()+cl->GetNz()-nz-ny),0.05)*scale; return 107; } Float_t diff = cl->GetNy()+cl->GetNz()-ny-nz; @@ -3031,13 +3397,25 @@ Int_t AliITStrackerMI::GetError(Int_t layer, const AliITSclusterV2*cl, Float_t t +void AliITStrackerMI::GetDCASigma(AliITStrackMI* track, Float_t & sigmarfi, Float_t &sigmaz) +{ + // + //DCA sigmas parameterization + //to be paramterized using external parameters in future + // + // + sigmarfi = 0.004+1.4 *TMath::Abs(track->GetC())+332.*track->GetC()*track->GetC(); + sigmaz = 0.011+4.37*TMath::Abs(track->GetC()); +} + + void AliITStrackerMI::SignDeltas( TObjArray *ClusterArray, Float_t vz) { // // 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]; @@ -3045,7 +3423,7 @@ void AliITStrackerMI::SignDeltas( TObjArray *ClusterArray, Float_t vz) Float_t r = (layer>0)? 7:4; // for (Int_t i=0;iAt(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 @@ -3058,7 +3436,7 @@ void AliITStrackerMI::SignDeltas( TObjArray *ClusterArray, Float_t vz) // // for (Int_t i=0;iAt(index[i]); + AliITSRecPoint* cl0 = (AliITSRecPoint*)ClusterArray->At(index[i]); if (cl0->GetDeltaProbability()>0.8) continue; // Int_t ncl = 0; @@ -3066,7 +3444,7 @@ void AliITStrackerMI::SignDeltas( TObjArray *ClusterArray, Float_t vz) sumy=sumz=sumy2=sumyz=sumw=0.0; for (Int_t j=0;jAt(index[j]); + AliITSRecPoint* cl1 = (AliITSRecPoint*)ClusterArray->At(index[j]); // Float_t dz = cl0->GetZ()-cl1->GetZ(); Float_t dy = cl0->GetY()-cl1->GetY(); @@ -3101,228 +3479,863 @@ void AliITStrackerMI::SignDeltas( TObjArray *ClusterArray, Float_t vz) } -void AliITStrackerMI::UpdateESDtrack(AliITStrackV2* track, ULong_t flags) const +void AliITStrackerMI::UpdateESDtrack(AliITStrackMI* track, ULong_t flags) const { // // track->UpdateESDtrack(flags); - AliITStrackV2 * oldtrack = (AliITStrackV2*)(track->fESDtrack->GetITStrack()); + AliITStrackMI * oldtrack = (AliITStrackMI*)(track->GetESDtrack()->GetITStrack()); if (oldtrack) delete oldtrack; - track->fESDtrack->SetITStrack(new AliITStrackV2(*track)); + track->GetESDtrack()->SetITStrack(new AliITStrackMI(*track)); + if (TMath::Abs(track->GetDnorm(1))<0.000000001){ + printf("Problem\n"); + } } - -void AliITStrackerMI::FindV0(AliESD */*event*/) -{ - // - // fast V0 finder +Int_t AliITStrackerMI::GetNearestLayer(const Double_t *xr) const{ // - AliHelix helixes[30000]; - TObjArray trackarray(30000); - Float_t dist[30000]; - AliITSRecV0Info vertex; - // - Int_t entries = fTrackHypothesys.GetEntriesFast(); - for (Int_t i=0;iAt(fBestTrackIndex[i]); - if (track){ - dist[i] = TMath::Sqrt(track->fD[0]*track->fD[0]+track->fD[1]*track->fD[1]); - trackarray.AddAt(track,i); - new (&helixes[i]) AliHelix(*track); - } - } - for (Int_t itrack0=0;itrack0fP4*track0->fP4>0) continue; //the same sign - AliHelix *h1 = &helixes[itrack0]; - AliHelix *h2 = &helixes[itrack1]; - - Double_t distance = TestV0(h1,h2,&vertex); - if (distance>0.4) continue; - if (vertex.fRr<0.3) continue; - if (vertex.fRr>27) continue; - Float_t v[3]={GetX(),GetY(),GetZ()}; - vertex.Update(v,track0->fMass, track1->fMass); - - if ((TMath::Abs(vertex.fInvMass-0.4976)<0.05 || TMath::Abs(vertex.fInvMass-0.0)<0.1|| TMath::Abs(vertex.fInvMass-1.1)<0.1)) { - if (vertex.fPointAngle<0.85) continue; - } - else{ - if (vertex.fPointAngle<0.98) continue; - } - if (TMath::Abs(TMath::Abs(track0->fLab)-TMath::Abs(track1->fLab))<2){ - Float_t mindist = FindBestPair(itrack0,itrack1,&vertex); - if (mindist>1) FindBestPair(itrack0,itrack1,&vertex); - } - } - } -} - -Double_t AliITStrackerMI::FindBestPair(Int_t esdtrack0, Int_t esdtrack1,AliITSRecV0Info *vertex) -{ + //Get nearest upper layer close to the point xr. + // rough approximation // - // 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(); - // - // - AliITSRecV0Info v0; - AliITSRecV0Info vbest; - Double_t criticalradius = vertex->fRr; - Double_t mindist =1000; - Int_t bestpair[2]; - // - for (Int_t itrack0=0;itrack0At(itrack0); - if (!track0) continue; - if (track0->fXfX>criticalradius+5) continue; - for (Int_t itrack1=0;itrack1At(itrack1); - if (!track1) continue; - if (track1->fXfX>criticalradius+5) continue; - - AliHelix h0(*track0); - AliHelix h1(*track1); - Double_t distance = TestV0(&h0,&h1,&v0); - if (v0.fRr>30) continue; - if (v0.fRr<0.2) continue; - Float_t v[3]={GetX(),GetY(),GetZ()}; - v0.Update(v,track0->fMass, track1->fMass); - if (distanceDump(); - } - return mindist; + return res; } -void AliITSRecV0Info::Update(Float_t vertex[3], Float_t mass1, Float_t mass2) -{ +void AliITStrackerMI::UpdateTPCV0(AliESD *event){ // - //Update V0 information + //try to update, or reject TPC V0s // - Float_t v[3] = {fXr[0]-vertex[0],fXr[1]-vertex[1],fXr[2]-vertex[2]}; - Float_t p[3] = {fPdr[0]+fPm[0], fPdr[1]+fPm[1],fPdr[2]+fPm[2]}; - - Float_t vnorm2 = v[0]*v[0]+v[1]*v[1]; - Float_t vnorm3 = TMath::Sqrt(v[2]*v[2]+vnorm2); - vnorm2 = TMath::Sqrt(vnorm2); - Float_t pnorm2 = p[0]*p[0]+p[1]*p[1]; - Float_t pnorm3 = TMath::Sqrt(p[2]*p[2]+pnorm2); - pnorm2 = TMath::Sqrt(pnorm2); - - fPointAngleFi = (v[0]*p[0]+v[1]*p[1])/(vnorm2*pnorm2); - fPointAngleTh = (v[2]*p[2]+vnorm2*pnorm2)/(vnorm3*pnorm3); - fPointAngle = (v[0]*p[0]+v[1]*p[1]+v[2]*p[2])/(vnorm3*pnorm3); - - Float_t e1 = TMath::Sqrt(mass1*mass1+ - fPdr[0]*fPdr[0]+ - fPdr[1]*fPdr[1]+ - fPdr[2]*fPdr[2]); - Float_t e2 = TMath::Sqrt(mass2*mass2+ - fPm[0]*fPm[0]+ - fPm[1]*fPm[1]+ - fPm[2]*fPm[2]); - - fInvMass = - (fPm[0]+fPdr[0])*(fPm[0]+fPdr[0])+ - (fPm[1]+fPdr[1])*(fPm[1]+fPdr[1])+ - (fPm[2]+fPdr[2])*(fPm[2]+fPdr[2]); - - fInvMass = TMath::Sqrt((e1+e2)*(e1+e2)-fInvMass); + Int_t nv0s = event->GetNumberOfV0s(); + Int_t nitstracks = fTrackHypothesys.GetEntriesFast(); + for (Int_t i=0;iGetV0(i); + Int_t ip = vertex->GetIndex(0); + Int_t im = vertex->GetIndex(1); + // + TObjArray * arrayp = (ipAt(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;ilayerGetClIndex(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;ilayerGetClIndex(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 + } + } + // } -Double_t AliITStrackerMI::TestV0(AliHelix *helix1, AliHelix *helix2, AliITSRecV0Info *vertex) +void AliITStrackerMI::FindV02(AliESD *event) { // - // test the helixes for the distnce calculate vertex characteristic + // V0 finder // - 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; + // Cuts on DCA - R dependent + // max distance DCA between 2 tracks cut + // maxDist = TMath::Min(kMaxDist,kMaxDist0+pvertex->GetRr()*kMaxDist); // - //find intersection linear + 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; + // - Double_t phase[2][2],radius[2]; - Int_t points = dhelix1.GetRPHIintersections(mhelix, phase, radius); - Double_t delta1=10000,delta2=10000; - - if (points>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); + // + 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;itrackGetESDtrack()->GetID(); + itsmap[esdindex] = itrack; } - distance1 = TMath::Min(delta1,delta2); - vertex->fDist1 = TMath::Sqrt(distance1); // - //find intersection parabolic + // create its tracks from esd tracks if not done before // - 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); + for (Int_t itrack=0;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++; } - - distance2 = TMath::Min(delta1,delta2); - vertex->fDist2 = TMath::Sqrt(distance2); - if (distance2<100){ - if (delta1fXr); - dhelix1.GetMomentum(phase[0][0],vertex->fPdr); - mhelix.GetMomentum(phase[0][1],vertex->fPm); - dhelix1.GetAngle(phase[0][0],mhelix,phase[0][1],vertex->fAngle); - vertex->fRr = TMath::Sqrt(radius[0]); + // + // fill temporary arrays + // + for (Int_t itrack=0;itrackGetTrack(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; + // + // + 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;ihAt(ih); + 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; } - else{ - dhelix1.Evaluate(phase[1][0],vertex->fXr); - dhelix1.GetMomentum(phase[1][0],vertex->fPdr); - mhelix.GetMomentum(phase[1][1],vertex->fPm); - dhelix1.GetAngle(phase[1][0],mhelix,phase[1][1],vertex->fAngle); - vertex->fRr = TMath::Sqrt(radius[1]); + // Get best long track without vertex constrain and best track without vertex constrain + for (Int_t ih=0;ihAt(ih); + 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 (!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 - + // + //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; + } + } + // + //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]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.="<GetSign()>0) continue; + AliITStrackMI *trackc0 = (AliITStrackMI*)trackarrayc.At(itrack0); + // + for (Int_t iesd1=0;iesd1GetSign()<0) continue; + Bool_t isGold = kFALSE; + if (TMath::Abs(TMath::Abs(btrack0->GetLabel())-TMath::Abs(btrack1->GetLabel()))==1){ + isGold = kTRUE; + } + AliITStrackMI *trackc1 = (AliITStrackMI*)trackarrayc.At(itrack1); + AliHelix &h1 = helixes[itrack0]; + AliHelix &h2 = helixes[itrack1]; + // + // find linear distance + Double_t rmin =0; + // + // + // + 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]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 (pointAnglemaxDist) continue; + // if (pvertex->GetRr()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->SetParamN(*track0); + pvertex->SetParamP(*track1); + pvertex->Update(primvertex); + pvertex->SetClusters(track0->ClIndex(),track1->ClIndex()); // register clusters + + if (pvertex->GetRr()GetRr()>kMaxR) continue; + if (pvertex->GetV0CosineOfPointingAngle()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()); + // + 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); + // + AliITStrackMI * track0b = (AliITStrackMI*)fOriginal.At(itrack0); + AliITStrackMI * track1b = (AliITStrackMI*)fOriginal.At(itrack1); + AliITStrackMI * track0l = (AliITStrackMI*)fOriginal.At(itrack0); + AliITStrackMI * track1l = (AliITStrackMI*)fOriginal.At(itrack1); + + 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->fXGetRr()-2.-0.5/(0.1+pvertex->GetAnglep()[2])) { + if (btrack->GetX()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;ilayerGetClIndex(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 (sumchi2GetNormChi2(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->fXGetRr()-2-0.5/(0.1+pvertex->GetAnglep()[2])){ + if (btrack->GetX()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;ilayerGetClIndex(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 (sumchi2GetNormChi2(i); + break; + } + // + // 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; + } + // + 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]); + // + // 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); + } + 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.)); + } + 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; + } + // + pvertex->SetCausality(pb0,pb1,pa0,pa1); + // + // 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 (causalityAGetLabel())-TMath::Abs(track1->GetLabel()))==1; + cstream<<"It0"<< + "Tr0.="<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); + } } } - // // - return vertex->fDist2; + // + // 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; +} + + +void AliITStrackerMI::RefitV02(AliESD *event) +{ + // + //try to refit V0s in the third path of the reconstruction + // + TTreeSRedirector &cstream = *fDebugStreamer; + // + Int_t nv0s = event->GetNumberOfV0s(); + Float_t primvertex[3]={GetX(),GetY(),GetZ()}; + AliV0 v0temp; + for (Int_t iv0 = 0; iv0GetV0(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.="<GetDist2() || v0temp.GetV0CosineOfPointingAngle()>v0mi->GetV0CosineOfPointingAngle()){ + if (v0temp.GetDcaV0Daughters()GetDcaV0Daughters() || v0temp.GetV0CosineOfPointingAngle()>v0mi->GetV0CosineOfPointingAngle()){ + v0mi->SetParamN(tpc0); + v0mi->SetParamP(tpc1); + v0mi->Update(primvertex); + } + } + continue; + } + 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.="<GetDist2() || v0temp.GetV0CosineOfPointingAngle()>v0mi->GetV0CosineOfPointingAngle()){ + if (v0temp.GetDcaV0Daughters()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.="<GetDist2() || v0temp.GetV0CosineOfPointingAngle()>v0mi->GetV0CosineOfPointingAngle()){ + if (v0temp.GetDcaV0Daughters()GetDcaV0Daughters() || v0temp.GetV0CosineOfPointingAngle()>v0mi->GetV0CosineOfPointingAngle()){ + v0mi->SetParamN(tpc0); + v0mi->SetParamP(tpc1); + v0mi->Update(primvertex); + } + } + } } + + + + + +