]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - ITS/AliITStrackerSA.cxx
Update of the QA code of the SDD: 1) SDD Checker: added protection in case only a...
[u/mrichter/AliRoot.git] / ITS / AliITStrackerSA.cxx
index 5c2270b6896bbc55151042347566d59c2ac8bd25..7fd94a7208f2562ca458ea4e4c4166b8cc4a2ad5 100644 (file)
@@ -39,6 +39,7 @@
 #include "AliITStrackSA.h"
 #include "AliITStrackerSA.h"
 #include "AliITSReconstructor.h"
+#include "AliLog.h"
 #include "AliRun.h"
 
 ClassImp(AliITStrackerSA)
@@ -58,9 +59,13 @@ fLambdaWin(0),
 fVert(0),
 fVertexer(0),
 fListOfTracks(0),
+fListOfSATracks(0),
 fITSclusters(0),
-fSixPoints(0),
+fInwardFlag(0),
 fOuterStartLayer(0),
+fInnerStartLayer(5),
+fMinNPoints(0),
+fMinQ(0.),
 fCluLayer(0),
 fCluCoord(0){
   // Default constructor
@@ -82,9 +87,13 @@ fLambdaWin(0),
 fVert(0),
 fVertexer(0),
 fListOfTracks(0),
+fListOfSATracks(0),
 fITSclusters(0),
-fSixPoints(0),
+fInwardFlag(0),
 fOuterStartLayer(0),
+fInnerStartLayer(5),
+fMinNPoints(0),
+fMinQ(0.),
 fCluLayer(0),
 fCluCoord(0) 
 {
@@ -113,9 +122,13 @@ fLambdaWin(0),
 fVert(vert),
 fVertexer(0),
 fListOfTracks(0),
+fListOfSATracks(0),
 fITSclusters(0),
-fSixPoints(0),
+fInwardFlag(0),
 fOuterStartLayer(0),
+fInnerStartLayer(5),
+fMinNPoints(0),
+fMinQ(0.),
 fCluLayer(0),
 fCluCoord(0)
 {
@@ -142,9 +155,13 @@ fLambdaWin(0),
 fVert(),
 fVertexer(vertexer),
 fListOfTracks(0),
+fListOfSATracks(0),
 fITSclusters(0),
-fSixPoints(0),
+fInwardFlag(0),
 fOuterStartLayer(0),
+fInnerStartLayer(5),
+fMinNPoints(0),
+fMinQ(0.),
 fCluLayer(0),
 fCluCoord(0)
 {
@@ -172,9 +189,13 @@ fLambdaWin(tracker.fLambdaWin),
 fVert(tracker.fVert),
 fVertexer(tracker.fVertexer),
 fListOfTracks(tracker.fListOfTracks),
+fListOfSATracks(tracker.fListOfSATracks),
 fITSclusters(tracker.fITSclusters),
-fSixPoints(tracker.fSixPoints),
+fInwardFlag(tracker.fInwardFlag),
 fOuterStartLayer(tracker.fOuterStartLayer),
+fInnerStartLayer(tracker.fInnerStartLayer),
+fMinNPoints(tracker.fMinNPoints),
+fMinQ(tracker.fMinQ),
 fCluLayer(tracker.fCluLayer),
 fCluCoord(tracker.fCluCoord) {
   // Copy constructor
@@ -219,6 +240,8 @@ AliITStrackerSA::~AliITStrackerSA(){
   if(fLambdaWin)delete []fLambdaWin;
   fListOfTracks->Delete();
   delete fListOfTracks;
+  fListOfSATracks->Delete();
+  delete fListOfSATracks;
   if(fCluLayer){
     for(Int_t i=0;i<AliITSgeomTGeo::GetNLayers();i++){
       if(fCluLayer[i]){
@@ -254,7 +277,13 @@ Int_t AliITStrackerSA::Clusters2Tracks(AliESDEvent *event){
   else {
     AliDebug(1,"Stand Alone flag set: doing tracking in ITS alone\n");
   }
-  if(!rc) rc=FindTracks(event);
+  if(!rc){ 
+    rc=FindTracks(event,kFALSE);
+    if(AliITSReconstructor::GetRecoParam()->GetSAUseAllClusters()==kTRUE) {
+      rc=FindTracks(event,kTRUE);
+    }
+  }
+
   return rc;
 }
 
@@ -272,14 +301,25 @@ void AliITStrackerSA::Init(){
     fPointc[1]=0;
     fVert = 0;
     fVertexer = 0;
-    SetWindowSizes();
+    Int_t nLoops=AliITSReconstructor::GetRecoParam()->GetNLoopsSA();
+    if(nLoops==33){
+      SetFixedWindowSizes();
+    }else{
+      Double_t phimin=AliITSReconstructor::GetRecoParam()->GetMinPhiSA();
+      Double_t phimax=AliITSReconstructor::GetRecoParam()->GetMaxPhiSA();
+      Double_t lambmin=AliITSReconstructor::GetRecoParam()->GetMinLambdaSA();
+      Double_t lambmax=AliITSReconstructor::GetRecoParam()->GetMaxLambdaSA();
+      SetCalculatedWindowSizes(nLoops,phimin,phimax,lambmin,lambmax);
+    }
+    fMinQ=AliITSReconstructor::GetRecoParam()->GetSAMinClusterCharge();
     fITSclusters = 0;
-    SetSixPoints();
-    SetOuterStartLayer(0);
+    SetOuterStartLayer(1);
     SetSAFlag(kFALSE);
-    fListOfTracks=new TObjArray(0,0);
+    fListOfTracks=new TClonesArray("AliITStrackMI",100);
+    fListOfSATracks=new TClonesArray("AliITStrackSA",100);
     fCluLayer = 0;
     fCluCoord = 0;
+    fMinNPoints = 3;
  }
 //_______________________________________________________________________
 void AliITStrackerSA::ResetForFinding(){
@@ -293,32 +333,30 @@ void AliITStrackerSA::ResetForFinding(){
     fCoef3=0;
     fPointc[0]=0;
     fPointc[1]=0;
-    fListOfTracks->Delete();
+    fListOfTracks->Clear();
+    fListOfSATracks->Clear();
 }
 
  
 
 //______________________________________________________________________
-Int_t AliITStrackerSA::FindTracks(AliESDEvent* event){
+Int_t AliITStrackerSA::FindTracks(AliESDEvent* event, Bool_t useAllClusters){
 
 // Track finder using the ESD object
 
-
-  //controllare numero cluster sui layer1 e 2 (morti?)
-  //non trova tracce...controllare..
+  AliDebug(2,Form(" field is %f",event->GetMagneticField()));
+  AliDebug(2,Form("SKIPPING %d %d %d %d %d %d",ForceSkippingOfLayer(0),ForceSkippingOfLayer(1),ForceSkippingOfLayer(2),ForceSkippingOfLayer(3),ForceSkippingOfLayer(4),ForceSkippingOfLayer(5)));
 
   if(!fITSclusters){
     Fatal("FindTracks","ITS cluster tree is not accessed - Abort!!!\n Please use method SetClusterTree to pass the pointer to the tree\n");
     return -1;
   }
-  
-   
   //Reads event and mark clusters of traks already found, with flag kITSin
   Int_t nentr=event->GetNumberOfTracks();
-  if(AliITSReconstructor::GetRecoParam()->GetSAUseAllClusters()==kFALSE) {
+  if(!useAllClusters) {
     while (nentr--) {
       AliESDtrack *track=event->GetTrack(nentr);
-      if (track->GetStatus()&AliESDtrack::kITSin==AliESDtrack::kITSin){
+      if ((track->GetStatus()&AliESDtrack::kITSin) == AliESDtrack::kITSin){
        Int_t idx[12];
        Int_t ncl = track->GetITSclusters(idx);
        for(Int_t k=0;k<ncl;k++){
@@ -327,50 +365,70 @@ Int_t AliITStrackerSA::FindTracks(AliESDEvent* event){
        }
       }
     }
+  }else{
+    while (nentr--) {
+      AliESDtrack *track=event->GetTrack(nentr);
+      if ((track->GetStatus()&AliESDtrack::kITSin) == AliESDtrack::kITSin){
+       Int_t idx[12];
+       Int_t ncl = track->GetITSclusters(idx);
+       for(Int_t k=0;k<ncl;k++){
+         AliITSRecPoint* cll = (AliITSRecPoint*)GetCluster(idx[k]);
+         cll->ResetBit(kSAflag);
+       }
+      }
+    }
   }
   //Get primary vertex
   Double_t primaryVertex[3];
   event->GetVertex()->GetXYZ(primaryVertex);
   //Creates TClonesArray with clusters for each layer. The clusters already used
   //by AliITStrackerMI are not considered
-  Int_t nclusters[6]={0,0,0,0,0,0};
-  Int_t dmar[6]={0,0,0,0,0,0};
+  Int_t nclusters[AliITSgeomTGeo::kNLayers]={0,0,0,0,0,0};
+  Int_t dmar[AliITSgeomTGeo::kNLayers]={0,0,0,0,0,0};
   if (fCluLayer == 0) {
-    fCluLayer = new TClonesArray*[AliITSgeomTGeo::GetNLayers()];
-    fCluCoord = new TClonesArray*[AliITSgeomTGeo::GetNLayers()];
+    fCluLayer = new TClonesArray*[AliITSgeomTGeo::kNLayers];
+    fCluCoord = new TClonesArray*[AliITSgeomTGeo::kNLayers];
     for(Int_t i=0;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)) {
+    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]);
+    if(!fCluLayer[i]){
+      fCluLayer[i] = new TClonesArray("AliITSRecPoint",nclusters[i]);
+    }else{
+      fCluLayer[i]->Delete();
+      fCluLayer[i]->Expand(nclusters[i]);
+    }
+    if(!fCluCoord[i]){
+      fCluCoord[i] = new TClonesArray("AliITSclusterTable",nclusters[i]);
+    }else{
+      fCluCoord[i]->Delete();
+      fCluCoord[i]->Expand(nclusters[i]);
+    }
   }
 
   for(Int_t ilay=0;ilay<AliITSgeomTGeo::GetNLayers();ilay++){
     TClonesArray &clulay = *fCluLayer[ilay];
     TClonesArray &clucoo = *fCluCoord[ilay];
     AliITSlayer &layer=fgLayers[ilay];
-    if (!AliITSReconstructor::GetRecoParam()->GetLayersToSkip(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;
@@ -383,207 +441,58 @@ Int_t AliITStrackerSA::FindTracks(AliESDEvent* event){
     }
   }
    
-  Int_t minNPoints = (fSixPoints ? AliITSgeomTGeo::GetNLayers() : AliITSgeomTGeo::GetNLayers()-1);  
-  for(Int_t i=0;i<AliITSgeomTGeo::GetNLayers();i++) {
-    if(AliITSReconstructor::GetRecoParam()->GetLayersToSkip(i)) {
-      minNPoints--;
-    }
-  }
-
-
+  // track counter
   Int_t ntrack=0;
-  //loop on the different windows
-  Int_t * nn = new Int_t[AliITSgeomTGeo::GetNLayers()];//counter for clusters on each layer
-  for(Int_t nloop=0;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();
-      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
+  static Int_t nClusLay[AliITSgeomTGeo::kNLayers];//counter for clusters on each layer
+  Int_t startLayForSeed=0;
+  Int_t lastLayForSeed=fOuterStartLayer;
+  Int_t nSeedSteps=lastLayForSeed-startLayForSeed;
+  Int_t seedStep=1;
+  if(fInwardFlag){
+    startLayForSeed=AliITSgeomTGeo::GetNLayers()-1;
+    lastLayForSeed=fInnerStartLayer;
+    nSeedSteps=startLayForSeed-lastLayForSeed;
+    seedStep=-1;
   }
 
-  delete[] nn;
-
-
-  minNPoints--;
-
-  //if 5/6 points are required, second loop starting 
-  //from second layer (SPD2), to find tracks with point of 
-  //layer 1 missing   
-  if(!fSixPoints) {
-    //printf("looking from SPD2\n");
-    //   counter for clusters on each layer  
-    Int_t * nn = new Int_t[AliITSgeomTGeo::GetNLayers()-1];      
-    for(Int_t nloop=0;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 layOK=0;
-       for(Int_t nnp=0;nnp<AliITSgeomTGeo::GetNLayers()-1;nnp++){
-         if(nn[nnp]!=0) layOK+=1;
-       }
-       if(layOK>=minNPoints){  // 5/6       
-         AliITStrackV2* tr2 = 0;
-         tr2 = FitTrack(trs,primaryVertex);
-         if(!tr2) continue;
-         
-         AliESDtrack outtrack;
-         outtrack.UpdateTrackParams(tr2,AliESDtrack::kITSin);
-         event->AddTrack(&outtrack);
-         ntrack++;
-         
-       }   
-       
-        delete trs;
-      }//end loop on clusters of layer2
-    }
-    
-    delete [] nn;
-  } //end opt="5/6"  
-
-  // search for tracks starting from SPD2, SDD1, SDD2, SSD2
-  // for cosmics (A. Dainese 31.07.07)
-  if(fOuterStartLayer>0) {
-    for(Int_t innLay=1; innLay<=fOuterStartLayer; innLay++) {
-      //printf("Searching from layer %d outward\n",innLay);
-      minNPoints=AliITSgeomTGeo::GetNLayers()-innLay;
-      for(Int_t i=innLay;i<AliITSgeomTGeo::GetNLayers();i++) 
-       if(AliITSReconstructor::GetRecoParam()->GetLayersToSkip(i)) 
+  // loop on minimum number of points
+  for(Int_t iMinNPoints=AliITSgeomTGeo::GetNLayers(); iMinNPoints>=fMinNPoints; iMinNPoints--) {
+
+    // loop on starting layer for track finding 
+    for(Int_t iSeedLay=0; iSeedLay<=nSeedSteps; iSeedLay++) {
+      Int_t theLay=startLayForSeed+iSeedLay*seedStep;
+      if(ForceSkippingOfLayer(theLay)) continue;
+      Int_t minNPoints=iMinNPoints-theLay;
+      if(fInwardFlag) minNPoints=iMinNPoints-(AliITSgeomTGeo::GetNLayers()-1-theLay);
+      for(Int_t i=theLay+1;i<AliITSgeomTGeo::GetNLayers();i++)
+       if(ForceSkippingOfLayer(i)) 
          minNPoints--;
-      //   counter for clusters on each layer  
-      Int_t * nn = new Int_t[AliITSgeomTGeo::GetNLayers()-innLay];      
+      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--){ //loop starting from layer innLay
+       Int_t nclTheLay=fCluLayer[theLay]->GetEntries();
+       while(nclTheLay--){ 
          ResetForFinding();
-         Int_t pflag=0;
-         AliITSRecPoint* cl = (AliITSRecPoint*)fCluLayer[innLay]->At(nclInnLay);
-         
-         if(!cl) continue;
-         AliITSclusterTable* arr = (AliITSclusterTable*)GetClusterCoord(innLay,nclInnLay);
-         fPhic = arr->GetPhi();
-         fLambdac = arr->GetLambda();
-         fPhiEstimate = fPhic;
-         
-         AliITStrackSA* trs = new AliITStrackSA(); 
-         fPoint1[0]=primaryVertex[0];
-         fPoint1[1]=primaryVertex[1];
-         fPoint2[0]=arr->GetX();
-         fPoint2[1]=arr->GetY();
-         
+         Bool_t useRP=SetFirstPoint(theLay,nclTheLay,primaryVertex);
+         if(!useRP) continue;      
+         AliITStrackSA trs;
+           
+         Int_t pflag=0;            
          Int_t kk;
-         for(kk=0;kk<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],
-                                 trs,primaryVertex[2],pflag);
-         for(Int_t nextLay=innLay+1; nextLay<AliITSgeomTGeo::GetNLayers(); nextLay++) {
+         nClusLay[kk] = SearchClusters(theLay,fPhiWin[nloop],fLambdaWin[nloop],
+                                       &trs,primaryVertex[2],pflag);
+         Int_t nextLay=theLay+seedStep;
+         Bool_t goon=kTRUE;
+         while(goon){
            kk++;
-           nn[kk] = SearchClusters(nextLay,fPhiWin[nloop],fLambdaWin[nloop],
-                                   trs,primaryVertex[2],pflag);
-           if(nn[kk]!=0){
+           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];
@@ -592,71 +501,68 @@ Int_t AliITStrackerSA::FindTracks(AliESDEvent* event){
                UpdatePoints();
              }
            }
+           nextLay+=seedStep;
+           if(nextLay<0 || nextLay==6) goon=kFALSE;
          }
-         
+
+           
          Int_t layOK=0;
-         for(Int_t nnp=0;nnp<AliITSgeomTGeo::GetNLayers()-innLay;nnp++){
-           if(nn[nnp]!=0) layOK+=1;
+         if(!fInwardFlag){
+           for(Int_t nnp=0;nnp<AliITSgeomTGeo::GetNLayers()-theLay;nnp++){
+             if(nClusLay[nnp]!=0) layOK+=1;
+           }
+         }else{
+           for(Int_t nnp=theLay; 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;
-           
-           
-           AliESDtrack outtrack;
-           outtrack.UpdateTrackParams(tr2,AliESDtrack::kITSin);
-           event->AddTrack(&outtrack);
+           tr2 = FitTrack(&trs,primaryVertex);
+           if(!tr2)
+             continue;
+           }
+           AliDebug(2,Form("---NPOINTS fit: %d\n",tr2->GetNumberOfClusters()));
+             
+           StoreTrack(tr2,event,useAllClusters);
            ntrack++;
-           
+             
          }   
          
-         delete trs;
-       }//end loop on clusters of innLay
+       }//end loop on clusters of theLay
       } //end loop on window sizes
-      
-      delete [] nn;
-    } //end loop on innLay
-  } //end if(fOuterStartLayer>0)
-  
+    } //end loop on theLay
+  }//end loop on min points
 
-  // search for 1-point tracks, only for cosmics
+  // search for 1-point tracks in SPD, only for cosmics
   // (A.Dainese 21.03.08)
   if(AliITSReconstructor::GetRecoParam()->GetSAOnePointTracks() && 
      TMath::Abs(event->GetMagneticField())<0.01) {
-    for(Int_t innLay=0; innLay<=fOuterStartLayer; innLay++) {
+    Int_t outerLayer=1; // only SPD
+    for(Int_t innLay=0; innLay<=TMath::Min(1,fOuterStartLayer); innLay++) {
       //   counter for clusters on each layer  
-      Int_t * nn = new Int_t[AliITSgeomTGeo::GetNLayers()-innLay];      
+
       for(Int_t nloop=0;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();
-         
+         Bool_t useRP=SetFirstPoint(innLay,nclInnLay,primaryVertex);
+         if(!useRP) continue;
+         AliITStrackSA trs;
+           
+         Int_t pflag=0;            
          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],
-                                 trs,primaryVertex[2],pflag);
-         for(Int_t nextLay=innLay+1; nextLay<AliITSgeomTGeo::GetNLayers(); nextLay++) {
+         nClusLay[kk] = SearchClusters(innLay,fPhiWin[nloop],fLambdaWin[nloop],
+                                 &trs,primaryVertex[2],pflag);
+         for(Int_t nextLay=innLay+1; nextLay<=outerLayer; nextLay++) {
            kk++;
-           nn[kk] = SearchClusters(nextLay,fPhiWin[nloop],fLambdaWin[nloop],
-                                   trs,primaryVertex[2],pflag);
-           if(nn[kk]!=0){
+           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];
@@ -669,31 +575,31 @@ Int_t AliITStrackerSA::FindTracks(AliESDEvent* event){
          
          Int_t layOK=0;
          for(Int_t nnp=0;nnp<AliITSgeomTGeo::GetNLayers()-innLay;nnp++){
-           if(nn[nnp]!=0) layOK+=1;
+           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;
+           tr2 = FitTrack(&trs,primaryVertex,onePoint);
+           if(!tr2){
+             continue;
+           }
+           AliDebug(2,Form("----NPOINTS fit: %d\n",tr2->GetNumberOfClusters()));
            
-           AliESDtrack outtrack;
-           outtrack.UpdateTrackParams(tr2,AliESDtrack::kITSin);
-           event->AddTrack(&outtrack);
+           StoreTrack(tr2,event,useAllClusters);
            ntrack++;
            
          }   
          
-         delete trs;
        }//end loop on clusters of innLay
       } //end loop on window sizes
       
-      delete [] nn;
     } //end loop on innLay
   } // end search 1-point tracks
   
-  delete [] firstmod;
-  Info("FindTracks","Number of found tracks: %d",event->GetNumberOfTracks());
+  if(!useAllClusters) AliInfo(Form("Number of found tracks: %d",event->GetNumberOfTracks()));
+  ResetForFinding();
   return 0;
 
 }
@@ -705,26 +611,23 @@ AliITStrackV2* AliITStrackerSA::FitTrack(AliITStrackSA* tr,Double_t *primaryVert
   // A.Dainese 16.11.07 
 
   
-  Int_t * firstmod = new Int_t[AliITSgeomTGeo::GetNLayers()];
-  TObjArray** listlayer = new TObjArray*[AliITSgeomTGeo::GetNLayers()];
-  Int_t ** clind=new Int_t*[AliITSgeomTGeo::GetNLayers()];
-  Int_t ** clmark=new Int_t*[AliITSgeomTGeo::GetNLayers()];
-  Int_t * nnn = new Int_t[AliITSgeomTGeo::GetNLayers()];
-  Int_t * kkk = new Int_t[AliITSgeomTGeo::GetNLayers()];
+  const Int_t kMaxClu=AliITStrackSA::kMaxNumberOfClusters;
 
-  const Int_t maxclu=AliITStrackSA::GetMaxNumberOfClusters();
+  static Int_t firstmod[AliITSgeomTGeo::kNLayers];
+  
+  static Int_t clind[AliITSgeomTGeo::kNLayers][kMaxClu];
+  static Int_t clmark[AliITSgeomTGeo::kNLayers][kMaxClu];
+  static Int_t end[AliITSgeomTGeo::kNLayers];
+  static AliITSRecPoint *listlayer[AliITSgeomTGeo::kNLayers][kMaxClu];
 
   for(Int_t i=0;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;
+   }
   }
   
 
@@ -734,29 +637,25 @@ 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 ind=nnn[lay];
-    clind[lay][ind]=index;
+    Int_t nInLay=end[lay];
+    listlayer[lay][nInLay]=cl;
+    clind[lay][nInLay]=index;
+    end[lay]++;
   }
-  delete [] nnn;
 
   for(Int_t nlay=0;nlay<AliITSgeomTGeo::GetNLayers();nlay++){
     for(Int_t ncl=0;ncl<tr->GetNumberOfMarked(nlay);ncl++){
       Int_t mark = tr->GetClusterMark(nlay,ncl);
-      Int_t ind=kkk[nlay];
-      clmark[nlay][ind]=mark;
+      clmark[nlay][ncl]=mark;
     }
   }
 
-  delete [] kkk;
 
   Int_t firstLay=-1,secondLay=-1;
-  Int_t * end = new Int_t[AliITSgeomTGeo::GetNLayers()];
   for(Int_t i=0;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) {
@@ -765,36 +664,23 @@ AliITStrackV2* AliITStrackerSA::FitTrack(AliITStrackSA* tr,Double_t *primaryVert
     }
   }
 
-  if(firstLay==-1 || (secondLay==-1 && !onePoint)) {
-    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;
+  TClonesArray &arrMI= *fListOfTracks;
+  TClonesArray &arrSA= *fListOfSATracks;
+  Int_t nFoundTracks=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;
@@ -892,57 +778,56 @@ AliITStrackV2* AliITStrackerSA::FitTrack(AliITStrackSA* tr,Double_t *primaryVert
              }
 
 
-              AliITStrackSA* trac = new AliITStrackSA(layer,ladder,detector,yclu1,zclu1,phi2,tgl2,cv,1);
+              AliITStrackSA trac(layer,ladder,detector,yclu1,zclu1,phi2,tgl2,cv,1);
 
 
               if(cl5!=0) {
-               trac->AddClusterV2(5,(clind[5][l5] & 0x0fffffff)>>0);
-               trac->AddClusterMark(5,clmark[5][l5]);
+               trac.AddClusterV2(5,(clind[5][l5] & 0x0fffffff)>>0);
+               trac.AddClusterMark(5,clmark[5][l5]);
              }
               if(cl4!=0){
-               trac->AddClusterV2(4,(clind[4][l4] & 0x0fffffff)>>0);
-               trac->AddClusterMark(4,clmark[4][l4]);
+               trac.AddClusterV2(4,(clind[4][l4] & 0x0fffffff)>>0);
+               trac.AddClusterMark(4,clmark[4][l4]);
              }
               if(cl3!=0){
-               trac->AddClusterV2(3,(clind[3][l3] & 0x0fffffff)>>0);
-               trac->AddClusterMark(3,clmark[3][l3]);
+               trac.AddClusterV2(3,(clind[3][l3] & 0x0fffffff)>>0);
+               trac.AddClusterMark(3,clmark[3][l3]);
              }
               if(cl2!=0){
-               trac->AddClusterV2(2,(clind[2][l2] & 0x0fffffff)>>0);
-               trac->AddClusterMark(2,clmark[2][l2]);
+               trac.AddClusterV2(2,(clind[2][l2] & 0x0fffffff)>>0);
+               trac.AddClusterMark(2,clmark[2][l2]);
              }
               if(cl1!=0){
-               trac->AddClusterV2(1,(clind[1][l1] & 0x0fffffff)>>0);
-               trac->AddClusterMark(1,clmark[1][l1]);
+               trac.AddClusterV2(1,(clind[1][l1] & 0x0fffffff)>>0);
+               trac.AddClusterMark(1,clmark[1][l1]);
              }
               if(cl0!=0){
-               trac->AddClusterV2(0,(clind[0][l0] & 0x0fffffff)>>0);
-               trac->AddClusterMark(0,clmark[0][l0]);
+               trac.AddClusterV2(0,(clind[0][l0] & 0x0fffffff)>>0);
+               trac.AddClusterMark(0,clmark[0][l0]);
              }
 
               //fit with Kalman filter using AliITStrackerMI::RefitAt()
-             AliITStrackMI* ot = new AliITStrackSA(*trac);
-              
-              ot->ResetCovariance(10.);
-              ot->ResetClusters();
+             AliITStrackSA ot(trac);
+
+              ot.ResetCovariance(10.);
+              ot.ResetClusters();
               
-              if(RefitAt(AliITSRecoParam::GetrInsideITSscreen(),ot,trac)){ //fit from layer 1 to layer 6
-                AliITStrackMI *otrack2 = new AliITStrackMI(*ot);
-                otrack2->ResetCovariance(10.); 
-                otrack2->ResetClusters();
-                //fit from layer 6 to layer 1
-                if(RefitAt(AliITSRecoParam::GetrInsideSPD1(),otrack2,ot)) {
-                 fListOfTracks->AddLast(otrack2);
-                 new (tri[nlist]) AliITStrackSA(*trac);
-                 nlist++;
-               } else {
-                 delete otrack2;
-               }
+             // Propagate inside the innermost layer with a cluster 
+             if(ot.Propagate(ot.GetX()-0.1*ot.GetX())) {
+
+               if(RefitAt(AliITSRecoParam::GetrInsideITSscreen(),&ot,&trac)){ //fit from layer 1 to layer 6
+                 AliITStrackMI otrack2(ot);
+                 otrack2.ResetCovariance(10.); 
+                 otrack2.ResetClusters();
+                 //fit from layer 6 to layer 1
+                 if(RefitAt(AliITSRecoParam::GetrInsideSPD1(),&otrack2,&ot)) {
+                   new(arrMI[nFoundTracks]) AliITStrackMI(otrack2);
+                   new(arrSA[nFoundTracks]) AliITStrackSA(trac);
+                   ++nFoundTracks;
+                 }
                               
-              }       
-          
-              delete ot;
-              delete trac;
+               }       
+             }
             }//end loop layer 6
           }//end loop layer 5
         }//end loop layer 4        
@@ -950,47 +835,18 @@ AliITStrackV2* AliITStrackerSA::FitTrack(AliITStrackSA* tr,Double_t *primaryVert
     }//end loop layer 2 
   }//end loop layer 1
 
-  delete [] end;
 
 
 
-  Int_t dim=fListOfTracks->GetEntries();
-  if(dim==0){
-    for(Int_t i=0;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);
@@ -1008,7 +864,6 @@ AliITStrackV2* AliITStrackerSA::FitTrack(AliITStrackSA* tr,Double_t *primaryVert
       labl[i][2]=-1;
     }
   }
-  delete [] indexc;
 
   CookLabel(otrack,0.); //MI change - to see fake ratio
  
@@ -1029,29 +884,37 @@ AliITStrackV2* AliITStrackerSA::FitTrack(AliITStrackSA* tr,Double_t *primaryVert
       fCluLayer[nlay]->Compress();
     }    
   }
-  listSA->Delete();
-  delete listSA;
 
-  for(Int_t i=0;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, Bool_t pureSA) const 
+{
+  //
+  // Add new track to the ESD
+  //
+  AliESDtrack outtrack;
+  outtrack.UpdateTrackParams(t,AliESDtrack::kITSin);
+  if(pureSA) outtrack.SetStatus(AliESDtrack::kITSpureSA);
+  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(AliITSReconstructor::GetRecoParam()->GetLayersToSkip(layer)) return 0;
+  if(ForceSkippingOfLayer(layer)) return 0;
 
   Int_t nc=0;
   AliITSlayer &lay = fgLayers[layer];
@@ -1072,6 +935,7 @@ Int_t AliITStrackerSA::SearchClusters(Int_t layer,Double_t phiwindow,Double_t la
     AliITSRecPoint *c = (AliITSRecPoint*)fCluLayer[layer]->At(index);
     if (!c) continue;
     if (c->GetQ()<=0) continue;
+    if(layer>1 && c->GetQ()<=fMinQ) continue;
     
      AliITSclusterTable* arr = (AliITSclusterTable*)GetClusterCoord(layer,index);
      Double_t phi = arr->GetPhi();
@@ -1097,6 +961,26 @@ Int_t AliITStrackerSA::SearchClusters(Int_t layer,Double_t phiwindow,Double_t la
   return nc;
 }
 
+//________________________________________________________________
+Bool_t AliITStrackerSA::SetFirstPoint(Int_t lay, Int_t clu, Double_t* primaryVertex){
+  // Sets the first point (seed) for tracking
+
+  AliITSRecPoint* cl = (AliITSRecPoint*)fCluLayer[lay]->At(clu);
+  if(!cl) return kFALSE;
+  if (cl->GetQ()<=0) return kFALSE;
+  if(lay>1 && cl->GetQ()<=fMinQ) return kFALSE;
+
+  AliITSclusterTable* arr = (AliITSclusterTable*)GetClusterCoord(lay,clu);
+  fPhic = arr->GetPhi();
+  fLambdac = arr->GetLambda();
+  fPhiEstimate = fPhic;
+  fPoint1[0]=primaryVertex[0];
+  fPoint1[1]=primaryVertex[1];
+  fPoint2[0]=arr->GetX();
+  fPoint2[1]=arr->GetY();
+  return kTRUE; 
+}
+
 //________________________________________________________________
 void AliITStrackerSA::UpdatePoints(){
   //update of points for the estimation of the curvature  
@@ -1185,41 +1069,22 @@ Double_t AliITStrackerSA::ChoosePoint(Double_t p1, Double_t p2, Double_t pp){
 
 
 //_________________________________________________________________
-Int_t AliITStrackerSA::FindTrackLowChiSquare(TObjArray* tracklist, Int_t dim) const {
-  // returns track with lowers chi square  
-  if(dim==1){
-    //AliITStrackV2* trk = (AliITStrackV2*)tracklist->At(0);
-    //return trk;
-    return 0;
-  }
-  if(dim==0) return 0;
-  Double_t * chi2 = new Double_t[dim];
-  Int_t * index = new Int_t[dim];
-  for(Int_t i=0;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;
 }
 
 //__________________________________________________________
@@ -1289,9 +1154,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
@@ -1388,3 +1269,4 @@ void AliITStrackerSA::GetCoorErrors(AliITSRecPoint* cl,Float_t &sx,Float_t &sy,
   sz = TMath::Sqrt(cl->GetSigmaZ2());
 */
 }
+