X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ITS%2FAliITStrackerSA.cxx;h=7fd94a7208f2562ca458ea4e4c4166b8cc4a2ad5;hb=f2fafc64fcbfadcbee202f56b48525a2019b58c0;hp=5c2270b6896bbc55151042347566d59c2ac8bd25;hpb=5a03f353382f242b9ae50f18d5c276f0a54118ce;p=u%2Fmrichter%2FAliRoot.git diff --git a/ITS/AliITStrackerSA.cxx b/ITS/AliITStrackerSA.cxx index 5c2270b6896..7fd94a7208f 100644 --- a/ITS/AliITStrackerSA.cxx +++ b/ITS/AliITStrackerSA.cxx @@ -39,6 +39,7 @@ #include "AliITStrackSA.h" #include "AliITStrackerSA.h" #include "AliITSReconstructor.h" +#include "AliLog.h" #include "AliRun.h" ClassImp(AliITStrackerSA) @@ -58,9 +59,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 @@ -82,9 +87,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) { @@ -113,9 +122,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) { @@ -142,9 +155,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) { @@ -172,9 +189,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 @@ -219,6 +240,8 @@ AliITStrackerSA::~AliITStrackerSA(){ if(fLambdaWin)delete []fLambdaWin; fListOfTracks->Delete(); delete fListOfTracks; + fListOfSATracks->Delete(); + delete fListOfSATracks; if(fCluLayer){ for(Int_t i=0;iGetSAUseAllClusters()==kTRUE) { + rc=FindTracks(event,kTRUE); + } + } + return rc; } @@ -272,14 +301,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(){ @@ -293,32 +333,30 @@ 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(); - if(AliITSReconstructor::GetRecoParam()->GetSAUseAllClusters()==kFALSE) { + if(!useAllClusters) { while (nentr--) { AliESDtrack *track=event->GetTrack(nentr); - if (track->GetStatus()&AliESDtrack::kITSin==AliESDtrack::kITSin){ + if ((track->GetStatus()&AliESDtrack::kITSin) == AliESDtrack::kITSin){ Int_t idx[12]; Int_t ncl = track->GetITSclusters(idx); for(Int_t k=0;kGetTrack(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); + } + } + } } //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}; + 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::GetNLayers()]; - fCluCoord = new TClonesArray*[AliITSgeomTGeo::GetNLayers()]; + fCluLayer = new TClonesArray*[AliITSgeomTGeo::kNLayers]; + fCluCoord = new TClonesArray*[AliITSgeomTGeo::kNLayers]; for(Int_t i=0;iGetLayersToSkip(i)) { + if (!ForceSkippingOfLayer(i)) { for(Int_t cli=0;cliTestBit(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]++; } } dmar[i]=0; - delete fCluLayer[i]; - fCluLayer[i] = new TClonesArray("AliITSRecPoint",nclusters[i]); - delete fCluCoord[i]; - fCluCoord[i] = new TClonesArray("AliITSclusterTable",nclusters[i]); + 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]); + } } for(Int_t ilay=0;ilayGetLayersToSkip(ilay)) { + if (!ForceSkippingOfLayer(ilay)) { for(Int_t cli=0;cliTestBit(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; @@ -383,207 +441,58 @@ Int_t AliITStrackerSA::FindTracks(AliESDEvent* event){ } } - Int_t minNPoints = (fSixPoints ? AliITSgeomTGeo::GetNLayers() : AliITSgeomTGeo::GetNLayers()-1); - for(Int_t i=0;iGetLayersToSkip(i)) { - minNPoints--; - } - } - - + // track counter Int_t ntrack=0; - //loop on the different windows - Int_t * nn = new Int_t[AliITSgeomTGeo::GetNLayers()];//counter for clusters on each layer - 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(); - for(Int_t i=0;i0){ - pflag=1; - fPoint3[0] = fPointc[0]; - fPoint3[1] = fPointc[1]; - } - 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]; - } - - 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; - //check of the candidate track - for(Int_t nnp=0;nnp=minNPoints) { - AliITStrackV2* tr2 = 0; - tr2 = FitTrack(trs,primaryVertex); - if(!tr2) continue; - - AliESDtrack outtrack; - outtrack.UpdateTrackParams(tr2,AliESDtrack::kITSin); - event->AddTrack(&outtrack); - ntrack++; - } - delete trs; - }//end loop on clusters of layer1 - //end loop2 + 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[] nn; - - - minNPoints--; - - //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=minNPoints){ // 5/6 - AliITStrackV2* tr2 = 0; - tr2 = FitTrack(trs,primaryVertex); - if(!tr2) 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); - minNPoints=AliITSgeomTGeo::GetNLayers()-innLay; - for(Int_t i=innLay;iGetLayersToSkip(i)) + // 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(nclInnLay--){ //loop starting from layer innLay + Int_t nclTheLay=fCluLayer[theLay]->GetEntries(); + while(nclTheLay--){ 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(); - + 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; - - - AliESDtrack outtrack; - outtrack.UpdateTrackParams(tr2,AliESDtrack::kITSin); - event->AddTrack(&outtrack); + tr2 = FitTrack(&trs,primaryVertex); + if(!tr2){ + continue; + } + AliDebug(2,Form("---NPOINTS fit: %d\n",tr2->GetNumberOfClusters())); + + StoreTrack(tr2,event,useAllClusters); ntrack++; - + } - delete trs; - }//end loop on clusters of innLay + }//end loop on clusters of theLay } //end loop on window sizes - - delete [] nn; - } //end loop on innLay - } //end if(fOuterStartLayer>0) - + } //end loop on theLay + }//end loop on min points - // search for 1-point tracks, only for cosmics + // 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) { - for(Int_t innLay=0; innLay<=fOuterStartLayer; innLay++) { + Int_t outerLayer=1; // only SPD + for(Int_t innLay=0; innLay<=TMath::Min(1,fOuterStartLayer); 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(); - + Bool_t useRP=SetFirstPoint(innLay,nclInnLay,primaryVertex); + if(!useRP) continue; + AliITStrackSA trs; + + Int_t pflag=0; Int_t kk; - for(kk=0;kkGetNumberOfClusters())); - AliESDtrack outtrack; - outtrack.UpdateTrackParams(tr2,AliESDtrack::kITSin); - event->AddTrack(&outtrack); + StoreTrack(tr2,event,useAllClusters); ntrack++; } - delete trs; }//end loop on clusters of innLay } //end loop on window sizes - delete [] nn; } //end loop on innLay } // end search 1-point tracks - delete [] firstmod; - Info("FindTracks","Number of found tracks: %d",event->GetNumberOfTracks()); + if(!useAllClusters) AliInfo(Form("Number of found tracks: %d",event->GetNumberOfTracks())); + ResetForFinding(); return 0; } @@ -705,26 +611,23 @@ AliITStrackV2* AliITStrackerSA::FitTrack(AliITStrackSA* tr,Double_t *primaryVert // A.Dainese 16.11.07 - Int_t * firstmod = new Int_t[AliITSgeomTGeo::GetNLayers()]; - TObjArray** listlayer = new TObjArray*[AliITSgeomTGeo::GetNLayers()]; - Int_t ** clind=new Int_t*[AliITSgeomTGeo::GetNLayers()]; - Int_t ** clmark=new Int_t*[AliITSgeomTGeo::GetNLayers()]; - Int_t * nnn = new Int_t[AliITSgeomTGeo::GetNLayers()]; - Int_t * kkk = new Int_t[AliITSgeomTGeo::GetNLayers()]; + const Int_t kMaxClu=AliITStrackSA::kMaxNumberOfClusters; - const Int_t maxclu=AliITStrackSA::GetMaxNumberOfClusters(); + static Int_t firstmod[AliITSgeomTGeo::kNLayers]; + + static Int_t clind[AliITSgeomTGeo::kNLayers][kMaxClu]; + static Int_t clmark[AliITSgeomTGeo::kNLayers][kMaxClu]; + static Int_t end[AliITSgeomTGeo::kNLayers]; + static AliITSRecPoint *listlayer[AliITSgeomTGeo::kNLayers][kMaxClu]; for(Int_t i=0;iTestBit(kSAflag)==kTRUE) cl->ResetBit(kSAflag); Int_t lay = (index & 0xf0000000) >> 28; - listlayer[lay]->AddLast(cl); - Int_t ind=nnn[lay]; - clind[lay][ind]=index; + 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); - Int_t ind=kkk[nlay]; - clmark[nlay][ind]=mark; + clmark[nlay][ncl]=mark; } } - delete [] kkk; Int_t firstLay=-1,secondLay=-1; - Int_t * end = new Int_t[AliITSgeomTGeo::GetNLayers()]; for(Int_t i=0;iGetEntries()==0) { + if(end[i]==0) { end[i]=1; - } else { - end[i]=listlayer[i]->GetEntries(); + }else{ if(firstLay==-1) { firstLay=i; } else if(secondLay==-1) { @@ -765,36 +664,23 @@ AliITStrackV2* AliITStrackerSA::FitTrack(AliITStrackSA* tr,Double_t *primaryVert } } - if(firstLay==-1 || (secondLay==-1 && !onePoint)) { - for(Int_t i=0;iAt(l0); + AliITSRecPoint* cl0 = (AliITSRecPoint*)listlayer[0][l0]; for(Int_t l1=0;l1At(l1); + AliITSRecPoint* cl1 = (AliITSRecPoint*)listlayer[1][l1]; for(Int_t l2=0;l2At(l2); + AliITSRecPoint* cl2 = (AliITSRecPoint*)listlayer[2][l2]; for(Int_t l3=0;l3At(l3); + AliITSRecPoint* cl3 = (AliITSRecPoint*)listlayer[3][l3]; for(Int_t l4=0;l4At(l4); + AliITSRecPoint* cl4 = (AliITSRecPoint*)listlayer[4][l4]; for(Int_t l5=0;l5At(l5); + AliITSRecPoint* cl5 = (AliITSRecPoint*)listlayer[5][l5]; Double_t x1,y1,z1,sx1,sy1,sz1; @@ -892,57 +778,56 @@ AliITStrackV2* AliITStrackerSA::FitTrack(AliITStrackSA* tr,Double_t *primaryVert } - AliITStrackSA* trac = new AliITStrackSA(layer,ladder,detector,yclu1,zclu1,phi2,tgl2,cv,1); + AliITStrackSA trac(layer,ladder,detector,yclu1,zclu1,phi2,tgl2,cv,1); if(cl5!=0) { - trac->AddClusterV2(5,(clind[5][l5] & 0x0fffffff)>>0); - trac->AddClusterMark(5,clmark[5][l5]); + trac.AddClusterV2(5,(clind[5][l5] & 0x0fffffff)>>0); + trac.AddClusterMark(5,clmark[5][l5]); } if(cl4!=0){ - trac->AddClusterV2(4,(clind[4][l4] & 0x0fffffff)>>0); - trac->AddClusterMark(4,clmark[4][l4]); + trac.AddClusterV2(4,(clind[4][l4] & 0x0fffffff)>>0); + trac.AddClusterMark(4,clmark[4][l4]); } if(cl3!=0){ - trac->AddClusterV2(3,(clind[3][l3] & 0x0fffffff)>>0); - trac->AddClusterMark(3,clmark[3][l3]); + trac.AddClusterV2(3,(clind[3][l3] & 0x0fffffff)>>0); + trac.AddClusterMark(3,clmark[3][l3]); } if(cl2!=0){ - trac->AddClusterV2(2,(clind[2][l2] & 0x0fffffff)>>0); - trac->AddClusterMark(2,clmark[2][l2]); + trac.AddClusterV2(2,(clind[2][l2] & 0x0fffffff)>>0); + trac.AddClusterMark(2,clmark[2][l2]); } if(cl1!=0){ - trac->AddClusterV2(1,(clind[1][l1] & 0x0fffffff)>>0); - trac->AddClusterMark(1,clmark[1][l1]); + trac.AddClusterV2(1,(clind[1][l1] & 0x0fffffff)>>0); + trac.AddClusterMark(1,clmark[1][l1]); } if(cl0!=0){ - trac->AddClusterV2(0,(clind[0][l0] & 0x0fffffff)>>0); - trac->AddClusterMark(0,clmark[0][l0]); + trac.AddClusterV2(0,(clind[0][l0] & 0x0fffffff)>>0); + trac.AddClusterMark(0,clmark[0][l0]); } //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(); - if(RefitAt(AliITSRecoParam::GetrInsideITSscreen(),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(AliITSRecoParam::GetrInsideSPD1(),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 @@ -950,47 +835,18 @@ AliITStrackV2* AliITStrackerSA::FitTrack(AliITStrackSA* tr,Double_t *primaryVert }//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; - } + if(fListOfTracks->GetEntries()==0) return 0; - Int_t lowchi2 = FindTrackLowChiSquare(fListOfTracks,dim); + 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; - delete [] clind; - delete [] clmark; - return 0; - } - Int_t * indexc = new Int_t[AliITSgeomTGeo::GetNLayers()]; + if(otrack==0) return 0; + + Int_t indexc[AliITSgeomTGeo::kNLayers]; for(Int_t i=0;iGetNumberOfClusters();nind++){ indexc[nind] = otrack->GetClusterIndex(nind); @@ -1008,7 +864,6 @@ AliITStrackV2* AliITStrackerSA::FitTrack(AliITStrackSA* tr,Double_t *primaryVert labl[i][2]=-1; } } - delete [] indexc; CookLabel(otrack,0.); //MI change - to see fake ratio @@ -1029,29 +884,37 @@ AliITStrackV2* AliITStrackerSA::FitTrack(AliITStrackSA* tr,Double_t *primaryVert fCluLayer[nlay]->Compress(); } } - 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(AliITSReconstructor::GetRecoParam()->GetLayersToSkip(layer)) return 0; + if(ForceSkippingOfLayer(layer)) return 0; Int_t nc=0; AliITSlayer &lay = fgLayers[layer]; @@ -1072,6 +935,7 @@ Int_t AliITStrackerSA::SearchClusters(Int_t layer,Double_t phiwindow,Double_t la AliITSRecPoint *c = (AliITSRecPoint*)fCluLayer[layer]->At(index); if (!c) continue; if (c->GetQ()<=0) continue; + if(layer>1 && c->GetQ()<=fMinQ) continue; AliITSclusterTable* arr = (AliITSclusterTable*)GetClusterCoord(layer,index); Double_t phi = arr->GetPhi(); @@ -1097,6 +961,26 @@ Int_t AliITStrackerSA::SearchClusters(Int_t layer,Double_t phiwindow,Double_t la 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]->At(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 @@ -1185,41 +1069,22 @@ 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 lowers 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(chi2GetSigmaZ2()); */ } +