X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ITS%2FAliITStrackerSA.cxx;h=ce836973c5d5237bc395be001cecf02ebd0f7996;hb=c1caadda8464e94e09f9fd053473f422f6c401db;hp=a7adcb4f58dfddd07370e9cb84f78424308814dd;hpb=e50912dbc6d22f2f78a5837c5db20e8fdf8a19e1;p=u%2Fmrichter%2FAliRoot.git diff --git a/ITS/AliITStrackerSA.cxx b/ITS/AliITStrackerSA.cxx index a7adcb4f58d..ce836973c5d 100644 --- a/ITS/AliITStrackerSA.cxx +++ b/ITS/AliITStrackerSA.cxx @@ -38,6 +38,7 @@ #include "AliITSgeomTGeo.h" #include "AliITStrackSA.h" #include "AliITStrackerSA.h" +#include "AliITSReconstructor.h" #include "AliRun.h" ClassImp(AliITStrackerSA) @@ -313,109 +314,106 @@ Int_t AliITStrackerSA::FindTracks(AliESDEvent* event){ //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 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]); + } + for(Int_t ilay=0;ilayTestBit(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 * 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; + Int_t minNPoints = (fSixPoints ? AliITSgeomTGeo::GetNLayers() : AliITSgeomTGeo::GetNLayers()-1); + for(Int_t i=0;iGetLayersToSkip(i)) { + minNPoints--; + } + } - 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;iGetEntries();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]; @@ -440,582 +438,271 @@ Int_t AliITStrackerSA::FindTracks(AliESDEvent* event){ 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;nnp=numberofpoints){ - AliITStrackV2* tr2 = FitTrack(trs,primaryVertex); - - if(tr2==0) continue; + if(layOK>=minNPoints){ + AliITStrackV2* tr2 = 0; + tr2 = FitTrack(trs,primaryVertex); + if(!tr2) continue; AliESDtrack outtrack; outtrack.UpdateTrackParams(tr2,AliESDtrack::kITSin); event->AddTrack(&outtrack); ntrack++; } - - 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[] 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); - // 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;kk0) { + 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)) + minNPoints--; + // 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) - - + for(Int_t nextLay=innLay+1; nextLay=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 innLay + } //end loop on window sizes + + delete [] nn; + } //end loop on innLay + } //end if(fOuterStartLayer>0) + + delete [] firstmod; Info("FindTracks","Number of found tracks: %d",event->GetNumberOfTracks()); return 0; } - - - - //________________________________________________________________________ -AliITStrackV2* AliITStrackerSA::FitTrack(AliITStrackSA* tr,Double_t *primaryVertex){ - //fit of the found track +AliITStrackV2* AliITStrackerSA::FitTrack(AliITStrackSA* tr,Double_t *primaryVertex) { + //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;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]++;} - - } - } - - 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(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; - } - - } - - 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; - + const Int_t maxclu=AliITStrackSA::GetMaxNumberOfClusters(); - 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]++;} + listlayer[lay]->AddLast(cl); + Int_t ind=nnn[lay]; + clind[lay][ind]=index; } 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]++;} - + Int_t ind=kkk[nlay]; + clmark[nlay][ind]=mark; } } delete [] kkk; - + Int_t firstLay=-1,secondLay=-1; Int_t * end = new Int_t[AliITSgeomTGeo::GetNLayers()]; - for(Int_t i=0;iGetEntries()==0) end[i]=1; - else end[i]=listlayer[i]->GetEntries(); + for(Int_t i=0;iGetEntries()==0) { + end[i]=1; + } else { + end[i]=listlayer[i]->GetEntries(); + if(firstLay==-1) { + firstLay=i; + } else if(secondLay==-1) { + secondLay=i; + } + } } 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); + for(Int_t l0=0;l0At(l0); + 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); Double_t x1,y1,z1,sx1,sy1,sz1; @@ -1024,35 +711,59 @@ AliITStrackV2* AliITStrackerSA::FitShortTrack(AliITStrackSA* tr,Double_t *primar AliITSRecPoint* p2=0; Int_t index1=0,index2=0; Int_t mrk1=0,mrk2=0; - if(innLay==1) { + + switch(firstLay) { + case 0: + p1=cl0; + index1=clind[0][l0];mrk1=clmark[0][l0]; + break; + case 1: p1=cl1; - p2=cl2; - index1=clind1[l2];mrk1=mark1[l2]; - index2=clind2[l3];mrk2=mark2[l3]; - } else if(innLay==2) { + index1=clind[1][l1];mrk1=clmark[1][l1]; + break; + case 2: p1=cl2; - p2=cl3; - index1=clind2[l3];mrk1=mark2[l3]; - index2=clind3[l4];mrk2=mark3[l4]; - } else if(innLay==3) { + index1=clind[2][l2];mrk1=clmark[2][l2]; + break; + case 3: p1=cl3; - p2=cl4; - index1=clind3[l4];mrk1=mark3[l4]; - index2=clind4[l5];mrk2=mark4[l5]; - } else if(innLay==4) { + index1=clind[3][l3];mrk1=clmark[3][l3]; + break; + case 4: p1=cl4; + index1=clind[4][l4];mrk1=clmark[4][l4]; + break; + } + + switch(secondLay) { + case 1: + p2=cl1; + index2=clind[1][l1];mrk2=clmark[1][l1]; + break; + case 2: + p2=cl2; + index2=clind[2][l2];mrk2=clmark[2][l2]; + break; + case 3: + p2=cl3; + index2=clind[3][l3];mrk2=clmark[3][l3]; + break; + case 4: + p2=cl4; + index2=clind[4][l4];mrk2=clmark[4][l4]; + break; + case 5: p2=cl5; - index1=clind4[l5];mrk1=mark4[l5]; - index2=clind5[l6];mrk2=mark5[l6]; + index2=clind[5][l5];mrk2=clmark[5][l5]; + break; } - Int_t lay1=innLay; - Int_t lay2=innLay+1; - Int_t module1 = p1->GetDetectorIndex()+firstmod[innLay]; + + Int_t module1 = p1->GetDetectorIndex()+firstmod[firstLay]; Int_t cln1=mrk1; Int_t cln2=mrk2; - AliITSclusterTable* arr1 = (AliITSclusterTable*)GetClusterCoord(lay1,cln1); - AliITSclusterTable* arr2 = (AliITSclusterTable*)GetClusterCoord(lay2,cln2); + AliITSclusterTable* arr1 = (AliITSclusterTable*)GetClusterCoord(firstLay,cln1); + AliITSclusterTable* arr2 = (AliITSclusterTable*)GetClusterCoord(secondLay,cln2); x1 = arr1->GetX(); x2 = arr2->GetX(); y1 = arr1->GetY(); @@ -1076,28 +787,28 @@ AliITStrackV2* AliITStrackerSA::FitShortTrack(AliITStrackSA* tr,Double_t *primar 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]); + trac->AddClusterV2(5,(clind[5][l5] & 0x0fffffff)>>0); + trac->AddClusterMark(5,clmark[5][l5]); } if(cl4!=0){ - trac->AddClusterV2(4,(clind4[l5] & 0x0fffffff)>>0); - trac->AddClusterMark(4,mark4[l5]); + trac->AddClusterV2(4,(clind[4][l4] & 0x0fffffff)>>0); + trac->AddClusterMark(4,clmark[4][l4]); } if(cl3!=0){ - trac->AddClusterV2(3,(clind3[l4] & 0x0fffffff)>>0); - trac->AddClusterMark(3,mark3[l4]); + trac->AddClusterV2(3,(clind[3][l3] & 0x0fffffff)>>0); + trac->AddClusterMark(3,clmark[3][l3]); } if(cl2!=0){ - trac->AddClusterV2(2,(clind2[l3] & 0x0fffffff)>>0); - trac->AddClusterMark(2,mark2[l3]); + trac->AddClusterV2(2,(clind[2][l2] & 0x0fffffff)>>0); + trac->AddClusterMark(2,clmark[2][l2]); } if(cl1!=0){ - trac->AddClusterV2(1,(clind1[l2] & 0x0fffffff)>>0); - trac->AddClusterMark(1,mark1[l2]); + trac->AddClusterV2(1,(clind[1][l1] & 0x0fffffff)>>0); + trac->AddClusterMark(1,clmark[1][l1]); } if(cl0!=0){ - trac->AddClusterV2(0,(clind0[l1] & 0x0fffffff)>>0); - trac->AddClusterMark(0,mark0[l1]); + trac->AddClusterV2(0,(clind[0][l0] & 0x0fffffff)>>0); + trac->AddClusterMark(0,clmark[0][l0]); } @@ -1139,8 +850,12 @@ AliITStrackV2* AliITStrackerSA::FitShortTrack(AliITStrackSA* tr,Double_t *primar if(dim==0){ for(Int_t i=0;iDelete(); delete listSA; delete [] firstmod; @@ -1154,11 +869,17 @@ AliITStrackV2* AliITStrackerSA::FitShortTrack(AliITStrackSA* tr,Double_t *primar 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()]; @@ -1180,15 +901,15 @@ AliITStrackV2* AliITStrackerSA::FitShortTrack(AliITStrackSA* tr,Double_t *primar } } delete [] indexc; - Int_t numberofpoints=AliITSgeomTGeo::GetNLayers()-innLay; + 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;iGetNumberOfClusters();i++) if(labl[i][0]==label || labl[i][1]==label || labl[i][2]==label) lflag++; - if(lflagGetNumberOfClusters()) label = -label; otrack->SetLabel(label); //remove clusters of found track @@ -1205,9 +926,13 @@ AliITStrackV2* AliITStrackerSA::FitShortTrack(AliITStrackSA* tr,Double_t *primar for(Int_t i=0;iGetLayersToSkip(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) @@ -1387,11 +1115,11 @@ Int_t AliITStrackerSA::FindTrackLowChiSquare(TObjArray* tracklist, Int_t dim) co } //__________________________________________________________ -Int_t AliITStrackerSA::FindLabel(Int_t l1, Int_t l2, Int_t l3, Int_t l4, Int_t l5, Int_t l6){ +Int_t AliITStrackerSA::FindLabel(Int_t l0, Int_t l1, Int_t l2, Int_t l3, Int_t l4, Int_t l5){ //function used to determine the track label - Int_t lb[6] = {l1,l2,l3,l4,l5,l6}; + Int_t lb[6] = {l0,l1,l2,l3,l4,l5}; Int_t aa[6]={1,1,1,1,1,1}; Int_t ff=0; Int_t ll=0; @@ -1432,7 +1160,7 @@ Int_t AliITStrackerSA::FindLabel(Int_t l1, Int_t l2, Int_t l3, Int_t l4, Int_t l //_____________________________________________________________________________ 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){ +Int_t gl12, Int_t gl13, Int_t gl14,Int_t gl15, Int_t gl16, Int_t gl17, Int_t gl18, Int_t minNPoints){ //function used to assign label to the found track. If track is fake, the label is negative @@ -1448,7 +1176,7 @@ Int_t gl12, Int_t gl13, Int_t gl14,Int_t gl15, Int_t gl16, Int_t gl17, Int_t gl1 if(lb0[i]==ll || lb1[i]==ll || lb2[i]==ll) lflag+=1; } - if(lflag>=numberofpoints) return ll; + if(lflag>=minNPoints) return ll; else return -ll; @@ -1486,10 +1214,12 @@ void AliITStrackerSA::SetWindowSizes(Int_t n, Double_t *phi, Double_t *lam){ fPhiWin = new Double_t[fNloop]; fLambdaWin = new Double_t[fNloop]; - + + Double_t factor=AliITSReconstructor::GetRecoParam()->GetFactorSAWindowSizes(); // possibility to enlarge windows for cosmics reco with large misalignments (A.Dainese) + for(Int_t k=0;k