X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=STEER%2FAliVertexerTracks.cxx;h=5a68582d75cb0818ac5aab79f485ba3476b5e26c;hb=c1ae51a3dbeaf220236a3c7b7c92d9f811008bd0;hp=ebde7f38c2887008ee10317ca5238c55f20b3054;hpb=5c03260fb98a6fd3b8c441fc97bbbf038a530013;p=u%2Fmrichter%2FAliRoot.git diff --git a/STEER/AliVertexerTracks.cxx b/STEER/AliVertexerTracks.cxx index ebde7f38c28..5a68582d75c 100644 --- a/STEER/AliVertexerTracks.cxx +++ b/STEER/AliVertexerTracks.cxx @@ -14,7 +14,7 @@ **************************************************************************/ //----------------------------------------------------------------- -// Implementation of the vertexer from ESD tracks +// Implementation of the vertexer from tracks // // Origin: AliITSVertexerTracks // A.Dainese, Padova, @@ -22,17 +22,22 @@ // M.Masera, Torino, // massimo.masera@to.infn.it // Moved to STEER and adapted to ESD tracks: -// F.Prino, Torino, prino@to.infn.it +// F.Prino, Torino, prino@to.infn.it //----------------------------------------------------------------- //---- Root headers -------- -#include -#include +#include +#include +#include +#include //---- AliRoot headers ----- #include "AliStrLine.h" -#include "AliVertexerTracks.h" -#include "AliESD.h" +#include "AliExternalTrackParam.h" +#include "AliNeutralTrackParam.h" +#include "AliVEvent.h" +#include "AliVTrack.h" #include "AliESDtrack.h" +#include "AliVertexerTracks.h" ClassImp(AliVertexerTracks) @@ -42,123 +47,229 @@ AliVertexerTracks::AliVertexerTracks(): TObject(), fVert(), fCurrentVertex(0), -fMinTracks(1), -fMinITSClusters(5), -fTrkArray(), +fMode(0), +fFieldkG(-999.), +fTrkArraySel(), +fIdSel(0), fTrksToSkip(0), fNTrksToSkip(0), -fDCAcut(0), -fAlgo(1), -fNSigma(3), -fITSin(kTRUE), +fConstraint(kFALSE), +fOnlyFitter(kFALSE), +fMinTracks(1), +fMinClusters(5), +fDCAcut(0.1), +fDCAcutIter0(0.1), +fNSigma(3.), +fMaxd0z0(0.5), +fMinDetFitter(100.), +fMaxTgl(1000.), fITSrefit(kTRUE), -fDebug(0) +fITSpureSA(kFALSE), +fFiducialR(3.), +fFiducialZ(30.), +fnSigmaForUi00(1.5), +fAlgo(1), +fAlgoIter0(4) { // // Default constructor // SetVtxStart(); SetVtxStartSigma(); - SetMinTracks(); - SetMinITSClusters(); - SetNSigmad0(); } -//----------------------------------------------------------------------------- -AliVertexerTracks::AliVertexerTracks(Double_t xStart, Double_t yStart): +//---------------------------------------------------------------------------- +AliVertexerTracks::AliVertexerTracks(Double_t fieldkG): TObject(), fVert(), fCurrentVertex(0), -fMinTracks(1), -fMinITSClusters(5), -fTrkArray(), +fMode(0), +fFieldkG(fieldkG), +fTrkArraySel(), +fIdSel(0), fTrksToSkip(0), fNTrksToSkip(0), -fDCAcut(0), -fAlgo(1), -fNSigma(3), -fITSin(kTRUE), +fConstraint(kFALSE), +fOnlyFitter(kFALSE), +fMinTracks(1), +fMinClusters(5), +fDCAcut(0.1), +fDCAcutIter0(0.1), +fNSigma(3.), +fMaxd0z0(0.5), +fMinDetFitter(100.), +fMaxTgl(1000.), fITSrefit(kTRUE), -fDebug(0) +fITSpureSA(kFALSE), +fFiducialR(3.), +fFiducialZ(30.), +fnSigmaForUi00(1.5), +fAlgo(1), +fAlgoIter0(4) { // // Standard constructor // - SetVtxStart(xStart,yStart); + SetVtxStart(); SetVtxStartSigma(); - SetMinTracks(); - SetMinITSClusters(); - SetNSigmad0(); } //----------------------------------------------------------------------------- -AliVertexerTracks::~AliVertexerTracks() { +AliVertexerTracks::~AliVertexerTracks() +{ // Default Destructor // The objects pointed by the following pointer are not owned // by this class and are not deleted fCurrentVertex = 0; - delete[] fTrksToSkip; + if(fTrksToSkip) { delete [] fTrksToSkip; fTrksToSkip=NULL; } + if(fIdSel) { delete [] fIdSel; fIdSel=NULL; } } //---------------------------------------------------------------------------- -AliESDVertex* AliVertexerTracks::FindPrimaryVertex(const AliESD *esdEvent) +AliESDVertex* AliVertexerTracks::FindPrimaryVertex(const AliVEvent *vEvent) { // -// Primary vertex for current ESD event +// Primary vertex for current ESD or AOD event // (Two iterations: -// 1st with 5*fNSigma*sigma(pt) cut w.r.t. to initial vertex; -// 2nd with fNSigma*sigma(pt) cut w.r.t. to vertex found in 1st iteration) -// All ESD tracks with inside the beam pipe are then propagated to found vertex +// 1st with 5*fNSigma*sigma cut w.r.t. to initial vertex +// + cut on sqrt(d0d0+z0z0) if fConstraint=kFALSE +// 2nd with fNSigma*sigma cut w.r.t. to vertex found in 1st iteration) // fCurrentVertex = 0; - Int_t nTrksTot = (Int_t)esdEvent->GetNumberOfTracks(); - TTree *trkTree = new TTree("TreeT","tracks"); - AliESDtrack *esdTrack = 0; - trkTree->Branch("tracks","AliESDtrack",&esdTrack); + TString evtype = vEvent->IsA()->GetName(); + Bool_t inputAOD = ((evtype=="AliAODEvent") ? kTRUE : kFALSE); + + if(inputAOD && fMode==1) { + printf("Error : AliVertexerTracks: no TPC-only vertex from AOD\n"); + TooFewTracks(); + return fCurrentVertex; + } + + // accept 1-track case only if constraint is available + if(!fConstraint && fMinTracks==1) fMinTracks=2; - Bool_t skipThis; - for(Int_t i=0; iGetNumberOfTracks(); + if(nTrks500) f = new TFile("VertexerTracks.root","recreate"); + TObjArray trkArrayOrig(nTrks); + UShort_t *idOrig = new UShort_t[nTrks]; + + Int_t nTrksOrig=0; + AliExternalTrackParam *t=0; + // loop on tracks + for(Int_t i=0; iGetTrack(i); // check tracks to skip - skipThis = kFALSE; + Bool_t skipThis = kFALSE; for(Int_t j=0; jGetID()==fTrksToSkip[j]) { + AliDebug(1,Form("skipping track: %d",i)); skipThis = kTRUE; } } - AliESDtrack *et = esdEvent->GetTrack(i); - esdTrack = new AliESDtrack(*et); - if(skipThis) {delete esdTrack;continue;} - if(fITSin) { - if(!(esdTrack->GetStatus()&AliESDtrack::kITSin)) {delete esdTrack;continue;} - if(fITSrefit && !(esdTrack->GetStatus()&AliESDtrack::kITSrefit)) {delete esdTrack;continue;} - Int_t nclus=esdTrack->GetNcls(0); // check number of clusters in ITS - if(nclusGetStatus()&AliESDtrack::kITSpureSA)) continue; + // or use only pure ITS SA tracks + if(fITSpureSA && !(track->GetStatus()&AliESDtrack::kITSpureSA)) continue; + + // kITSrefit + if(fMode==0 && fITSrefit && !(track->GetStatus()&AliESDtrack::kITSrefit)) continue; + + if(!inputAOD) { // ESD + AliESDtrack* esdt = (AliESDtrack*)track; + if(esdt->GetNcls(fMode) < fMinClusters) continue; + if(fMode==0) { // ITS mode + Double_t x,p[5],cov[15]; + esdt->GetExternalParameters(x,p); + esdt->GetExternalCovariance(cov); + t = new AliExternalTrackParam(x,esdt->GetAlpha(),p,cov); + } else if(fMode==1) { // TPC mode + t = (AliExternalTrackParam*)esdt->GetTPCInnerParam(); + if(!t) continue; + Double_t radius = 2.8; //something less than the beam pipe radius + if(!PropagateTrackTo(t,radius)) continue; + } + } else { // AOD (only ITS mode) + Int_t ncls0=0; + for(Int_t l=0;l<6;l++) if(TESTBIT(track->GetITSClusterMap(),l)) ncls0++; + if(ncls0 < fMinClusters) continue; + t = new AliExternalTrackParam(track); + } + trkArrayOrig.AddLast(t); + idOrig[nTrksOrig]=(UShort_t)track->GetID(); + nTrksOrig++; + } // end loop on tracks + + // call method that will reconstruct the vertex + FindPrimaryVertex(&trkArrayOrig,idOrig); + + if(fMode==0) trkArrayOrig.Delete(); + delete [] idOrig; idOrig=NULL; + + if(f) { + f->Close(); delete f; f = NULL; + gSystem->Unlink("VertexerTracks.root"); + olddir->cd(); + } + + // set vertex ID for tracks used in the fit + // (only for ESD) + if(!inputAOD) { + Int_t nIndices = fCurrentVertex->GetNIndices(); + UShort_t *indices = fCurrentVertex->GetIndices(); + for(Int_t ind=0; indGetTrack(indices[ind]); + esdt->SetVertexID(-1); } - trkTree->Fill(); - delete esdTrack; } - - // ITERATION 1 - // propagate tracks to initVertex - // preselect them (reject for |d0|>5*fNSigma*sigma w.r.t. initVertex) - Int_t nTrksPrep; - nTrksPrep = PrepareTracks(*trkTree,1); - if(fDebug) printf(" tracks prepared - step 1: %d\n",nTrksPrep); - if(nTrksPrep < fMinTracks) { - if(fDebug) printf("TooFewTracks\n"); - TooFewTracks(esdEvent); - if(fDebug) fCurrentVertex->PrintStatus(); - fTrkArray.Delete(); - delete trkTree; - return fCurrentVertex; - } - - if(nTrksPrep==1){ - if(fDebug) printf("Just one track\n"); - OneTrackVertFinder(); - }else{ - // vertex finder - switch (fAlgo) { + return fCurrentVertex; +} +//---------------------------------------------------------------------------- +AliESDVertex* AliVertexerTracks::FindPrimaryVertex(const TObjArray *trkArrayOrig, + UShort_t *idOrig) +{ +// +// Primary vertex using the AliExternalTrackParam's in the TObjArray. +// idOrig must contain the track IDs from AliESDtrack::GetID() +// (Two iterations: +// 1st with 5*fNSigma*sigma cut w.r.t. to initial vertex +// + cut on sqrt(d0d0+z0z0) if fConstraint=kFALSE +// 2nd with fNSigma*sigma cut w.r.t. to vertex found in 1st iteration) +// + fCurrentVertex = 0; + + // accept 1-track case only if constraint is available + if(!fConstraint && fMinTracks==1) fMinTracks=2; + + // read tracks from array + Int_t nTrksOrig = (Int_t)trkArrayOrig->GetEntriesFast(); + AliDebug(1,Form("Initial number of tracks: %d",nTrksOrig)); + if(nTrksOrig0) { + fVert.GetXYZ(fNominalPos); + fNominalPos[0] = fVert.GetXv(); + fNominalPos[1] = fVert.GetYv(); + fNominalPos[2] = fVert.GetZv(); + AliDebug(1,Form("No mean vertex: VertexFinder gives (%f, %f, %f)",fNominalPos[0],fNominalPos[1],fNominalPos[2])); + } else { + fNominalPos[0] = 0.; + fNominalPos[1] = 0.; + fNominalPos[2] = 0.; + AliDebug(1,"No mean vertex and VertexFinder failed"); + } } - if(fDebug) printf(" vertex finding completed\n"); - - // vertex fitter - VertexFitter(kTRUE); - if(fDebug) printf(" vertex fit completed\n"); - fTrkArray.Delete(); + + // TWO ITERATIONS: + // + // ITERATION 1 + // propagate tracks to fNominalPos vertex + // preselect them: + // if(constraint) reject for |d0|>5*fNSigma*sigma w.r.t. fNominal... vertex + // else reject for |d0|\oplus|z0| > 5 mm w.r.t. fNominal... vertex // ITERATION 2 // propagate tracks to best between initVertex and fCurrentVertex // preselect tracks (reject for |d0|>fNSigma*sigma w.r.t. best // between initVertex and fCurrentVertex) - nTrksPrep = PrepareTracks(*trkTree,2); - delete trkTree; - if(fDebug) printf(" tracks prepared - step 2: %d\n",nTrksPrep); - if(nTrksPrep < fMinTracks) { - if(fDebug) printf("TooFewTracks\n"); - TooFewTracks(esdEvent); - if(fDebug) fCurrentVertex->PrintStatus(); - fTrkArray.Delete(); - return fCurrentVertex; - } - - // vertex finder - if(nTrksPrep==1){ - if(fDebug) printf("Just one track\n"); - OneTrackVertFinder(); - }else{ - switch (fAlgo) { - case 1: StrLinVertexFinderMinDist(1); break; - case 2: StrLinVertexFinderMinDist(0); break; - case 3: HelixVertexFinder(); break; - case 4: VertexFinder(1); break; - case 5: VertexFinder(0); break; - default: printf("Wrong algorithm\n"); break; + for(Int_t iter=1; iter<=2; iter++) { + if(fOnlyFitter && iter==1) continue; + if(fIdSel) { delete [] fIdSel; fIdSel=NULL; } + fIdSel = new UShort_t[nTrksOrig]; + Int_t nTrksSel = PrepareTracks(*trkArrayOrig,idOrig,iter); + AliDebug(1,Form("N tracks selected in iteration %d: %d",iter,nTrksSel)); + if(nTrksSel < fMinTracks) { + TooFewTracks(); + return fCurrentVertex; } - } - if(fDebug) printf(" vertex finding completed\n"); - // fitter - VertexFitter(kTRUE); - if(fDebug) printf(" vertex fit completed\n"); - - - // take true pos from ESD - Double_t tp[3]; - esdEvent->GetVertex()->GetTruePos(tp); - fCurrentVertex->SetTruePos(tp); - if(fNominalCov[0]>1.) { - fCurrentVertex->SetTitle("VertexerTracksNoConstraint"); - } else { - fCurrentVertex->SetTitle("VertexerTracksWithConstraint"); - } - - - // propagate tracks to found vertex - if(TMath::Sqrt(fCurrentVertex->GetXv()*fCurrentVertex->GetXv()+fCurrentVertex->GetYv()*fCurrentVertex->GetYv())<3.) { - for(Int_t ii=0; iiGetTrack(ii); - if(!(et->GetStatus()&AliESDtrack::kITSin)) continue; - if(et->GetX()>3.) continue; - et->RelateToVertex(fCurrentVertex,GetField(),100.); + // vertex finder + if(!fOnlyFitter) { + if(nTrksSel==1) { + AliDebug(1,"Just one track"); + OneTrackVertFinder(); + } else { + switch (fAlgo) { + case 1: StrLinVertexFinderMinDist(1); break; + case 2: StrLinVertexFinderMinDist(0); break; + case 3: HelixVertexFinder(); break; + case 4: VertexFinder(1); break; + case 5: VertexFinder(0); break; + default: printf("Wrong algorithm"); break; + } + } + AliDebug(1," Vertex finding completed"); } - } else { - AliWarning("Found vertex outside beam pipe!"); - } + // vertex fitter + VertexFitter(); + } // end loop on the two iterations + + // set indices of used tracks UShort_t *indices = 0; - AliESDtrack *ett = 0; if(fCurrentVertex->GetNContributors()>0) { - indices = new UShort_t[fCurrentVertex->GetNContributors()]; - for(Int_t jj=0;jj<(Int_t)fTrkArray.GetEntriesFast();jj++) { - ett = (AliESDtrack*)fTrkArray.At(jj); - indices[jj] = (UShort_t)ett->GetID(); - } - fCurrentVertex->SetIndices(fCurrentVertex->GetNContributors(),indices); + Int_t nIndices = (Int_t)fTrkArraySel.GetEntriesFast(); + indices = new UShort_t[nIndices]; + for(Int_t jj=0; jjSetIndices(nIndices,indices); } - delete [] indices; - fTrkArray.Delete(); + if (indices) {delete [] indices; indices=NULL;} + // - if(fTrksToSkip) delete [] fTrksToSkip; + // set vertex title + TString title="VertexerTracksNoConstraint"; + if(fConstraint) { + title="VertexerTracksWithConstraint"; + if(fOnlyFitter) title.Append("OnlyFitter"); + } + fCurrentVertex->SetTitle(title.Data()); + // + AliDebug(1,Form("xyz: %f %f %f; nc %d",fCurrentVertex->GetXv(),fCurrentVertex->GetYv(),fCurrentVertex->GetZv(),fCurrentVertex->GetNContributors())); - if(fDebug) fCurrentVertex->PrintStatus(); - if(fDebug) fCurrentVertex->PrintIndices(); - + // clean up + delete [] fIdSel; fIdSel=NULL; + fTrkArraySel.Delete(); + if(fTrksToSkip) { delete [] fTrksToSkip; fTrksToSkip=NULL; } + // + return fCurrentVertex; } //------------------------------------------------------------------------ -Double_t AliVertexerTracks::GetDeterminant3X3(Double_t matr[][3]){ +Double_t AliVertexerTracks::GetDeterminant3X3(Double_t matr[][3]) +{ // Double_t det=matr[0][0]*matr[1][1]*matr[2][2]-matr[0][0]*matr[1][2]*matr[2][1]-matr[0][1]*matr[1][0]*matr[2][2]+matr[0][1]*matr[1][2]*matr[2][0]+matr[0][2]*matr[1][0]*matr[2][1]-matr[0][2]*matr[1][1]*matr[2][0]; return det; } //------------------------------------------------------------------------- -void AliVertexerTracks::GetStrLinDerivMatrix(Double_t *p0,Double_t *p1,Double_t (*m)[3],Double_t *d){ - +void AliVertexerTracks::GetStrLinDerivMatrix(const Double_t *p0,const Double_t *p1,Double_t (*m)[3],Double_t *d) +{ // Double_t x12=p0[0]-p1[0]; Double_t y12=p0[1]-p1[1]; @@ -283,7 +398,8 @@ void AliVertexerTracks::GetStrLinDerivMatrix(Double_t *p0,Double_t *p1,Double_t } //-------------------------------------------------------------------------- -void AliVertexerTracks::GetStrLinDerivMatrix(Double_t *p0,Double_t *p1,Double_t *sigmasq,Double_t (*m)[3],Double_t *d){ +void AliVertexerTracks::GetStrLinDerivMatrix(const Double_t *p0,const Double_t *p1,const Double_t *sigmasq,Double_t (*m)[3],Double_t *d) +{ // Double_t x12=p1[0]-p0[0]; Double_t y12=p1[1]-p0[1]; @@ -325,7 +441,8 @@ void AliVertexerTracks::GetStrLinDerivMatrix(Double_t *p0,Double_t *p1,Double_t } //-------------------------------------------------------------------------- -Double_t AliVertexerTracks::GetStrLinMinDist(Double_t *p0,Double_t *p1,Double_t *x0){ +Double_t AliVertexerTracks::GetStrLinMinDist(const Double_t *p0,const Double_t *p1,const Double_t *x0) +{ // Double_t x12=p0[0]-p1[0]; Double_t y12=p0[1]-p1[1]; @@ -333,20 +450,24 @@ Double_t AliVertexerTracks::GetStrLinMinDist(Double_t *p0,Double_t *p1,Double_t Double_t x10=p0[0]-x0[0]; Double_t y10=p0[1]-x0[1]; Double_t z10=p0[2]-x0[2]; - return ((x10*x10+y10*y10+z10*z10)*(x12*x12+y12*y12+z12*z12)-(x10*x12+y10*y12+z10*z12)*(x10*x12+y10*y12+z10*z12))/(x12*x12+y12*y12+z12*z12); + // return ((x10*x10+y10*y10+z10*z10)*(x12*x12+y12*y12+z12*z12)-(x10*x12+y10*y12+z10*z12)*(x10*x12+y10*y12+z10*z12))/(x12*x12+y12*y12+z12*z12); + return ((y10*z12-z10*y12)*(y10*z12-z10*y12)+ + (z10*x12-x10*z12)*(z10*x12-x10*z12)+ + (x10*y12-y10*x12)*(x10*y12-y10*x12)) + /(x12*x12+y12*y12+z12*z12); } //--------------------------------------------------------------------------- -void AliVertexerTracks::OneTrackVertFinder() { +void AliVertexerTracks::OneTrackVertFinder() +{ // find vertex for events with 1 track, using DCA to nominal beam axis - if(fDebug) printf("Number of prepared tracks =%d - Call OneTrackVertFinder",fTrkArray.GetEntries()); - AliESDtrack *track1; - track1 = (AliESDtrack*)fTrkArray.At(0); - Double_t field=GetField(); + AliDebug(1,Form("Number of prepared tracks =%d - Call OneTrackVertFinder",fTrkArraySel.GetEntries())); + AliExternalTrackParam *track1; + track1 = (AliExternalTrackParam*)fTrkArraySel.At(0); Double_t alpha=track1->GetAlpha(); Double_t mindist = TMath::Cos(alpha)*fNominalPos[0]+TMath::Sin(alpha)*fNominalPos[1]; Double_t pos[3],dir[3]; - track1->GetXYZAt(mindist,field,pos); - track1->GetPxPyPzAt(mindist,field,dir); + track1->GetXYZAt(mindist,GetFieldkG(),pos); + track1->GetPxPyPzAt(mindist,GetFieldkG(),dir); AliStrLine *line1 = new AliStrLine(pos,dir); Double_t p1[3]={fNominalPos[0],fNominalPos[1],0.}; Double_t p2[3]={fNominalPos[0],fNominalPos[1],10.}; @@ -366,52 +487,51 @@ void AliVertexerTracks::OneTrackVertFinder() { fVert.SetNContributors(nContrib); } //--------------------------------------------------------------------------- -void AliVertexerTracks::HelixVertexFinder() { - +void AliVertexerTracks::HelixVertexFinder() +{ // Get estimate of vertex position in (x,y) from tracks DCA Double_t initPos[3]; initPos[2] = 0.; for(Int_t i=0;i<2;i++)initPos[i]=fNominalPos[i]; - Double_t field=GetField(); - Int_t nacc = (Int_t)fTrkArray.GetEntriesFast(); + Int_t nacc = (Int_t)fTrkArraySel.GetEntriesFast(); Double_t aver[3]={0.,0.,0.}; Double_t averquad[3]={0.,0.,0.}; Double_t sigmaquad[3]={0.,0.,0.}; Double_t sigma=0; Int_t ncombi = 0; - AliESDtrack *track1; - AliESDtrack *track2; + AliExternalTrackParam *track1; + AliExternalTrackParam *track2; Double_t distCA; - Double_t x, par[5]; + Double_t x; Double_t alpha, cs, sn; Double_t crosspoint[3]; for(Int_t i=0; iPropagateToDCA(track1,field); + track2 = (AliExternalTrackParam*)fTrkArraySel.At(j); + distCA=track2->PropagateToDCA(track1,GetFieldkG()); if(fDCAcut<=0 ||(fDCAcut>0&&distCAGetExternalParameters(x,par); + x=track1->GetX(); alpha=track1->GetAlpha(); cs=TMath::Cos(alpha); sn=TMath::Sin(alpha); - Double_t x1=x*cs - par[0]*sn; - Double_t y1=x*sn + par[0]*cs; - Double_t z1=par[1]; + Double_t x1=x*cs - track1->GetY()*sn; + Double_t y1=x*sn + track1->GetY()*cs; + Double_t z1=track1->GetZ(); + Double_t sx1=sn*sn*track1->GetSigmaY2(), sy1=cs*cs*track1->GetSigmaY2(); - track2->GetExternalParameters(x,par); + x=track2->GetX(); alpha=track2->GetAlpha(); cs=TMath::Cos(alpha); sn=TMath::Sin(alpha); - Double_t x2=x*cs - par[0]*sn; - Double_t y2=x*sn + par[0]*cs; - Double_t z2=par[1]; + Double_t x2=x*cs - track2->GetY()*sn; + Double_t y2=x*sn + track2->GetY()*cs; + Double_t z2=track2->GetZ(); Double_t sx2=sn*sn*track2->GetSigmaY2(), sy2=cs*cs*track2->GetSigmaY2(); Double_t sz1=track1->GetSigmaZ2(), sz2=track2->GetSigmaZ2(); Double_t wx1=sx2/(sx1+sx2), wx2=1.- wx1; @@ -446,116 +566,585 @@ void AliVertexerTracks::HelixVertexFinder() { fVert.SetNContributors(ncombi); } //---------------------------------------------------------------------------- -Int_t AliVertexerTracks::PrepareTracks(TTree &trkTree,Int_t OptImpParCut) { +Int_t AliVertexerTracks::PrepareTracks(const TObjArray &trkArrayOrig, + const UShort_t *idOrig, + Int_t optImpParCut) +{ // // Propagate tracks to initial vertex position and store them in a TObjArray // - Double_t maxd0rphi = 3.; - Int_t nTrks = 0; + AliDebug(1," PrepareTracks()"); + + Int_t nTrksOrig = (Int_t)trkArrayOrig.GetEntriesFast(); + Int_t nTrksSel = 0; + Double_t maxd0rphi; Double_t sigmaCurr[3]; - Float_t d0z0[2],covd0z0[3]; - Double_t sigma; - Double_t field=GetField(); + Double_t normdistx,normdisty; + Double_t d0z0[2],covd0z0[3]; + Double_t sigmad0; AliESDVertex *initVertex = new AliESDVertex(fNominalPos,fNominalCov,1,1); - Int_t nEntries = (Int_t)trkTree.GetEntries(); - if(!fTrkArray.IsEmpty()) fTrkArray.Delete(); + if(!fTrkArraySel.IsEmpty()) fTrkArraySel.Delete(); - if(fDebug) { - printf(" PrepareTracks()\n"); - } + AliExternalTrackParam *track=0; - for(Int_t i=0; iCharge()!=0) { // normal tracks + track = new AliExternalTrackParam(*(AliExternalTrackParam*)trkArrayOrig.At(i)); + } else { // neutral tracks (from a V0) + track = new AliNeutralTrackParam(*(AliNeutralTrackParam*)trkArrayOrig.At(i)); + } + // tgl cut + if(TMath::Abs(track->GetTgl())>fMaxTgl) { + AliDebug(1,Form(" rejecting track with tgl = %f",track->GetTgl())); + delete track; continue; + } + + Bool_t propagateOK = kFALSE, cutond0z0 = kTRUE; // propagate track to vertex - if(OptImpParCut==1) { // OptImpParCut==1 - track->RelateToVertex(initVertex,field,100.); - } else { // OptImpParCut==2 + if(optImpParCut<2 || fOnlyFitter) { // optImpParCut==1 or 0 + propagateOK = track->PropagateToDCA(initVertex,GetFieldkG(),100.,d0z0,covd0z0); + } else { // optImpParCut==2 fCurrentVertex->GetSigmaXYZ(sigmaCurr); - if((sigmaCurr[0]+sigmaCurr[1])<(TMath::Sqrt(fNominalCov[0])+TMath::Sqrt(fNominalCov[2]))) { - track->RelateToVertex(fCurrentVertex,field,100.); + normdistx = TMath::Abs(fCurrentVertex->GetXv()-fNominalPos[0])/TMath::Sqrt(sigmaCurr[0]*sigmaCurr[0]+fNominalCov[0]); + normdisty = TMath::Abs(fCurrentVertex->GetYv()-fNominalPos[1])/TMath::Sqrt(sigmaCurr[1]*sigmaCurr[1]+fNominalCov[2]); + AliDebug(1,Form("normdistx %f %f %f",fCurrentVertex->GetXv(),fNominalPos[0],TMath::Sqrt(sigmaCurr[0]*sigmaCurr[0]+fNominalCov[0]))); + AliDebug(1,Form("normdisty %f %f %f",fCurrentVertex->GetYv(),fNominalPos[1],TMath::Sqrt(sigmaCurr[1]*sigmaCurr[1]+fNominalCov[2]))); + AliDebug(1,Form("sigmaCurr %f %f %f",sigmaCurr[0],sigmaCurr[1],TMath::Sqrt(fNominalCov[0])+TMath::Sqrt(fNominalCov[2]))); + if(normdistx < 3. && normdisty < 3. && + (sigmaCurr[0]+sigmaCurr[1])<(TMath::Sqrt(fNominalCov[0])+TMath::Sqrt(fNominalCov[2]))) { + propagateOK = track->PropagateToDCA(fCurrentVertex,GetFieldkG(),100.,d0z0,covd0z0); } else { - track->RelateToVertex(initVertex,field,100.); + propagateOK = track->PropagateToDCA(initVertex,GetFieldkG(),100.,d0z0,covd0z0); + if(fConstraint) cutond0z0=kFALSE; } } - // select tracks with d0rphi < maxd0rphi - track->GetImpactParameters(d0z0,covd0z0); - sigma = TMath::Sqrt(covd0z0[0]); - maxd0rphi = fNSigma*sigma; - if(OptImpParCut==1) maxd0rphi *= 5.; + if(!propagateOK) { + AliDebug(1," rejected"); + delete track; continue; + } + + sigmad0 = TMath::Sqrt(covd0z0[0]); + maxd0rphi = fNSigma*sigmad0; + if(optImpParCut==1) maxd0rphi *= 5.; + maxd0rphi = TMath::Min(maxd0rphi,fFiducialR); + //sigmad0z0 = TMath::Sqrt(covd0z0[0]+covd0z0[2]); + + AliDebug(1,Form("trk %d; id %d; |d0| = %f; d0 cut = %f; |z0| = %f; |d0|oplus|z0| = %f; d0z0 cut = %f",i,(Int_t)idOrig[i],TMath::Abs(d0z0[0]),maxd0rphi,TMath::Abs(d0z0[1]),TMath::Sqrt(d0z0[0]*d0z0[0]+d0z0[1]*d0z0[1]),fMaxd0z0)); + + + //---- track selection based on impact parameters ----// - if(fDebug) printf("trk %d; lab %d; |d0| = %f; cut = %f\n",i,track->GetLabel(),TMath::Abs(d0z0[0]),maxd0rphi); - if(TMath::Abs(d0z0[0]) > maxd0rphi) { - if(fDebug) printf(" rejected\n"); + // always reject tracks outside fiducial volume + if(TMath::Abs(d0z0[0])>fFiducialR || TMath::Abs(d0z0[1])>fFiducialZ) { + AliDebug(1," rejected"); delete track; continue; } - fTrkArray.AddLast(track); - nTrks++; - } + // during iterations 1 and 2 , reject tracks with d0rphi > maxd0rphi + if(optImpParCut>0 && TMath::Abs(d0z0[0])>maxd0rphi) { + AliDebug(1," rejected"); + delete track; continue; + } + + // if fConstraint=kFALSE, during iterations 1 and 2 || + // if fConstraint=kTRUE, during iteration 2, + // select tracks with d0oplusz0 < fMaxd0z0 + if((!fConstraint && optImpParCut>0 && fVert.GetNContributors()>0) || + ( fConstraint && optImpParCut==2 && cutond0z0)) { + if(nTrksOrig>=3 && + TMath::Sqrt(d0z0[0]*d0z0[0]+d0z0[1]*d0z0[1])>fMaxd0z0) { + AliDebug(1," rejected"); + delete track; continue; + } + } + + // track passed all selections + fTrkArraySel.AddLast(track); + fIdSel[nTrksSel] = idOrig[i]; + nTrksSel++; + } // end loop on tracks delete initVertex; - return nTrks; + return nTrksSel; } +//---------------------------------------------------------------------------- +Bool_t AliVertexerTracks::PropagateTrackTo(AliExternalTrackParam *track, + Double_t xToGo) { + //---------------------------------------------------------------- + // COPIED from AliTracker + // + // Propagates the track to the plane X=xk (cm). + // + // Origin: Marian Ivanov, Marian.Ivanov@cern.ch + //---------------------------------------------------------------- + + const Double_t kEpsilon = 0.00001; + Double_t xpos = track->GetX(); + Double_t dir = (xpos kEpsilon){ + Double_t step = dir*TMath::Min(TMath::Abs(xToGo-xpos), maxStep); + Double_t x = xpos+step; + Double_t xyz0[3],xyz1[3]; + track->GetXYZ(xyz0); //starting global position + + if(!track->GetXYZAt(x,GetFieldkG(),xyz1)) return kFALSE; // no prolongation + xyz1[2]+=kEpsilon; // waiting for bug correction in geo + + if(TMath::Abs(track->GetSnpAt(x,GetFieldkG())) >= maxSnp) return kFALSE; + if(!track->PropagateTo(x,GetFieldkG())) return kFALSE; + + if(TMath::Abs(track->GetSnp()) >= maxSnp) return kFALSE; + track->GetXYZ(xyz0); // global position + Double_t alphan = TMath::ATan2(xyz0[1], xyz0[0]); + // + Double_t ca=TMath::Cos(alphan-track->GetAlpha()), + sa=TMath::Sin(alphan-track->GetAlpha()); + Double_t sf=track->GetSnp(), cf=TMath::Sqrt((1.-sf)*(1.+sf)); + Double_t sinNew = sf*ca - cf*sa; + if(TMath::Abs(sinNew) >= maxSnp) return kFALSE; + if(!track->Rotate(alphan)) return kFALSE; + + xpos = track->GetX(); + } + return kTRUE; +} +//--------------------------------------------------------------------------- +AliESDVertex* AliVertexerTracks::RemoveTracksFromVertex(AliESDVertex *inVtx, + const TObjArray *trkArray, + UShort_t *id, + const Float_t *diamondxy) const +{ +// +// Removes tracks in trksTree from fit of inVtx +// + + if(!strstr(inVtx->GetTitle(),"VertexerTracksWithConstraint")) { + printf("ERROR: primary vertex has no constraint: cannot remove tracks"); + return 0x0; + } + if(!strstr(inVtx->GetTitle(),"VertexerTracksWithConstraintOnlyFitter")) + printf("WARNING: result of tracks' removal will be only approximately correct"); + + TMatrixD rv(3,1); + rv(0,0) = inVtx->GetXv(); + rv(1,0) = inVtx->GetYv(); + rv(2,0) = inVtx->GetZv(); + TMatrixD vV(3,3); + Double_t cov[6]; + inVtx->GetCovMatrix(cov); + vV(0,0) = cov[0]; + vV(0,1) = cov[1]; vV(1,0) = cov[1]; + vV(1,1) = cov[2]; + vV(0,2) = cov[3]; vV(2,0) = cov[3]; + vV(1,2) = cov[4]; vV(2,1) = cov[4]; + vV(2,2) = cov[5]; + + TMatrixD sumWi(TMatrixD::kInverted,vV); + TMatrixD sumWiri(sumWi,TMatrixD::kMult,rv); + + Int_t nUsedTrks = inVtx->GetNIndices(); + Double_t chi2 = inVtx->GetChi2(); + + AliExternalTrackParam *track = 0; + Int_t ntrks = (Int_t)trkArray->GetEntriesFast(); + for(Int_t i=0;iAt(i); + if(!inVtx->UsesTrack(id[i])) { + printf("track %d was not used in vertex fit",id[i]); + continue; + } + Double_t alpha = track->GetAlpha(); + Double_t xl = diamondxy[0]*TMath::Cos(alpha)+diamondxy[1]*TMath::Sin(alpha); + track->PropagateTo(xl,GetFieldkG()); + // vector of track global coordinates + TMatrixD ri(3,1); + // covariance matrix of ri + TMatrixD wWi(3,3); + + // get space point from track + if(!TrackToPoint(track,ri,wWi)) continue; + + TMatrixD wWiri(wWi,TMatrixD::kMult,ri); + + sumWi -= wWi; + sumWiri -= wWiri; + + // track contribution to chi2 + TMatrixD deltar = rv; deltar -= ri; + TMatrixD wWideltar(wWi,TMatrixD::kMult,deltar); + Double_t chi2i = deltar(0,0)*wWideltar(0,0)+ + deltar(1,0)*wWideltar(1,0)+ + deltar(2,0)*wWideltar(2,0); + // remove from total chi2 + chi2 -= chi2i; + + nUsedTrks--; + if(nUsedTrks<2) { + printf("Trying to remove too many tracks!"); + return 0x0; + } + } + + TMatrixD rvnew(3,1); + TMatrixD vVnew(3,3); + + // new inverted of weights matrix + TMatrixD invsumWi(TMatrixD::kInverted,sumWi); + vVnew = invsumWi; + // new position of primary vertex + rvnew.Mult(vVnew,sumWiri); + + Double_t position[3]; + position[0] = rvnew(0,0); + position[1] = rvnew(1,0); + position[2] = rvnew(2,0); + cov[0] = vVnew(0,0); + cov[1] = vVnew(0,1); + cov[2] = vVnew(1,1); + cov[3] = vVnew(0,2); + cov[4] = vVnew(1,2); + cov[5] = vVnew(2,2); + + // store data in the vertex object + AliESDVertex *outVtx = new AliESDVertex(position,cov,chi2,nUsedTrks+1); // the +1 is for the constraint + outVtx->SetTitle(inVtx->GetTitle()); + UShort_t *inindices = inVtx->GetIndices(); + Int_t nIndices = nUsedTrks; + UShort_t *outindices = new UShort_t[nIndices]; + Int_t j=0; + for(Int_t k=0; kGetNIndices(); k++) { + Bool_t copyindex=kTRUE; + for(Int_t l=0; lSetIndices(nIndices,outindices); + if (outindices) delete [] outindices; + + /* + printf("Vertex before removing tracks:"); + inVtx->PrintStatus(); + inVtx->PrintIndices(); + printf("Vertex after removing tracks:"); + outVtx->PrintStatus(); + outVtx->PrintIndices(); + */ + + return outVtx; +} +//--------------------------------------------------------------------------- +AliESDVertex* AliVertexerTracks::RemoveConstraintFromVertex(AliESDVertex *inVtx, + Float_t *diamondxyz, + Float_t *diamondcov) const +{ +// +// Removes diamond constraint from fit of inVtx +// + + if(!strstr(inVtx->GetTitle(),"VertexerTracksWithConstraint")) { + printf("ERROR: primary vertex has no constraint: cannot remove it\n"); + return 0x0; + } + if(inVtx->GetNContributors()<3) { + printf("ERROR: primary vertex has less than 2 tracks: cannot remove contraint\n"); + return 0x0; + } + + // diamond constraint + TMatrixD vVb(3,3); + vVb(0,0) = diamondcov[0]; + vVb(0,1) = diamondcov[1]; + vVb(0,2) = 0.; + vVb(1,0) = diamondcov[1]; + vVb(1,1) = diamondcov[2]; + vVb(1,2) = 0.; + vVb(2,0) = 0.; + vVb(2,1) = 0.; + vVb(2,2) = diamondcov[5]; + TMatrixD vVbInv(TMatrixD::kInverted,vVb); + TMatrixD rb(3,1); + rb(0,0) = diamondxyz[0]; + rb(1,0) = diamondxyz[1]; + rb(2,0) = diamondxyz[2]; + TMatrixD vVbInvrb(vVbInv,TMatrixD::kMult,rb); + + // input vertex + TMatrixD rv(3,1); + rv(0,0) = inVtx->GetXv(); + rv(1,0) = inVtx->GetYv(); + rv(2,0) = inVtx->GetZv(); + TMatrixD vV(3,3); + Double_t cov[6]; + inVtx->GetCovMatrix(cov); + vV(0,0) = cov[0]; + vV(0,1) = cov[1]; vV(1,0) = cov[1]; + vV(1,1) = cov[2]; + vV(0,2) = cov[3]; vV(2,0) = cov[3]; + vV(1,2) = cov[4]; vV(2,1) = cov[4]; + vV(2,2) = cov[5]; + TMatrixD vVInv(TMatrixD::kInverted,vV); + TMatrixD vVInvrv(vVInv,TMatrixD::kMult,rv); + + + TMatrixD sumWi = vVInv - vVbInv; + + + TMatrixD sumWiri = vVInvrv - vVbInvrb; + + TMatrixD rvnew(3,1); + TMatrixD vVnew(3,3); + + // new inverted of weights matrix + TMatrixD invsumWi(TMatrixD::kInverted,sumWi); + vVnew = invsumWi; + // new position of primary vertex + rvnew.Mult(vVnew,sumWiri); + + Double_t position[3]; + position[0] = rvnew(0,0); + position[1] = rvnew(1,0); + position[2] = rvnew(2,0); + cov[0] = vVnew(0,0); + cov[1] = vVnew(0,1); + cov[2] = vVnew(1,1); + cov[3] = vVnew(0,2); + cov[4] = vVnew(1,2); + cov[5] = vVnew(2,2); + + + Double_t chi2 = inVtx->GetChi2(); + + // diamond constribution to chi2 + TMatrixD deltar = rv; deltar -= rb; + TMatrixD vVbInvdeltar(vVbInv,TMatrixD::kMult,deltar); + Double_t chi2b = deltar(0,0)*vVbInvdeltar(0,0)+ + deltar(1,0)*vVbInvdeltar(1,0)+ + deltar(2,0)*vVbInvdeltar(2,0); + // remove from total chi2 + chi2 -= chi2b; + + // store data in the vertex object + AliESDVertex *outVtx = new AliESDVertex(position,cov,chi2,inVtx->GetNContributors()-1); + outVtx->SetTitle("VertexerTracksNoConstraint"); + UShort_t *inindices = inVtx->GetIndices(); + Int_t nIndices = inVtx->GetNIndices(); + outVtx->SetIndices(nIndices,inindices); + + return outVtx; +} +//--------------------------------------------------------------------------- +void AliVertexerTracks::SetCuts(Double_t *cuts) +{ +// +// Cut values +// + SetDCAcut(cuts[0]); + SetDCAcutIter0(cuts[1]); + SetMaxd0z0(cuts[2]); + if(fMode==0 && cuts[3]<0) SetITSrefitNotRequired(); + SetMinClusters((Int_t)(TMath::Abs(cuts[3]))); + SetMinTracks((Int_t)(cuts[4])); + SetNSigmad0(cuts[5]); + SetMinDetFitter(cuts[6]); + SetMaxTgl(cuts[7]); + SetFiducialRZ(cuts[8],cuts[9]); + fAlgo=(Int_t)(cuts[10]); + fAlgoIter0=(Int_t)(cuts[11]); + + return; +} +//--------------------------------------------------------------------------- +void AliVertexerTracks::SetITSMode(Double_t dcacut, + Double_t dcacutIter0, + Double_t maxd0z0, + Int_t minCls, + Int_t mintrks, + Double_t nsigma, + Double_t mindetfitter, + Double_t maxtgl, + Double_t fidR, + Double_t fidZ, + Int_t finderAlgo, + Int_t finderAlgoIter0) +{ +// +// Cut values for ITS mode +// + fMode = 0; + if(minCls>0) { + SetITSrefitRequired(); + } else { + SetITSrefitNotRequired(); + } + SetDCAcut(dcacut); + SetDCAcutIter0(dcacutIter0); + SetMaxd0z0(maxd0z0); + SetMinClusters(TMath::Abs(minCls)); + SetMinTracks(mintrks); + SetNSigmad0(nsigma); + SetMinDetFitter(mindetfitter); + SetMaxTgl(maxtgl); + SetFiducialRZ(fidR,fidZ); + fAlgo=finderAlgo; + fAlgoIter0=finderAlgoIter0; + + return; +} +//--------------------------------------------------------------------------- +void AliVertexerTracks::SetTPCMode(Double_t dcacut, + Double_t dcacutIter0, + Double_t maxd0z0, + Int_t minCls, + Int_t mintrks, + Double_t nsigma, + Double_t mindetfitter, + Double_t maxtgl, + Double_t fidR, + Double_t fidZ, + Int_t finderAlgo, + Int_t finderAlgoIter0) +{ +// +// Cut values for TPC mode +// + fMode = 1; + SetITSrefitNotRequired(); + SetDCAcut(dcacut); + SetDCAcutIter0(dcacutIter0); + SetMaxd0z0(maxd0z0); + SetMinClusters(minCls); + SetMinTracks(mintrks); + SetNSigmad0(nsigma); + SetMinDetFitter(mindetfitter); + SetMaxTgl(maxtgl); + SetFiducialRZ(fidR,fidZ); + fAlgo=finderAlgo; + fAlgoIter0=finderAlgoIter0; + + return; +} //--------------------------------------------------------------------------- -void AliVertexerTracks::SetSkipTracks(Int_t n,Int_t *skipped) { +void AliVertexerTracks::SetSkipTracks(Int_t n,const Int_t *skipped) +{ // -// Mark the tracks not ot be used in the vertex finding +// Mark the tracks not to be used in the vertex reconstruction. +// Tracks are identified by AliESDtrack::GetID() // - fNTrksToSkip = n; - fTrksToSkip = new Int_t[n]; + fNTrksToSkip = n; fTrksToSkip = new Int_t[n]; for(Int_t i=0;iGetXYZ(fNominalPos); vtx->GetCovMatrix(fNominalCov); + SetConstraintOn(); return; } //--------------------------------------------------------------------------- -void AliVertexerTracks::StrLinVertexFinderMinDist(Int_t optUseWeights){ +void AliVertexerTracks::StrLinVertexFinderMinDist(Int_t optUseWeights) +{ + AliExternalTrackParam *track1; + const Int_t knacc = (Int_t)fTrkArraySel.GetEntriesFast(); + AliStrLine **linarray = new AliStrLine* [knacc]; + for(Int_t i=0; iGetAlpha(); + Double_t mindist = TMath::Cos(alpha)*fNominalPos[0]+TMath::Sin(alpha)*fNominalPos[1]; + Double_t pos[3],dir[3],sigmasq[3]; + track1->GetXYZAt(mindist,GetFieldkG(),pos); + track1->GetPxPyPzAt(mindist,GetFieldkG(),dir); + sigmasq[0]=TMath::Sin(alpha)*TMath::Sin(alpha)*track1->GetSigmaY2(); + sigmasq[1]=TMath::Cos(alpha)*TMath::Cos(alpha)*track1->GetSigmaY2(); + sigmasq[2]=track1->GetSigmaZ2(); + TMatrixD ri(3,1); + TMatrixD wWi(3,3); + if(!TrackToPoint(track1,ri,wWi)) {optUseWeights=kFALSE;printf("WARNING\n");} + Double_t wmat[9]; + Int_t iel=0; + for(Int_t ia=0;ia<3;ia++){ + for(Int_t ib=0;ib<3;ib++){ + wmat[iel]=wWi(ia,ib); + iel++; + } + } + linarray[i] = new AliStrLine(pos,sigmasq,wmat,dir); + } + fVert=TrackletVertexFinder(linarray,knacc,optUseWeights); + for(Int_t i=0; iGetEntriesFast(); + AliStrLine** lines2 = new AliStrLine* [knacc]; + for(Int_t i=0; iAt(i); + } + AliESDVertex vert = TrackletVertexFinder(lines2,knacc,optUseWeights); + delete [] lines2; + return vert; +} - // Calculate the point at minimum distance to prepared tracks - - Double_t initPos[3]; - initPos[2] = 0.; - Double_t sigma=0; - for(Int_t i=0;i<2;i++)initPos[i]=fNominalPos[i]; - const Int_t knacc = (Int_t)fTrkArray.GetEntriesFast(); - Double_t field=GetField(); +//--------------------------------------------------------------------------- +AliESDVertex AliVertexerTracks::TrackletVertexFinder(AliStrLine **lines, const Int_t knacc, Int_t optUseWeights) +{ + // Calculate the point at minimum distance to prepared tracks (array of AliStrLine) + + Double_t initPos[3]={0.,0.,0.}; - AliESDtrack *track1; Double_t (*vectP0)[3]=new Double_t [knacc][3]; Double_t (*vectP1)[3]=new Double_t [knacc][3]; Double_t sum[3][3]; Double_t dsum[3]={0,0,0}; - for(Int_t i=0;i<3;i++) - for(Int_t j=0;j<3;j++)sum[i][j]=0; - for(Int_t i=0; iGetAlpha(); - Double_t mindist = TMath::Cos(alpha)*fNominalPos[0]+TMath::Sin(alpha)*fNominalPos[1]; - Double_t pos[3],dir[3]; - track1->GetXYZAt(mindist,field,pos); - track1->GetPxPyPzAt(mindist,field,dir); - AliStrLine *line1 = new AliStrLine(pos,dir); - // AliStrLine *line1 = new AliStrLine(); - // track1->ApproximateHelixWithLine(mindist,field,line1); + TMatrixD sumWi(3,3); + for(Int_t i=0;i<3;i++){ + for(Int_t j=0;j<3;j++){ + sum[i][j]=0; + sumWi(i,j)=0.; + } + } - Double_t p0[3],cd[3]; + for(Int_t i=0; iGetP0(p0); line1->GetCd(cd); + line1->GetSigma2P0(sigmasq); + line1->GetWMatrix(wmat); + TMatrixD wWi(3,3); + Int_t iel=0; + for(Int_t ia=0;ia<3;ia++){ + for(Int_t ib=0;ib<3;ib++){ + wWi(ia,ib)=wmat[iel]; + iel++; + } + } + + sumWi+=wWi; + Double_t p1[3]={p0[0]+cd[0],p0[1]+cd[1],p0[2]+cd[2]}; vectP0[i][0]=p0[0]; vectP0[i][1]=p0[1]; @@ -567,132 +1156,243 @@ void AliVertexerTracks::StrLinVertexFinderMinDist(Int_t optUseWeights){ Double_t matr[3][3]; Double_t dknow[3]; if(optUseWeights==0)GetStrLinDerivMatrix(p0,p1,matr,dknow); - if(optUseWeights==1){ - Double_t sigmasq[3]; - sigmasq[0]=track1->GetSigmaY2(); - sigmasq[1]=track1->GetSigmaY2(); - sigmasq[2]=track1->GetSigmaZ2(); - GetStrLinDerivMatrix(p0,p1,sigmasq,matr,dknow); - } + else GetStrLinDerivMatrix(p0,p1,sigmasq,matr,dknow); + for(Int_t iii=0;iii<3;iii++){ dsum[iii]+=dknow[iii]; for(Int_t lj=0;lj<3;lj++) sum[iii][lj]+=matr[iii][lj]; } - delete line1; } - + + TMatrixD invsumWi(TMatrixD::kInverted,sumWi); + Double_t covmatrix[6]; + covmatrix[0] = invsumWi(0,0); + covmatrix[1] = invsumWi(0,1); + covmatrix[2] = invsumWi(1,1); + covmatrix[3] = invsumWi(0,2); + covmatrix[4] = invsumWi(1,2); + covmatrix[5] = invsumWi(2,2); + Double_t vett[3][3]; Double_t det=GetDeterminant3X3(sum); + Double_t sigma=0; - if(det!=0){ - for(Int_t zz=0;zz<3;zz++){ - for(Int_t ww=0;ww<3;ww++){ - for(Int_t kk=0;kk<3;kk++) vett[ww][kk]=sum[ww][kk]; - } - for(Int_t kk=0;kk<3;kk++) vett[kk][zz]=dsum[kk]; - initPos[zz]=GetDeterminant3X3(vett)/det; - } - - - for(Int_t i=0; i kAlmost0){ + for(Int_t zz=0;zz<3;zz++){ + for(Int_t ww=0;ww<3;ww++){ + for(Int_t kk=0;kk<3;kk++) vett[ww][kk]=sum[ww][kk]; + } + for(Int_t kk=0;kk<3;kk++) vett[kk][zz]=dsum[kk]; + initPos[zz]=GetDeterminant3X3(vett)/det; + } + + + for(Int_t i=0; i0.) {sigma=TMath::Sqrt(sigma);}else{sigma=999;} + }else{ sigma=999; } - delete vectP0; - delete vectP1; - fVert.SetXYZ(initPos); - fVert.SetDispersion(sigma); - fVert.SetNContributors(knacc); + AliESDVertex theVert(initPos,covmatrix,99999.,knacc); + theVert.SetDispersion(sigma); + delete [] vectP0; + delete [] vectP1; + return theVert; } + +//--------------------------------------------------------------------------- +Bool_t AliVertexerTracks::TrackToPoint(AliExternalTrackParam *t, + TMatrixD &ri,TMatrixD &wWi, + Bool_t uUi3by3) const +{ +// +// Extract from the AliExternalTrackParam the global coordinates ri and covariance matrix +// wWi of the space point that it represents (to be used in VertexFitter()) +// + + + Double_t rotAngle = t->GetAlpha(); + if(rotAngle<0.) rotAngle += 2.*TMath::Pi(); + Double_t cosRot = TMath::Cos(rotAngle); + Double_t sinRot = TMath::Sin(rotAngle); + + ri(0,0) = t->GetX()*cosRot-t->GetY()*sinRot; + ri(1,0) = t->GetX()*sinRot+t->GetY()*cosRot; + ri(2,0) = t->GetZ(); + + + + if(!uUi3by3) { + // matrix to go from global (x,y,z) to local (y,z); + TMatrixD qQi(2,3); + qQi(0,0) = -sinRot; + qQi(0,1) = cosRot; + qQi(0,2) = 0.; + qQi(1,0) = 0.; + qQi(1,1) = 0.; + qQi(1,2) = 1.; + + // covariance matrix of local (y,z) - inverted + TMatrixD uUi(2,2); + uUi(0,0) = t->GetSigmaY2(); + uUi(0,1) = t->GetSigmaZY(); + uUi(1,0) = t->GetSigmaZY(); + uUi(1,1) = t->GetSigmaZ2(); + //printf(" Ui :"); + //printf(" %f %f",uUi(0,0),uUi(0,1)); + //printf(" %f %f",uUi(1,0),uUi(1,1)); + + if(uUi.Determinant() <= 0.) return kFALSE; + TMatrixD uUiInv(TMatrixD::kInverted,uUi); + + // weights matrix: wWi = qQiT * uUiInv * qQi + TMatrixD uUiInvQi(uUiInv,TMatrixD::kMult,qQi); + TMatrixD m(qQi,TMatrixD::kTransposeMult,uUiInvQi); + wWi = m; + } else { + if(fVert.GetNContributors()<1) AliFatal("Vertex from finder is empty"); + // matrix to go from global (x,y,z) to local (x,y,z); + TMatrixD qQi(3,3); + qQi(0,0) = cosRot; + qQi(0,1) = sinRot; + qQi(0,2) = 0.; + qQi(1,0) = -sinRot; + qQi(1,1) = cosRot; + qQi(1,2) = 0.; + qQi(2,0) = 0.; + qQi(2,1) = 0.; + qQi(2,2) = 1.; + + // covariance of fVert along the track + Double_t p[3],pt,ptot; + t->GetPxPyPz(p); + pt = TMath::Sqrt(p[0]*p[0]+p[1]*p[1]); + ptot = TMath::Sqrt(pt*pt+p[2]*p[2]); + Double_t cphi = p[0]/pt; //cos(phi)=px/pt + Double_t sphi = p[1]/pt; //sin(phi)=py/pt + Double_t clambda = pt/ptot; //cos(lambda)=pt/ptot + Double_t slambda = p[2]/ptot; //sin(lambda)=pz/ptot + Double_t covfVert[6]; + fVert.GetCovMatrix(covfVert); + Double_t covfVertalongt = + covfVert[0]*cphi*cphi*clambda*clambda + +covfVert[1]*2.*cphi*sphi*clambda*clambda + +covfVert[3]*2.*cphi*clambda*slambda + +covfVert[2]*sphi*sphi*clambda*clambda + +covfVert[4]*2.*sphi*clambda*slambda + +covfVert[5]*slambda*slambda; + // covariance matrix of local (x,y,z) - inverted + TMatrixD uUi(3,3); + uUi(0,0) = covfVertalongt * fnSigmaForUi00 * fnSigmaForUi00; + AliDebug(1,Form("=====> sqrtUi00 cm %f",TMath::Sqrt(uUi(0,0)))); + uUi(0,1) = 0.; + uUi(0,2) = 0.; + uUi(1,0) = 0.; + uUi(1,1) = t->GetSigmaY2(); + uUi(1,2) = t->GetSigmaZY(); + uUi(2,0) = 0.; + uUi(2,1) = t->GetSigmaZY(); + uUi(2,2) = t->GetSigmaZ2(); + //printf(" Ui :\n"); + //printf(" %f %f\n",uUi(0,0),uUi(0,1)); + //printf(" %f %f\n",uUi(1,0),uUi(1,1)); + + if(uUi.Determinant() <= 0.) return kFALSE; + TMatrixD uUiInv(TMatrixD::kInverted,uUi); + + // weights matrix: wWi = qQiT * uUiInv * qQi + TMatrixD uUiInvQi(uUiInv,TMatrixD::kMult,qQi); + TMatrixD m(qQi,TMatrixD::kTransposeMult,uUiInvQi); + wWi = m; + } + + + return kTRUE; +} //--------------------------------------------------------------------------- -void AliVertexerTracks::TooFewTracks(const AliESD* esdEvent) { +void AliVertexerTracks::TooFewTracks() +{ // -// When the number of tracks is < fMinTracks +// When the number of tracks is < fMinTracks, +// deal with vertices not found and prepare to exit // + AliDebug(1,"TooFewTracks"); - // deal with vertices not found Double_t pos[3],err[3]; - Int_t ncontr=0; pos[0] = fNominalPos[0]; err[0] = TMath::Sqrt(fNominalCov[0]); pos[1] = fNominalPos[1]; err[1] = TMath::Sqrt(fNominalCov[2]); - pos[2] = esdEvent->GetVertex()->GetZv(); - err[2] = esdEvent->GetVertex()->GetZRes(); - if(err[0]>1. && esdEvent->GetVertex()->GetNContributors()<=0) - ncontr = -1; // (x,y,z) = (0,0,0) - if(err[0]>1. && esdEvent->GetVertex()->GetNContributors()>0) - ncontr = -2; // (x,y,z) = (0,0,z_fromSPD) - if(err[0]<1. && esdEvent->GetVertex()->GetNContributors()<=0) - ncontr = -3; // (x,y,z) = (x_mean,y_mean,0) - if(err[0]<1. && esdEvent->GetVertex()->GetNContributors()>0) - ncontr = -4; // (x,y,z) = (x_mean,y_mean,z_fromSPD) - fCurrentVertex = 0; + pos[2] = fNominalPos[2]; + err[2] = TMath::Sqrt(fNominalCov[5]); + Int_t ncontr = (err[0]>1. ? -1 : -3); + if(fCurrentVertex) { delete fCurrentVertex; fCurrentVertex=0; } fCurrentVertex = new AliESDVertex(pos,err); fCurrentVertex->SetNContributors(ncontr); - Double_t tp[3]; - esdEvent->GetVertex()->GetTruePos(tp); - fCurrentVertex->SetTruePos(tp); - fCurrentVertex->SetTitle("VertexerTracksWithConstraint"); - if(ncontr==-1||ncontr==-2) + if(fConstraint) { + fCurrentVertex->SetTitle("VertexerTracksWithConstraint"); + } else { fCurrentVertex->SetTitle("VertexerTracksNoConstraint"); + } + + if(!fTrkArraySel.IsEmpty()) fTrkArraySel.Delete(); + if(fIdSel) {delete [] fIdSel; fIdSel=NULL;} + if(fTrksToSkip) {delete [] fTrksToSkip; fTrksToSkip=NULL;} return; } //--------------------------------------------------------------------------- -void AliVertexerTracks::VertexFinder(Int_t optUseWeights) { +void AliVertexerTracks::VertexFinder(Int_t optUseWeights) +{ // Get estimate of vertex position in (x,y) from tracks DCA Double_t initPos[3]; initPos[2] = 0.; for(Int_t i=0;i<2;i++)initPos[i]=fNominalPos[i]; - Int_t nacc = (Int_t)fTrkArray.GetEntriesFast(); + Int_t nacc = (Int_t)fTrkArraySel.GetEntriesFast(); Double_t aver[3]={0.,0.,0.}; Double_t aversq[3]={0.,0.,0.}; Double_t sigmasq[3]={0.,0.,0.}; Double_t sigma=0; Int_t ncombi = 0; - AliESDtrack *track1; - AliESDtrack *track2; + AliExternalTrackParam *track1; + AliExternalTrackParam *track2; Double_t pos[3],dir[3]; Double_t alpha,mindist; - Double_t field=GetField(); for(Int_t i=0; iGetAlpha(); mindist = TMath::Cos(alpha)*fNominalPos[0]+TMath::Sin(alpha)*fNominalPos[1]; - track1->GetXYZAt(mindist,field,pos); - track1->GetPxPyPzAt(mindist,field,dir); + track1->GetXYZAt(mindist,GetFieldkG(),pos); + track1->GetPxPyPzAt(mindist,GetFieldkG(),dir); AliStrLine *line1 = new AliStrLine(pos,dir); // AliStrLine *line1 = new AliStrLine(); - // track1->ApproximateHelixWithLine(mindist,field,line1); + // track1->ApproximateHelixWithLine(mindist,GetFieldkG(),line1); for(Int_t j=i+1; jGetAlpha(); mindist = TMath::Cos(alpha)*fNominalPos[0]+TMath::Sin(alpha)*fNominalPos[1]; - track2->GetXYZAt(mindist,field,pos); - track2->GetPxPyPzAt(mindist,field,dir); + track2->GetXYZAt(mindist,GetFieldkG(),pos); + track2->GetPxPyPzAt(mindist,GetFieldkG(),dir); AliStrLine *line2 = new AliStrLine(pos,dir); // AliStrLine *line2 = new AliStrLine(); - // track2->ApproximateHelixWithLine(mindist,field,line2); + // track2->ApproximateHelixWithLine(mindist,GetFieldkG(),line2); Double_t distCA=line2->GetDCA(line1); - if(fDCAcut<=0 || (fDCAcut>0&&distCA0&&distCA0){ for(Int_t jj=0;jj<3;jj++){ initPos[jj] = aver[jj]/ncombi; + //printf("%f\n",initPos[jj]); aversq[jj]/=ncombi; sigmasq[jj]=aversq[jj]-initPos[jj]*initPos[jj]; sigma+=sigmasq[jj]; @@ -749,22 +1450,34 @@ void AliVertexerTracks::VertexFinder(Int_t optUseWeights) { fVert.SetNContributors(ncombi); } //--------------------------------------------------------------------------- -void AliVertexerTracks::VertexFitter(Bool_t useNominalVtx) { +void AliVertexerTracks::VertexFitter() +{ // // The optimal estimate of the vertex position is given by a "weighted -// average of tracks positions" -// Original method: CMS Note 97/0051 +// average of tracks positions". +// Original method: V. Karimaki, CMS Note 97/0051 // + Bool_t useConstraint = fConstraint; Double_t initPos[3]; - fVert.GetXYZ(initPos); - if(fDebug) { - printf(" VertexFitter(): start\n"); - printf(" Number of tracks in array: %d\n",(Int_t)fTrkArray.GetEntriesFast()); - printf(" Minimum # tracks required in fit: %d\n",fMinTracks); - printf("Vertex position after finder: %f,%f,%f\n",initPos[0],initPos[1],initPos[2]); - if(useNominalVtx) printf(" This vertex will be used in fit: (%f+-%f,%f+-%f)\n",fNominalPos[0],TMath::Sqrt(fNominalCov[0]),fNominalPos[1],TMath::Sqrt(fNominalCov[2])); + if(!fOnlyFitter) { + fVert.GetXYZ(initPos); + } else { + initPos[0]=fNominalPos[0]; + initPos[1]=fNominalPos[1]; + initPos[2]=fNominalPos[2]; } + Int_t nTrksSel = (Int_t)fTrkArraySel.GetEntries(); + if(nTrksSel==1) useConstraint=kTRUE; + AliDebug(1,"--- VertexFitter(): start"); + AliDebug(1,Form(" Number of tracks in array: %d\n",nTrksSel)); + AliDebug(1,Form(" Minimum # tracks required in fit: %d\n",fMinTracks)); + AliDebug(1,Form(" Vertex position after finder: %f,%f,%f\n",initPos[0],initPos[1],initPos[2])); + if(useConstraint) AliDebug(1,Form(" This vertex will be used in fit: (%f+-%f,%f+-%f)\n",fNominalPos[0],TMath::Sqrt(fNominalCov[0]),fNominalPos[1],TMath::Sqrt(fNominalCov[2]))); + + // special treatment for few-tracks fits (e.g. secondary vertices) + Bool_t uUi3by3 = kFALSE; if(nTrksSel<5 && !useConstraint) uUi3by3 = kTRUE; + Int_t i,j,k,step=0; TMatrixD rv(3,1); TMatrixD vV(3,3); @@ -772,13 +1485,9 @@ void AliVertexerTracks::VertexFitter(Bool_t useNominalVtx) { rv(1,0) = initPos[1]; rv(2,0) = 0.; Double_t xlStart,alpha; - Double_t rotAngle; - Double_t cosRot,sinRot; - Double_t cc[15]; - Int_t nUsedTrks; - Double_t chi2,chi2i; - Int_t arrEntries = (Int_t)fTrkArray.GetEntries(); - AliESDtrack *t = 0; + Int_t nTrksUsed; + Double_t chi2,chi2i,chi2b; + AliExternalTrackParam *t = 0; Int_t failed = 0; // initial vertex covariance matrix @@ -804,9 +1513,11 @@ void AliVertexerTracks::VertexFitter(Bool_t useNominalVtx) { // 1st - estimate of vtx using all tracks // 2nd - estimate of global chi2 for(step=0; step<2; step++) { - if(fDebug) printf(" step = %d\n",step); + AliDebug(1,Form(" step = %d\n",step)); chi2 = 0.; - nUsedTrks = 0; + nTrksUsed = 0; + + if(step==1) { initPos[0]=rv(0,0); initPos[0]=rv(1,0); } TMatrixD sumWiri(3,1); TMatrixD sumWi(3,3); @@ -815,55 +1526,38 @@ void AliVertexerTracks::VertexFitter(Bool_t useNominalVtx) { for(j=0; j<3; j++) sumWi(j,i) = 0.; } - - if(useNominalVtx) { + // mean vertex constraint + if(useConstraint) { for(i=0;i<3;i++) { sumWiri(i,0) += vVbInvrb(i,0); for(k=0;k<3;k++) sumWi(i,k) += vVbInv(i,k); } + // chi2 + TMatrixD deltar = rv; deltar -= rb; + TMatrixD vVbInvdeltar(vVbInv,TMatrixD::kMult,deltar); + chi2b = deltar(0,0)*vVbInvdeltar(0,0)+ + deltar(1,0)*vVbInvdeltar(1,0)+ + deltar(2,0)*vVbInvdeltar(2,0); + chi2 += chi2b; } - // loop on tracks - for(k=0; kGetAlpha(); xlStart = initPos[0]*TMath::Cos(alpha)+initPos[1]*TMath::Sin(alpha); - t->AliExternalTrackParam::PropagateTo(xlStart,AliTracker::GetBz()); // to vtxSeed - rotAngle = alpha; - if(alpha<0.) rotAngle += 2.*TMath::Pi(); - cosRot = TMath::Cos(rotAngle); - sinRot = TMath::Sin(rotAngle); - + // to vtxSeed (from finder) + t->PropagateTo(xlStart,GetFieldkG()); + // vector of track global coordinates TMatrixD ri(3,1); - ri(0,0) = t->GetX()*cosRot-t->GetY()*sinRot; - ri(1,0) = t->GetX()*sinRot+t->GetY()*cosRot; - ri(2,0) = t->GetZ(); - - // matrix to go from global (x,y,z) to local (y,z); - TMatrixD qQi(2,3); - qQi(0,0) = -sinRot; - qQi(0,1) = cosRot; - qQi(0,2) = 0.; - qQi(1,0) = 0.; - qQi(1,1) = 0.; - qQi(1,2) = 1.; - - // covariance matrix of local (y,z) - inverted - TMatrixD uUi(2,2); - t->GetExternalCovariance(cc); - uUi(0,0) = cc[0]; - uUi(0,1) = cc[1]; - uUi(1,0) = cc[1]; - uUi(1,1) = cc[2]; - - // weights matrix: wWi = qQiT * uUiInv * qQi - if(uUi.Determinant() <= 0.) continue; - TMatrixD uUiInv(TMatrixD::kInverted,uUi); - TMatrixD uUiInvQi(uUiInv,TMatrixD::kMult,qQi); - TMatrixD wWi(qQi,TMatrixD::kTransposeMult,uUiInvQi); + // covariance matrix of ri + TMatrixD wWi(3,3); + + // get space point from track + if(!TrackToPoint(t,ri,wWi,uUi3by3)) continue; + TMatrixD wWiri(wWi,TMatrixD::kMult,ri); // track chi2 TMatrixD deltar = rv; deltar -= ri; @@ -872,45 +1566,38 @@ void AliVertexerTracks::VertexFitter(Bool_t useNominalVtx) { deltar(1,0)*wWideltar(1,0)+ deltar(2,0)*wWideltar(2,0); - // add to total chi2 chi2 += chi2i; - TMatrixD wWiri(wWi,TMatrixD::kMult,ri); - sumWiri += wWiri; sumWi += wWi; - nUsedTrks++; + nTrksUsed++; } // end loop on tracks - if(nUsedTrks < fMinTracks) { + if(nTrksUsed < fMinTracks) { failed=1; continue; } Double_t determinant = sumWi.Determinant(); - //cerr<<" determinant: "<PrintStatus(); - } + AliDebug(1," Vertex after fit:"); + AliDebug(1,Form("xyz: %f %f %f; nc %d",fCurrentVertex->GetXv(),fCurrentVertex->GetYv(),fCurrentVertex->GetZv(),fCurrentVertex->GetNContributors())); + AliDebug(1,"--- VertexFitter(): finish\n"); + return; } //---------------------------------------------------------------------------- -AliVertex* AliVertexerTracks::VertexForSelectedTracks(TTree *trkTree) { +AliESDVertex* AliVertexerTracks::VertexForSelectedTracks(const TObjArray *trkArray, + UShort_t *id, + Bool_t optUseFitter, + Bool_t optPropagate, + Bool_t optUseDiamondConstraint) +{ // -// Return vertex from tracks in trkTree +// Return vertex from tracks (AliExternalTrackParam) in array // + fCurrentVertex = 0; + // set optUseDiamondConstraint=TRUE only if you are reconstructing the + // primary vertex! + if(optUseDiamondConstraint) { + SetConstraintOn(); + } else { + SetConstraintOff(); + } // get tracks and propagate them to initial vertex position - Int_t nTrksPrep = PrepareTracks(*trkTree,1); - if(nTrksPrep < TMath::Max(2,fMinTracks) ) { - if(fDebug) printf("TooFewTracks\n"); - Double_t vtx[3]={0,0,0}; - fVert.SetXYZ(vtx); - fVert.SetDispersion(999); - fVert.SetNContributors(-5); - fTrkArray.Delete(); - return &fVert; + fIdSel = new UShort_t[(Int_t)trkArray->GetEntriesFast()]; + Int_t nTrksSel = PrepareTracks(*trkArray,id,0); + if((!optUseDiamondConstraint && nTrksSelSetDispersion(fVert.GetDispersion()); + + + // set indices of used tracks and propagate track to found vertex UShort_t *indices = 0; - AliESDtrack *eta = 0; - if(fVert.GetNContributors()>0) { - indices = new UShort_t[fVert.GetNContributors()]; - for(Int_t jj=0;jj<(Int_t)fTrkArray.GetEntriesFast();jj++) { - eta = (AliESDtrack*)fTrkArray.At(jj); - indices[jj] = (UShort_t)eta->GetID(); + Double_t d0z0[2],covd0z0[3]; + AliExternalTrackParam *t = 0; + if(fCurrentVertex->GetNContributors()>0) { + indices = new UShort_t[fTrkArraySel.GetEntriesFast()]; + for(Int_t jj=0; jj<(Int_t)fTrkArraySel.GetEntriesFast(); jj++) { + indices[jj] = fIdSel[jj]; + t = (AliExternalTrackParam*)fTrkArraySel.At(jj); + if(optPropagate && optUseFitter) { + if(TMath::Sqrt(fCurrentVertex->GetXv()*fCurrentVertex->GetXv()+fCurrentVertex->GetYv()*fCurrentVertex->GetYv())<3.) { + t->PropagateToDCA(fCurrentVertex,GetFieldkG(),100.,d0z0,covd0z0); + AliDebug(1,Form("Track %d propagated to found vertex",jj)); + } else { + AliWarning("Found vertex outside beam pipe!"); + } + } } - fVert.SetIndices(fVert.GetNContributors(),indices); + fCurrentVertex->SetIndices(fCurrentVertex->GetNContributors(),indices); } - delete [] indices; - fTrkArray.Delete(); + + // clean up + if (indices) {delete [] indices; indices=NULL;} + delete [] fIdSel; fIdSel=NULL; + fTrkArraySel.Delete(); - return &fVert; + return fCurrentVertex; } //---------------------------------------------------------------------------- -AliVertex* AliVertexerTracks::VertexForSelectedTracks(TObjArray *trkArray) { +AliESDVertex* AliVertexerTracks::VertexForSelectedESDTracks(TObjArray *trkArray, + Bool_t optUseFitter, + Bool_t optPropagate, + Bool_t optUseDiamondConstraint) + +{ // -// Return vertex from array of tracks +// Return vertex from array of ESD tracks // - // get tracks and propagate them to initial vertex position - Int_t nTrks = trkArray->GetEntriesFast(); - if(nTrks < TMath::Max(2,fMinTracks) ) { - if(fDebug) printf("TooFewTracks\n"); - Double_t vtx[3]={0,0,0}; - fVert.SetXYZ(vtx); - fVert.SetDispersion(999); - fVert.SetNContributors(-5); - fTrkArray.Delete(); - return &fVert; - } - TTree *trkTree = new TTree("TreeT","tracks"); - AliESDtrack *esdTrack = 0; - trkTree->Branch("tracks","AliESDtrack",&esdTrack); + Int_t nTrks = (Int_t)trkArray->GetEntriesFast(); + UShort_t *id = new UShort_t[nTrks]; + + AliESDtrack *esdt = 0; for(Int_t i=0; iAt(i); - trkTree->Fill(); + esdt = (AliESDtrack*)trkArray->At(i); + id[i] = (UShort_t)esdt->GetID(); } - AliVertex *vtx = VertexForSelectedTracks(trkTree); - delete trkTree; - return vtx; + VertexForSelectedTracks(trkArray,id,optUseFitter,optPropagate,optUseDiamondConstraint); + + delete [] id; id=NULL; + + return fCurrentVertex; } //--------------------------------------------------------------------------