X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ITS%2FAliITStrackerSA.cxx;h=008b6acbfeb5f6219db24720d10c336271a0437d;hb=7f346d34297b74c0e09cb1c2be03e56c077bb8c2;hp=01d9bb560d783e20780ba903af12cb228769a630;hpb=adda6c2b277bfdfdf2796aa4f35e7150976ad124;p=u%2Fmrichter%2FAliRoot.git diff --git a/ITS/AliITStrackerSA.cxx b/ITS/AliITStrackerSA.cxx index 01d9bb560d7..008b6acbfeb 100644 --- a/ITS/AliITStrackerSA.cxx +++ b/ITS/AliITStrackerSA.cxx @@ -15,12 +15,11 @@ /* $Id$ */ -//////////////////////////////////////////////////// -// Stand alone tracker class // -// Origin: Elisabetta Crescio // -// e-mail: crescio@to.infn.it // -// tracks are saved as AliITStrackV2 objects // -//////////////////////////////////////////////////// +/////////////////////////////////////////////////////////// +// Stand alone ITS tracker class // +// Origin: Elisabetta Crescio - crescio@to.infn.it // +// Updated: Francesco Prino - prino@to.infn.it // +/////////////////////////////////////////////////////////// #include @@ -38,6 +37,8 @@ #include "AliITSgeomTGeo.h" #include "AliITStrackSA.h" #include "AliITStrackerSA.h" +#include "AliITSReconstructor.h" +#include "AliLog.h" #include "AliRun.h" ClassImp(AliITStrackerSA) @@ -57,9 +58,13 @@ fLambdaWin(0), fVert(0), fVertexer(0), fListOfTracks(0), +fListOfSATracks(0), fITSclusters(0), -fSixPoints(0), +fInwardFlag(0), fOuterStartLayer(0), +fInnerStartLayer(5), +fMinNPoints(0), +fMinQ(0.), fCluLayer(0), fCluCoord(0){ // Default constructor @@ -81,9 +86,13 @@ fLambdaWin(0), fVert(0), fVertexer(0), fListOfTracks(0), +fListOfSATracks(0), fITSclusters(0), -fSixPoints(0), +fInwardFlag(0), fOuterStartLayer(0), +fInnerStartLayer(5), +fMinNPoints(0), +fMinQ(0.), fCluLayer(0), fCluCoord(0) { @@ -112,9 +121,13 @@ fLambdaWin(0), fVert(vert), fVertexer(0), fListOfTracks(0), +fListOfSATracks(0), fITSclusters(0), -fSixPoints(0), +fInwardFlag(0), fOuterStartLayer(0), +fInnerStartLayer(5), +fMinNPoints(0), +fMinQ(0.), fCluLayer(0), fCluCoord(0) { @@ -141,9 +154,13 @@ fLambdaWin(0), fVert(), fVertexer(vertexer), fListOfTracks(0), +fListOfSATracks(0), fITSclusters(0), -fSixPoints(0), +fInwardFlag(0), fOuterStartLayer(0), +fInnerStartLayer(5), +fMinNPoints(0), +fMinQ(0.), fCluLayer(0), fCluCoord(0) { @@ -155,7 +172,7 @@ fCluCoord(0) fVertexer = vertexer; } - +/* //____________________________________________________________________________ AliITStrackerSA::AliITStrackerSA(const AliITStrackerSA& tracker):AliITStrackerMI(), fPhiEstimate(tracker.fPhiEstimate), @@ -171,9 +188,13 @@ fLambdaWin(tracker.fLambdaWin), fVert(tracker.fVert), fVertexer(tracker.fVertexer), fListOfTracks(tracker.fListOfTracks), +fListOfSATracks(tracker.fListOfSATracks), fITSclusters(tracker.fITSclusters), -fSixPoints(tracker.fSixPoints), +fInwardFlag(tracker.fInwardFlag), fOuterStartLayer(tracker.fOuterStartLayer), +fInnerStartLayer(tracker.fInnerStartLayer), +fMinNPoints(tracker.fMinNPoints), +fMinQ(tracker.fMinQ), fCluLayer(tracker.fCluLayer), fCluCoord(tracker.fCluCoord) { // Copy constructor @@ -202,7 +223,7 @@ AliITStrackerSA& AliITStrackerSA::operator=(const AliITStrackerSA& source){ return *this; } - +*/ //____________________________________________________________________________ AliITStrackerSA::~AliITStrackerSA(){ // destructor @@ -218,6 +239,8 @@ AliITStrackerSA::~AliITStrackerSA(){ if(fLambdaWin)delete []fLambdaWin; fListOfTracks->Delete(); delete fListOfTracks; + fListOfSATracks->Delete(); + delete fListOfSATracks; if(fCluLayer){ for(Int_t i=0;iGetPrimaryVertexSPD(); + if(spdv) nSPDcontr = spdv->GetNContributors(); + if(AliITSReconstructor::GetRecoParam()->GetSAUseAllClusters()==kTRUE && + nSPDcontr<=AliITSReconstructor::GetRecoParam()->GetMaxSPDcontrForSAToUseAllClusters()) { + rc=FindTracks(event,kTRUE); + } + } return rc; } @@ -271,14 +304,25 @@ void AliITStrackerSA::Init(){ fPointc[1]=0; fVert = 0; fVertexer = 0; - SetWindowSizes(); + Int_t nLoops=AliITSReconstructor::GetRecoParam()->GetNLoopsSA(); + if(nLoops==33){ + SetFixedWindowSizes(); + }else{ + Double_t phimin=AliITSReconstructor::GetRecoParam()->GetMinPhiSA(); + Double_t phimax=AliITSReconstructor::GetRecoParam()->GetMaxPhiSA(); + Double_t lambmin=AliITSReconstructor::GetRecoParam()->GetMinLambdaSA(); + Double_t lambmax=AliITSReconstructor::GetRecoParam()->GetMaxLambdaSA(); + SetCalculatedWindowSizes(nLoops,phimin,phimax,lambmin,lambmax); + } + fMinQ=AliITSReconstructor::GetRecoParam()->GetSAMinClusterCharge(); fITSclusters = 0; - SetSixPoints(); - SetOuterStartLayer(0); + SetOuterStartLayer(1); SetSAFlag(kFALSE); - fListOfTracks=new TObjArray(0,0); + fListOfTracks=new TClonesArray("AliITStrackMI",100); + fListOfSATracks=new TClonesArray("AliITStrackSA",100); fCluLayer = 0; fCluCoord = 0; + fMinNPoints = 3; } //_______________________________________________________________________ void AliITStrackerSA::ResetForFinding(){ @@ -292,847 +336,428 @@ void AliITStrackerSA::ResetForFinding(){ fCoef3=0; fPointc[0]=0; fPointc[1]=0; - fListOfTracks->Delete(); + fListOfTracks->Clear(); + fListOfSATracks->Clear(); } //______________________________________________________________________ -Int_t AliITStrackerSA::FindTracks(AliESDEvent* event){ +Int_t AliITStrackerSA::FindTracks(AliESDEvent* event, Bool_t useAllClusters){ // Track finder using the ESD object - - //controllare numero cluster sui layer1 e 2 (morti?) - //non trova tracce...controllare.. + AliDebug(2,Form(" field is %f",event->GetMagneticField())); + AliDebug(2,Form("SKIPPING %d %d %d %d %d %d",ForceSkippingOfLayer(0),ForceSkippingOfLayer(1),ForceSkippingOfLayer(2),ForceSkippingOfLayer(3),ForceSkippingOfLayer(4),ForceSkippingOfLayer(5))); if(!fITSclusters){ Fatal("FindTracks","ITS cluster tree is not accessed - Abort!!!\n Please use method SetClusterTree to pass the pointer to the tree\n"); return -1; } - - //Reads event and mark clusters of traks already found, with flag kITSin - Int_t nentr=event->GetNumberOfTracks(); - while (nentr--) { - AliESDtrack *track=event->GetTrack(nentr); - if (track->GetStatus()&AliESDtrack::kITSin==AliESDtrack::kITSin){ - Int_t idx[12]; - Int_t ncl = track->GetITSclusters(idx); - for(Int_t k=0;kSetBit(kSAflag); - } - } - } - - //Get primary vertex - Double_t primaryVertex[3]; - event->GetVertex()->GetXYZ(primaryVertex); - //Creates TClonesArray with clusters for each layer. The clusters already used - //by AliITStrackerMI are not considered - - Int_t nclusters[6]={0,0,0,0,0,0}; - Int_t dmar[6]={0,0,0,0,0,0}; - if (fCluLayer == 0) { - fCluLayer = new TClonesArray*[AliITSgeomTGeo::GetNLayers()]; - fCluCoord = new TClonesArray*[AliITSgeomTGeo::GetNLayers()]; - for(Int_t i=0;iTestBit(kSAflag)==kTRUE) continue; //clusters used by TPC prol. - if(cls->GetQ()==0) continue; //fake clusters dead zones - nclusters[i]++; - } - dmar[i]=0; - delete fCluLayer[i]; - fCluLayer[i] = new TClonesArray("AliITSRecPoint",nclusters[i]); - delete fCluCoord[i]; - fCluCoord[i] = new TClonesArray("AliITSclusterTable",nclusters[i]); - } - - - Int_t * firstmod = new Int_t[AliITSgeomTGeo::GetNLayers()]; - for(Int_t i=0;iTestBit(kSAflag)==kTRUE) continue; - if(cls->GetQ()==0) continue; - Double_t phi=0;Double_t lambda=0; - Float_t x=0;Float_t y=0;Float_t z=0; - Float_t sx=0;Float_t sy=0;Float_t sz=0; - GetCoorAngles(cls,phi,lambda,x,y,z,primaryVertex); - GetCoorErrors(cls,sx,sy,sz); - new (clulay[dmar[ilay]]) AliITSRecPoint(*cls); - new (clucoo[dmar[ilay]]) AliITSclusterTable(x,y,z,sx,sy,sz,phi,lambda,cli); - dmar[ilay]++; - } - } - - - - Int_t ntrack=0; - //loop on the different windows - for(Int_t nloop=0;nloopGetEntries();ncl++){ //loop starting from layer 0 - - ResetForFinding(); - Int_t pflag=0; - - AliITSRecPoint* cl = (AliITSRecPoint*)fCluLayer[0]->At(ncl); - - if(!cl) continue; - - - if (cl->GetQ()<=0) continue; - - AliITSclusterTable* arr = (AliITSclusterTable*)GetClusterCoord(0,ncl); - fPhic = arr->GetPhi(); - fLambdac = arr->GetLambda(); - if (TMath::Abs(fLambdac)>0.26*TMath::Pi()) continue; - fPhiEstimate = fPhic; - AliITStrackSA* trs = new AliITStrackSA(); - fPoint1[0]=primaryVertex[0]; - fPoint1[1]=primaryVertex[1]; - - - fPoint2[0]=arr->GetX(); - fPoint2[1]=arr->GetY(); - Int_t * nn = new Int_t[AliITSgeomTGeo::GetNLayers()];//counter for clusters on each layer - for(Int_t i=0;i0){ - pflag=1; - fPoint3[0] = fPointc[0]; - fPoint3[1] = fPointc[1]; + Int_t nentr=event->GetNumberOfTracks(); + if(!useAllClusters) { + while (nentr--) { + AliESDtrack *track=event->GetTrack(nentr); + if ((track->GetStatus()&AliESDtrack::kITSin) == AliESDtrack::kITSin){ + Int_t idx[12]; + Int_t ncl = track->GetITSclusters(idx); + for(Int_t k=0;kSetBit(kSAflag); + } } - nn[2] = SearchClusters(2,fPhiWin[nloop],fLambdaWin[nloop],trs,primaryVertex[2],pflag); - if(nn[1]==0 && nn[2]==0) pflag=0; - if(nn[2]!=0 && nn[1]!=0){ pflag=1; UpdatePoints();} - if(nn[2]!=0 && nn[1]==0){ - pflag=1; - fPoint3[0]=fPointc[0]; - fPoint3[1]=fPointc[1]; + } + }else{ + while (nentr--) { + AliESDtrack *track=event->GetTrack(nentr); + if ((track->GetStatus()&AliESDtrack::kITSin) == AliESDtrack::kITSin){ + Int_t idx[12]; + Int_t ncl = track->GetITSclusters(idx); + for(Int_t k=0;kResetBit(kSAflag); + } } - - nn[3] = SearchClusters(3,fPhiWin[nloop],fLambdaWin[nloop],trs,primaryVertex[2],pflag); - pflag=1; - if(nn[3]!=0) UpdatePoints(); - nn[4] = SearchClusters(4,fPhiWin[nloop],fLambdaWin[nloop],trs,primaryVertex[2],pflag); - pflag=1; - if(nn[4]!=0) UpdatePoints(); - nn[5] = SearchClusters(5,fPhiWin[nloop],fLambdaWin[nloop],trs,primaryVertex[2],pflag); - - - Int_t layOK=0; - Int_t numberofpoints; - if(fSixPoints) numberofpoints=6; //check of the candidate track - else numberofpoints=5; //if track is good (with the required number - for(Int_t nnp=0;nnpGetVertex()->GetXYZ(primaryVertex); + //Creates TClonesArray with clusters for each layer. The clusters already used + //by AliITStrackerMI are not considered + Int_t nclusters[AliITSgeomTGeo::kNLayers]={0,0,0,0,0,0}; + Int_t dmar[AliITSgeomTGeo::kNLayers]={0,0,0,0,0,0}; + if (fCluLayer == 0) { + fCluLayer = new TClonesArray*[AliITSgeomTGeo::kNLayers]; + fCluCoord = new TClonesArray*[AliITSgeomTGeo::kNLayers]; + for(Int_t i=0;iTestBit(kSAflag)==kTRUE) continue; //clusters used by TPC prol. + if(cls->GetQ()==0) continue; //fake clusters dead zones + if(i>1 && cls->GetQ()<=fMinQ) continue; // cut on SDD and SSD cluster charge + nclusters[i]++; } - if(layOK>=numberofpoints){ - - AliITStrackV2* tr2 = FitTrack(trs,primaryVertex); - - if(tr2==0) continue; + } + dmar[i]=0; + if(!fCluLayer[i]){ + fCluLayer[i] = new TClonesArray("AliITSRecPoint",nclusters[i]); + }else{ + fCluLayer[i]->Delete(); + fCluLayer[i]->Expand(nclusters[i]); + } + if(!fCluCoord[i]){ + fCluCoord[i] = new TClonesArray("AliITSclusterTable",nclusters[i]); + }else{ + fCluCoord[i]->Delete(); + fCluCoord[i]->Expand(nclusters[i]); + } + } - AliESDtrack outtrack; - outtrack.UpdateTrackParams(tr2,AliESDtrack::kITSin); - event->AddTrack(&outtrack); - ntrack++; + for(Int_t ilay=0;ilayTestBit(kSAflag)==kTRUE) continue; + if(cls->GetQ()==0) continue; + if(ilay>1 && cls->GetQ()<=fMinQ) continue; + Double_t phi=0;Double_t lambda=0; + Float_t x=0;Float_t y=0;Float_t z=0; + Float_t sx=0;Float_t sy=0;Float_t sz=0; + GetCoorAngles(cls,phi,lambda,x,y,z,primaryVertex); + GetCoorErrors(cls,sx,sy,sz); + new (clulay[dmar[ilay]]) AliITSRecPoint(*cls); + new (clucoo[dmar[ilay]]) AliITSclusterTable(x,y,z,sx,sy,sz,phi,lambda,cli); + dmar[ilay]++; } - - - delete trs; - delete[] nn; - - }//end loop on clusters of layer1 - - //end loop2 - } - - //if 5/6 points are required, second loop starting - //from second layer (SPD2), to find tracks with point of - //layer 1 missing - if(!fSixPoints) { - //printf("looking from SPD2\n"); - // counter for clusters on each layer - Int_t * nn = new Int_t[AliITSgeomTGeo::GetNLayers()-1]; - for(Int_t nloop=0;nloopGetEntries(); - while(ncl2--){ //loop starting from layer 2 - ResetForFinding(); - Int_t pflag=0; - AliITSRecPoint* cl = (AliITSRecPoint*)fCluLayer[1]->At(ncl2); - - if(!cl) continue; - AliITSclusterTable* arr = (AliITSclusterTable*)GetClusterCoord(1,ncl2); - fPhic = arr->GetPhi(); - fLambdac = arr->GetLambda(); - fPhiEstimate = fPhic; - - AliITStrackSA* trs = new AliITStrackSA(); - fPoint1[0]=primaryVertex[0]; - fPoint1[1]=primaryVertex[1]; - - fPoint2[0]=arr->GetX(); - fPoint2[1]=arr->GetY(); - for(Int_t kk=0;kk=5){ // 5/6 - AliITStrackV2* tr2 = FitTrack(trs,primaryVertex); - if(tr2==0){ - continue; - } - - AliESDtrack outtrack; - outtrack.UpdateTrackParams(tr2,AliESDtrack::kITSin); - event->AddTrack(&outtrack); - ntrack++; - - } - - delete trs; - }//end loop on clusters of layer2 - } - - delete [] nn; - } //end opt="5/6" - - - - // search for tracks starting from SPD2, SDD1, SDD2, SSD2 - // for cosmics (A. Dainese 31.07.07) - if(fOuterStartLayer>0) { - for(Int_t innLay=1; innLay<=fOuterStartLayer; innLay++) { - printf("Searching from layer %d outward\n",innLay); - // counter for clusters on each layer - Int_t * nn = new Int_t[AliITSgeomTGeo::GetNLayers()-innLay]; - for(Int_t nloop=0;nloopGetEntries(); - while(nclInnLay--){ //loop starting from layer innLay - ResetForFinding(); - Int_t pflag=0; - AliITSRecPoint* cl = (AliITSRecPoint*)fCluLayer[innLay]->At(nclInnLay); - - if(!cl) continue; - AliITSclusterTable* arr = (AliITSclusterTable*)GetClusterCoord(innLay,nclInnLay); - fPhic = arr->GetPhi(); - fLambdac = arr->GetLambda(); - fPhiEstimate = fPhic; - - AliITStrackSA* trs = new AliITStrackSA(); - fPoint1[0]=primaryVertex[0]; - fPoint1[1]=primaryVertex[1]; - fPoint2[0]=arr->GetX(); - fPoint2[1]=arr->GetY(); - - Int_t kk; - for(kk=0;kk=AliITSgeomTGeo::GetNLayers()-innLay){ - AliITStrackV2* tr2 = FitShortTrack(trs,primaryVertex,innLay); - if(tr2==0){ - continue; - } - - AliESDtrack outtrack; - outtrack.UpdateTrackParams(tr2,AliESDtrack::kITSin); - event->AddTrack(&outtrack); - ntrack++; - - } - - delete trs; - }//end loop on clusters of innLay - } //end loop on window sizes + } + } - delete [] nn; - } //end loop on innLay - } //end if(fOuterStartLayer>0) + // track counter + Int_t ntrack=0; + + static Int_t nClusLay[AliITSgeomTGeo::kNLayers];//counter for clusters on each layer + Int_t startLayForSeed=0; + Int_t lastLayForSeed=fOuterStartLayer; + Int_t nSeedSteps=lastLayForSeed-startLayForSeed; + Int_t seedStep=1; + if(fInwardFlag){ + startLayForSeed=AliITSgeomTGeo::GetNLayers()-1; + lastLayForSeed=fInnerStartLayer; + nSeedSteps=startLayForSeed-lastLayForSeed; + seedStep=-1; + } - - delete [] firstmod; - Info("FindTracks","Number of found tracks: %d",event->GetNumberOfTracks()); + // loop on minimum number of points + for(Int_t iMinNPoints=AliITSgeomTGeo::GetNLayers(); iMinNPoints>=fMinNPoints; iMinNPoints--) { + + // loop on starting layer for track finding + for(Int_t iSeedLay=0; iSeedLay<=nSeedSteps; iSeedLay++) { + Int_t theLay=startLayForSeed+iSeedLay*seedStep; + if(ForceSkippingOfLayer(theLay)) continue; + Int_t minNPoints=iMinNPoints-theLay; + if(fInwardFlag) minNPoints=iMinNPoints-(AliITSgeomTGeo::GetNLayers()-1-theLay); + for(Int_t i=theLay+1;iGetEntries(); + while(nclTheLay--){ + ResetForFinding(); + Bool_t useRP=SetFirstPoint(theLay,nclTheLay,primaryVertex); + if(!useRP) continue; + AliITStrackSA trs; + + Int_t pflag=0; + Int_t kk; + for(kk=0;kk=0; nnp--){ + if(nClusLay[nnp]!=0) layOK+=1; + } + } + if(layOK>=minNPoints){ + AliDebug(2,Form("---NPOINTS: %d; MAP: %d %d %d %d %d %d\n",layOK,nClusLay[0],nClusLay[1],nClusLay[2],nClusLay[3],nClusLay[4],nClusLay[5])); + AliITStrackV2* tr2 = 0; + tr2 = FitTrack(&trs,primaryVertex); + if(!tr2){ + continue; + } + AliDebug(2,Form("---NPOINTS fit: %d\n",tr2->GetNumberOfClusters())); + + StoreTrack(tr2,event,useAllClusters); + ntrack++; + + } + + }//end loop on clusters of theLay + } //end loop on window sizes + } //end loop on theLay + }//end loop on min points + + // search for 1-point tracks in SPD, only for cosmics + // (A.Dainese 21.03.08) + if(AliITSReconstructor::GetRecoParam()->GetSAOnePointTracks() && + TMath::Abs(event->GetMagneticField())<0.01) { + Int_t outerLayer=1; // only SPD + for(Int_t innLay=0; innLay<=TMath::Min(1,fOuterStartLayer); innLay++) { + // counter for clusters on each layer + + for(Int_t nloop=0;nloopGetEntries(); + while(nclInnLay--){ //loop starting from layer innLay + ResetForFinding(); + Bool_t useRP=SetFirstPoint(innLay,nclInnLay,primaryVertex); + if(!useRP) continue; + AliITStrackSA trs; + + Int_t pflag=0; + Int_t kk; + for(kk=0;kkGetNumberOfClusters())); + + StoreTrack(tr2,event,useAllClusters); + ntrack++; + + } + + }//end loop on clusters of innLay + } //end loop on window sizes + + } //end loop on innLay + } // end search 1-point tracks + + if(!useAllClusters) AliInfo(Form("Number of found tracks: %d",event->GetNumberOfTracks())); + ResetForFinding(); return 0; } - - - - //________________________________________________________________________ -AliITStrackV2* AliITStrackerSA::FitTrack(AliITStrackSA* tr,Double_t *primaryVertex){ - //fit of the found track +AliITStrackV2* AliITStrackerSA::FitTrack(AliITStrackSA* tr,Double_t *primaryVertex,Bool_t onePoint) { + //fit of the found track (most general case, also <6 points, layers missing) + // A.Dainese 16.11.07 - Int_t * firstmod = new Int_t[AliITSgeomTGeo::GetNLayers()]; - for(Int_t i=0;iGetNumberOfClustersSA(); - TObjArray** listlayer = new TObjArray*[AliITSgeomTGeo::GetNLayers()]; - for(Int_t i=0;iGetNumberOfClustersSA(); for(Int_t ncl=0;nclGetClusterIndexSA(ncl); AliITSRecPoint* cl = (AliITSRecPoint*)GetCluster(index); - if(cl->TestBit(kSAflag)==kTRUE) cl->ResetBit(kSAflag); Int_t lay = (index & 0xf0000000) >> 28; - if(lay==0) { listlayer[0]->AddLast(cl); clind0[nnn[0]]=index;nnn[0]++;} - if(lay==1) { listlayer[1]->AddLast(cl); clind1[nnn[1]]=index;nnn[1]++;} - if(lay==2) { listlayer[2]->AddLast(cl); clind2[nnn[2]]=index;nnn[2]++;} - if(lay==3) { listlayer[3]->AddLast(cl); clind3[nnn[3]]=index;nnn[3]++;} - if(lay==4) { listlayer[4]->AddLast(cl); clind4[nnn[4]]=index;nnn[4]++;} - if(lay==5) { listlayer[5]->AddLast(cl); clind5[nnn[5]]=index;nnn[5]++;} + Int_t nInLay=end[lay]; + listlayer[lay][nInLay]=cl; + clind[lay][nInLay]=index; + end[lay]++; } - delete [] nnn; for(Int_t nlay=0;nlayGetNumberOfMarked(nlay);ncl++){ Int_t mark = tr->GetClusterMark(nlay,ncl); - if(nlay==0) { mark0[kkk[0]]=mark;kkk[0]++;} - if(nlay==1) { mark1[kkk[1]]=mark;kkk[1]++;} - if(nlay==2) { mark2[kkk[2]]=mark;kkk[2]++;} - if(nlay==3) { mark3[kkk[3]]=mark;kkk[3]++;} - if(nlay==4) { mark4[kkk[4]]=mark;kkk[4]++;} - if(nlay==5) { mark5[kkk[5]]=mark;kkk[5]++;} - + clmark[nlay][ncl]=mark; } } - delete [] kkk; - - - Int_t * end = new Int_t[AliITSgeomTGeo::GetNLayers()]; - for(Int_t i=0;iGetEntries()==0) end[i]=1; - else end[i]=listlayer[i]->GetEntries(); - } - - TClonesArray* listSA = new TClonesArray("AliITStrackSA"); - TClonesArray &tri = *listSA; - Int_t nlist=0; - - if(end[0]==0) end[0]=1; //for tracks with cluster on layer 0 missing - for(Int_t l1=0;l1At(l1); - Double_t x1,y1,z1,sx1,sy1,sz1; - Double_t x2,y2,z2,sx2,sy2,sz2; - AliITSRecPoint* p1=0; - AliITSRecPoint* p2=0; - Int_t index1=clind0[l1]; - Int_t index2=0; - Int_t mrk1 = mark0[l1]; - Int_t mrk2 = 0; - Int_t lay1=0; - Int_t lay2=1; - Int_t module1=-1; - for(Int_t l2=0;l2At(l2); - index2=clind1[l2]; - mrk2 = mark1[l2]; - for(Int_t l3=0;l3At(l3); - - if(cl0==0 && cl1!=0) { - p1=cl1; - p2=cl2; - index1=clind1[l2];mrk1=mark1[l2]; - index2=clind2[l3];mrk2=mark2[l3]; - lay1=1; - lay2=2; - module1 = p1->GetDetectorIndex()+firstmod[1]; - } - if(cl0!=0 && cl1==0){ - p1=cl0; - p2=cl2;index2=clind2[l3];mrk2=mark2[l3]; - lay1=0; - lay2=2; - module1 = p1->GetDetectorIndex()+firstmod[0]; - } - if(cl0!=0 && cl1!=0){ - p1=cl0; - p2=cl1; - lay1=0; - lay2=1; - module1 = p1->GetDetectorIndex()+firstmod[0]; - } - - Int_t cln1=mrk1; - Int_t cln2=mrk2; - AliITSclusterTable* arr1 = (AliITSclusterTable*)GetClusterCoord(lay1,cln1); - AliITSclusterTable* arr2 = (AliITSclusterTable*)GetClusterCoord(lay2,cln2); - x1 = arr1->GetX(); - x2 = arr2->GetX(); - y1 = arr1->GetY(); - y2 = arr2->GetY(); - z1 = arr1->GetZ(); - z2 = arr2->GetZ(); - sx1 = arr1->GetSx(); - sx2 = arr2->GetSx(); - sy1 = arr1->GetSy(); - sy2 = arr2->GetSy(); - sz1 = arr1->GetSz(); - sz2 = arr2->GetSz(); - - Int_t layer,ladder,detector; - AliITSgeomTGeo::GetModuleId(module1,layer,ladder,detector); - Float_t yclu1 = p1->GetY(); - Float_t zclu1 = p1->GetZ(); - Double_t cv=Curvature(primaryVertex[0],primaryVertex[1],x1,y1,x2,y2); - Double_t tgl2 = (z2-z1)/TMath::Sqrt((x2-x1)*(x2-x1)+(y2-y1)*(y2-y1)); - Double_t phi2 = TMath::ATan2((y2-y1),(x2-x1)); - - for(Int_t l4=0;l4At(l4); - for(Int_t l5=0;l5At(l5); - for(Int_t l6=0;l6At(l6); - AliITStrackSA* trac = new AliITStrackSA(layer,ladder,detector,yclu1,zclu1,phi2,tgl2,cv,1); - - if(cl5!=0) { - trac->AddClusterV2(5,(clind5[l6] & 0x0fffffff)>>0); - trac->AddClusterMark(5,mark5[l6]); - } - if(cl4!=0){ - trac->AddClusterV2(4,(clind4[l5] & 0x0fffffff)>>0); - trac->AddClusterMark(4,mark4[l5]); - } - if(cl3!=0){ - trac->AddClusterV2(3,(clind3[l4] & 0x0fffffff)>>0); - trac->AddClusterMark(3,mark3[l4]); - } - if(cl2!=0){ - trac->AddClusterV2(2,(clind2[l3] & 0x0fffffff)>>0); - trac->AddClusterMark(2,mark2[l3]); - } - if(cl1!=0){ - trac->AddClusterV2(1,(clind1[l2] & 0x0fffffff)>>0); - trac->AddClusterMark(1,mark1[l2]); - } - if(cl0!=0){ - trac->AddClusterV2(0,(clind0[l1] & 0x0fffffff)>>0); - trac->AddClusterMark(0,mark0[l1]); - } - //fit with Kalman filter using AliITStrackerMI::RefitAt() - - AliITStrackMI* ot = new AliITStrackSA(*trac); - - ot->ResetCovariance(10.); - ot->ResetClusters(); - - if(RefitAt(krInsideITSscreen,ot,trac)){ //fit from layer 1 to layer 6 - AliITStrackMI *otrack2 = new AliITStrackMI(*ot); - otrack2->ResetCovariance(10.); - otrack2->ResetClusters(); - //fit from layer 6 to layer 1 - if(RefitAt(krInsideSPD1,otrack2,ot)) { - fListOfTracks->AddLast(otrack2); - new (tri[nlist]) AliITStrackSA(*trac); - nlist++; - } else { - delete otrack2; - } - - } - - delete ot; - delete trac; - }//end loop layer 6 - }//end loop layer 5 - }//end loop layer 4 - }//end loop layer 3 - }//end loop layer 2 - }//end loop layer 1 - - delete [] end; - - - - Int_t dim=fListOfTracks->GetEntries(); - if(dim==0){ - for(Int_t i=0;iDelete(); - delete listSA; - delete [] firstmod; - return 0; - } - - Int_t lowchi2 = FindTrackLowChiSquare(fListOfTracks,dim); - AliITStrackV2* otrack =(AliITStrackV2*)fListOfTracks->At(lowchi2); - AliITStrackSA* trsa = (AliITStrackSA*)listSA->At(lowchi2); - - if(otrack==0) { - for(Int_t i=0;iDelete(); - delete listSA; - delete [] firstmod; - return 0; - } - Int_t * indexc = new Int_t[AliITSgeomTGeo::GetNLayers()]; - for(Int_t i=0;iGetNumberOfClusters();nind++){ - indexc[nind] = otrack->GetClusterIndex(nind); - } - AliITSRecPoint* cl0 = (AliITSRecPoint*)GetCluster(indexc[0]); - AliITSRecPoint* cl1 = (AliITSRecPoint*)GetCluster(indexc[1]); - AliITSRecPoint* cl2 = (AliITSRecPoint*)GetCluster(indexc[2]); - AliITSRecPoint* cl3 = (AliITSRecPoint*)GetCluster(indexc[3]); - AliITSRecPoint* cl4 = (AliITSRecPoint*)GetCluster(indexc[4]); - Int_t labl[3]={-1,-1,-1}; - if(otrack->GetNumberOfClusters()==AliITSgeomTGeo::GetNLayers()){ - AliITSRecPoint* cl5 = (AliITSRecPoint*)GetCluster(indexc[5]); - labl[0]=cl5->GetLabel(0); - labl[1]=cl5->GetLabel(1); - labl[2]=cl5->GetLabel(2); - } - delete [] indexc; - if(otrack->GetNumberOfClusters()==(AliITSgeomTGeo::GetNLayers()-1)){ - labl[0]=-1; - labl[1]=-1; - labl[2]=-1; - } - Int_t numberofpoints; - if(fSixPoints) numberofpoints=6; - else numberofpoints=5; - CookLabel(otrack,0.); //MI change - to see fake ratio - Int_t label = Label(cl0->GetLabel(0),cl1->GetLabel(0), - cl2->GetLabel(0),cl3->GetLabel(0), - cl4->GetLabel(0),labl[0], - cl0->GetLabel(1),cl1->GetLabel(1), - cl2->GetLabel(1),cl3->GetLabel(1), - cl4->GetLabel(1),labl[1], - cl0->GetLabel(2),cl1->GetLabel(2), - cl2->GetLabel(2),cl3->GetLabel(2), - cl4->GetLabel(2),labl[2],numberofpoints); - - otrack->SetLabel(label); - //remove clusters of found track - - for(Int_t nlay=0;nlayGetNumberOfMarked(nlay);cln++){ - Int_t index = trsa->GetClusterMark(nlay,cln); - fCluLayer[nlay]->RemoveAt(index); - RemoveClusterCoord(nlay,index); - fCluLayer[nlay]->Compress(); - } - } - listSA->Delete(); - delete listSA; - - for(Int_t i=0;iGetNumberOfClustersSA(); - TObjArray** listlayer = new TObjArray*[AliITSgeomTGeo::GetNLayers()]; - for(Int_t i=0;iGetClusterIndexSA(ncl); - AliITSRecPoint* cl = (AliITSRecPoint*)GetCluster(index); - if(cl->TestBit(kSAflag)==kTRUE) cl->ResetBit(kSAflag); - Int_t lay = (index & 0xf0000000) >> 28; - if(lay==0) { listlayer[0]->AddLast(cl); clind0[nnn[0]]=index;nnn[0]++;} - if(lay==1) { listlayer[1]->AddLast(cl); clind1[nnn[1]]=index;nnn[1]++;} - if(lay==2) { listlayer[2]->AddLast(cl); clind2[nnn[2]]=index;nnn[2]++;} - if(lay==3) { listlayer[3]->AddLast(cl); clind3[nnn[3]]=index;nnn[3]++;} - if(lay==4) { listlayer[4]->AddLast(cl); clind4[nnn[4]]=index;nnn[4]++;} - if(lay==5) { listlayer[5]->AddLast(cl); clind5[nnn[5]]=index;nnn[5]++;} - } - delete [] nnn; - - for(Int_t nlay=0;nlayGetNumberOfMarked(nlay);ncl++){ - Int_t mark = tr->GetClusterMark(nlay,ncl); - if(nlay==0) { mark0[kkk[0]]=mark;kkk[0]++;} - if(nlay==1) { mark1[kkk[1]]=mark;kkk[1]++;} - if(nlay==2) { mark2[kkk[2]]=mark;kkk[2]++;} - if(nlay==3) { mark3[kkk[3]]=mark;kkk[3]++;} - if(nlay==4) { mark4[kkk[4]]=mark;kkk[4]++;} - if(nlay==5) { mark5[kkk[5]]=mark;kkk[5]++;} - - } - } + for(Int_t l0=0;l0GetEntries()==0) end[i]=1; - else end[i]=listlayer[i]->GetEntries(); - } + Int_t iFirstLay=indices[firstLay]; + Int_t mrk1=clmark[firstLay][iFirstLay]; - TClonesArray* listSA = new TClonesArray("AliITStrackSA"); - TClonesArray &tri = *listSA; - Int_t nlist=0; - - // if(end[0]==0) end[0]=1; //for tracks with cluster on layer 0 missing - for(Int_t l1=0;l1At(l1); - for(Int_t l2=0;l2At(l2); - for(Int_t l3=0;l3At(l3); - for(Int_t l4=0;l4At(l4); - for(Int_t l5=0;l5At(l5); - for(Int_t l6=0;l6At(l6); - - - Double_t x1,y1,z1,sx1,sy1,sz1; - Double_t x2,y2,z2,sx2,sy2,sz2; - AliITSRecPoint* p1=0; - AliITSRecPoint* p2=0; - Int_t index1=0,index2=0; - Int_t mrk1=0,mrk2=0; - if(innLay==1) { - p1=cl1; - p2=cl2; - index1=clind1[l2];mrk1=mark1[l2]; - index2=clind2[l3];mrk2=mark2[l3]; - } else if(innLay==2) { - p1=cl2; - p2=cl3; - index1=clind2[l3];mrk1=mark2[l3]; - index2=clind3[l4];mrk2=mark3[l4]; - } else if(innLay==3) { - p1=cl3; - p2=cl4; - index1=clind3[l4];mrk1=mark3[l4]; - index2=clind4[l5];mrk2=mark4[l5]; - } else if(innLay==4) { - p1=cl4; - p2=cl5; - index1=clind4[l5];mrk1=mark4[l5]; - index2=clind5[l6];mrk2=mark5[l6]; - } - Int_t lay1=innLay; - Int_t lay2=innLay+1; - Int_t module1 = p1->GetDetectorIndex()+firstmod[innLay]; - - Int_t cln1=mrk1; - Int_t cln2=mrk2; - AliITSclusterTable* arr1 = (AliITSclusterTable*)GetClusterCoord(lay1,cln1); - AliITSclusterTable* arr2 = (AliITSclusterTable*)GetClusterCoord(lay2,cln2); - x1 = arr1->GetX(); - x2 = arr2->GetX(); - y1 = arr1->GetY(); - y2 = arr2->GetY(); - z1 = arr1->GetZ(); - z2 = arr2->GetZ(); - sx1 = arr1->GetSx(); - sx2 = arr2->GetSx(); - sy1 = arr1->GetSy(); - sy2 = arr2->GetSy(); - sz1 = arr1->GetSz(); - sz2 = arr2->GetSz(); - + AliITSRecPoint* p1=(AliITSRecPoint*)listlayer[firstLay][iFirstLay]; + Int_t module1 = p1->GetDetectorIndex()+firstmod[firstLay]; Int_t layer,ladder,detector; AliITSgeomTGeo::GetModuleId(module1,layer,ladder,detector); Float_t yclu1 = p1->GetY(); Float_t zclu1 = p1->GetZ(); - Double_t cv=Curvature(primaryVertex[0],primaryVertex[1],x1,y1,x2,y2); - Double_t tgl2 = (z2-z1)/TMath::Sqrt((x2-x1)*(x2-x1)+(y2-y1)*(y2-y1)); - Double_t phi2 = TMath::ATan2((y2-y1),(x2-x1)); - //printf("phi2: %f tgl2: %f\n",phi2,tgl2); - AliITStrackSA* trac = new AliITStrackSA(layer,ladder,detector,yclu1,zclu1,phi2,tgl2,cv,1); - - //Float_t clxyz[3]; - if(cl5!=0) { - trac->AddClusterV2(5,(clind5[l6] & 0x0fffffff)>>0); - trac->AddClusterMark(5,mark5[l6]); - //cl5->GetGlobalXYZ(clxyz);printf("gcl %f %f %f\n",clxyz[0],clxyz[1],clxyz[2]); - } - if(cl4!=0){ - trac->AddClusterV2(4,(clind4[l5] & 0x0fffffff)>>0); - trac->AddClusterMark(4,mark4[l5]); - //cl4->GetGlobalXYZ(clxyz);printf("gcl %f %f %f\n",clxyz[0],clxyz[1],clxyz[2]); - } - if(cl3!=0){ - trac->AddClusterV2(3,(clind3[l4] & 0x0fffffff)>>0); - trac->AddClusterMark(3,mark3[l4]); - //cl3->GetGlobalXYZ(clxyz);printf("gcl %f %f %f\n",clxyz[0],clxyz[1],clxyz[2]); - } - if(cl2!=0){ - trac->AddClusterV2(2,(clind2[l3] & 0x0fffffff)>>0); - trac->AddClusterMark(2,mark2[l3]); - //cl2->GetGlobalXYZ(clxyz);printf("gcl %f %f %f\n",clxyz[0],clxyz[1],clxyz[2]); - } - if(cl1!=0){ - trac->AddClusterV2(1,(clind1[l2] & 0x0fffffff)>>0); - trac->AddClusterMark(1,mark1[l2]); - //cl1->GetGlobalXYZ(clxyz);printf("gcl %f %f %f\n",clxyz[0],clxyz[1],clxyz[2]); - } - if(cl0!=0){ - trac->AddClusterV2(0,(clind0[l1] & 0x0fffffff)>>0); - trac->AddClusterMark(0,mark0[l1]); - //cl0->GetGlobalXYZ(clxyz);printf("gcl %f %f %f\n",clxyz[0],clxyz[1],clxyz[2]); + + Double_t x1,y1,z1; + Double_t x2,y2,z2; + Double_t cv=0,tgl2=0,phi2=0; + AliITSclusterTable* arr1 = (AliITSclusterTable*)GetClusterCoord(firstLay,mrk1); + x1 = arr1->GetX(); + y1 = arr1->GetY(); + z1 = arr1->GetZ(); + + if(secondLay>0) { + Int_t iSecondLay=indices[secondLay]; + Int_t mrk2=clmark[secondLay][iSecondLay]; + AliITSclusterTable* arr2 = (AliITSclusterTable*)GetClusterCoord(secondLay,mrk2); + x2 = arr2->GetX(); + y2 = arr2->GetY(); + z2 = arr2->GetZ(); + cv = Curvature(primaryVertex[0],primaryVertex[1],x1,y1,x2,y2); + tgl2 = (z2-z1)/TMath::Sqrt((x2-x1)*(x2-x1)+(y2-y1)*(y2-y1)); + phi2 = TMath::ATan2((y2-y1),(x2-x1)); + } else { // special case of 1-point tracks, only for cosmics (B=0) + x2 = primaryVertex[0]; + y2 = primaryVertex[1]; + z2 = primaryVertex[2]; + cv = 0; + tgl2 = (z1-z2)/TMath::Sqrt((x1-x2)*(x1-x2)+(y1-y2)*(y1-y2)); + phi2 = TMath::ATan2((y1-y2),(x1-x2)); } + // create track and attach it the RecPoints + AliITStrackSA trac(layer,ladder,detector,yclu1,zclu1,phi2,tgl2,cv,1); + for(Int_t iLay=5; iLay>=0; iLay--){ + Int_t iInLay=indices[iLay]; + AliITSRecPoint* cl=(AliITSRecPoint*)listlayer[iLay][iInLay]; + if(cl!=0){ + trac.AddClusterV2(iLay,(clind[iLay][iInLay] & 0x0fffffff)>>0); + trac.AddClusterMark(iLay,clmark[iLay][iInLay]); + } + } //fit with Kalman filter using AliITStrackerMI::RefitAt() - AliITStrackMI* ot = new AliITStrackSA(*trac); - - ot->ResetCovariance(10.); - ot->ResetClusters(); + AliITStrackSA ot(trac); + + ot.ResetCovariance(10.); + ot.ResetClusters(); - //printf("%d \n",trac->GetNumberOfClusters());for(Int_t ijk=0;ijkGetNumberOfClusters();ijk++) printf(" %d",trac->GetClusterIndex(ijk)); printf("\n"); - if(RefitAt(krInsideITSscreen,ot,trac)){ //fit from layer 1 to layer 6 - AliITStrackMI *otrack2 = new AliITStrackMI(*ot); - otrack2->ResetCovariance(10.); - otrack2->ResetClusters(); - //fit from layer 6 to layer 1 - if(RefitAt(krInsideSPD1,otrack2,ot)) { - fListOfTracks->AddLast(otrack2); - new (tri[nlist]) AliITStrackSA(*trac); - nlist++; - } else { - delete otrack2; - } + // Propagate inside the innermost layer with a cluster + if(ot.Propagate(ot.GetX()-0.1*ot.GetX())) { + + if(RefitAt(AliITSRecoParam::GetrInsideITSscreen(),&ot,&trac)){ //fit from layer 1 to layer 6 + AliITStrackMI otrack2(ot); + otrack2.ResetCovariance(10.); + otrack2.ResetClusters(); + //fit from layer 6 to layer 1 + if(RefitAt(AliITSRecoParam::GetrInsideSPD1(),&otrack2,&ot)) { + new(arrMI[nFoundTracks]) AliITStrackMI(otrack2); + new(arrSA[nFoundTracks]) AliITStrackSA(trac); + ++nFoundTracks; + } - } - - delete ot; - delete trac; + } + } }//end loop layer 6 }//end loop layer 5 }//end loop layer 4 @@ -1140,65 +765,23 @@ AliITStrackV2* AliITStrackerSA::FitShortTrack(AliITStrackSA* tr,Double_t *primar }//end loop layer 2 }//end loop layer 1 - delete [] end; - - Int_t dim=fListOfTracks->GetEntries(); - if(dim==0){ - for(Int_t i=0;iDelete(); - delete listSA; - delete [] firstmod; - return 0; - } - Int_t lowchi2 = FindTrackLowChiSquare(fListOfTracks,dim); + if(fListOfTracks->GetEntries()==0) return 0; + + Int_t lowchi2 = FindTrackLowChiSquare(); AliITStrackV2* otrack =(AliITStrackV2*)fListOfTracks->At(lowchi2); - AliITStrackSA* trsa = (AliITStrackSA*)listSA->At(lowchi2); + AliITStrackSA* trsa = (AliITStrackSA*)fListOfSATracks->At(lowchi2); - if(otrack==0) { - for(Int_t i=0;iDelete(); - delete listSA; - delete [] firstmod; - return 0; - } - Int_t * indexc = new Int_t[AliITSgeomTGeo::GetNLayers()]; - for(Int_t i=0;iGetNumberOfClusters();nind++){ - indexc[nind] = otrack->GetClusterIndex(nind); - } - Int_t labl[6][3]; - for(Int_t i=0;iGetNumberOfClusters()) { - AliITSRecPoint* cl = (AliITSRecPoint*)GetCluster(indexc[i]); - labl[i][0]=cl->GetLabel(0); - labl[i][1]=cl->GetLabel(1); - labl[i][2]=cl->GetLabel(2); - } else { - labl[i][0]=-1; - labl[i][1]=-1; - labl[i][2]=-1; - } - } - delete [] indexc; - Int_t numberofpoints=AliITSgeomTGeo::GetNLayers()-innLay; + if(otrack==0) return 0; + CookLabel(otrack,0.); //MI change - to see fake ratio - - Int_t label=FindLabel(labl[0][0],labl[1][0],labl[2][0],labl[3][0],labl[4][0],labl[5][0]); - Int_t lflag=0; - for(Int_t i=0;iSetLabel(label); + Double_t low=0.; + Double_t up=0.51; + otrack->CookdEdx(low,up); //remove clusters of found track for(Int_t nlay=0;nlayCompress(); } } - listSA->Delete(); - delete listSA; - for(Int_t i=0;iGetModuleIndex(i)); + } + Double_t sdedx[4]={0.,0.,0.,0.}; + for(Int_t i=0; i<4; i++) sdedx[i]=t->GetSampledEdx(i); + outtrack.SetITSdEdxSamples(sdedx); + event->AddTrack(&outtrack); + + return; +} //_______________________________________________________ Int_t AliITStrackerSA::SearchClusters(Int_t layer,Double_t phiwindow,Double_t lambdawindow, AliITStrackSA* trs,Double_t /*zvertex*/,Int_t pflag){ //function used to to find the clusters associated to the track + + if(ForceSkippingOfLayer(layer)) return 0; + Int_t nc=0; AliITSlayer &lay = fgLayers[layer]; Double_t r=lay.GetR(); - if(pflag==1){ + if(pflag==1){ Float_t cx1,cx2,cy1,cy2; FindEquation(fPoint1[0],fPoint1[1],fPoint2[0],fPoint2[1],fPoint3[0],fPoint3[1],fCoef1,fCoef2,fCoef3); if (FindIntersection(fCoef1,fCoef2,fCoef3,-r*r,cx1,cy1,cx2,cy2)==0) @@ -1240,36 +838,61 @@ Int_t AliITStrackerSA::SearchClusters(Int_t layer,Double_t phiwindow,Double_t la } - Int_t ncl = fCluLayer[layer]->GetEntries(); + Double_t phiExpect=fPhiEstimate; + Double_t lamExpect=fLambdac; + + Int_t ncl = fCluLayer[layer]->GetEntriesFast(); for (Int_t index=0; indexAt(index); + AliITSRecPoint *c = (AliITSRecPoint*)fCluLayer[layer]->UncheckedAt(index); if (!c) continue; - if (c->GetQ()<=0) continue; - AliITSclusterTable* arr = (AliITSclusterTable*)GetClusterCoord(layer,index); - Double_t phi = arr->GetPhi(); - if (TMath::Abs(phi-fPhiEstimate)>phiwindow) continue; - - Double_t lambda = arr->GetLambda(); - if (TMath::Abs(lambda-fLambdac)>lambdawindow) continue; - - if(trs->GetNumberOfClustersSA()==trs->GetMaxNumberOfClusters()) return 0; - if(trs->GetNumberOfMarked(layer)==trs->GetMaxNMarkedPerLayer()) return 0; - Int_t orind = arr->GetOrInd(); - trs->AddClusterSA(layer,orind); - trs->AddClusterMark(layer,index); - - nc++; - fLambdac=lambda; - fPhiEstimate=phi; - - fPointc[0]=arr->GetX(); - fPointc[1]=arr->GetY(); + AliITSclusterTable* arr = (AliITSclusterTable*)GetClusterCoord(layer,index); + + Double_t lambda = arr->GetLambda(); + if (TMath::Abs(lambda-lamExpect)>lambdawindow) continue; + Double_t phi = arr->GetPhi(); + Double_t deltaPhi = phi-phiExpect; + if(deltaPhi>TMath::Pi()) deltaPhi-=2*TMath::Pi(); + else if(deltaPhi<-TMath::Pi()) deltaPhi+=2*TMath::Pi(); + if (TMath::Abs(deltaPhi)>phiwindow) continue; + + if(trs->GetNumberOfClustersSA()==trs->GetMaxNumberOfClusters()) return 0; + if(trs->GetNumberOfMarked(layer)==trs->GetMaxNMarkedPerLayer()) return 0; + Int_t orind = arr->GetOrInd(); + trs->AddClusterSA(layer,orind); + trs->AddClusterMark(layer,index); + nc++; + fLambdac=lambda; + fPhiEstimate=phi; + + fPointc[0]=arr->GetX(); + fPointc[1]=arr->GetY(); + } return nc; } +//________________________________________________________________ +Bool_t AliITStrackerSA::SetFirstPoint(Int_t lay, Int_t clu, Double_t* primaryVertex){ + // Sets the first point (seed) for tracking + + AliITSRecPoint* cl = (AliITSRecPoint*)fCluLayer[lay]->UncheckedAt(clu); + if(!cl) return kFALSE; + if (cl->GetQ()<=0) return kFALSE; + if(lay>1 && cl->GetQ()<=fMinQ) return kFALSE; + + AliITSclusterTable* arr = (AliITSclusterTable*)GetClusterCoord(lay,clu); + fPhic = arr->GetPhi(); + fLambdac = arr->GetLambda(); + fPhiEstimate = fPhic; + fPoint1[0]=primaryVertex[0]; + fPoint1[1]=primaryVertex[1]; + fPoint2[0]=arr->GetX(); + fPoint2[1]=arr->GetY(); + return kTRUE; +} + //________________________________________________________________ void AliITStrackerSA::UpdatePoints(){ //update of points for the estimation of the curvature @@ -1358,112 +981,99 @@ Double_t AliITStrackerSA::ChoosePoint(Double_t p1, Double_t p2, Double_t pp){ //_________________________________________________________________ -Int_t AliITStrackerSA::FindTrackLowChiSquare(TObjArray* tracklist, Int_t dim) const { - // returns track with lowes chi square - if(dim==1){ - //AliITStrackV2* trk = (AliITStrackV2*)tracklist->At(0); - //return trk; - return 0; - } - //if(dim==0) return 0; - Double_t * chi2 = new Double_t[dim]; - Int_t * index = new Int_t[dim]; - for(Int_t i=0;iAt(i); - chi2[i]=trk->GetChi2(); - index[i]=i; - } - - Int_t w=0;Double_t value; - Int_t lp; - while(wGetEntries(); + if(dim<=1) return 0; + AliITStrackV2* trk = (AliITStrackV2*)fListOfTracks->At(0); + Double_t minChi2=trk->GetChi2(); + Int_t index=0; + for(Int_t i=1;iAt(i); + Double_t chi2=trk->GetChi2(); + if(chi2GetNumberOfClusters(); i++) { + Int_t indexc = track->GetClusterIndex(i); + AliITSRecPoint* cl = (AliITSRecPoint*)GetCluster(indexc); + Int_t iLayer=cl->GetLayer(); + for(Int_t k=0;k<3;k++){ + labl[iLayer][k]=cl->GetLabel(k); + if(labl[iLayer][k]<0) iNotLabel++; + } + } + if(iNotLabel==3*track->GetNumberOfClusters()) return -2; + + for(Int_t j1=0;j1=0 && labl[j1][k1]==labl[j2][k2] && cnts[j2][k2]>0){ + cnts[j2][k2]++; + cnts[j1][k1]=0; + } + } + } } - w++; } - if(num==6) return lb[5]; - else return lb[4]; -} - -//_____________________________________________________________________________ -Int_t AliITStrackerSA::Label(Int_t gl1, Int_t gl2, Int_t gl3, Int_t gl4, Int_t gl5, Int_t gl6,Int_t gl7, Int_t gl8, Int_t gl9, Int_t gl10,Int_t gl11, -Int_t gl12, Int_t gl13, Int_t gl14,Int_t gl15, Int_t gl16, Int_t gl17, Int_t gl18, Int_t numberofpoints){ - - - //function used to assign label to the found track. If track is fake, the label is negative - Int_t lb0[6] = {gl1,gl2,gl3,gl4,gl5,gl6}; - Int_t lb1[6] = {gl7,gl8,gl9,gl10,gl11,gl12}; - Int_t lb2[6] = {gl13,gl14,gl15,gl16,gl17,gl18}; - Int_t ll=FindLabel(lb0[0],lb0[1],lb0[2],lb0[3],lb0[4],lb0[5]); - Int_t lflag=0;Int_t num=6; - if(lb0[5]==-1 && lb1[5]==-1 && lb2[5]==-1) num=5; - for(Int_t i=0;icntMax && labl[j][k]>=0){ + cntMax=cnts[j][k]; + label=labl[j][k]; + } + } } - if(lflag>=numberofpoints) return ll; - else return -ll; - + Int_t lflag=0; + for(Int_t i=0;iGetNumberOfClusters()) label = -label; + return label; } - //_____________________________________________________________________________ -void AliITStrackerSA::SetWindowSizes(Int_t n, Double_t *phi, Double_t *lam){ +void AliITStrackerSA::SetCalculatedWindowSizes(Int_t n, Float_t phimin, Float_t phimax, Float_t lambdamin, Float_t lambdamax){ + // Set sizes of the phi and lambda windows used for track finding + fNloop = n; + if(fPhiWin) delete [] fPhiWin; + if(fLambdaWin) delete [] fLambdaWin; + fPhiWin = new Double_t[fNloop]; + fLambdaWin = new Double_t[fNloop]; + Float_t stepPhi=(phimax-phimin)/(Float_t)(fNloop-1); + Float_t stepLambda=(lambdamax-lambdamin)/(Float_t)(fNloop-1); + for(Int_t k=0;kGetFactorSAWindowSizes(); // possibility to enlarge windows for cosmics reco with large misalignments (A.Dainese) + for(Int_t k=0;k