]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - ITS/AliITStrackerSA.cxx
Skipping layers corresponding to ITS subdetectors that are not in the TriggerCluster...
[u/mrichter/AliRoot.git] / ITS / AliITStrackerSA.cxx
index 80201cda25ba5aeaa0bd328170b59765e04f28e7..fa7fd1d1b58ff3e7e19e6ffe0b65735394fd2d3a 100644 (file)
@@ -38,6 +38,8 @@
 #include "AliITSgeomTGeo.h"
 #include "AliITStrackSA.h"
 #include "AliITStrackerSA.h"
+#include "AliITSReconstructor.h"
+#include "AliLog.h"
 #include "AliRun.h"
 
 ClassImp(AliITStrackerSA)
@@ -57,8 +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
@@ -80,8 +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) 
 {
@@ -110,8 +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)
 {
@@ -138,8 +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)
 {
@@ -167,8 +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
@@ -212,6 +239,9 @@ AliITStrackerSA::~AliITStrackerSA(){
   if(fPhiWin)delete []fPhiWin;
   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]){
@@ -265,13 +295,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(1);
     SetSAFlag(kFALSE);
     fListOfTracks=new TObjArray(0,0);
+    fListOfSATracks=new TObjArray(0,0);
     fCluLayer = 0;
     fCluCoord = 0;
+    fMinNPoints = 3;
  }
 //_______________________________________________________________________
 void AliITStrackerSA::ResetForFinding(){
@@ -286,6 +328,7 @@ void AliITStrackerSA::ResetForFinding(){
     fPointc[0]=0;
     fPointc[1]=0;
     fListOfTracks->Delete();
+    fListOfSATracks->Delete();
 }
 
  
@@ -295,524 +338,565 @@ Int_t AliITStrackerSA::FindTracks(AliESDEvent* event){
 
 // 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;k<ncl;k++){
-                AliITSRecPoint* cll = (AliITSRecPoint*)GetCluster(idx[k]);
-        cll->SetBit(kSAflag);
-       }
-     }
-   }
-
-   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};
-   fCluLayer = new TClonesArray*[AliITSgeomTGeo::GetNLayers()];
-   fCluCoord = new TClonesArray*[AliITSgeomTGeo::GetNLayers()];
-
-   for(Int_t i=0;i<AliITSgeomTGeo::GetNLayers();i++){
-     AliITSlayer &layer=fgLayers[i];
-     for(Int_t cli=0;cli<layer.GetNumberOfClusters();cli++){
-       AliITSRecPoint* cls = (AliITSRecPoint*)layer.GetCluster(cli);
-       if(cls->TestBit(kSAflag)==kTRUE) continue; //clusters used by TPC prol.
-       if(cls->GetQ()==0) continue; //fake clusters dead zones
-       nclusters[i]++;
-     }
-     dmar[i]=0;
-     fCluLayer[i] = new TClonesArray("AliITSRecPoint",nclusters[i]);
-     fCluCoord[i] = new TClonesArray("AliITSclusterTable",nclusters[i]);
-   }
-
-   
-   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);
-   }
-   
-   for(Int_t ilay=0;ilay<AliITSgeomTGeo::GetNLayers();ilay++){
-     TClonesArray &clulay = *fCluLayer[ilay];
-     TClonesArray &clucoo = *fCluCoord[ilay];
-     AliITSlayer &layer=fgLayers[ilay];
-     for(Int_t cli=0;cli<layer.GetNumberOfClusters();cli++){
-       AliITSRecPoint* cls = (AliITSRecPoint*)layer.GetCluster(cli);
-       if(cls->TestBit(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]++;
-     }
-   }
-   
-  //Get primary vertex
-
-   Int_t ntrack=0;
-   //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
-       
-       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;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];
+  Int_t nentr=event->GetNumberOfTracks();
+  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);
+       }
       }
-      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];
+    }
+  }
+  //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[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;i<AliITSgeomTGeo::GetNLayers();i++) {
+      fCluLayer[i]=0;
+      fCluCoord[i]=0;
+    }
+  }
+  for(Int_t i=0;i<AliITSgeomTGeo::GetNLayers();i++){
+    AliITSlayer &layer=fgLayers[i];
+    if (!ForceSkippingOfLayer(i)) {
+      for(Int_t cli=0;cli<layer.GetNumberOfClusters();cli++){
+       AliITSRecPoint* cls = (AliITSRecPoint*)layer.GetCluster(cli);
+       if(cls->TestBit(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]);
+  }
 
-      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;nnp<AliITSgeomTGeo::GetNLayers();nnp++){    //of points) it is written on file
-        if(nn[nnp]!=0) layOK+=1;
+  for(Int_t ilay=0;ilay<AliITSgeomTGeo::GetNLayers();ilay++){
+    TClonesArray &clulay = *fCluLayer[ilay];
+    TClonesArray &clucoo = *fCluCoord[ilay];
+    AliITSlayer &layer=fgLayers[ilay];
+    if (!ForceSkippingOfLayer(ilay)) {
+      for(Int_t cli=0;cli<layer.GetNumberOfClusters();cli++){
+       AliITSRecPoint* cls = (AliITSRecPoint*)layer.GetCluster(cli);
+       if(cls->TestBit(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]++;
       }
-      if(layOK>=numberofpoints){
+    }
+  }
+   
+  // track counter
+  Int_t ntrack=0;
 
-        AliITStrackV2* tr2 = FitTrack(trs,primaryVertex);
-       
-        if(tr2==0) continue;
+  static Int_t nClusLay[AliITSgeomTGeo::kNLayers];//counter for clusters on each layer
 
-       AliESDtrack outtrack;
-       outtrack.UpdateTrackParams(tr2,AliESDtrack::kITSin);
-       event->AddTrack(&outtrack);
-       ntrack++;
-      }
-       
+  if(AliITSReconstructor::GetRecoParam()->GetAllowProlongationWithEmptyRoad()) fMinNPoints=2;
 
-      delete trs;
-      delete[] nn;
-      
-     }//end loop on clusters of layer1
-    
-     //end loop2
-   }
-   
-   //if 5/6 points are required, second loop starting 
-   //from second layer, to find tracks with point of 
-   //layer 1 missing
-   
-   if(!fSixPoints){
-     //   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
-        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<AliITSgeomTGeo::GetNLayers()-1;kk++)nn[kk] = 0;
-        nn[0] = SearchClusters(1,fPhiWin[nloop],fLambdaWin[nloop],
-                                  trs,primaryVertex[2],pflag);
-        nn[1] = SearchClusters(2,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(3,fPhiWin[nloop],fLambdaWin[nloop],
-                                  trs,primaryVertex[2],pflag);
-        if(nn[2]!=0){
-          pflag=1;
-          UpdatePoints();
-        }
-        nn[3]= SearchClusters(4,fPhiWin[nloop],fLambdaWin[nloop],
-                                  trs,primaryVertex[2],pflag);
-        if(nn[3]!=0){
-          pflag=1;
-          UpdatePoints();
-        }
-        nn[4]=SearchClusters(5,fPhiWin[nloop],fLambdaWin[nloop],
-                                  trs,primaryVertex[2],pflag);
-
-        Int_t fl=0;
-        for(Int_t nnp=0;nnp<AliITSgeomTGeo::GetNLayers()-1;nnp++){
-          if(nn[nnp]!=0) fl+=1;
-        }
-        if(fl>=5){  // 5/6       
-          AliITStrackV2* tr2 = FitTrack(trs,primaryVertex);
-          if(tr2==0){
-            continue;
-          }
-          
-          AliESDtrack outtrack;
-          outtrack.UpdateTrackParams(tr2,AliESDtrack::kITSin);
-          event->AddTrack(&outtrack);
-          ntrack++;
-
-        }   
+  // loop on minimum number of points
+  for(Int_t iMinNPoints=AliITSgeomTGeo::GetNLayers(); iMinNPoints>=fMinNPoints; iMinNPoints--) {
+
+    if(!fInwardFlag){ // Tracking outwards from the inner layers
+      // loop on starting layer for track finding 
+      for(Int_t innLay=0; innLay<=fOuterStartLayer; innLay++) {
+       if(ForceSkippingOfLayer(innLay)) continue; 
+       Int_t minNPoints=iMinNPoints-innLay;
+       for(Int_t i=innLay+1;i<AliITSgeomTGeo::GetNLayers();i++)
+         if(ForceSkippingOfLayer(i)) 
+           minNPoints--;
+       if(minNPoints<fMinNPoints) continue;
+
+       // loop on phi and lambda window size
+       for(Int_t nloop=0;nloop<fNloop;nloop++){
+         Int_t nclInnLay=fCluLayer[innLay]->GetEntries();
+         while(nclInnLay--){ 
+           ResetForFinding();
+           Bool_t useRP=SetFirstPoint(innLay,nclInnLay,primaryVertex);
+           if(!useRP) continue;            
+           AliITStrackSA* trs = new AliITStrackSA(); 
+           
+           Int_t pflag=0;          
+           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<AliITSgeomTGeo::GetNLayers(); 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>=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);
+             ntrack++;
+             
+           }   
+           
+           delete trs;
+         }//end loop on clusters of innLay
+       } //end loop on window sizes
+      } //end loop on innLay
+    }else{// Tracking inwards from the outer layers
+    // loop on starting layer for track finding 
+      for(Int_t outLay=AliITSgeomTGeo::GetNLayers()-1; outLay>=fInnerStartLayer; outLay--) {
+
+       if(ForceSkippingOfLayer(outLay)) continue;
+       Int_t minNPoints=iMinNPoints-(AliITSgeomTGeo::GetNLayers()-1-outLay);
+       for(Int_t i=0;i<outLay-1;i++)
+         if(ForceSkippingOfLayer(i)) 
+           minNPoints--;
+       if(minNPoints<fMinNPoints) continue;
        
-       
-        delete trs;
-      }//end loop on clusters of layer2
-     }
-   
-    delete [] nn;
-  }  //end opt="5/6"  
-   
-  delete [] firstmod;
+       // loop on phi and lambda window size
+       for(Int_t nloop=0;nloop<fNloop;nloop++){
+         Int_t nclOutLay=fCluLayer[outLay]->GetEntries();
+         while(nclOutLay--){ 
+           ResetForFinding();
+           Bool_t useRP=SetFirstPoint(outLay,nclOutLay,primaryVertex);
+           if(!useRP) continue;            
+           AliITStrackSA* trs = new AliITStrackSA(); 
+           
+           Int_t pflag=0;          
+           Int_t kk;
+           for(kk=0;kk<AliITSgeomTGeo::GetNLayers();kk++) nClusLay[kk] = 0;
+           
+           kk=0;
+           nClusLay[kk] = SearchClusters(outLay,fPhiWin[nloop],fLambdaWin[nloop],
+                                 trs,primaryVertex[2],pflag);
+           for(Int_t nextLay=outLay-1; nextLay>=0; 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=outLay; nnp>=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);
+             ntrack++;
+             
+           }   
+           
+           delete trs;
+       }//end loop on clusters of innLay
+       } //end loop on window sizes
+      } //end loop on innLay
+    } // end if (fInwardFlag)
+  }//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;nloop<fNloop;nloop++){
+       Int_t nclInnLay=fCluLayer[innLay]->GetEntries();
+       while(nclInnLay--){ //loop starting from layer innLay
+         ResetForFinding();
+         Bool_t useRP=SetFirstPoint(innLay,nclInnLay,primaryVertex);
+         if(!useRP) continue;
+         AliITStrackSA* trs = new AliITStrackSA(); 
+           
+         Int_t pflag=0;            
+         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) {
+           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;
+           Bool_t onePoint = kTRUE;
+           tr2 = FitTrack(trs,primaryVertex,onePoint);
+           if(!tr2) continue;
+           AliDebug(2,Form("----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
+  
   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,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;i<AliITSgeomTGeo::GetNLayers();i++){
-    firstmod[i]=AliITSgeomTGeo::GetModuleIndex(i+1,1,1);
-  }  
+  const Int_t kMaxClu=AliITStrackSA::kMaxNumberOfClusters;
 
-  Int_t nclusters = tr->GetNumberOfClustersSA();
-  TObjArray** listlayer = new TObjArray*[AliITSgeomTGeo::GetNLayers()];
-  for(Int_t i=0;i<AliITSgeomTGeo::GetNLayers();i++){
-    listlayer[i] = new TObjArray(0,0);
+  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);
+    nnn[i]=0;
+    kkk[i]=0;
+    end[i]=0;
+    for(Int_t j=0;j<kMaxClu; j++){
+      clind[i][j]=0;
+      clmark[i][j]=0;
+      listlayer[i][j]=0;
+   }
   }
-
-  TArrayI clind0(20);
-  TArrayI clind1(20);
-  TArrayI clind2(20);
-  TArrayI clind3(20);
-  TArrayI clind4(20);
-  TArrayI clind5(20);
-
-  TArrayI mark0(20);
-  TArrayI mark1(20);
-  TArrayI mark2(20);
-  TArrayI mark3(20);
-  TArrayI mark4(20);
-  TArrayI mark5(20);
-
-
-  Int_t * nnn = new Int_t[AliITSgeomTGeo::GetNLayers()];
-  Int_t * kkk = new Int_t[AliITSgeomTGeo::GetNLayers()];
-  for(Int_t i=0;i<AliITSgeomTGeo::GetNLayers();i++) {nnn[i]=0;kkk[i]=0;}
   
+
+  Int_t nclusters = tr->GetNumberOfClustersSA();
   for(Int_t ncl=0;ncl<nclusters;ncl++){
     Int_t index = tr->GetClusterIndexSA(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;
+    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++){
       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 * end = new Int_t[AliITSgeomTGeo::GetNLayers()];
-  for(Int_t i=0;i<AliITSgeomTGeo::GetNLayers();i++){
-    if(listlayer[i]->GetEntries()==0) end[i]=1;
-    else end[i]=listlayer[i]->GetEntries();
+  Int_t firstLay=-1,secondLay=-1;
+  for(Int_t i=0;i<AliITSgeomTGeo::GetNLayers();i++) {
+    if(end[i]==0) {
+      end[i]=1;
+    }else{
+      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;l1<end[0];l1++){//loop on layer 1
-    AliITSRecPoint* cl0 = (AliITSRecPoint*)listlayer[0]->At(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;l2<end[1];l2++){//loop on layer 2
-      AliITSRecPoint* cl1 = (AliITSRecPoint*)listlayer[1]->At(l2); 
-      index2=clind1[l2];
-      mrk2 = mark1[l2];
-      for(Int_t l3=0;l3<end[2];l3++){  //loop on layer 3
-        AliITSRecPoint* cl2 = (AliITSRecPoint*)listlayer[2]->At(l3);
-
-        if(cl0==0 && cl1!=0) {
-          p2 = cl2;index1=clind2[l3];mrk1=mark2[l3];lay1=2;
-          p1=cl1;
-          module1 = p1->GetDetectorIndex()+firstmod[1]; 
-        }
-        if(cl0!=0 && cl1==0){
-          p1=cl0;
-          p2=cl2;index2=clind2[l3];mrk2=mark2[l3];lay2=2;
-         module1 = p1->GetDetectorIndex()+firstmod[0];
-        }
-        if(cl0!=0 && cl1!=0){
-          p1=cl0;
-          p2=cl1;
-         module1 = p1->GetDetectorIndex()+firstmod[0];
-        }
-       
-       Int_t cln1=mrk1;
-       Int_t cln2=mrk2;
-       AliITSclusterTable* arr = (AliITSclusterTable*)GetClusterCoord(lay1,cln1);
-       AliITSclusterTable* arr1= (AliITSclusterTable*)GetClusterCoord(lay2,cln2);
-       x1 = arr->GetX();
-       x2 = arr1->GetX();
-       y1 = arr->GetY();
-       y2 = arr1->GetY();
-       z1 = arr->GetZ();
-       z2 = arr1->GetZ();
-       sx1 = arr->GetSx();
-       sx2 = arr1->GetSx();
-       sy1 = arr->GetSy();
-       sy2 = arr1->GetSy();
-       sz1 = arr->GetSz();
-       sz2 = arr1->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;l4<end[3];l4++){ //loop on layer 4   
-          AliITSRecPoint* cl3 = (AliITSRecPoint*)listlayer[3]->At(l4);
-          for(Int_t l5=0;l5<end[4];l5++){ //loop on layer 5
-            AliITSRecPoint* cl4 = (AliITSRecPoint*)listlayer[4]->At(l5);
-            for(Int_t l6=0;l6<end[5];l6++){ //loop on layer 6  
-              AliITSRecPoint* cl5 = (AliITSRecPoint*)listlayer[5]->At(l6);
+  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][l0];
+    for(Int_t l1=0;l1<end[1];l1++){ //loop on layer 2
+      AliITSRecPoint* cl1 = (AliITSRecPoint*)listlayer[1][l1];
+      for(Int_t l2=0;l2<end[2];l2++){  //loop on layer 3
+        AliITSRecPoint* cl2 = (AliITSRecPoint*)listlayer[2][l2];
+        for(Int_t l3=0;l3<end[3];l3++){ //loop on layer 4   
+          AliITSRecPoint* cl3 = (AliITSRecPoint*)listlayer[3][l3];
+          for(Int_t l4=0;l4<end[4];l4++){ //loop on layer 5
+            AliITSRecPoint* cl4 = (AliITSRecPoint*)listlayer[4][l4];
+            for(Int_t l5=0;l5<end[5];l5++){ //loop on layer 6  
+              AliITSRecPoint* cl5 = (AliITSRecPoint*)listlayer[5][l5];
+
+
+             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;
+
+             switch(firstLay) {
+             case 0:
+               p1=cl0;
+               index1=clind[0][l0];mrk1=clmark[0][l0];
+               break;
+             case 1:
+               p1=cl1;
+               index1=clind[1][l1];mrk1=clmark[1][l1];
+               break;
+             case 2:
+               p1=cl2;
+               index1=clind[2][l2];mrk1=clmark[2][l2];
+               break;
+             case 3:
+               p1=cl3;
+               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;
+               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;
+             AliITSclusterTable* arr1 = (AliITSclusterTable*)GetClusterCoord(firstLay,cln1);
+             x1 = arr1->GetX();
+             y1 = arr1->GetY();
+             z1 = arr1->GetZ();
+             sx1 = arr1->GetSx();
+             sy1 = arr1->GetSy();
+             sz1 = arr1->GetSz();
+
+             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);
-                              
+
+
               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]);
              }
-              //fit with Kalman filter using AliITStrackerMI::RefitAt()
-          
 
-              AliITStrackMI* ot = new AliITStrackSA(*trac);
+              //fit with Kalman filter using AliITStrackerMI::RefitAt()
+             AliITStrackMI* ot = new AliITStrackSA(*trac);
               
               ot->ResetCovariance(10.);
               ot->ResetClusters();
               
-              if(RefitAt(49.,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(3.7,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 = new AliITStrackMI(*ot);
+                 otrack2->ResetCovariance(10.); 
+                 otrack2->ResetClusters();
+                 //fit from layer 6 to layer 1
+                 if(RefitAt(AliITSRecoParam::GetrInsideSPD1(),otrack2,ot)) {
+                   fListOfTracks->AddLast(otrack2);
+                   fListOfSATracks->AddLast(trac);
+                 } else {
+                   delete otrack2;
+                   delete trac;
+                 }
                               
-              }       
-          
+               }       
+             }
               delete ot;
-              delete trac;
             }//end loop layer 6
           }//end loop layer 5
-        }//end loop layer 4
-        
+        }//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;i<AliITSgeomTGeo::GetNLayers();i++){
-      delete listlayer[i];
-    }
-    delete [] listlayer;
-    listSA->Delete();
-    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;i<AliITSgeomTGeo::GetNLayers();i++){
-      delete listlayer[i];
-    }
-    delete [] listlayer; 
-    listSA->Delete();
-    delete listSA;
-    delete [] firstmod;
-    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);
   }      
-  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 labl[6][3];
+  for(Int_t i=0;i<AliITSgeomTGeo::GetNLayers();i++) {
+    if(i<otrack->GetNumberOfClusters()) {
+      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;
+    }
   }
-  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);
+  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;i<otrack->GetNumberOfClusters();i++)
+    if(labl[i][0]==label || labl[i][1]==label || labl[i][2]==label) lflag++;
   
+  if(lflag<otrack->GetNumberOfClusters()) label = -label;
   otrack->SetLabel(label);  
-  //remove clusters of found track
 
+  //remove clusters of found track
   for(Int_t nlay=0;nlay<AliITSgeomTGeo::GetNLayers();nlay++){
     for(Int_t cln=0;cln<trsa->GetNumberOfMarked(nlay);cln++){
       Int_t index = trsa->GetClusterMark(nlay,cln);
@@ -821,27 +905,41 @@ 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 [] listlayer; 
-  delete [] firstmod;
   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));
+  }
+  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)
@@ -857,6 +955,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();
@@ -882,6 +981,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  
@@ -970,54 +1089,35 @@ 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;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++;
   }
-
-  delete [] chi2;
-  delete [] index;
-  return index[dim-1];
+  return index;
 }
 
 //__________________________________________________________
-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;
   Int_t k=0;Int_t w=0;Int_t num=6;
-  if(lb[5]==-1) num=5;
+  for(Int_t i=5;i>=0;i--) if(lb[i]==-1) num=i;
   
   while(k<num){
   
@@ -1029,11 +1129,11 @@ Int_t AliITStrackerSA::FindLabel(Int_t l1, Int_t l2, Int_t l3, Int_t l4, Int_t l
         aa[i]=0;
       }
     }
-  k++;
+    k++;
   }
 
   while(w<num){
-  
     for(Int_t j=0;j<6;j++){
       if(aa[w]<aa[j]){
       ff=aa[w];
@@ -1044,15 +1144,16 @@ Int_t AliITStrackerSA::FindLabel(Int_t l1, Int_t l2, Int_t l3, Int_t l4, Int_t l
       lb[j]=ll;
      }
     }
-  w++;
+    w++;
   }
-  if(num==6)  return lb[5];
-  else return lb[4];
+  
+  if(num<1) return -1; 
+  return lb[num-1];
 }
 
 //_____________________________________________________________________________
 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
@@ -1068,14 +1169,30 @@ 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;
 
   
 }
-
 //_____________________________________________________________________________
-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
@@ -1106,10 +1223,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<fNloop;k++){
-      fPhiWin[k]=phid[k];
-      fLambdaWin[k]=lambdad[k];
+      fPhiWin[k]=phid[k]*factor;
+      fLambdaWin[k]=lambdad[k]*factor;
     }
   
   }
@@ -1171,4 +1290,3 @@ void AliITStrackerSA::GetCoorErrors(AliITSRecPoint* cl,Float_t &sx,Float_t &sy,
 */
 }
 
-