]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - ITS/AliITStrackerSA.cxx
Small optimizations
[u/mrichter/AliRoot.git] / ITS / AliITStrackerSA.cxx
index e0cd647f3f5796d4a015881fc43d34e961627c3c..4305191a7570eb82b970adf7f7265ea9ae0864c3 100644 (file)
@@ -13,6 +13,8 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
+/* $Id$ */
+
 ////////////////////////////////////////////////////
 //  Stand alone tracker class                     //
 //  Origin:  Elisabetta Crescio                   //
 //  tracks are saved as AliITStrackV2 objects     //
 ////////////////////////////////////////////////////
 
-//#include <stdlib.h>
-#include "TArrayI.h"
+#include <stdlib.h>
+
+#include <TArrayI.h>
 #include <TBranch.h>
-#include <TMath.h>
 #include <TObjArray.h>
 #include <TTree.h>
-#include "AliRun.h"
+
+#include "AliESDEvent.h"
+#include "AliESDVertex.h"
+#include "AliESDtrack.h"
+#include "AliITSVertexer.h"
 #include "AliITSclusterTable.h"
-#include "AliITSclusterV2.h"
-#include "AliITSgeom.h"
-#include "AliITSRiemannFit.h"
-#include "AliITStrackerSA.h"
+#include "AliITSRecPoint.h"
+#include "AliITSgeomTGeo.h"
 #include "AliITStrackSA.h"
-#include "AliITSVertexer.h"
-#include "AliITSVertex.h"
-
+#include "AliITStrackerSA.h"
+#include "AliRun.h"
 
 ClassImp(AliITStrackerSA)
 
 //____________________________________________________________________________
-AliITStrackerSA::AliITStrackerSA():AliITStrackerV2(){
+AliITStrackerSA::AliITStrackerSA():AliITStrackerMI(),
+fPhiEstimate(0),
+fITSStandAlone(0),
+fLambdac(0),
+fPhic(0),
+fCoef1(0),
+fCoef2(0),
+fCoef3(0),
+fNloop(0),
+fPhiWin(0),
+fLambdaWin(0),
+fVert(0),
+fVertexer(0),
+fListOfTracks(0),
+fITSclusters(0),
+fSixPoints(0),
+fOuterStartLayer(0),
+fCluLayer(0),
+fCluCoord(0){
   // Default constructor
   Init();
 }
 //____________________________________________________________________________
-AliITStrackerSA::AliITStrackerSA(AliITSgeom *geom, AliITSVertex *vert):AliITStrackerV2(geom) 
+AliITStrackerSA::AliITStrackerSA(const Char_t *geom):AliITStrackerMI(0),
+fPhiEstimate(0),
+fITSStandAlone(0),
+fLambdac(0),
+fPhic(0),
+fCoef1(0),
+fCoef2(0),
+fCoef3(0),
+fNloop(0),
+fPhiWin(0),
+fLambdaWin(0),
+fVert(0),
+fVertexer(0),
+fListOfTracks(0),
+fITSclusters(0),
+fSixPoints(0),
+fOuterStartLayer(0),
+fCluLayer(0),
+fCluCoord(0) 
 {
   // Standard constructor (Vertex is known and passed to this obj.)
-  Init();
-  fVert = vert;
-  fGeom = geom;
-}
+  if (geom) {
+    AliWarning("\"geom\" is actually a dummy argument !");
+  }
 
-//______________________________________________________________________
-AliITStrackerSA::AliITStrackerSA(const AliITStrackerSA &trkr) : 
-                    AliITStrackerV2(trkr) {
-  // Copy constructor
-  // Copies are not allowed. The method is protected to avoid misuse.
-  Error("AliITStrackerSA","Copy constructor not allowed\n");
+  Init();
+  fVert = 0;
 }
 
-//______________________________________________________________________
-AliITStrackerSA& AliITStrackerSA::operator=(const 
-                    AliITStrackerSA& /* trkr */){
-  // Assignment operator
-  // Assignment is not allowed. The method is protected to avoid misuse.
-  Error("= operator","Assignment operator not allowed\n");
-  return *this;
+//____________________________________________________________________________
+AliITStrackerSA::AliITStrackerSA(const Char_t *geom, AliESDVertex *vert):AliITStrackerMI(0),
+fPhiEstimate(0),
+fITSStandAlone(0),
+fLambdac(0),
+fPhic(0),
+fCoef1(0),
+fCoef2(0),
+fCoef3(0),
+fNloop(0),
+fPhiWin(0),
+fLambdaWin(0),
+fVert(vert),
+fVertexer(0),
+fListOfTracks(0),
+fITSclusters(0),
+fSixPoints(0),
+fOuterStartLayer(0),
+fCluLayer(0),
+fCluCoord(0)
+{
+  // Standard constructor (Vertex is known and passed to this obj.)
+  if (geom) {
+    AliWarning("\"geom\" is actually a dummy argument !");
+  }
+  Init();
 }
 
 //____________________________________________________________________________
-AliITStrackerSA::AliITStrackerSA(AliITSgeom *geom, AliITSVertexer *vertexer):AliITStrackerV2(geom) 
+AliITStrackerSA::AliITStrackerSA(const Char_t *geom, AliITSVertexer *vertexer):AliITStrackerMI(0),
+fPhiEstimate(0),
+fITSStandAlone(0),
+fLambdac(0),
+fPhic(0),
+fCoef1(0),
+fCoef2(0),
+fCoef3(0),
+fNloop(0),
+fPhiWin(0),
+fLambdaWin(0),
+fVert(),
+fVertexer(vertexer),
+fListOfTracks(0),
+fITSclusters(0),
+fSixPoints(0),
+fOuterStartLayer(0),
+fCluLayer(0),
+fCluCoord(0)
 {
   // Standard constructor (Vertex is unknown - vertexer is passed to this obj)
+  if (geom) {
+    AliWarning("\"geom\" is actually a dummy argument !");
+  }
   Init();
   fVertexer = vertexer;
-  fGeom = geom;
 }
 
 //____________________________________________________________________________
-AliITStrackerSA::AliITStrackerSA(AliITStrackerSA& tracker):AliITStrackerV2(){
+AliITStrackerSA::AliITStrackerSA(const AliITStrackerSA& tracker):AliITStrackerMI(),
+fPhiEstimate(tracker.fPhiEstimate),
+fITSStandAlone(tracker.fITSStandAlone),
+fLambdac(tracker.fLambdac),
+fPhic(tracker.fPhic),
+fCoef1(tracker.fCoef1),
+fCoef2(tracker.fCoef2),
+fCoef3(tracker.fCoef3),
+fNloop(tracker.fNloop),
+fPhiWin(tracker.fPhiWin),
+fLambdaWin(tracker.fLambdaWin),
+fVert(tracker.fVert),
+fVertexer(tracker.fVertexer),
+fListOfTracks(tracker.fListOfTracks),
+fITSclusters(tracker.fITSclusters),
+fSixPoints(tracker.fSixPoints),
+fOuterStartLayer(tracker.fOuterStartLayer),
+fCluLayer(tracker.fCluLayer),
+fCluCoord(tracker.fCluCoord) {
   // Copy constructor
-  fPhiEstimate = tracker.fPhiEstimate;
   for(Int_t i=0;i<2;i++){
     fPoint1[i]=tracker.fPoint1[i];
     fPoint2[i]=tracker.fPoint2[i];
     fPoint3[i]=tracker.fPoint3[i];
     fPointc[i]=tracker.fPointc[i];
   }
-  fLambdac = tracker.fLambdac;
-  fPhic = tracker.fPhic;
-  fCoef1 = tracker.fCoef1;
-  fCoef2 = tracker.fCoef2;
-  fCoef3 = tracker.fCoef3;
-  fNloop = tracker.fNloop;
-  fPhiWin = tracker.fPhiWin;
-  fLambdaWin = tracker.fLambdaWin;
   if(tracker.fVertexer && tracker.fVert){
-    fVert = new AliITSVertex(*tracker.fVert);
+    fVert = new AliESDVertex(*tracker.fVert);
   }
   else {
     fVert = tracker.fVert;
   }
-  fVertexer = tracker.fVertexer;
-  fGeom = tracker.fGeom;
-  fFlagLoad = tracker.fFlagLoad;
-  fTable = tracker.fTable;
+  for(Int_t i=0;i<AliITSgeomTGeo::GetNLayers();i++){
+    fCluLayer[i] = tracker.fCluLayer[i];
+    fCluCoord[i] = tracker.fCluCoord[i];
+  } 
+}
+//______________________________________________________________________
+AliITStrackerSA& AliITStrackerSA::operator=(const AliITStrackerSA& source){
+    // Assignment operator. 
+  this->~AliITStrackerSA();
+  new(this) AliITStrackerSA(source);
+  return *this;
 }
 
 //____________________________________________________________________________
 AliITStrackerSA::~AliITStrackerSA(){
   // destructor
-  // if fVertexer is not null, the AliITSVertex obj. is owned by this class
+  // if fVertexer is not null, the AliESDVertex obj. is owned by this class
   // and is deleted here
   if(fVertexer){
     if(fVert)delete fVert;
   }
   fVert = 0;
   fVertexer = 0;
-  fGeom = 0;
-  fFlagLoad = 0;
   if(fPhiWin)delete []fPhiWin;
   if(fLambdaWin)delete []fLambdaWin;
-  fTable =0;
+  fListOfTracks->Delete();
+  delete fListOfTracks;
+  if(fCluLayer){
+    for(Int_t i=0;i<AliITSgeomTGeo::GetNLayers();i++){
+      if(fCluLayer[i]){
+       fCluLayer[i]->Delete();
+       delete fCluLayer[i];
+      }
+    }
+    delete [] fCluLayer;
+  }
+  if(fCluCoord){
+    for(Int_t i=0;i<AliITSgeomTGeo::GetNLayers();i++){
+      if(fCluCoord[i]){
+       fCluCoord[i]->Delete();
+       delete fCluCoord[i];
+      }
+    }
+    delete [] fCluCoord;
+  }
+  
+}
+
+//____________________________________________________________________________
+Int_t AliITStrackerSA::Clusters2Tracks(AliESDEvent *event){
+// This method is used to find and fit the tracks. By default the corresponding
+// method in the parent class is invoked. In this way a combined tracking
+// TPC+ITS is performed. If the flag fITSStandAlone is true, the tracking
+// is done in the ITS only. In the standard reconstruction chain this option
+// can be set via AliReconstruction::SetOption("ITS","onlyITS")
+  Int_t rc=0;
+  if(!fITSStandAlone){
+    rc=AliITStrackerMI::Clusters2Tracks(event);
+  }
+  else {
+    AliDebug(1,"Stand Alone flag set: doing tracking in ITS alone\n");
+  }
+  if(!rc) rc=FindTracks(event);
+  return rc;
 }
 
 //____________________________________________________________________________
@@ -140,11 +271,15 @@ void AliITStrackerSA::Init(){
     fPointc[1]=0;
     fVert = 0;
     fVertexer = 0;
-    fGeom = 0;
-    fFlagLoad = 0;
     SetWindowSizes();
-    fTable = 0;
-}
+    fITSclusters = 0;
+    SetSixPoints();
+    SetOuterStartLayer(0);
+    SetSAFlag(kFALSE);
+    fListOfTracks=new TObjArray(0,0);
+    fCluLayer = 0;
+    fCluCoord = 0;
+ }
 //_______________________________________________________________________
 void AliITStrackerSA::ResetForFinding(){
   //  Reset data members used in all loops during track finding
@@ -157,294 +292,355 @@ void AliITStrackerSA::ResetForFinding(){
     fCoef3=0;
     fPointc[0]=0;
     fPointc[1]=0;
+    fListOfTracks->Delete();
 }
-//____________________________________________________________________________
-void AliITStrackerSA::FindTracks(TTree *clusterTree, TTree *out,Int_t evnumber,char *opt){
-
-  /**************************************************************************
-   * Options: to use only ITS execute FindTracks                            *
-   *          to define good tracks with 6 points out of 6 in the ITS write *
-   *          *opt="6/6". The default is *opt="6/6"                         *
-   *                                                                        * 
-   *                                                                        *
-   * Example: to execute function with only the ITS (no combined tracking   *
-   *          with TPC+ITS) and requiring 5/6 points to define a good track *
-   *          use: FindTracks(treein,treeout,evnumber,"5/6")                *
-   *          to execute combined tracking, before using FindTracks use     *
-   *          UseFoundTracksV2                                              *
-   *************************************************************************/
-
-  //options
-  TString choice(opt);
-  Bool_t sixpoints= choice.Contains("6/6");
-
-  //Fill array with cluster indices for each module
-  if(!fTable){
-    fTable = new AliITSclusterTable(fGeom,this);
-    fTable->FillArray(clusterTree,evnumber);
-  }
-  //Get primary vertex
-  if(fVertexer){
-    if(fVert)delete fVert;
-    fVert = fVertexer->FindVertexForCurrentEvent(evnumber);
-  }
-  else {
-    gAlice->GetEvent(evnumber);
-    if(!fVert){
-      Fatal("FindTracks","Vertex is missing\n");
-      return;
-    }
-  }
-  Double_t primaryVertex[3];
-  Double_t errorsprimvert[3];
-  fVert->GetXYZ(primaryVertex);
-  fVert->GetSigmaXYZ(errorsprimvert);
-  if(errorsprimvert[0]==0 || errorsprimvert[1]==0){
-    Warning("FindTracks","Set errors on vertex positions x and y at 0.0001");
-    errorsprimvert[0]=0.0001;
-    errorsprimvert[1]=0.0001;
+
+
+//______________________________________________________________________
+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;
   }
-  fVert->PrintStatus();
+  
+   
+  //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);
+       }
+     }
+   }
 
-  SetEventNumber(evnumber);
-  if(GetFlagLoadedClusters()==0) LoadClusters(clusterTree);
+   //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
    
-//Fill tree for found tracks
-  AliITStrackV2* outrack=0;
-  TBranch* branch=out->Branch("Tracks","AliITStrackV2",&outrack,32000,0);
-  if (!branch) out->Branch("tracks","AliITStrackV2",&outrack,32000,3);
-  else branch->SetAddress(&outrack);
+   Int_t nclusters[6]={0,0,0,0,0,0};
+   Int_t dmar[6]={0,0,0,0,0,0};
+   if (fCluLayer == 0) {
+   fCluLayer = new TClonesArray*[AliITSgeomTGeo::GetNLayers()];
+   fCluCoord = new TClonesArray*[AliITSgeomTGeo::GetNLayers()];
+     for(Int_t i=0;i<AliITSgeomTGeo::GetNLayers();i++) {
+        fCluLayer[i]=0;
+        fCluCoord[i]=0;
+     }
+   }
+   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;
+     delete fCluLayer[i];
+     fCluLayer[i] = new TClonesArray("AliITSRecPoint",nclusters[i]);
+     delete fCluCoord[i];
+     fCluCoord[i] = new TClonesArray("AliITSclusterTable",nclusters[i]);
+   }
 
-  
-  Int_t * firstmod = new Int_t[fGeom->GetNlayers()];
-  for(Int_t i=0;i<fGeom->GetNlayers();i++){
-    firstmod[i]=fGeom->GetModuleIndex(i+1,1,1);
-  }
-  // firstmod [i] number of the first module in the ITS layer i.
-    
-  AliITSlayer &layer=fgLayers[0];   // first layer
-  Int_t ntrack=0;
-  //loop on the different windows
-  for(Int_t nloop=0;nloop<fNloop;nloop++){
-    Int_t ncl=layer.GetNumberOfClusters();   
-    while(ncl--){ //loop starting from layer 0
-      ResetForFinding();
-      Int_t pflag=0;
-      AliITSclusterV2* cl = layer.GetCluster(ncl);
-      if(cl->IsUsed()==1) continue;     
-      Double_t x,y,z;
-      Int_t module = cl->GetDetectorIndex()+firstmod[0];
-      GetClusterGCoordinates(cl,module,x,y,z);
-      fPhic  = TMath::ATan2(y,x);
-      fLambdac = TMath::ATan2(z-primaryVertex[2],TMath::Sqrt((x-primaryVertex[0])*(x-primaryVertex[0])+(y-primaryVertex[1])*(y-primaryVertex[1])));    
-      fPhiEstimate = fPhic;
-      AliITStrackSA* trs = new AliITStrackSA();      
-      fPoint1[0]=primaryVertex[0];
-      fPoint1[1]=primaryVertex[1];
-      fPoint2[0]=x;
-      fPoint2[1]=y;
-      
-      Int_t * nn = new Int_t[fGeom->GetNlayers()];//counter for clusters on each layer
-      for(Int_t i=0;i<fGeom->GetNlayers();i++){        nn[i]=0;}
-      nn[0] = SearchClusters(0,fPhiWin[nloop],fLambdaWin[nloop],trs,primaryVertex[2],primaryVertex[1],primaryVertex[0],pflag,fTable);
-      nn[1] = SearchClusters(1,fPhiWin[nloop],fLambdaWin[nloop],trs,primaryVertex[2],primaryVertex[1],primaryVertex[0],pflag,fTable);
+   
+   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]++;
+     }
+   }
+   
 
+   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];
+        pflag=1;
+        fPoint3[0] = fPointc[0];
+        fPoint3[1] = fPointc[1];
       }
-      nn[2] = SearchClusters(2,fPhiWin[nloop],fLambdaWin[nloop],trs,primaryVertex[2],primaryVertex[1],primaryVertex[0],pflag,fTable);
+      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];
+        pflag=1;
+        fPoint3[0]=fPointc[0];
+        fPoint3[1]=fPointc[1];
       }
 
-      nn[3] = SearchClusters(3,fPhiWin[nloop],fLambdaWin[nloop],trs,primaryVertex[2],primaryVertex[1],primaryVertex[0],pflag,fTable);
+      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],primaryVertex[1],primaryVertex[0],pflag,fTable); 
+      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],primaryVertex[1],primaryVertex[0],pflag,fTable); 
+      nn[5] = SearchClusters(5,fPhiWin[nloop],fLambdaWin[nloop],trs,primaryVertex[2],pflag); 
           
 
       Int_t layOK=0;
       Int_t numberofpoints;
-      if(sixpoints) numberofpoints=6;  //check of the candidate track
+      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<fGeom->GetNlayers();nnp++){    //of points) it is written on file
-       if(nn[nnp]!=0) layOK+=1;
+      for(Int_t nnp=0;nnp<AliITSgeomTGeo::GetNLayers();nnp++){    //of points) it is written on file
+        if(nn[nnp]!=0) layOK+=1;
       }
       if(layOK>=numberofpoints){
-               AliITStrackV2* tr2 = FitTrack(trs,primaryVertex,errorsprimvert,opt);
-       if(tr2==0){
-         Int_t nct = trs->GetNumberOfClustersSA();
-         while(nct--){
-           Int_t index = trs->GetClusterIndexSA(nct);
-           AliITSclusterV2* kl = (AliITSclusterV2*)GetCluster(index);
-           if(kl->IsUsed()==1) kl->Use();
-         }
-         continue;
-       }
-               outrack=tr2;  
-       out->Fill();
-       ntrack++;
-       Int_t nct = tr2->GetNumberOfClusters();
-
-               while(nct--){
-         Int_t index = tr2->GetClusterIndex(nct);     
-         AliITSclusterV2* kl = (AliITSclusterV2*)GetCluster(index);      
-         if(kl->IsUsed()==0) kl->Use();
-
-       }
-      }        
-      else{
-       Int_t nct = trs->GetNumberOfClustersSA();
-       while(nct--){
-         Int_t index = trs->GetClusterIndexSA(nct);
-         AliITSclusterV2* kl = (AliITSclusterV2*)GetCluster(index);
-         if(kl->IsUsed()==1) kl->Use();
-       }
-      }
-      delete trs;
 
-    }//end loop on clusters of layer1
+        AliITStrackV2* tr2 = FitTrack(trs,primaryVertex);
+       
+        if(tr2==0) continue;
 
-  }//end loop2
+       AliESDtrack outtrack;
+       outtrack.UpdateTrackParams(tr2,AliESDtrack::kITSin);
+       event->AddTrack(&outtrack);
+       ntrack++;
+      }
+       
 
-  //if 5/6 points are required, second loop starting 
-  //from second layer, to find tracks with point of 
-  //layer 1 missing
-   
-  if(!sixpoints){
-    //   counter for clusters on each layer  
-    Int_t * nn = new Int_t[fGeom->GetNlayers()-1];      
-    for(Int_t nloop=0;nloop<fNloop;nloop++){
-      AliITSlayer &layer2=fgLayers[1]; //loop on layer 2
-      Int_t ncl2=layer2.GetNumberOfClusters();
-      while(ncl2--){ //loop starting from layer 2
-       ResetForFinding();
-       Int_t pflag=0;
-       AliITSclusterV2* cl = layer2.GetCluster(ncl2);
-       if(cl->IsUsed()==1) continue;
-       Double_t x,y,z;
-       Int_t module = cl->GetDetectorIndex()+firstmod[1];
-       GetClusterGCoordinates(cl,module,x,y,z);
-       fPhic  = TMath::ATan2(y,x); 
-       fLambdac = TMath::ATan2(z-primaryVertex[2],TMath::Sqrt((x-primaryVertex[0])*(x-primaryVertex[0])+(y-primaryVertex[1])*(y-primaryVertex[1])));       
-
-       fPhiEstimate = fPhic;
-       AliITStrackSA* trs = new AliITStrackSA(); 
-     
-       fPoint1[0]=primaryVertex[0];
-       fPoint1[1]=primaryVertex[1];
-       fPoint2[0]=x;
-       fPoint2[1]=y;
+      delete trs;
+      delete[] nn;
+      
+     }//end loop on clusters of layer1
+    
+     //end loop2
+   }
    
-       for(Int_t kk=0;kk<fGeom->GetNlayers()-1;kk++)nn[kk] = 0;
-       for(Int_t kk=0;kk<fGeom->GetNlayers()-1;kk++){
-         nn[kk] = SearchClusters(kk+1,fPhiWin[nloop],fLambdaWin[nloop],
-                   trs,primaryVertex[2],primaryVertex[1],primaryVertex[0],pflag,fTable);
-         if(nn[kk]==0)break;
-         if(kk>0){
-           UpdatePoints();
-           pflag = 1;
-         }
-       }
-       Int_t fl=0;
-       for(Int_t nnp=0;nnp<fGeom->GetNlayers()-1;nnp++){
-         if(nn[nnp]!=0) fl+=1;
-       }
-       if(fl>=5){  // 5/6       
-         AliITStrackV2* tr2 = FitTrack(trs,primaryVertex,errorsprimvert,opt);
-         if(tr2==0){
-           Int_t nct = trs->GetNumberOfClustersSA();
-           while(nct--){
-             Int_t index = trs->GetClusterIndexSA(nct);
-             AliITSclusterV2* kl = (AliITSclusterV2*)GetCluster(index);
-             if(kl->IsUsed()==1) kl->Use();
-           }
-           continue;
-         }
-         outrack=tr2;
-         out->Fill();
-         Int_t nct = tr2->GetNumberOfClusters();
-         while(nct--){
-           Int_t index = tr2->GetClusterIndex(nct);     
-           AliITSclusterV2* kl = (AliITSclusterV2*)GetCluster(index);
-           if(kl==0) continue;
-           if(kl->IsUsed()==0) kl->Use();
-         }
-       }       
-       else{
-         Int_t nct = trs->GetNumberOfClustersSA();
-         while(nct--){
-           Int_t index = trs->GetClusterIndexSA(nct);
-           AliITSclusterV2* kl = (AliITSclusterV2*)GetCluster(index);
-           if(kl==0) continue;
-           if(kl->IsUsed()==1) kl->Use();
-         }
-       }
-       delete trs;
+   //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 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++;
+
+        }   
+              
+        delete trs;
       }//end loop on clusters of layer2
-    }
+     }
+   
     delete [] nn;
-  }  //end opt="5/6"  
+  } //end opt="5/6"  
+
+
+
+   // search for tracks starting from SPD2, SDD1, SDD2, SSD2
+   // for cosmics (A. Dainese 31.07.07)
+   if(fOuterStartLayer>0) {
+     for(Int_t innLay=1; innLay<=fOuterStartLayer; innLay++) {
+       printf("Searching from layer %d outward\n",innLay);
+       //   counter for clusters on each layer  
+       Int_t * nn = new Int_t[AliITSgeomTGeo::GetNLayers()-innLay];      
+       for(Int_t nloop=0;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()-innLay;kk++) nn[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++) {
+            kk++;
+            nn[kk] = SearchClusters(nextLay,fPhiWin[nloop],fLambdaWin[nloop],
+                                    trs,primaryVertex[2],pflag);
+            if(nn[kk]!=0){
+              pflag=1;
+              if(kk==1) {
+                fPoint3[0]=fPointc[0];
+                fPoint3[1]=fPointc[1];
+              } else {
+                UpdatePoints();
+              }
+            }
+          }
+
+          Int_t fl=0;
+          for(Int_t nnp=0;nnp<AliITSgeomTGeo::GetNLayers()-innLay;nnp++){
+            if(nn[nnp]!=0) fl+=1;
+          }
+          if(fl>=AliITSgeomTGeo::GetNLayers()-innLay){ 
+            AliITStrackV2* tr2 = FitShortTrack(trs,primaryVertex,innLay);
+            if(tr2==0){
+              continue;
+            }
+            
+            AliESDtrack outtrack;
+            outtrack.UpdateTrackParams(tr2,AliESDtrack::kITSin);
+            event->AddTrack(&outtrack);
+            ntrack++;
+            
+          }   
+              
+          delete trs;
+        }//end loop on clusters of innLay
+       } //end loop on window sizes
+   
+       delete [] nn;
+     } //end loop on innLay
+   } //end if(fOuterStartLayer>0)
 
+   
   delete [] firstmod;
+  Info("FindTracks","Number of found tracks: %d",event->GetNumberOfTracks());
+  return 0;
 
-  UnloadClusters();
 }
-//_______________________________________________________________________
-void AliITStrackerSA::UseFoundTracksV2(Int_t evnum,TTree* treev2, TTree* clustertree){
-  // Marks as used clusters belonging to tracks found with V2 TPC+ITS tracking
-  if(!fTable){
-    fTable = new AliITSclusterTable(fGeom,this);
-    fTable->FillArray(clustertree,evnum);
-  }
-  LoadClusters(clustertree);
-  SetFlagLoadedClusters(1);
-
-  TBranch* bra = (TBranch*)treev2->GetBranch("tracks");
-  if(!bra) Warning("UseFoundTracksV2","No branch for track tree");
-  AliITStrackV2* ttrrt = new AliITStrackV2;
-  bra->SetAddress(&ttrrt);
-
-  for(Int_t nj=0;nj<treev2->GetEntries();nj++){
-    treev2->GetEvent(nj);
-    Int_t ncl = ttrrt->GetNumberOfClusters();
-    for(Int_t k=0;k<ncl;k++){
-      Int_t index = ttrrt->GetClusterIndex(k);
-      AliITSclusterV2* clui = (AliITSclusterV2*)GetCluster(index);
-      if(clui->IsUsed()==0) clui->Use();  
-    }
-  }
-  delete ttrrt;
+
+
 
-}
 
 //________________________________________________________________________
 
-AliITStrackV2* AliITStrackerSA::FitTrack(AliITStrackSA* tr,Double_t *primaryVertex,Double_t *errorsprimvert,char *opt){
+AliITStrackV2* AliITStrackerSA::FitTrack(AliITStrackSA* tr,Double_t *primaryVertex){
   //fit of the found track
 
-//options
-  TString choice(opt);
-  Bool_t sixpoints= choice.Contains("6/6");
   
-  Int_t * firstmod = new Int_t[fGeom->GetNlayers()];
-  for(Int_t i=0;i<fGeom->GetNlayers();i++){
-    firstmod[i]=fGeom->GetModuleIndex(i+1,1,1);
+  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);
   }  
-  TObjArray* listoftracks=new TObjArray(0,0);
-  AliITStrackV2* otrack2;
+
   Int_t nclusters = tr->GetNumberOfClustersSA();
-  TObjArray** listlayer = new TObjArray*[fGeom->GetNlayers()];
-  for(Int_t i=0;i<fGeom->GetNlayers();i++){
+  TObjArray** listlayer = new TObjArray*[AliITSgeomTGeo::GetNLayers()];
+  for(Int_t i=0;i<AliITSgeomTGeo::GetNLayers();i++){
     listlayer[i] = new TObjArray(0,0);
   }
 
@@ -455,13 +651,22 @@ AliITStrackV2* AliITStrackerSA::FitTrack(AliITStrackSA* tr,Double_t *primaryVert
   TArrayI clind4(20);
   TArrayI clind5(20);
 
-  Int_t * nnn = new Int_t[fGeom->GetNlayers()];
-  for(Int_t i=0;i<fGeom->GetNlayers();i++)nnn[i]=0;
+  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;}
   
   for(Int_t ncl=0;ncl<nclusters;ncl++){
-    Int_t index = tr->GetClusterIndexSA(ncl);   
-    AliITSclusterV2* cl = (AliITSclusterV2*)GetCluster(index);
-    if(cl->IsUsed()==1) cl->Use();
+    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]++;}
@@ -472,358 +677,609 @@ AliITStrackV2* AliITStrackerSA::FitTrack(AliITStrackSA* tr,Double_t *primaryVert
   }
   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]++;}
+
+    }
+  }
+
+  delete [] kkk;
+
  
-  Int_t * end = new Int_t[fGeom->GetNlayers()];
-  for(Int_t i=0;i<fGeom->GetNlayers();i++){
+  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();
   }
 
-  for(Int_t l1=0;l1<end[0];l1++){//loop on layer 1
-    AliITSclusterV2* cl0 = (AliITSclusterV2*)listlayer[0]->At(l1); 
-    TVector3** recp = new TVector3*[3];
-    TVector3** errs = new TVector3*[3];
-    recp[0] = new TVector3(primaryVertex[0],primaryVertex[1],primaryVertex[2]);
-    errs[0] = new TVector3(errorsprimvert[0],errorsprimvert[1],errorsprimvert[2]);
+  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;
-    AliITSclusterV2* p1=0;
-    AliITSclusterV2* p2=0;
-
-    for(Int_t l2=0;l2<end[1];l2++){//loop on layer 2
-      AliITSclusterV2* cl1 = (AliITSclusterV2*)listlayer[1]->At(l2);    
+    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
-       AliITSclusterV2* cl2 = (AliITSclusterV2*)listlayer[2]->At(l3);
-
-       if(cl0==0 && cl1!=0) {
-         p2 = cl2;
-         p1=cl1;
-               
-       }
-       if(cl0!=0 && cl1==0){
-         p1=cl0;
-         p2=cl2;
-       }
-       if(cl0!=0 && cl1!=0){
-         p1=cl0;
-         p2=cl1;
-       }
-       Int_t module1 = p1->GetDetectorIndex()+firstmod[0];
-       Int_t module2 = p2->GetDetectorIndex()+firstmod[1];
-       GetClusterGCoordinates(p1,module1,x1,y1,z1);
-       GetClusterGCoordinates(p2,module2,x2,y2,z2);
-       GetClusterGErrors(p1,module1,sx1,sy1,sz1);
-       GetClusterGErrors(p2,module2,sx2,sy2,sz2);
-       Double_t phi1=TMath::ATan2(y1,x1);
-       recp[1] = new TVector3(x1,y1,z1);
-       errs[1] = new TVector3(sx1,sy1,sz1);
-       recp[2] = new TVector3(x2,y2,z2);
-       errs[2] = new TVector3(sx2,sy2,sz2);
+        AliITSRecPoint* cl2 = (AliITSRecPoint*)listlayer[2]->At(l3);
+
+        if(cl0==0 && cl1!=0) {
+          p1=cl1;
+          p2=cl2;
+         index1=clind1[l2];mrk1=mark1[l2];
+         index2=clind2[l3];mrk2=mark2[l3];
+         lay1=1;
+         lay2=2;
+          module1 = p1->GetDetectorIndex()+firstmod[1]; 
+        }
+        if(cl0!=0 && cl1==0){
+          p1=cl0;
+          p2=cl2;index2=clind2[l3];mrk2=mark2[l3];
+         lay1=0;
+         lay2=2;
+         module1 = p1->GetDetectorIndex()+firstmod[0];
+        }
+        if(cl0!=0 && cl1!=0){
+          p1=cl0;
+          p2=cl1;
+         lay1=0;
+         lay2=1;
+         module1 = p1->GetDetectorIndex()+firstmod[0];
+        }
        
-       //fit on the Riemann sphere
-       Float_t seed1,seed2,seed3;
-       AliITSRiemannFit fit;
-       Int_t rf = fit.FitHelix(3,recp,errs,seed1,seed2,seed3); //this gives phi,tgl,curvature to start Kalman Filter
-       if(rf==0) continue;  
-       Double_t phi=seed1;
-       Double_t tgl=seed2;
-       
-       if(phi1>0){ 
-         if(seed1>-TMath::Pi() && seed1<-0.5*TMath::Pi()){
-           phi=seed1+1.5*TMath::Pi();
-           tgl=seed2; 
-         }
-         if(seed1>-0.5*TMath::Pi() && seed1<0.5*TMath::Pi()){
-           phi=seed1+0.5*TMath::Pi();
-           tgl=(-1)*seed2; 
-         }
-         if(seed1>0.5*TMath::Pi() && seed1<TMath::Pi()){
-           phi=seed1-0.5*TMath::Pi();
-           tgl=seed2; 
-         }
-       }      
-       if(phi1<0){
-         if(seed1>-TMath::Pi() && seed1<-0.5*TMath::Pi()){
-           phi=seed1+0.5*TMath::Pi();
-           tgl=(-1)*seed2; 
-         }
-         if(seed1>-0.5*TMath::Pi() && seed1<0.5*TMath::Pi()){
-           phi=seed1-0.5*TMath::Pi();
-           tgl=seed2; 
-         }
-         if(seed1>0.5*TMath::Pi() && seed1<TMath::Pi()){
-           phi=seed1-1.5*TMath::Pi();
-           tgl=(-1)*seed2; 
-           }
-         }
+       Int_t cln1=mrk1;
+       Int_t cln2=mrk2;
+       AliITSclusterTable* arr1 = (AliITSclusterTable*)GetClusterCoord(lay1,cln1);
+       AliITSclusterTable* arr2 = (AliITSclusterTable*)GetClusterCoord(lay2,cln2);
+       x1 = arr1->GetX();
+       x2 = arr2->GetX();
+       y1 = arr1->GetY();
+       y2 = arr2->GetY();
+       z1 = arr1->GetZ();
+       z2 = arr2->GetZ();
+       sx1 = arr1->GetSx();
+       sx2 = arr2->GetSx();
+       sy1 = arr1->GetSy();
+       sy2 = arr2->GetSy();
+       sz1 = arr1->GetSz();
+       sz2 = arr2->GetSz();
        
        Int_t layer,ladder,detector;
-       fGeom->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);
-             
-       for(Int_t l4=0;l4<end[3];l4++){ //loop on layer 4   
-         AliITSclusterV2* cl3 = (AliITSclusterV2*)listlayer[3]->At(l4);
-         for(Int_t l5=0;l5<end[4];l5++){ //loop on layer 5
-           AliITSclusterV2* cl4 = (AliITSclusterV2*)listlayer[4]->At(l5);
-           for(Int_t l6=0;l6<end[5];l6++){ //loop on layer 6  
-             AliITSclusterV2* cl5 = (AliITSclusterV2*)listlayer[5]->At(l6);
-             AliITStrackSA* trac = new AliITStrackSA(layer,ladder,detector,yclu1,zclu1,phi,tgl,cv,1);
-                             
-             if(cl5!=0) trac->AddClusterV2(5,(clind5[l6] & 0x0fffffff)>>0);
-             if(cl4!=0) trac->AddClusterV2(4,(clind4[l5] & 0x0fffffff)>>0);
-             if(cl3!=0) trac->AddClusterV2(3,(clind3[l4] & 0x0fffffff)>>0);
-             if(cl2!=0) trac->AddClusterV2(2,(clind2[l3] & 0x0fffffff)>>0);
-             if(cl1!=0) trac->AddClusterV2(1,(clind1[l2] & 0x0fffffff)>>0);
-             if(cl0!=0) trac->AddClusterV2(0,(clind0[l1] & 0x0fffffff)>>0);
-           
-             //fit with Kalman filter using AliITStrackerV2::RefitAt()
-         
-             AliITStrackV2* ot = new AliITStrackV2(*trac);
-             
-             ot->ResetCovariance();
-             ot->ResetClusters();
-             
-             if(RefitAt(49.,ot,trac)){ //fit from layer 1 to layer 6
-
-               otrack2 = new AliITStrackV2(*ot);
-               otrack2->ResetCovariance(); 
-               otrack2->ResetClusters();
-               //fit from layer 6 to layer 1
-               if(RefitAt(3.7,otrack2,ot)) listoftracks->AddLast(otrack2);
-                             
-             }       
-         
-             delete ot;
-             delete trac;
-           }//end loop layer 6
-         }//end loop layer 5
-       }//end loop layer 4
-       
-       for(Int_t i=1;i<3;i++){
-         delete recp[i];
-         delete errs[i];
-       }
+       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);
+              AliITStrackSA* trac = new AliITStrackSA(layer,ladder,detector,yclu1,zclu1,phi2,tgl2,cv,1);
+                              
+              if(cl5!=0) {
+               trac->AddClusterV2(5,(clind5[l6] & 0x0fffffff)>>0);
+               trac->AddClusterMark(5,mark5[l6]);
+             }
+              if(cl4!=0){
+               trac->AddClusterV2(4,(clind4[l5] & 0x0fffffff)>>0);
+               trac->AddClusterMark(4,mark4[l5]);
+             }
+              if(cl3!=0){
+               trac->AddClusterV2(3,(clind3[l4] & 0x0fffffff)>>0);
+               trac->AddClusterMark(3,mark3[l4]);
+             }
+              if(cl2!=0){
+               trac->AddClusterV2(2,(clind2[l3] & 0x0fffffff)>>0);
+               trac->AddClusterMark(2,mark2[l3]);
+             }
+              if(cl1!=0){
+               trac->AddClusterV2(1,(clind1[l2] & 0x0fffffff)>>0);
+               trac->AddClusterMark(1,mark1[l2]);
+             }
+              if(cl0!=0){
+               trac->AddClusterV2(0,(clind0[l1] & 0x0fffffff)>>0);
+               trac->AddClusterMark(0,mark0[l1]);
+             }
+              //fit with Kalman filter using AliITStrackerMI::RefitAt()
+          
+
+              AliITStrackMI* ot = new AliITStrackSA(*trac);
+              
+              ot->ResetCovariance(10.);
+              ot->ResetClusters();
+              
+              if(RefitAt(krInsideITSscreen,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(krInsideSPD1,otrack2,ot)) {
+                 fListOfTracks->AddLast(otrack2);
+                 new (tri[nlist]) AliITStrackSA(*trac);
+                 nlist++;
+               } else {
+                 delete otrack2;
+               }
+                              
+              }       
+          
+              delete ot;
+              delete trac;
+            }//end loop layer 6
+          }//end loop layer 5
+        }//end loop layer 4        
       }//end loop layer 3
-    }//end loop layer 2        
-    delete recp[0];
-    delete errs[0];
-    delete[] recp;
-    delete[] errs;    
+    }//end loop layer 2 
   }//end loop layer 1
 
   delete [] end;
 
-  Int_t dim=listoftracks->GetEntries();
+
+  Int_t dim=fListOfTracks->GetEntries();
   if(dim==0){
-    delete listoftracks;
-    for(Int_t i=0;i<fGeom->GetNlayers();i++){
+    for(Int_t i=0;i<AliITSgeomTGeo::GetNLayers();i++){
       delete listlayer[i];
     }
-    delete listlayer;
+    delete [] listlayer;
+    listSA->Delete();
+    delete listSA;
+    delete [] firstmod;
     return 0;
   }
 
-  AliITStrackV2* otrack =(AliITStrackV2*)FindTrackLowChiSquare(listoftracks,dim);
-
-  if(otrack==0) return 0;
-  Int_t * indexc = new Int_t[fGeom->GetNlayers()];
-  for(Int_t i=0;i<fGeom->GetNlayers();i++) indexc[i]=0;
+  Int_t lowchi2 = FindTrackLowChiSquare(fListOfTracks,dim);
+  AliITStrackV2* otrack =(AliITStrackV2*)fListOfTracks->At(lowchi2);
+  AliITStrackSA* trsa = (AliITStrackSA*)listSA->At(lowchi2);
+  if(otrack==0) {
+    for(Int_t i=0;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()];
+  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);
   }      
-  AliITSclusterV2* cl0 = (AliITSclusterV2*)GetCluster(indexc[0]);
-  AliITSclusterV2* cl1 = (AliITSclusterV2*)GetCluster(indexc[1]);     
-  AliITSclusterV2* cl2 = (AliITSclusterV2*)GetCluster(indexc[2]);     
-  AliITSclusterV2* cl3 = (AliITSclusterV2*)GetCluster(indexc[3]);
-  AliITSclusterV2* cl4 = (AliITSclusterV2*)GetCluster(indexc[4]);
+  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()==fGeom->GetNlayers()){
-    AliITSclusterV2* cl5 = (AliITSclusterV2*)GetCluster(indexc[5]);
+  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()==(fGeom->GetNlayers()-1)){
+  if(otrack->GetNumberOfClusters()==(AliITSgeomTGeo::GetNLayers()-1)){
     labl[0]=-1;
     labl[1]=-1;
     labl[2]=-1;
   }
   Int_t numberofpoints;
-  if(sixpoints) numberofpoints=6;
+  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);
+                       cl2->GetLabel(0),cl3->GetLabel(0),
+                       cl4->GetLabel(0),labl[0],
+                       cl0->GetLabel(1),cl1->GetLabel(1),
+                       cl2->GetLabel(1),cl3->GetLabel(1),
+                       cl4->GetLabel(1),labl[1],
+                       cl0->GetLabel(2),cl1->GetLabel(2),
+                       cl2->GetLabel(2),cl3->GetLabel(2),
+                       cl4->GetLabel(2),labl[2],numberofpoints);
   
   otrack->SetLabel(label);  
-  delete listoftracks;
-  for(Int_t i=0;i<fGeom->GetNlayers();i++){
+  //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);
+      fCluLayer[nlay]->RemoveAt(index);
+      RemoveClusterCoord(nlay,index);
+      fCluLayer[nlay]->Compress();
+    }    
+  }
+  listSA->Delete();
+  delete listSA;
+
+  for(Int_t i=0;i<AliITSgeomTGeo::GetNLayers();i++){
     delete listlayer[i];
   }
-  delete listlayer; 
+  delete [] listlayer; 
   delete [] firstmod;
   return otrack;
 
 }
 
-//________________________________________________________________
-void AliITStrackerSA::UpdatePoints(){
-  //update of points for the estimation of the curvature  
+//________________________________________________________________________
 
-  fPoint1[0]=fPoint2[0]; 
-  fPoint1[1]=fPoint2[1];
-  fPoint2[0]=fPoint3[0];
-  fPoint2[1]=fPoint3[1];
-  fPoint3[0]=fPointc[0];
-  fPoint3[1]=fPointc[1];
+AliITStrackV2* AliITStrackerSA::FitShortTrack(AliITStrackSA* tr,Double_t *primaryVertex,Int_t innLay){
+  //fit of the found track (short tracks, <6 points, for cosmics). A.Dainese 31.07.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);
+  }  
 
-//_________________________________________________________________
+  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);
+  }
 
-Int_t AliITStrackerSA::SearchClusters(Int_t layer,Double_t phiwindow,Double_t lambdawindow, AliITStrackSA* trs,Double_t zvertex,Double_t yvertex,Double_t xvertex,Int_t pflag,AliITSclusterTable* table){
-  //function used to to find the clusters associated to the track
-  Int_t nc=0;
-  AliITSlayer &lay = fgLayers[layer];
-  Int_t * firstmod = new Int_t[fGeom->GetNlayers()];
-  for(Int_t i=0;i<fGeom->GetNlayers();i++){
-    firstmod[i]=fGeom->GetModuleIndex(i+1,1,1);
+  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;}
+  
+  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]++;}    
   }
-  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);
-    Int_t fun = FindIntersection(fCoef1,fCoef2,fCoef3,-(lay.GetR()*lay.GetR()),cx1,cy1,cx2,cy2);
-    if(fun==0) return 0;
-    Double_t fi1 =TMath::ATan2(cy1,cx1);
-    Double_t fi2 =TMath::ATan2(cy2,cx2);
-    fPhiEstimate = ChoosePoint(fi1,fi2,fPhic);
+  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]++;}
+
+    }
   }
 
-  Double_t zed = TMath::Tan(fLambdac)*lay.GetR()+zvertex;
-  Double_t zed1  =  TMath::Tan(fLambdac+lambdawindow)*lay.GetR()+zvertex;
-  Double_t zed2  =  TMath::Tan(fLambdac-lambdawindow)*lay.GetR()+zvertex;
-  
-  Double_t fi = fPhiEstimate;
-  Int_t nmod  = lay.FindDetectorIndex(fi,zed)+firstmod[layer];
+  delete [] kkk;
+
  
-  Int_t nm[8]={0,0,0,0,0,0,0,0};
-  nm[0] = lay.FindDetectorIndex(fi+phiwindow,zed)+firstmod[layer];
-  nm[1] = lay.FindDetectorIndex(fi-phiwindow,zed)+firstmod[layer];
-  nm[2]  = lay.FindDetectorIndex(fi,zed1)+firstmod[layer];
-  nm[3]  = lay.FindDetectorIndex(fi,zed2)+firstmod[layer];
-  nm[4]  = lay.FindDetectorIndex(fi+phiwindow,zed1)+firstmod[layer];
-  nm[5]  = lay.FindDetectorIndex(fi-phiwindow,zed1)+firstmod[layer];
-  nm[6]  = lay.FindDetectorIndex(fi+phiwindow,zed2)+firstmod[layer];
-  nm[7]  = lay.FindDetectorIndex(fi-phiwindow,zed2)+firstmod[layer];
+  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();
+  }
+
+  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); 
+    for(Int_t l2=0;l2<end[1];l2++){ //loop on layer 2
+      AliITSRecPoint* cl1 = (AliITSRecPoint*)listlayer[1]->At(l2); 
+      for(Int_t l3=0;l3<end[2];l3++){  //loop on layer 3
+        AliITSRecPoint* cl2 = (AliITSRecPoint*)listlayer[2]->At(l3);
+        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);
+
+
+             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;
+             if(innLay==1) {
+               p1=cl1;
+               p2=cl2;
+               index1=clind1[l2];mrk1=mark1[l2];
+               index2=clind2[l3];mrk2=mark2[l3];
+             } else if(innLay==2) {
+               p1=cl2;
+               p2=cl3;
+               index1=clind2[l3];mrk1=mark2[l3];
+               index2=clind3[l4];mrk2=mark3[l4];
+             } else if(innLay==3) {
+               p1=cl3;
+               p2=cl4;
+               index1=clind3[l4];mrk1=mark3[l4];
+               index2=clind4[l5];mrk2=mark4[l5];
+             } else if(innLay==4) {
+               p1=cl4;
+               p2=cl5;
+               index1=clind4[l5];mrk1=mark4[l5];
+               index2=clind5[l6];mrk2=mark5[l6];
+             }
+             Int_t lay1=innLay;
+             Int_t lay2=innLay+1;
+             Int_t module1 = p1->GetDetectorIndex()+firstmod[innLay]; 
+             
+             Int_t cln1=mrk1;
+             Int_t cln2=mrk2;
+             AliITSclusterTable* arr1 = (AliITSclusterTable*)GetClusterCoord(lay1,cln1);
+             AliITSclusterTable* arr2 = (AliITSclusterTable*)GetClusterCoord(lay2,cln2);
+             x1 = arr1->GetX();
+             x2 = arr2->GetX();
+             y1 = arr1->GetY();
+             y2 = arr2->GetY();
+             z1 = arr1->GetZ();
+             z2 = arr2->GetZ();
+             sx1 = arr1->GetSx();
+             sx2 = arr2->GetSx();
+             sy1 = arr1->GetSy();
+             sy2 = arr2->GetSy();
+             sz1 = arr1->GetSz();
+             sz2 = arr2->GetSz();
+             
+             Int_t layer,ladder,detector;
+             AliITSgeomTGeo::GetModuleId(module1,layer,ladder,detector);
+             Float_t yclu1 = p1->GetY();
+             Float_t zclu1 = p1->GetZ();
+             Double_t cv=Curvature(primaryVertex[0],primaryVertex[1],x1,y1,x2,y2);        
+             Double_t tgl2 = (z2-z1)/TMath::Sqrt((x2-x1)*(x2-x1)+(y2-y1)*(y2-y1));
+             Double_t phi2 = TMath::ATan2((y2-y1),(x2-x1));
+             //printf("phi2: %f   tgl2: %f\n",phi2,tgl2);
+              AliITStrackSA* trac = new AliITStrackSA(layer,ladder,detector,yclu1,zclu1,phi2,tgl2,cv,1);
+                              
+             //Float_t clxyz[3]; 
+              if(cl5!=0) {
+               trac->AddClusterV2(5,(clind5[l6] & 0x0fffffff)>>0);
+               trac->AddClusterMark(5,mark5[l6]);
+               //cl5->GetGlobalXYZ(clxyz);printf("gcl %f %f %f\n",clxyz[0],clxyz[1],clxyz[2]);       
+             }
+              if(cl4!=0){
+               trac->AddClusterV2(4,(clind4[l5] & 0x0fffffff)>>0);
+               trac->AddClusterMark(4,mark4[l5]);
+               //cl4->GetGlobalXYZ(clxyz);printf("gcl %f %f %f\n",clxyz[0],clxyz[1],clxyz[2]);       
+             }
+              if(cl3!=0){
+               trac->AddClusterV2(3,(clind3[l4] & 0x0fffffff)>>0);
+               trac->AddClusterMark(3,mark3[l4]);
+               //cl3->GetGlobalXYZ(clxyz);printf("gcl %f %f %f\n",clxyz[0],clxyz[1],clxyz[2]);       
+             }
+              if(cl2!=0){
+               trac->AddClusterV2(2,(clind2[l3] & 0x0fffffff)>>0);
+               trac->AddClusterMark(2,mark2[l3]);
+               //cl2->GetGlobalXYZ(clxyz);printf("gcl %f %f %f\n",clxyz[0],clxyz[1],clxyz[2]);       
+             }
+              if(cl1!=0){
+               trac->AddClusterV2(1,(clind1[l2] & 0x0fffffff)>>0);
+               trac->AddClusterMark(1,mark1[l2]);
+               //cl1->GetGlobalXYZ(clxyz);printf("gcl %f %f %f\n",clxyz[0],clxyz[1],clxyz[2]);       
+             }
+              if(cl0!=0){
+               trac->AddClusterV2(0,(clind0[l1] & 0x0fffffff)>>0);
+               trac->AddClusterMark(0,mark0[l1]);
+               //cl0->GetGlobalXYZ(clxyz);printf("gcl %f %f %f\n",clxyz[0],clxyz[1],clxyz[2]);       
+             }
+
+
+              //fit with Kalman filter using AliITStrackerMI::RefitAt()
+             AliITStrackMI* ot = new AliITStrackSA(*trac);
+              
+              ot->ResetCovariance(10.);
+              ot->ResetClusters();
+              
+             //printf("%d  \n",trac->GetNumberOfClusters());for(Int_t ijk=0;ijk<trac->GetNumberOfClusters();ijk++) printf("    %d",trac->GetClusterIndex(ijk)); printf("\n");
+              if(RefitAt(krInsideITSscreen,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(krInsideSPD1,otrack2,ot)) {
+                 fListOfTracks->AddLast(otrack2);
+                 new (tri[nlist]) AliITStrackSA(*trac);
+                 nlist++;
+               } else {
+                 delete otrack2;
+               }
+                              
+              }       
+          
+              delete ot;
+              delete trac;
+            }//end loop layer 6
+          }//end loop layer 5
+        }//end loop layer 4        
+      }//end loop layer 3
+    }//end loop layer 2 
+  }//end loop layer 1
+
+  delete [] end;
 
  
-   if(nmod<0) return 0;
-  Int_t nn=0;
-  TArrayI* array =(TArrayI*)table->GetListOfClusters(nmod);
-  TArrayI* list = new TArrayI(array->GetSize());
-  for(Int_t i=0;i<array->GetSize();i++){
-    Int_t in=(Int_t)array->At(i);
-    list->AddAt(in,nn);
-    nn++;
+
+  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;
   }
-  
-  for(Int_t ii=0;ii<8;ii++){
-    if(nm[ii]!=nmod && nm[ii]>=0){
-      TArrayI* ar =(TArrayI*)table->GetListOfClusters(nm[ii]);
-      list->Set(list->GetSize()+ar->GetSize());
-      for(Int_t j=0;j<ar->GetSize();j++){
-       Int_t in=(Int_t)ar->At(j);
-       list->AddAt(in,nn);
-       nn++;
-      }
+
+  Int_t lowchi2 = FindTrackLowChiSquare(fListOfTracks,dim);
+  AliITStrackV2* otrack =(AliITStrackV2*)fListOfTracks->At(lowchi2);
+  AliITStrackSA* trsa = (AliITStrackSA*)listSA->At(lowchi2);
+  if(otrack==0) {
+    for(Int_t i=0;i<AliITSgeomTGeo::GetNLayers();i++){
+      delete listlayer[i];
     }
+    delete [] listlayer; 
+    listSA->Delete();
+    delete listSA;
+    delete [] firstmod;
+    return 0;
   }
-  for(Int_t i=0;i<list->GetSize();i++){
-    Int_t index = (Int_t)list->At(i);
-    AliITSclusterV2* cllay = lay.GetCluster(index);
-    if(cllay==0) continue;
-    if(cllay->IsUsed()==1) continue;
-    
-    Double_t x,y,z;
-    Int_t modlay = cllay->GetDetectorIndex()+firstmod[layer];
-    GetClusterGCoordinates(cllay,modlay,x,y,z);
-    Double_t phi   = TMath::ATan2(y,x);
-    Double_t lambda=TMath::ATan2(z-zvertex,TMath::Sqrt((x-xvertex)*(x-xvertex)+(y-yvertex)*(y-yvertex)));
-
-
-    if(TMath::Abs(fLambdac-lambda)<lambdawindow && 
-       TMath::Abs(fPhiEstimate-phi)<phiwindow){
-      nc+=1;
-      fLambdac = lambda;
-      if(trs->GetNumberOfClustersSA()==20){
-       delete list;
-       return 0;
-      }
-      trs->AddClusterSA(layer,index);
-      cllay->Use();
-      fPhiEstimate=phi;
-      fPointc[0]=x;fPointc[1]=y;
+  Int_t * indexc = new Int_t[AliITSgeomTGeo::GetNLayers()];
+  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);
+  }      
+  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;
     }
+  }
+  delete [] indexc;
+  Int_t numberofpoints=AliITSgeomTGeo::GetNLayers()-innLay;
+  CookLabel(otrack,0.); //MI change - to see fake ratio
+  Int_t label=FindLabel(labl[0][0],labl[1][0],labl[2][0],labl[3][0],labl[4][0],labl[5][0]);
+  Int_t lflag=0;
+  for(Int_t i=0;i<numberofpoints;i++)
+    if(labl[i][0]==label || labl[i][1]==label || labl[i][2]==label) lflag++;
+  
+  if(lflag<numberofpoints) label = -label;
+  otrack->SetLabel(label);  
 
+  //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);
+      fCluLayer[nlay]->RemoveAt(index);
+      RemoveClusterCoord(nlay,index);
+      fCluLayer[nlay]->Compress();
+    }    
+  }
+  listSA->Delete();
+  delete listSA;
+
+  for(Int_t i=0;i<AliITSgeomTGeo::GetNLayers();i++){
+    delete listlayer[i];
   }
-  delete list;
+  delete [] listlayer; 
   delete [] firstmod;
-  return nc;
+  return otrack;
 
 }
 
-//__________________________________________________________________
-void AliITStrackerSA::GetClusterGCoordinates(AliITSclusterV2* cluster,Int_t module,Double_t& x, Double_t& y, Double_t& z){
-
-  //returns x,y,z of cluster in global coordinates
-
-  Double_t rot[9];     fGeom->GetRotMatrix(module,rot);
-  Int_t lay,lad,det; fGeom->GetModuleId(module,lay,lad,det);
-  Float_t tx,ty,tz;  fGeom->GetTrans(lay,lad,det,tx,ty,tz);     
 
-  Double_t alpha=TMath::ATan2(rot[1],rot[0])+TMath::Pi();
-  Double_t phi=TMath::Pi()/2+alpha;
-  if (lay==1) phi+=TMath::Pi();
-
-  Double_t cp=TMath::Cos(phi), sp=TMath::Sin(phi);
-  Double_t r=tx*cp+ty*sp;
 
-  x= r*cp - cluster->GetY()*sp;
-  y= r*sp + cluster->GetY()*cp;
-  z=cluster->GetZ();
+//_______________________________________________________
+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
+  Int_t nc=0;
+  AliITSlayer &lay = fgLayers[layer];
+  Double_t r=lay.GetR();
+   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)
+       return 0;
+    Double_t fi1=TMath::ATan2(cy1-fPoint1[1],cx1-fPoint1[0]);
+    Double_t fi2=TMath::ATan2(cy2-fPoint1[1],cx2-fPoint1[0]);
+    fPhiEstimate=ChoosePoint(fi1,fi2,fPhic);
+  }
 
-  
+  Int_t ncl = fCluLayer[layer]->GetEntries();
+  for (Int_t index=0; index<ncl; index++) {
+    AliITSRecPoint *c = (AliITSRecPoint*)fCluLayer[layer]->At(index);
+    if (!c) continue;
+    if (c->GetQ()<=0) continue;
+    
+     AliITSclusterTable* arr = (AliITSclusterTable*)GetClusterCoord(layer,index);
+     Double_t phi = arr->GetPhi();
+     if (TMath::Abs(phi-fPhiEstimate)>phiwindow) continue;
+
+     Double_t lambda = arr->GetLambda();
+     if (TMath::Abs(lambda-fLambdac)>lambdawindow) continue;
+
+     if(trs->GetNumberOfClustersSA()==trs->GetMaxNumberOfClusters()) return 0;
+     if(trs->GetNumberOfMarked(layer)==trs->GetMaxNMarkedPerLayer()) return 0;
+     Int_t orind = arr->GetOrInd();
+     trs->AddClusterSA(layer,orind);
+     trs->AddClusterMark(layer,index);
+       
+     nc++;
+     fLambdac=lambda;
+     fPhiEstimate=phi;
+
+     fPointc[0]=arr->GetX();
+     fPointc[1]=arr->GetY();
 
+  }
+  return nc;
 }
-//__________________________________________________________________
-void AliITStrackerSA::GetClusterGErrors(AliITSclusterV2* cluster,Int_t module,Double_t& sigmax, Double_t& sigmay, Double_t& sigmaz){
-
-  //returns x,y,z of cluster in global coordinates
 
-  Double_t rot[9];     fGeom->GetRotMatrix(module,rot);
-  Int_t lay,lad,det; fGeom->GetModuleId(module,lay,lad,det);
-  Double_t alpha=TMath::ATan2(rot[1],rot[0])+TMath::Pi();
-  Double_t phi=TMath::Pi()/2+alpha;
-  if (lay==1) phi+=TMath::Pi();
+//________________________________________________________________
+void AliITStrackerSA::UpdatePoints(){
+  //update of points for the estimation of the curvature  
 
-  Double_t cp=TMath::Cos(phi), sp=TMath::Sin(phi);
+  fPoint2[0]=fPoint3[0];
+  fPoint2[1]=fPoint3[1];
+  fPoint3[0]=fPointc[0];
+  fPoint3[1]=fPointc[1];
 
-  sigmax = TMath::Sqrt(sp*sp*cluster->GetSigmaY2());
-  sigmay = TMath::Sqrt(cp*cp*cluster->GetSigmaY2());
-  sigmaz = TMath::Sqrt(cluster->GetSigmaZ2());
+  
 }
 
 //___________________________________________________________________
@@ -846,14 +1302,15 @@ Int_t AliITStrackerSA::FindEquation(Float_t x1, Float_t y1, Float_t x2, Float_t
  //c2 is -rlayer*rlayer
 
   if(a1==0) return 0;
- Float_t m = c2-c1; 
- Float_t aA = (b1*b1)/(a1*a1)+1;
- Float_t bB = (-2*m*b1/(a1*a1));
- Float_t cC = c2+(m*m)/(a1*a1);
- if((bB*bB-4*aA*cC)<0) return 0;
+ Double_t m = c2-c1; 
+ Double_t aA = (b1*b1)/(a1*a1)+1;
+ Double_t bB = (-2*m*b1/(a1*a1));
+ Double_t cC = c2+(m*m)/(a1*a1);
+ Double_t dD = bB*bB-4*aA*cC;
+ if(dD<0) return 0;
  
- y1 = (-bB+TMath::Sqrt(bB*bB-4*aA*cC))/(2*aA); 
- y2 = (-bB-TMath::Sqrt(bB*bB-4*aA*cC))/(2*aA); 
+ y1 = (-bB+TMath::Sqrt(dD))/(2*aA); 
+ y2 = (-bB-TMath::Sqrt(dD))/(2*aA); 
  x1 = (c2-c1-b1*y1)/a1;
  x2 = (c2-c1-b1*y2)/a1;
 
@@ -883,6 +1340,8 @@ x2,Double_t y2,Double_t x3,Double_t y3){
   return 1/rad;
  
 }
+
+
 //____________________________________________________________________
 Double_t AliITStrackerSA::ChoosePoint(Double_t p1, Double_t p2, Double_t pp){
 
@@ -899,11 +1358,12 @@ Double_t AliITStrackerSA::ChoosePoint(Double_t p1, Double_t p2, Double_t pp){
 
 
 //_________________________________________________________________
-AliITStrackV2* AliITStrackerSA::FindTrackLowChiSquare(TObjArray* tracklist, Int_t dim) const {
-  // returns track with lowes chi square  
+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;
+    //AliITStrackV2* trk = (AliITStrackV2*)tracklist->At(0);
+    //return trk;
+    return 0;
   }
   if(dim==0) return 0;
   Double_t * chi2 = new Double_t[dim];
@@ -919,22 +1379,20 @@ AliITStrackV2* AliITStrackerSA::FindTrackLowChiSquare(TObjArray* tracklist, Int_
   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;
+        value=chi2[w];
+        chi2[w]=chi2[j];
+        chi2[j]=value;
+        lp=index[w];
+        index[w]=index[j];
+        index[j]=lp;
       }
     }
     w++;
   }
-
-  AliITStrackV2* trk = (AliITStrackV2*)tracklist->At(index[dim-1]);
+  Int_t tmp = index[dim-1];
   delete [] chi2;
   delete [] index;
-  return trk;
-  
+  return tmp;
 }
 
 //__________________________________________________________
@@ -947,7 +1405,7 @@ Int_t AliITStrackerSA::FindLabel(Int_t l1, Int_t l2, Int_t l3, Int_t l4, Int_t l
   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){
   
@@ -959,11 +1417,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];
@@ -974,10 +1432,11 @@ 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];
 }
 
 //_____________________________________________________________________________
@@ -1017,25 +1476,23 @@ void AliITStrackerSA::SetWindowSizes(Int_t n, Double_t *phi, Double_t *lam){
     }
   }
   else {  // default values
-    Double_t phid[46]   = {0.001,0.0015,0.002,0.0023,0.0025,0.0027,0.003,
-                       0.0033,0.0035,0.0037,0.004,0.0043,0.0045,0.0047,
-                        0.005,0.0053,0.0055,
-                       0.006,0.0063,0.0065,0.007,0.0073,0.0075,0.0077,
-                       0.008,0.0083,0.0085,0.0087,0.009,0.0095,0.0097,
-                       0.01,0.0105,0.011,0.0115,0.012,0.0125,0.013,0.0135,
-                       0.014,0.0145,0.015,0.0155,0.016,0.0165,0.017};
-    Double_t lambdad[46] = {0.001,0.0015,0.002,0.0023,0.0025,0.0027,0.003,
-                       0.0033,0.0035,0.0037,0.004,0.0043,0.0045,0.0047,
-                        0.005,0.0053,0.0055,
-                       0.006,0.0063,0.0065,0.007,0.0073,0.0075,0.0077,
-                       0.008,0.0083,0.0085,0.0087,0.009,0.0095,0.0097,
-                       0.01,0.015,0.011,0.0115,0.012,0.0125,0.013,0.0135,
-                       0.014,0.0145,0.015,0.0155,0.016,0.016,0.016};
-    if(fNloop!=46){
-      fNloop = 46;
-      Warning("SetWindowSizes","Number of loop forced to the default value %d",fNloop);
+            
+    Double_t phid[33]   = {0.002,0.003,0.004,0.0045,0.0047,
+                          0.005,0.0053,0.0055,
+                          0.006,0.0063,0.0065,0.007,0.0073,0.0075,0.0077,
+                          0.008,0.0083,0.0085,0.0087,0.009,0.0095,0.0097,
+                          0.01,0.0105,0.011,0.0115,0.012,0.0125,0.013,0.0135,0.0140,0.0145};
+    Double_t lambdad[33] = {0.003,0.004,0.005,0.005,0.005,
+                           0.005,0.005,0.006,
+                           0.006,0.006,0.006,0.007,0.007,0.007,0.007,
+                           0.007,0.007,0.007,0.007,0.007,0.007,0.007,
+                           0.008,0.008,0.008,0.008,0.008,0.008,0.008,0.008,0.008,0.008};
+    
+    if(fNloop!=33){
+      fNloop = 33;
     }
-   
+    
+    
     fPhiWin = new Double_t[fNloop];
     fLambdaWin = new Double_t[fNloop];
    
@@ -1047,30 +1504,59 @@ void AliITStrackerSA::SetWindowSizes(Int_t n, Double_t *phi, Double_t *lam){
   }
 
 }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+//_______________________________________________________________________
+void AliITStrackerSA::GetCoorAngles(AliITSRecPoint* cl,Double_t &phi,Double_t &lambda, Float_t &x, Float_t &y,Float_t &z,Double_t* vertex){
+  //Returns values of phi (azimuthal) and lambda angles for a given cluster
+/*  
+  Double_t rot[9];     fGeom->GetRotMatrix(module,rot);
+  Int_t lay,lad,det; fGeom->GetModuleId(module,lay,lad,det);
+  Float_t tx,ty,tz;  fGeom->GetTrans(lay,lad,det,tx,ty,tz);     
 
+  Double_t alpha=TMath::ATan2(rot[1],rot[0])+TMath::Pi();
+  Double_t phi1=TMath::Pi()/2+alpha;
+  if (lay==1) phi1+=TMath::Pi();
+
+  Float_t cp=TMath::Cos(phi1), sp=TMath::Sin(phi1);
+  Float_t r=tx*cp+ty*sp;
+
+  xyz= r*cp - cl->GetY()*sp;
+  y= r*sp + cl->GetY()*cp;
+  z=cl->GetZ();
+*/
+  Float_t xyz[3];
+  cl->GetGlobalXYZ(xyz);
+  x=xyz[0];
+  y=xyz[1];
+  z=xyz[2];
+  phi=TMath::ATan2(y-vertex[1],x-vertex[0]);
+  lambda=TMath::ATan2(z-vertex[2],TMath::Sqrt((x-vertex[0])*(x-vertex[0])+(y-vertex[1])*(y-vertex[1])));
+}
 
+//________________________________________________________________________
+void AliITStrackerSA::GetCoorErrors(AliITSRecPoint* cl,Float_t &sx,Float_t &sy, Float_t &sz){
 
+  //returns sigmax, y, z of cluster in global coordinates
+/*
+  Double_t rot[9];     fGeom->GetRotMatrix(module,rot);
+  Int_t lay,lad,det; 
+  AliITSgeomTGeo::GetModuleId(module,lay,lad,det);
+  Double_t alpha=TMath::ATan2(rot[1],rot[0])+TMath::Pi();
+  Double_t phi=TMath::Pi()/2+alpha;
+  if (lay==1) phi+=TMath::Pi();
 
+  Float_t cp=TMath::Cos(phi), sp=TMath::Sin(phi);
+*/
+  Float_t covm[6];
+  cl->GetGlobalCov(covm);
+  sx=TMath::Sqrt(covm[0]);
+  sy=TMath::Sqrt(covm[3]);
+  sz=TMath::Sqrt(covm[5]);
+/*
+  sx = TMath::Sqrt(sp*sp*cl->GetSigmaY2());
+  sy = TMath::Sqrt(cp*cp*cl->GetSigmaY2());
+  sz = TMath::Sqrt(cl->GetSigmaZ2());
+*/
+}