X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ITS%2FAliITStrackerSA.cxx;h=9bb4ff54537d9c31f72b41de2d717b6e88a6fef2;hb=f746346a0d1d5d4f083da43b9b9961e811032064;hp=837708d5819bc11a6fd76bcd72e830caac2a1b51;hpb=855b47303d34ec47e1266ce66d27a5ab344ed8d9;p=u%2Fmrichter%2FAliRoot.git

diff --git a/ITS/AliITStrackerSA.cxx b/ITS/AliITStrackerSA.cxx
index 837708d5819..9bb4ff54537 100644
--- a/ITS/AliITStrackerSA.cxx
+++ b/ITS/AliITStrackerSA.cxx
@@ -15,12 +15,11 @@
 
 /* $Id$ */
 
-////////////////////////////////////////////////////
-//  Stand alone tracker class                     //
-//  Origin:  Elisabetta Crescio                   //
-//  e-mail:  crescio@to.infn.it                   //
-//  tracks are saved as AliITStrackV2 objects     //
-////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////
+//  Stand alone ITS tracker class                        //
+//  Origin:  Elisabetta Crescio - crescio@to.infn.it     //
+//  Updated: Francesco Prino    - prino@to.infn.it       //
+///////////////////////////////////////////////////////////
 
 #include <stdlib.h>
 
@@ -173,7 +172,7 @@ fCluCoord(0)
   fVertexer = vertexer;
  
 }
-
+/*
 //____________________________________________________________________________
 AliITStrackerSA::AliITStrackerSA(const AliITStrackerSA& tracker):AliITStrackerMI(),
 fPhiEstimate(tracker.fPhiEstimate),
@@ -224,7 +223,7 @@ AliITStrackerSA& AliITStrackerSA::operator=(const AliITStrackerSA& source){
   return *this;
  
 }
-
+*/
 //____________________________________________________________________________
 AliITStrackerSA::~AliITStrackerSA(){
   // destructor
@@ -271,13 +270,23 @@ Int_t AliITStrackerSA::Clusters2Tracks(AliESDEvent *event){
 // 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);
+  if(!rc){ 
+    rc=FindTracks(event,kFALSE);
+    Int_t nSPDcontr=0;
+    const AliESDVertex *spdv = event->GetPrimaryVertexSPD();
+    if(spdv) nSPDcontr = spdv->GetNContributors();
+    if(AliITSReconstructor::GetRecoParam()->GetSAUseAllClusters()==kTRUE && 
+       nSPDcontr<=AliITSReconstructor::GetRecoParam()->GetMaxSPDcontrForSAToUseAllClusters()) {
+      rc=FindTracks(event,kTRUE);
+    }
+  }
   return rc;
 }
 
@@ -309,8 +318,8 @@ void AliITStrackerSA::Init(){
     fITSclusters = 0;
     SetOuterStartLayer(1);
     SetSAFlag(kFALSE);
-    fListOfTracks=new TObjArray(0,0);
-    fListOfSATracks=new TObjArray(0,0);
+    fListOfTracks=new TClonesArray("AliITStrackMI",100);
+    fListOfSATracks=new TClonesArray("AliITStrackSA",100);
     fCluLayer = 0;
     fCluCoord = 0;
     fMinNPoints = 3;
@@ -327,14 +336,14 @@ void AliITStrackerSA::ResetForFinding(){
     fCoef3=0;
     fPointc[0]=0;
     fPointc[1]=0;
-    fListOfTracks->Delete();
-    fListOfSATracks->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
 
@@ -347,7 +356,7 @@ Int_t AliITStrackerSA::FindTracks(AliESDEvent* event){
   }
   //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){
@@ -359,6 +368,18 @@ 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];
@@ -427,134 +448,95 @@ Int_t AliITStrackerSA::FindTracks(AliESDEvent* event){
   Int_t ntrack=0;
 
   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;
+  }
 
   // loop on minimum number of points
   for(Int_t iMinNPoints=AliITSgeomTGeo::GetNLayers(); iMinNPoints>=fMinNPoints; iMinNPoints--) {
 
-    if(!fInwardFlag){ // Tracking outwards from the inner layers
-      // loop on starting layer for track finding 
-      for(Int_t innLay=0; innLay<=fOuterStartLayer; innLay++) {
-	if(ForceSkippingOfLayer(innLay)) continue; 
-	Int_t minNPoints=iMinNPoints-innLay;
-	for(Int_t i=innLay+1;i<AliITSgeomTGeo::GetNLayers();i++)
-	  if(ForceSkippingOfLayer(i)) 
-	    minNPoints--;
-	if(minNPoints<fMinNPoints) continue;
-
-	// loop on phi and lambda window size
-	for(Int_t nloop=0;nloop<fNloop;nloop++){
-	  Int_t nclInnLay=fCluLayer[innLay]->GetEntries();
-	  while(nclInnLay--){ 
-	    ResetForFinding();
-	    Bool_t useRP=SetFirstPoint(innLay,nclInnLay,primaryVertex);
-	    if(!useRP) continue;	    
-	    AliITStrackSA* trs = new AliITStrackSA(); 
+    // 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--;
+      if(minNPoints<fMinNPoints) continue;
+
+      // loop on phi and lambda window size
+      for(Int_t nloop=0;nloop<fNloop;nloop++){
+	Int_t nclTheLay=fCluLayer[theLay]->GetEntries();
+	while(nclTheLay--){ 
+	  ResetForFinding();
+	  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();kk++) nClusLay[kk] = 0;
+	  Int_t pflag=0;	    
+	  Int_t kk;
+	  for(kk=0;kk<AliITSgeomTGeo::GetNLayers();kk++) nClusLay[kk] = 0;
 	    
-	    kk=0;
-	    nClusLay[kk] = SearchClusters(innLay,fPhiWin[nloop],fLambdaWin[nloop],
-					  trs,primaryVertex[2],pflag);
-	    for(Int_t nextLay=innLay+1; nextLay<AliITSgeomTGeo::GetNLayers(); nextLay++) {
-	      kk++;
-	      nClusLay[kk] = SearchClusters(nextLay,fPhiWin[nloop],fLambdaWin[nloop],
-					    trs,primaryVertex[2],pflag);
-	      if(nClusLay[kk]!=0){
-		pflag=1;
-		if(kk==1) {
-		  fPoint3[0]=fPointc[0];
-		  fPoint3[1]=fPointc[1];
-		} else {
-		  UpdatePoints();
-		}
+	  kk=0;
+	  nClusLay[kk] = SearchClusters(theLay,fPhiWin[nloop],fLambdaWin[nloop],
+					&trs,primaryVertex[2],pflag);
+	  Int_t nextLay=theLay+seedStep;
+	  Bool_t goon=kTRUE;
+	  if(nextLay<0 || nextLay == 6) goon = kFALSE;
+	  while(goon){
+	    kk++;
+	    nClusLay[kk] = SearchClusters(nextLay,fPhiWin[nloop],fLambdaWin[nloop],
+					    &trs,primaryVertex[2],pflag);
+	    if(nClusLay[kk]!=0){
+	      pflag=1;
+	      if(kk==1) {
+		fPoint3[0]=fPointc[0];
+		fPoint3[1]=fPointc[1];
+	      } else {
+		UpdatePoints();
 	      }
 	    }
+	    nextLay+=seedStep;
+	    if(nextLay<0 || nextLay==6) goon=kFALSE;
+	  }
+
 	    
-	    Int_t layOK=0;
-	    for(Int_t nnp=0;nnp<AliITSgeomTGeo::GetNLayers()-innLay;nnp++){
+	  Int_t layOK=0;
+	  if(!fInwardFlag){
+	    for(Int_t nnp=0;nnp<AliITSgeomTGeo::GetNLayers()-theLay;nnp++){
 	      if(nClusLay[nnp]!=0) layOK+=1;
 	    }
-	    if(layOK>=minNPoints){ 
-	      AliDebug(2,Form("---NPOINTS: %d; MAP: %d %d %d %d %d %d\n",layOK,nClusLay[0],nClusLay[1],nClusLay[2],nClusLay[3],nClusLay[4],nClusLay[5]));
-	      AliITStrackV2* tr2 = 0;
-	      tr2 = FitTrack(trs,primaryVertex);
-	      if(!tr2) continue;
-	      AliDebug(2,Form("---NPOINTS fit: %d\n",tr2->GetNumberOfClusters()));
-	      
-	      StoreTrack(tr2,event);
-	      ntrack++;
-	      
-	    }   
-	    
-	    delete trs;
-	  }//end loop on clusters of innLay
-	} //end loop on window sizes
-      } //end loop on innLay
-    }else{// Tracking inwards from the outer layers
-    // loop on starting layer for track finding 
-      for(Int_t outLay=AliITSgeomTGeo::GetNLayers()-1; outLay>=fInnerStartLayer; outLay--) {
-
-	if(ForceSkippingOfLayer(outLay)) continue;
-	Int_t minNPoints=iMinNPoints-(AliITSgeomTGeo::GetNLayers()-1-outLay);
-	for(Int_t i=0;i<outLay-1;i++)
-	  if(ForceSkippingOfLayer(i)) 
-	    minNPoints--;
-	if(minNPoints<fMinNPoints) continue;
-	
-	// loop on phi and lambda window size
-	for(Int_t nloop=0;nloop<fNloop;nloop++){
-	  Int_t nclOutLay=fCluLayer[outLay]->GetEntries();
-	  while(nclOutLay--){ 
-	    ResetForFinding();
-	    Bool_t useRP=SetFirstPoint(outLay,nclOutLay,primaryVertex);
-	    if(!useRP) continue;	    
-	    AliITStrackSA* trs = new AliITStrackSA(); 
-	    
-	    Int_t pflag=0;	    
-	    Int_t kk;
-	    for(kk=0;kk<AliITSgeomTGeo::GetNLayers();kk++) nClusLay[kk] = 0;
-	    
-	    kk=0;
-	    nClusLay[kk] = SearchClusters(outLay,fPhiWin[nloop],fLambdaWin[nloop],
-				  trs,primaryVertex[2],pflag);
-	    for(Int_t nextLay=outLay-1; nextLay>=0; nextLay--) {
-	      kk++;
-	      nClusLay[kk] = SearchClusters(nextLay,fPhiWin[nloop],fLambdaWin[nloop],
-					    trs,primaryVertex[2],pflag);
-	      if(nClusLay[kk]!=0){
-		pflag=1;
-		if(kk==1) {
-		  fPoint3[0]=fPointc[0];
-		  fPoint3[1]=fPointc[1];
-		} else {
-		  UpdatePoints();
-		}
-	      }
-	    }
-	  
-	    Int_t layOK=0;
-	    for(Int_t nnp=outLay; nnp>=0; nnp--){
+	  }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;
-	      AliDebug(2,Form("---NPOINTS fit: %d\n",tr2->GetNumberOfClusters()));
+	  }
+	  if(layOK>=minNPoints){ 
+	    AliDebug(2,Form("---NPOINTS: %d; MAP: %d %d %d %d %d %d\n",layOK,nClusLay[0],nClusLay[1],nClusLay[2],nClusLay[3],nClusLay[4],nClusLay[5]));
+	    AliITStrackV2* tr2 = 0;
+	    tr2 = FitTrack(&trs,primaryVertex);
+	    if(!tr2){ 
+	      continue;
+	    }
+	    AliDebug(2,Form("---NPOINTS fit: %d\n",tr2->GetNumberOfClusters()));
 	      
-	      StoreTrack(tr2,event);
-	      ntrack++;
+	    StoreTrack(tr2,event,useAllClusters);
+	    ntrack++;
 	      
-	    }   
-	    
-	    delete trs;
-	}//end loop on clusters of innLay
-	} //end loop on window sizes
-      } //end loop on innLay
-    } // end if (fInwardFlag)
+	  }   
+	  
+	}//end loop on clusters of theLay
+      } //end loop on window sizes
+    } //end loop on theLay
   }//end loop on min points
 
   // search for 1-point tracks in SPD, only for cosmics
@@ -571,7 +553,7 @@ Int_t AliITStrackerSA::FindTracks(AliESDEvent* event){
 	  ResetForFinding();
 	  Bool_t useRP=SetFirstPoint(innLay,nclInnLay,primaryVertex);
 	  if(!useRP) continue;
-	  AliITStrackSA* trs = new AliITStrackSA(); 
+	  AliITStrackSA trs;
 	    
 	  Int_t pflag=0;	    
 	  Int_t kk;
@@ -579,11 +561,11 @@ Int_t AliITStrackerSA::FindTracks(AliESDEvent* event){
 	  
 	  kk=0;
 	  nClusLay[kk] = SearchClusters(innLay,fPhiWin[nloop],fLambdaWin[nloop],
-				  trs,primaryVertex[2],pflag);
+				  &trs,primaryVertex[2],pflag);
 	  for(Int_t nextLay=innLay+1; nextLay<=outerLayer; nextLay++) {
 	    kk++;
 	    nClusLay[kk] = SearchClusters(nextLay,fPhiWin[nloop],fLambdaWin[nloop],
-				    trs,primaryVertex[2],pflag);
+				    &trs,primaryVertex[2],pflag);
 	    if(nClusLay[kk]!=0){
 	      pflag=1;
 	      if(kk==1) {
@@ -603,23 +585,24 @@ Int_t AliITStrackerSA::FindTracks(AliESDEvent* event){
 	    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()));
 	    
-	    StoreTrack(tr2,event);
+	    StoreTrack(tr2,event,useAllClusters);
 	    ntrack++;
 	    
 	  }   
 	  
-	  delete trs;
 	}//end loop on clusters of innLay
       } //end loop on window sizes
       
     } //end loop on innLay
   } // end search 1-point tracks
   
-  AliInfo(Form("Number of found tracks: %d",event->GetNumberOfTracks()));
+  if(!useAllClusters) AliInfo(Form("Number of found tracks: %d",event->GetNumberOfTracks()));
   ResetForFinding();
   return 0;
 
@@ -634,11 +617,12 @@ AliITStrackV2* AliITStrackerSA::FitTrack(AliITStrackSA* tr,Double_t *primaryVert
   
   const Int_t kMaxClu=AliITStrackSA::kMaxNumberOfClusters;
 
-  static Int_t firstmod[AliITSgeomTGeo::kNLayers];
-  
+  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 Int_t indices[AliITSgeomTGeo::kNLayers];
+
   static AliITSRecPoint *listlayer[AliITSgeomTGeo::kNLayers][kMaxClu];
 
   for(Int_t i=0;i<AliITSgeomTGeo::GetNLayers();i++) {
@@ -656,7 +640,6 @@ AliITStrackV2* AliITStrackerSA::FitTrack(AliITStrackSA* tr,Double_t *primaryVert
   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;
     Int_t nInLay=end[lay];
     listlayer[lay][nInLay]=cl;
@@ -686,103 +669,51 @@ AliITStrackV2* AliITStrackerSA::FitTrack(AliITStrackSA* tr,Double_t *primaryVert
   }
 
   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][l0];
+    indices[0]=l0;
     for(Int_t l1=0;l1<end[1];l1++){ //loop on layer 2
-      AliITSRecPoint* cl1 = (AliITSRecPoint*)listlayer[1][l1];
+      indices[1]=l1;
       for(Int_t l2=0;l2<end[2];l2++){  //loop on layer 3
-        AliITSRecPoint* cl2 = (AliITSRecPoint*)listlayer[2][l2];
+	indices[2]=l2;
         for(Int_t l3=0;l3<end[3];l3++){ //loop on layer 4   
-          AliITSRecPoint* cl3 = (AliITSRecPoint*)listlayer[3][l3];
+	  indices[3]=l3;
           for(Int_t l4=0;l4<end[4];l4++){ //loop on layer 5
-            AliITSRecPoint* cl4 = (AliITSRecPoint*)listlayer[4][l4];
+	    indices[4]=l4;
             for(Int_t l5=0;l5<end[5];l5++){ //loop on layer 6  
-              AliITSRecPoint* cl5 = (AliITSRecPoint*)listlayer[5][l5];
-
-
-	      Double_t x1,y1,z1,sx1,sy1,sz1;
-	      Double_t x2,y2,z2,sx2,sy2,sz2;
-	      AliITSRecPoint* p1=0;
-	      AliITSRecPoint* p2=0;
-	      Int_t index1=0,index2=0;
-	      Int_t mrk1=0,mrk2=0;
-
-	      switch(firstLay) {
-	      case 0:
-		p1=cl0;
-		index1=clind[0][l0];mrk1=clmark[0][l0];
-		break;
-	      case 1:
-		p1=cl1;
-		index1=clind[1][l1];mrk1=clmark[1][l1];
-		break;
-	      case 2:
-		p1=cl2;
-		index1=clind[2][l2];mrk1=clmark[2][l2];
-		break;
-	      case 3:
-		p1=cl3;
-		index1=clind[3][l3];mrk1=clmark[3][l3];
-		break;
-	      case 4:
-		p1=cl4;
-		index1=clind[4][l4];mrk1=clmark[4][l4];
-		break;
-	      }
+	      indices[5]=l5;
 
-	      switch(secondLay) {
-	      case 1:
-		p2=cl1;
-		index2=clind[1][l1];mrk2=clmark[1][l1];
-		break;
-	      case 2:
-		p2=cl2;
-		index2=clind[2][l2];mrk2=clmark[2][l2];
-		break;
-	      case 3:
-		p2=cl3;
-		index2=clind[3][l3];mrk2=clmark[3][l3];
-		break;
-	      case 4:
-		p2=cl4;
-		index2=clind[4][l4];mrk2=clmark[4][l4];
-		break;
-	      case 5:
-		p2=cl5;
-		index2=clind[5][l5];mrk2=clmark[5][l5];
-		break;
-	      default:
-		p2=0;
-		index2=-1;mrk2=-1;
-		break;
-	      }
+	      // estimate curvature from 2 innermost points (or innermost point + vertex)
 
+	      Int_t iFirstLay=indices[firstLay];
+	      Int_t mrk1=clmark[firstLay][iFirstLay];
+
+	      AliITSRecPoint* p1=(AliITSRecPoint*)listlayer[firstLay][iFirstLay];
 	      Int_t module1 = p1->GetDetectorIndex()+firstmod[firstLay]; 
 	      Int_t layer,ladder,detector;
 	      AliITSgeomTGeo::GetModuleId(module1,layer,ladder,detector);
 	      Float_t yclu1 = p1->GetY();
 	      Float_t zclu1 = p1->GetZ();
+
+	      Double_t x1,y1,z1;
+	      Double_t x2,y2,z2;
 	      Double_t cv=0,tgl2=0,phi2=0;
-	      
-	      Int_t cln1=mrk1;
-	      AliITSclusterTable* arr1 = (AliITSclusterTable*)GetClusterCoord(firstLay,cln1);
+	      AliITSclusterTable* arr1 = (AliITSclusterTable*)GetClusterCoord(firstLay,mrk1);
 	      x1 = arr1->GetX();
 	      y1 = arr1->GetY();
 	      z1 = arr1->GetZ();
-	      sx1 = arr1->GetSx();
-	      sy1 = arr1->GetSy();
-	      sz1 = arr1->GetSz();
 
 	      if(secondLay>0) {
-		Int_t cln2=mrk2;
-		AliITSclusterTable* arr2 = (AliITSclusterTable*)GetClusterCoord(secondLay,cln2);
+		Int_t iSecondLay=indices[secondLay];	      
+		Int_t mrk2=clmark[secondLay][iSecondLay];
+		AliITSclusterTable* arr2 = (AliITSclusterTable*)GetClusterCoord(secondLay,mrk2);
 		x2 = arr2->GetX();
 		y2 = arr2->GetY();
 		z2 = arr2->GetZ();
-		sx2 = arr2->GetSx();
-		sy2 = arr2->GetSy();
-		sz2 = arr2->GetSz();
 		cv = Curvature(primaryVertex[0],primaryVertex[1],x1,y1,x2,y2);
 		tgl2 = (z2-z1)/TMath::Sqrt((x2-x1)*(x2-x1)+(y2-y1)*(y2-y1));
 		phi2 = TMath::ATan2((y2-y1),(x2-x1));
@@ -795,60 +726,39 @@ AliITStrackV2* AliITStrackerSA::FitTrack(AliITStrackSA* tr,Double_t *primaryVert
 		phi2 = TMath::ATan2((y1-y2),(x1-x2));
 	      }
 
-
-              AliITStrackSA* trac = new AliITStrackSA(layer,ladder,detector,yclu1,zclu1,phi2,tgl2,cv,1);
-
-
-              if(cl5!=0) {
-		trac->AddClusterV2(5,(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]);
-	      }
-              if(cl3!=0){
-		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]);
-	      }
-              if(cl1!=0){
-		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]);
+	      // create track and attach it the RecPoints
+              AliITStrackSA trac(layer,ladder,detector,yclu1,zclu1,phi2,tgl2,cv,1);
+	      for(Int_t iLay=5; iLay>=0; iLay--){
+		Int_t iInLay=indices[iLay];
+		AliITSRecPoint* cl=(AliITSRecPoint*)listlayer[iLay][iInLay];
+		if(cl!=0){
+		  trac.AddClusterV2(iLay,(clind[iLay][iInLay] & 0x0fffffff)>>0);
+		  trac.AddClusterMark(iLay,clmark[iLay][iInLay]);
+		}
 	      }
 
               //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();
               
 	      // Propagate inside the innermost layer with a cluster 
-	      if(ot->Propagate(ot->GetX()-0.1*ot->GetX())) {
+	      if(ot.Propagate(ot.GetX()-0.1*ot.GetX())) {
 
-		if(RefitAt(AliITSRecoParam::GetrInsideITSscreen(),ot,trac)){ //fit from layer 1 to layer 6
-		  AliITStrackMI *otrack2 = new AliITStrackMI(*ot);
-		  otrack2->ResetCovariance(10.); 
-		  otrack2->ResetClusters();
+		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)) {
-		    fListOfTracks->AddLast(otrack2);
-		    fListOfSATracks->AddLast(trac);
-		  } else {
-		    delete otrack2;
-		    delete trac;
+		  if(RefitAt(AliITSRecoParam::GetrInsideSPD1(),&otrack2,&ot)) {
+		    new(arrMI[nFoundTracks]) AliITStrackMI(otrack2);
+		    new(arrSA[nFoundTracks]) AliITStrackSA(trac);
+		    ++nFoundTracks;
 		  }
                               
 		}       
 	      }
-              delete ot;
             }//end loop layer 6
           }//end loop layer 5
         }//end loop layer 4        
@@ -867,34 +777,12 @@ AliITStrackV2* AliITStrackerSA::FitTrack(AliITStrackSA* tr,Double_t *primaryVert
  
   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);
-  }      
-  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;
-    }
-  }
-
   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<otrack->GetNumberOfClusters();i++)
-    if(labl[i][0]==label || labl[i][1]==label || labl[i][2]==label) lflag++;
-  
-  if(lflag<otrack->GetNumberOfClusters()) label = -label;
+  Int_t label=FindLabel(otrack);
   otrack->SetLabel(label);  
+  Double_t low=0.;
+  Double_t up=0.51;    
+  otrack->CookdEdx(low,up);
 
   //remove clusters of found track
   for(Int_t nlay=0;nlay<AliITSgeomTGeo::GetNLayers();nlay++){
@@ -911,13 +799,14 @@ AliITStrackV2* AliITStrackerSA::FitTrack(AliITStrackSA* tr,Double_t *primaryVert
 }
 
 //_______________________________________________________
-void AliITStrackerSA::StoreTrack(AliITStrackV2 *t,AliESDEvent *event) const 
+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));
   }
@@ -950,33 +839,37 @@ Int_t AliITStrackerSA::SearchClusters(Int_t layer,Double_t phiwindow,Double_t la
   }
 
  
-  Int_t ncl = fCluLayer[layer]->GetEntries();
+  Double_t phiExpect=fPhiEstimate;
+  Double_t lamExpect=fLambdac;
+
+  Int_t ncl = fCluLayer[layer]->GetEntriesFast();
   for (Int_t index=0; index<ncl; index++) {
-    AliITSRecPoint *c = (AliITSRecPoint*)fCluLayer[layer]->At(index);
+    AliITSRecPoint *c = (AliITSRecPoint*)fCluLayer[layer]->UncheckedAt(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();
-     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();
+    AliITSclusterTable* arr = (AliITSclusterTable*)GetClusterCoord(layer,index);
+
+    Double_t lambda = arr->GetLambda();
+    if (TMath::Abs(lambda-lamExpect)>lambdawindow) continue;
 
+    Double_t phi = arr->GetPhi();
+    Double_t deltaPhi = phi-phiExpect;
+    if(deltaPhi>TMath::Pi()) deltaPhi-=2*TMath::Pi();
+    else if(deltaPhi<-TMath::Pi()) deltaPhi+=2*TMath::Pi();
+    if (TMath::Abs(deltaPhi)>phiwindow) 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;
 }
@@ -985,7 +878,7 @@ Int_t AliITStrackerSA::SearchClusters(Int_t layer,Double_t phiwindow,Double_t la
 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);
+  AliITSRecPoint* cl = (AliITSRecPoint*)fCluLayer[lay]->UncheckedAt(clu);
   if(!cl) return kFALSE;
   if (cl->GetQ()<=0) return kFALSE;
   if(lay>1 && cl->GetQ()<=fMinQ) return kFALSE;
@@ -1108,71 +1001,60 @@ Int_t AliITStrackerSA::FindTrackLowChiSquare() const {
 }
 
 //__________________________________________________________
-Int_t AliITStrackerSA::FindLabel(Int_t l0, Int_t l1, Int_t l2, Int_t l3, Int_t l4, Int_t l5){
-
-  //function used to determine the track label
-  
-  Int_t lb[6] = {l0,l1,l2,l3,l4,l5};
-  Int_t aa[6]={1,1,1,1,1,1};
-  Int_t ff=0; 
-  Int_t ll=0;
-  Int_t k=0;Int_t w=0;Int_t num=6;
-  for(Int_t i=5;i>=0;i--) if(lb[i]==-1) num=i;
-  
-  while(k<num){
+Int_t AliITStrackerSA::FindLabel(AliITStrackV2* track){
+  //
   
-    for(Int_t i=k+1;i<num;i++){
-    
-      if(lb[k]==lb[i] && aa[k]!=0){
-      
-        aa[k]+=1;
-        aa[i]=0;
-      }
+  Int_t labl[AliITSgeomTGeo::kNLayers][3];
+  Int_t cnts[AliITSgeomTGeo::kNLayers][3];
+  for(Int_t j=0;j<AliITSgeomTGeo::GetNLayers();j++){
+    for(Int_t k=0;k<3;k++){
+      labl[j][k]=-2;
+      cnts[j][k]=1;
     }
-    k++;
   }
-
-  while(w<num){
- 
-    for(Int_t j=0;j<6;j++){
-      if(aa[w]<aa[j]){
-      ff=aa[w];
-      aa[w]=aa[j];
-      aa[j]=ff;
-      ll=lb[w];
-      lb[w]=lb[j];
-      lb[j]=ll;
-     }
+  Int_t iNotLabel=0;
+  for(Int_t i=0;i<track->GetNumberOfClusters(); i++) {
+    Int_t indexc = track->GetClusterIndex(i);
+    AliITSRecPoint* cl = (AliITSRecPoint*)GetCluster(indexc);
+    Int_t iLayer=cl->GetLayer();
+    for(Int_t k=0;k<3;k++){
+      labl[iLayer][k]=cl->GetLabel(k);
+      if(labl[iLayer][k]<0) iNotLabel++;
+    }
+  }
+  if(iNotLabel==3*track->GetNumberOfClusters()) return -2;
+
+  for(Int_t j1=0;j1<AliITSgeomTGeo::kNLayers; j1++) {
+    for(Int_t j2=0; j2<j1;  j2++){
+      for(Int_t k1=0; k1<3; k1++){
+	for(Int_t k2=0; k2<3; k2++){
+	  if(labl[j1][k1]>=0 && labl[j1][k1]==labl[j2][k2] && cnts[j2][k2]>0){
+	    cnts[j2][k2]++;
+	    cnts[j1][k1]=0;
+	  }
+	}
+      }
     }
-    w++;
   }
-  
-  if(num<1) return -1; 
-  return lb[num-1];
-}
-
-//_____________________________________________________________________________
-Int_t AliITStrackerSA::Label(Int_t gl1, Int_t gl2, Int_t gl3, Int_t gl4, Int_t gl5, Int_t gl6,Int_t gl7, Int_t gl8, Int_t gl9, Int_t gl10,Int_t gl11,
-Int_t gl12, Int_t gl13, Int_t gl14,Int_t gl15, Int_t gl16, Int_t gl17, Int_t gl18, Int_t minNPoints){
-
- 
-  //function used to assign label to the found track. If track is fake, the label is negative
 
-  Int_t lb0[6] = {gl1,gl2,gl3,gl4,gl5,gl6};
-  Int_t lb1[6] = {gl7,gl8,gl9,gl10,gl11,gl12};
-  Int_t lb2[6] = {gl13,gl14,gl15,gl16,gl17,gl18};
-  Int_t ll=FindLabel(lb0[0],lb0[1],lb0[2],lb0[3],lb0[4],lb0[5]);
-  Int_t lflag=0;Int_t num=6;
-  if(lb0[5]==-1 && lb1[5]==-1 && lb2[5]==-1) num=5;
 
-  for(Int_t i=0;i<num;i++){
-    if(lb0[i]==ll || lb1[i]==ll || lb2[i]==ll) lflag+=1;
+  Int_t cntMax=0;
+  Int_t label=-1;
+  for(Int_t j=0;j<AliITSgeomTGeo::kNLayers;j++){
+    for(Int_t k=0;k<3;k++){
+      if(cnts[j][k]>cntMax && labl[j][k]>=0){
+	cntMax=cnts[j][k];
+	label=labl[j][k];
+      }
+    }
   }
 
-  if(lflag>=minNPoints) return ll;
-  else return -ll;
-
+  Int_t lflag=0;
+  for(Int_t i=0;i<AliITSgeomTGeo::kNLayers;i++)
+    if(labl[i][0]==label || labl[i][1]==label || labl[i][2]==label) lflag++;
   
+  if(lflag<track->GetNumberOfClusters()) label = -label;
+  return label;
 }
 //_____________________________________________________________________________
 void AliITStrackerSA::SetCalculatedWindowSizes(Int_t n, Float_t phimin, Float_t phimax, Float_t lambdamin, Float_t lambdamax){
@@ -1289,3 +1171,4 @@ void AliITStrackerSA::GetCoorErrors(AliITSRecPoint* cl,Float_t &sx,Float_t &sy,
   sz = TMath::Sqrt(cl->GetSigmaZ2());
 */
 }
+