]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - ITS/AliITStrackerSA.cxx
When calculating a*a-b*b the form (a-b)*(a+b) is usually more numerically stable.
[u/mrichter/AliRoot.git] / ITS / AliITStrackerSA.cxx
index 86d34b53d55386ca4e040bbee95291e850cf34ed..8fe1c94210d22f2433b8184fb345dd6a8851884b 100644 (file)
@@ -58,6 +58,7 @@ fLambdaWin(0),
 fVert(0),
 fVertexer(0),
 fListOfTracks(0),
+fListOfSATracks(0),
 fITSclusters(0),
 fSixPoints(0),
 fOuterStartLayer(0),
@@ -82,6 +83,7 @@ fLambdaWin(0),
 fVert(0),
 fVertexer(0),
 fListOfTracks(0),
+fListOfSATracks(0),
 fITSclusters(0),
 fSixPoints(0),
 fOuterStartLayer(0),
@@ -113,6 +115,7 @@ fLambdaWin(0),
 fVert(vert),
 fVertexer(0),
 fListOfTracks(0),
+fListOfSATracks(0),
 fITSclusters(0),
 fSixPoints(0),
 fOuterStartLayer(0),
@@ -142,6 +145,7 @@ fLambdaWin(0),
 fVert(),
 fVertexer(vertexer),
 fListOfTracks(0),
+fListOfSATracks(0),
 fITSclusters(0),
 fSixPoints(0),
 fOuterStartLayer(0),
@@ -172,6 +176,7 @@ fLambdaWin(tracker.fLambdaWin),
 fVert(tracker.fVert),
 fVertexer(tracker.fVertexer),
 fListOfTracks(tracker.fListOfTracks),
+fListOfSATracks(tracker.fListOfSATracks),
 fITSclusters(tracker.fITSclusters),
 fSixPoints(tracker.fSixPoints),
 fOuterStartLayer(tracker.fOuterStartLayer),
@@ -219,6 +224,8 @@ AliITStrackerSA::~AliITStrackerSA(){
   if(fLambdaWin)delete []fLambdaWin;
   fListOfTracks->Delete();
   delete fListOfTracks;
+  fListOfSATracks->Delete();
+  delete fListOfSATracks;
   if(fCluLayer){
     for(Int_t i=0;i<AliITSgeomTGeo::GetNLayers();i++){
       if(fCluLayer[i]){
@@ -272,12 +279,22 @@ 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);
+    }
     fITSclusters = 0;
     SetSixPoints();
     SetOuterStartLayer(0);
     SetSAFlag(kFALSE);
     fListOfTracks=new TObjArray(0,0);
+    fListOfSATracks=new TObjArray(0,0);
     fCluLayer = 0;
     fCluCoord = 0;
  }
@@ -294,6 +311,7 @@ void AliITStrackerSA::ResetForFinding(){
     fPointc[0]=0;
     fPointc[1]=0;
     fListOfTracks->Delete();
+    fListOfSATracks->Delete();
 }
 
  
@@ -304,25 +322,23 @@ Int_t AliITStrackerSA::FindTracks(AliESDEvent* event){
 // Track finder using the ESD object
 
 
-  //controllare numero cluster sui layer1 e 2 (morti?)
-  //non trova tracce...controllare..
-
+  
   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;k<ncl;k++){
-       AliITSRecPoint* cll = (AliITSRecPoint*)GetCluster(idx[k]);
-       cll->SetBit(kSAflag);
+  if(AliITSReconstructor::GetRecoParam()->GetSAUseAllClusters()==kFALSE) {
+    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;k<ncl;k++){
+         AliITSRecPoint* cll = (AliITSRecPoint*)GetCluster(idx[k]);
+         cll->SetBit(kSAflag);
+       }
       }
     }
   }
@@ -331,19 +347,17 @@ Int_t AliITStrackerSA::FindTracks(AliESDEvent* event){
   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;i<AliITSgeomTGeo::GetNLayers();i++) {
       fCluLayer[i]=0;
       fCluCoord[i]=0;
     }
   }
-  Int_t * firstmod = new Int_t[AliITSgeomTGeo::GetNLayers()];
   for(Int_t i=0;i<AliITSgeomTGeo::GetNLayers();i++){
-    firstmod[i]=AliITSgeomTGeo::GetModuleIndex(i+1,1,1);
     AliITSlayer &layer=fgLayers[i];
     if (!AliITSReconstructor::GetRecoParam()->GetLayersToSkip(i)) {
       for(Int_t cli=0;cli<layer.GetNumberOfClusters();cli++){
@@ -381,6 +395,9 @@ Int_t AliITStrackerSA::FindTracks(AliESDEvent* event){
     }
   }
    
+  // track counter
+  Int_t ntrack=0;
+
   Int_t minNPoints = (fSixPoints ? AliITSgeomTGeo::GetNLayers() : AliITSgeomTGeo::GetNLayers()-1);  
   for(Int_t i=0;i<AliITSgeomTGeo::GetNLayers();i++) {
     if(AliITSReconstructor::GetRecoParam()->GetLayersToSkip(i)) {
@@ -388,92 +405,92 @@ Int_t AliITStrackerSA::FindTracks(AliESDEvent* event){
     }
   }
 
+  static Int_t nClusLay[AliITSgeomTGeo::kNLayers];//counter for clusters on each layer
 
-  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;nloop<fNloop;nloop++){
-    for(Int_t ncl=0;ncl<fCluLayer[0]->GetEntries();ncl++){ //loop starting from layer 0
-      
-      ResetForFinding();
-      Int_t pflag=0;
-      
-      AliITSRecPoint* cl = (AliITSRecPoint*)fCluLayer[0]->At(ncl);
+  //loop on different minNPoints
+  Int_t minMinNPoints=minNPoints;
+  if(AliITSReconstructor::GetRecoParam()->GetAllowProlongationWithEmptyRoad()) minMinNPoints=2;
+  for(Int_t iMinNPoints=minNPoints; iMinNPoints>=minMinNPoints; iMinNPoints--) {
+    //loop on the different windows
+    for(Int_t nloop=0;nloop<fNloop;nloop++){
+      for(Int_t ncl=0;ncl<fCluLayer[0]->GetEntries();ncl++){ //loop starting from layer 0
       
-      if(!cl) continue;
-      if (cl->GetQ()<=0) continue;
+       ResetForFinding();
+       Int_t pflag=0;
       
-      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];
+       AliITSRecPoint* cl = (AliITSRecPoint*)fCluLayer[0]->At(ncl);
       
+       if(!cl) continue;
+       if (cl->GetQ()<=0) continue;
       
-      fPoint2[0]=arr->GetX();
-      fPoint2[1]=arr->GetY();
-      for(Int_t i=0;i<AliITSgeomTGeo::GetNLayers();i++){ nn[i]=0;}
-      nn[0] = SearchClusters(0,fPhiWin[nloop],fLambdaWin[nloop],trs,primaryVertex[2],pflag);
-      nn[1] = SearchClusters(1,fPhiWin[nloop],fLambdaWin[nloop],trs,primaryVertex[2],pflag);
-      if(nn[1]>0){
-        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<AliITSgeomTGeo::GetNLayers();nnp++) {
-        if(nn[nnp]!=0) layOK+=1;
-      }
-
-      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;
-     }//end loop on clusters of layer1
-     //end loop2
-  }
+       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;i<AliITSgeomTGeo::GetNLayers();i++) nClusLay[i]=0;
+       nClusLay[0] = SearchClusters(0,fPhiWin[nloop],fLambdaWin[nloop],trs,primaryVertex[2],pflag);
+       nClusLay[1] = SearchClusters(1,fPhiWin[nloop],fLambdaWin[nloop],trs,primaryVertex[2],pflag);
+       if(nClusLay[1]>0){
+         pflag=1;
+         fPoint3[0] = fPointc[0];
+         fPoint3[1] = fPointc[1];
+       }
+       nClusLay[2] = SearchClusters(2,fPhiWin[nloop],fLambdaWin[nloop],trs,primaryVertex[2],pflag);
+       if(nClusLay[1]==0 && nClusLay[2]==0) pflag=0;
+       if(nClusLay[2]!=0 && nClusLay[1]!=0){ pflag=1; UpdatePoints();}
+       if(nClusLay[2]!=0 && nClusLay[1]==0){
+         pflag=1;
+         fPoint3[0]=fPointc[0];
+         fPoint3[1]=fPointc[1];
+       }
+       
+       nClusLay[3] = SearchClusters(3,fPhiWin[nloop],fLambdaWin[nloop],trs,primaryVertex[2],pflag);
+       pflag=1;
+       if(nClusLay[3]!=0) UpdatePoints();
+       nClusLay[4] = SearchClusters(4,fPhiWin[nloop],fLambdaWin[nloop],trs,primaryVertex[2],pflag); 
+       pflag=1;
+       if(nClusLay[4]!=0) UpdatePoints();
+       nClusLay[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<AliITSgeomTGeo::GetNLayers();nnp++) {
+         if(nClusLay[nnp]!=0) layOK+=1;
+       }
+       
+       if(layOK>=iMinNPoints) {
+         //printf("-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;
+         //printf("-NPOINTS fit: %d\n",tr2->GetNumberOfClusters());      
 
-  delete[] nn;
+         StoreTrack(tr2,event);
+         ntrack++;
+       }
+       delete trs;
+      }//end loop on clusters of layer1
+    }//end loop on windows
+  }//end loop on min points
 
 
   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) {
+  //layer 1 missing. Not done for cosmics.   
+  if(!fSixPoints && fOuterStartLayer==0) {
     //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;nloop<fNloop;nloop++){
       Int_t ncl2=fCluLayer[1]->GetEntries();
       while(ncl2--){ //loop starting from layer 2
@@ -493,43 +510,44 @@ Int_t AliITStrackerSA::FindTracks(AliESDEvent* event){
        
        fPoint2[0]=arr->GetX();
        fPoint2[1]=arr->GetY();
-       for(Int_t kk=0;kk<AliITSgeomTGeo::GetNLayers()-1;kk++)nn[kk] = 0;
-       nn[0] = SearchClusters(1,fPhiWin[nloop],fLambdaWin[nloop],
+       for(Int_t kk=0;kk<AliITSgeomTGeo::GetNLayers();kk++) nClusLay[kk] = 0;
+       nClusLay[0] = SearchClusters(1,fPhiWin[nloop],fLambdaWin[nloop],
                               trs,primaryVertex[2],pflag);
-       nn[1] = SearchClusters(2,fPhiWin[nloop],fLambdaWin[nloop],
+       nClusLay[1] = SearchClusters(2,fPhiWin[nloop],fLambdaWin[nloop],
                               trs,primaryVertex[2],pflag);
-       if(nn[1]!=0){
+       if(nClusLay[1]!=0){
          pflag=1;
          fPoint3[0]=fPointc[0];
          fPoint3[1]=fPointc[1];
        }
-       nn[2]= SearchClusters(3,fPhiWin[nloop],fLambdaWin[nloop],
+       nClusLay[2]= SearchClusters(3,fPhiWin[nloop],fLambdaWin[nloop],
                              trs,primaryVertex[2],pflag);
-       if(nn[2]!=0){
+       if(nClusLay[2]!=0){
          pflag=1;
          UpdatePoints();
        }
-       nn[3]= SearchClusters(4,fPhiWin[nloop],fLambdaWin[nloop],
+       nClusLay[3]= SearchClusters(4,fPhiWin[nloop],fLambdaWin[nloop],
                              trs,primaryVertex[2],pflag);
-       if(nn[3]!=0){
+       if(nClusLay[3]!=0){
          pflag=1;
          UpdatePoints();
        }
-       nn[4]=SearchClusters(5,fPhiWin[nloop],fLambdaWin[nloop],
+       nClusLay[4]=SearchClusters(5,fPhiWin[nloop],fLambdaWin[nloop],
                             trs,primaryVertex[2],pflag);
        
-       Int_t fl=0;
+       Int_t layOK=0;
        for(Int_t nnp=0;nnp<AliITSgeomTGeo::GetNLayers()-1;nnp++){
-         if(nn[nnp]!=0) fl+=1;
+         if(nClusLay[nnp]!=0) layOK+=1;
        }
-       if(fl>=minNPoints){  // 5/6       
+       if(layOK>=minNPoints){  // 5/6
+         //printf("--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;
+         //printf("--NPOINTS fit: %d\n",tr2->GetNumberOfClusters());
          
-         AliESDtrack outtrack;
-         outtrack.UpdateTrackParams(tr2,AliESDtrack::kITSin);
-         event->AddTrack(&outtrack);
+         StoreTrack(tr2,event);
          ntrack++;
          
        }   
@@ -538,12 +556,11 @@ Int_t AliITStrackerSA::FindTracks(AliESDEvent* event){
       }//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) {
+  if(fOuterStartLayer>0 && !AliITSReconstructor::GetRecoParam()->GetAllowProlongationWithEmptyRoad()) {
     for(Int_t innLay=1; innLay<=fOuterStartLayer; innLay++) {
       //printf("Searching from layer %d outward\n",innLay);
       minNPoints=AliITSgeomTGeo::GetNLayers()-innLay;
@@ -551,7 +568,7 @@ Int_t AliITStrackerSA::FindTracks(AliESDEvent* event){
        if(AliITSReconstructor::GetRecoParam()->GetLayersToSkip(i)) 
          minNPoints--;
       //   counter for clusters on each layer  
-      Int_t * nn = new Int_t[AliITSgeomTGeo::GetNLayers()-innLay];      
+
       for(Int_t nloop=0;nloop<fNloop;nloop++){
        Int_t nclInnLay=fCluLayer[innLay]->GetEntries();
        while(nclInnLay--){ //loop starting from layer innLay
@@ -572,16 +589,16 @@ Int_t AliITStrackerSA::FindTracks(AliESDEvent* event){
          fPoint2[1]=arr->GetY();
          
          Int_t kk;
-         for(kk=0;kk<AliITSgeomTGeo::GetNLayers()-innLay;kk++) nn[kk] = 0;
+         for(kk=0;kk<AliITSgeomTGeo::GetNLayers();kk++) nClusLay[kk] = 0;
          
          kk=0;
-         nn[kk] = SearchClusters(innLay,fPhiWin[nloop],fLambdaWin[nloop],
+         nClusLay[kk] = SearchClusters(innLay,fPhiWin[nloop],fLambdaWin[nloop],
                                  trs,primaryVertex[2],pflag);
          for(Int_t nextLay=innLay+1; nextLay<AliITSgeomTGeo::GetNLayers(); nextLay++) {
            kk++;
-           nn[kk] = SearchClusters(nextLay,fPhiWin[nloop],fLambdaWin[nloop],
+           nClusLay[kk] = SearchClusters(nextLay,fPhiWin[nloop],fLambdaWin[nloop],
                                    trs,primaryVertex[2],pflag);
-           if(nn[kk]!=0){
+           if(nClusLay[kk]!=0){
              pflag=1;
              if(kk==1) {
                fPoint3[0]=fPointc[0];
@@ -592,19 +609,18 @@ Int_t AliITStrackerSA::FindTracks(AliESDEvent* event){
            }
          }
          
-         Int_t fl=0;
+         Int_t layOK=0;
          for(Int_t nnp=0;nnp<AliITSgeomTGeo::GetNLayers()-innLay;nnp++){
-           if(nn[nnp]!=0) fl+=1;
+           if(nClusLay[nnp]!=0) layOK+=1;
          }
-         if(fl>=minNPoints){ 
+         if(layOK>=minNPoints){ 
+           //printf("---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;
+           //printf("---NPOINTS fit: %d\n",tr2->GetNumberOfClusters());
            
-           
-           AliESDtrack outtrack;
-           outtrack.UpdateTrackParams(tr2,AliESDtrack::kITSin);
-           event->AddTrack(&outtrack);
+           StoreTrack(tr2,event);
            ntrack++;
            
          }   
@@ -613,12 +629,82 @@ Int_t AliITStrackerSA::FindTracks(AliESDEvent* event){
        }//end loop on clusters of innLay
       } //end loop on window sizes
       
-      delete [] nn;
     } //end loop on innLay
   } //end if(fOuterStartLayer>0)
   
+
+  // 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;nloop<fNloop;nloop++){
+       Int_t nclInnLay=fCluLayer[innLay]->GetEntries();
+       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();kk++) nClusLay[kk] = 0;
+         
+         kk=0;
+         nClusLay[kk] = SearchClusters(innLay,fPhiWin[nloop],fLambdaWin[nloop],
+                                 trs,primaryVertex[2],pflag);
+         for(Int_t nextLay=innLay+1; nextLay<=outerLayer; nextLay++) {
+           kk++;
+           nClusLay[kk] = SearchClusters(nextLay,fPhiWin[nloop],fLambdaWin[nloop],
+                                   trs,primaryVertex[2],pflag);
+           if(nClusLay[kk]!=0){
+             pflag=1;
+             if(kk==1) {
+               fPoint3[0]=fPointc[0];
+               fPoint3[1]=fPointc[1];
+             } else {
+               UpdatePoints();
+             }
+           }
+         }
+         
+         Int_t layOK=0;
+         for(Int_t nnp=0;nnp<AliITSgeomTGeo::GetNLayers()-innLay;nnp++){
+           if(nClusLay[nnp]!=0) layOK+=1;
+         }
+         if(layOK==1) {
+           //printf("----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;
+           Bool_t onePoint = kTRUE;
+           tr2 = FitTrack(trs,primaryVertex,onePoint);
+           if(!tr2) continue;
+           //printf("----NPOINTS fit: %d\n",tr2->GetNumberOfClusters());
+           
+           StoreTrack(tr2,event);
+           ntrack++;
+           
+         }   
+         
+         delete trs;
+       }//end loop on clusters of innLay
+      } //end loop on window sizes
+      
+    } //end loop on innLay
+  } // end search 1-point tracks
   
-  delete [] firstmod;
   Info("FindTracks","Number of found tracks: %d",event->GetNumberOfTracks());
   return 0;
 
@@ -626,31 +712,32 @@ Int_t AliITStrackerSA::FindTracks(AliESDEvent* event){
  
 //________________________________________________________________________
 
-AliITStrackV2* AliITStrackerSA::FitTrack(AliITStrackSA* tr,Double_t *primaryVertex) {
+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()];
-  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 nnn[AliITSgeomTGeo::kNLayers];
+  static Int_t kkk[AliITSgeomTGeo::kNLayers];
+  static Int_t end[AliITSgeomTGeo::kNLayers];
+  static AliITSRecPoint *listlayer[AliITSgeomTGeo::kNLayers][kMaxClu];
 
   for(Int_t i=0;i<AliITSgeomTGeo::GetNLayers();i++) {
     firstmod[i]=AliITSgeomTGeo::GetModuleIndex(i+1,1,1);
-    listlayer[i] = new TObjArray(0,0);
     nnn[i]=0;
     kkk[i]=0;
-    clind[i]=new Int_t[maxclu]; 
-    clmark[i]=new Int_t[maxclu];
-    for(Int_t j=0;j<maxclu; j++){
+    end[i]=0;
+    for(Int_t j=0;j<kMaxClu; j++){
       clind[i][j]=0;
       clmark[i][j]=0;
-    }
+      listlayer[i][j]=0;
+   }
   }
   
 
@@ -660,11 +747,12 @@ AliITStrackV2* AliITStrackerSA::FitTrack(AliITStrackSA* tr,Double_t *primaryVert
     AliITSRecPoint* cl = (AliITSRecPoint*)GetCluster(index);
     if(cl->TestBit(kSAflag)==kTRUE) cl->ResetBit(kSAflag);
     Int_t lay = (index & 0xf0000000) >> 28;
-    listlayer[lay]->AddLast(cl); 
+    Int_t nInLay=end[lay];
+    listlayer[lay][nInLay]=cl;
     Int_t ind=nnn[lay];
     clind[lay][ind]=index;
+    end[lay]++;
   }
-  delete [] nnn;
 
   for(Int_t nlay=0;nlay<AliITSgeomTGeo::GetNLayers();nlay++){
     for(Int_t ncl=0;ncl<tr->GetNumberOfMarked(nlay);ncl++){
@@ -674,15 +762,12 @@ AliITStrackV2* AliITStrackerSA::FitTrack(AliITStrackSA* tr,Double_t *primaryVert
     }
   }
 
-  delete [] kkk;
 
   Int_t firstLay=-1,secondLay=-1;
-  Int_t * end = new Int_t[AliITSgeomTGeo::GetNLayers()];
   for(Int_t i=0;i<AliITSgeomTGeo::GetNLayers();i++) {
-    if(listlayer[i]->GetEntries()==0) {
+    if(end[i]==0) {
       end[i]=1;
-    } else {
-      end[i]=listlayer[i]->GetEntries();
+    }else{
       if(firstLay==-1) {
        firstLay=i;
       } else if(secondLay==-1) {
@@ -691,36 +776,20 @@ AliITStrackV2* AliITStrackerSA::FitTrack(AliITStrackSA* tr,Double_t *primaryVert
     }
   }
 
-  if(firstLay==-1 || secondLay==-1) {
-    for(Int_t i=0;i<AliITSgeomTGeo::GetNLayers();i++){
-      delete listlayer[i];
-      delete clind[i];
-      delete clmark[i];
-    }
-    delete [] listlayer;
-    delete [] clind;
-    delete [] clmark;
-    delete [] firstmod;
-    delete [] end;
-    return 0;
-  }
-
-  TClonesArray* listSA = new TClonesArray("AliITStrackSA");
-  TClonesArray &tri = *listSA;
-  Int_t nlist=0;
-
+  if(firstLay==-1 || (secondLay==-1 && !onePoint)) return 0;
+  
   for(Int_t l0=0;l0<end[0];l0++){ //loop on layer 1
-    AliITSRecPoint* cl0 = (AliITSRecPoint*)listlayer[0]->At(l0); 
+    AliITSRecPoint* cl0 = (AliITSRecPoint*)listlayer[0][l0];
     for(Int_t l1=0;l1<end[1];l1++){ //loop on layer 2
-      AliITSRecPoint* cl1 = (AliITSRecPoint*)listlayer[1]->At(l1); 
+      AliITSRecPoint* cl1 = (AliITSRecPoint*)listlayer[1][l1];
       for(Int_t l2=0;l2<end[2];l2++){  //loop on layer 3
-        AliITSRecPoint* cl2 = (AliITSRecPoint*)listlayer[2]->At(l2);
+        AliITSRecPoint* cl2 = (AliITSRecPoint*)listlayer[2][l2];
         for(Int_t l3=0;l3<end[3];l3++){ //loop on layer 4   
-          AliITSRecPoint* cl3 = (AliITSRecPoint*)listlayer[3]->At(l3);
+          AliITSRecPoint* cl3 = (AliITSRecPoint*)listlayer[3][l3];
           for(Int_t l4=0;l4<end[4];l4++){ //loop on layer 5
-            AliITSRecPoint* cl4 = (AliITSRecPoint*)listlayer[4]->At(l4);
+            AliITSRecPoint* cl4 = (AliITSRecPoint*)listlayer[4][l4];
             for(Int_t l5=0;l5<end[5];l5++){ //loop on layer 6  
-              AliITSRecPoint* cl5 = (AliITSRecPoint*)listlayer[5]->At(l5);
+              AliITSRecPoint* cl5 = (AliITSRecPoint*)listlayer[5][l5];
 
 
              Double_t x1,y1,z1,sx1,sy1,sz1;
@@ -774,34 +843,50 @@ AliITStrackV2* AliITStrackerSA::FitTrack(AliITStrackSA* tr,Double_t *primaryVert
                p2=cl5;
                index2=clind[5][l5];mrk2=clmark[5][l5];
                break;
+             default:
+               p2=0;
+               index2=-1;mrk2=-1;
+               break;
              }
 
              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=0,tgl2=0,phi2=0;
              
              Int_t cln1=mrk1;
-             Int_t cln2=mrk2;
              AliITSclusterTable* arr1 = (AliITSclusterTable*)GetClusterCoord(firstLay,cln1);
-             AliITSclusterTable* arr2 = (AliITSclusterTable*)GetClusterCoord(secondLay,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));
+             if(secondLay>0) {
+               Int_t cln2=mrk2;
+               AliITSclusterTable* arr2 = (AliITSclusterTable*)GetClusterCoord(secondLay,cln2);
+               x2 = arr2->GetX();
+               y2 = arr2->GetY();
+               z2 = arr2->GetZ();
+               sx2 = arr2->GetSx();
+               sy2 = arr2->GetSy();
+               sz2 = arr2->GetSz();
+               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));
+             }
+
+
               AliITStrackSA* trac = new AliITStrackSA(layer,ladder,detector,yclu1,zclu1,phi2,tgl2,cv,1);
 
 
@@ -843,16 +928,15 @@ AliITStrackV2* AliITStrackerSA::FitTrack(AliITStrackSA* tr,Double_t *primaryVert
                 //fit from layer 6 to layer 1
                 if(RefitAt(AliITSRecoParam::GetrInsideSPD1(),otrack2,ot)) {
                  fListOfTracks->AddLast(otrack2);
-                 new (tri[nlist]) AliITStrackSA(*trac);
-                 nlist++;
+                 fListOfSATracks->AddLast(trac);
                } else {
                  delete otrack2;
+                 delete trac;
                }
                               
               }       
           
               delete ot;
-              delete trac;
             }//end loop layer 6
           }//end loop layer 5
         }//end loop layer 4        
@@ -860,47 +944,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;i<AliITSgeomTGeo::GetNLayers();i++){
-      delete listlayer[i];
-      delete clind[i];
-      delete clmark[i];
-    }
-    delete [] listlayer;
-    delete [] clind;
-    delete [] clmark;
-    listSA->Delete();
-    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;i<AliITSgeomTGeo::GetNLayers();i++){
-      delete listlayer[i];
-      delete clind[i];
-      delete clmark[i];
-    }
-    delete [] listlayer; 
-    delete [] clind;
-    delete [] clmark;
-    listSA->Delete();
-    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;i<AliITSgeomTGeo::GetNLayers();i++) indexc[i]=0;
   for(Int_t nind=0;nind<otrack->GetNumberOfClusters();nind++){
     indexc[nind] = otrack->GetClusterIndex(nind);
@@ -918,7 +973,6 @@ AliITStrackV2* AliITStrackerSA::FitTrack(AliITStrackSA* tr,Double_t *primaryVert
       labl[i][2]=-1;
     }
   }
-  delete [] indexc;
 
   CookLabel(otrack,0.); //MI change - to see fake ratio
  
@@ -939,22 +993,26 @@ AliITStrackV2* AliITStrackerSA::FitTrack(AliITStrackSA* tr,Double_t *primaryVert
       fCluLayer[nlay]->Compress();
     }    
   }
-  listSA->Delete();
-  delete listSA;
 
-  for(Int_t i=0;i<AliITSgeomTGeo::GetNLayers();i++){
-    delete listlayer[i];
-    delete clind[i];
-    delete clmark[i];
-  }
-  delete [] listlayer; 
-  delete [] firstmod;
-  delete [] clind;
-  delete [] clmark;
   return otrack;
 
 }
 
+//_______________________________________________________
+void AliITStrackerSA::StoreTrack(AliITStrackV2 *t,AliESDEvent *event) const 
+{
+  //
+  // Add new track to the ESD
+  //
+  AliESDtrack outtrack;
+  outtrack.UpdateTrackParams(t,AliESDtrack::kITSin);
+  for(Int_t i=0;i<12;i++) {
+    outtrack.SetITSModuleIndex(i,t->GetModuleIndex(i));
+  }
+  event->AddTrack(&outtrack);
+
+  return;
+}
 
 
 //_______________________________________________________
@@ -1095,41 +1153,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;i<dim;i++){
-    AliITStrackV2* trk = (AliITStrackV2*)tracklist->At(i);
-    chi2[i]=trk->GetChi2();
-    index[i]=i;
-  }
-
-  Int_t w=0;Double_t value;
-  Int_t lp;
-  while(w<dim){
-    for(Int_t j=w+1;j<dim;j++){
-      if(chi2[w]<chi2[j]){
-        value=chi2[w];
-        chi2[w]=chi2[j];
-        chi2[j]=value;
-        lp=index[w];
-        index[w]=index[j];
-        index[j]=lp;
-      }
+Int_t AliITStrackerSA::FindTrackLowChiSquare() const {
+  // returns track with lowest chi square  
+  Int_t dim=fListOfTracks->GetEntries();
+  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;i<dim;i++){
+    trk = (AliITStrackV2*)fListOfTracks->At(i);
+    Double_t chi2=trk->GetChi2();
+    if(chi2<minChi2){
+      minChi2=chi2;
+      index=i;
     }
-    w++;
   }
-  Int_t tmp = index[dim-1];
-  delete [] chi2;
-  delete [] index;
-  return tmp;
+  return index;
 }
 
 //__________________________________________________________
@@ -1199,9 +1238,25 @@ Int_t gl12, Int_t gl13, Int_t gl14,Int_t gl15, Int_t gl16, Int_t gl17, Int_t gl1
 
   
 }
-
 //_____________________________________________________________________________
-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;k<fNloop;k++){
+    Float_t phi=phimin+k*stepPhi;
+    Float_t lam=lambdamin+k*stepLambda;
+    fPhiWin[k]=phi;
+    fLambdaWin[k]=lam;
+  }
+}
+//_____________________________________________________________________________
+void AliITStrackerSA::SetFixedWindowSizes(Int_t n, Double_t *phi, Double_t *lam){
   // Set sizes of the phi and lambda windows used for track finding
   fNloop = n;
   if(phi){ // user defined values