]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - TPC/AliTPCtrackerMI.cxx
Removing error message in SetFastCluster (Marian)
[u/mrichter/AliRoot.git] / TPC / AliTPCtrackerMI.cxx
index 4260113d079b903f425ce62ac3cb9427c4172b0e..2434d24f34e788c035dc5f42bc2721bcd2d6765c 100644 (file)
 //   Origin: Marian Ivanov   Marian.Ivanov@cern.ch
 // 
 //  AliTPC parallel tracker
+//
+//  The track fitting is based on Kalaman filtering approach
+
+//  The track finding steps:
+//      1. Seeding - with and without vertex constraint
+//                 - seeding with vertex constain done at first n^2 proble
+//                 - seeding without vertex constraint n^3 problem
+//      2. Tracking - follow prolongation road - find cluster - update kalman track
+
+//  The seeding and tracking is repeated several times, in different seeding region.
+//  This approach enables to find the track which cannot be seeded in some region of TPC
+//  This can happen because of low momenta (track do not reach outer radius), or track is currently in the ded region between sectors, or the track is for the moment overlapped with other track (seed quality is poor) ...
+
+//  With this approach we reach almost 100 % efficiency also for high occupancy events.
+//  (If the seeding efficiency in a region is about 90 % than with logical or of several 
+//  regions we will reach 100% (in theory - supposing independence) 
+
+//  Repeating several seeding - tracking procedures some of the tracks can be find 
+//  several times. 
+
+//  The procedures to remove multi find tacks are impremented:
+//  RemoveUsed2 - fast procedure n problem - 
+//                 Algorithm - Sorting tracks according quality
+//                             remove tracks with some shared fraction 
+//                             Sharing in respect to all tacks 
+//                             Signing clusters in gold region
+//  FindSplitted - slower algorithm n^2
+//                 Sort the tracks according quality
+//                 Loop over pair of tracks
+//                 If overlap with other track bigger than threshold - remove track
+//  
+//  FindCurling  - Finds the pair of tracks which are curling
+//               - About 10% of tracks can be find with this procedure
+//                 The combinatorial background is too big to be used in High 
+//                  multiplicity environment 
+//               - n^2 problem - Slow procedure - currently it is disabled because of 
+//                  low efficiency
+//                 
+//  The number of splitted tracks can be reduced disabling the sharing of the cluster.
+//  tpcRecoParam-> SetClusterSharing(kFALSE);
+//  IT IS HIGHLY non recomended to use it in high flux enviroonment
+//  Even using this switch some tracks can be found more than once 
+//  (because of multiple seeding and low quality tracks which will not cross full chamber)
+//                          
+//
+// The tracker itself can be debugged  - the information about tracks can be stored in several // phases of the reconstruction
+// To enable storage of the TPC tracks in the ESD friend track
+// use AliTPCReconstructor::SetStreamLevel(n); where nis bigger 0
+//
+// The debug level -  different procedure produce tree for numerical debugging
+//                    To enable them set AliTPCReconstructor::SetStreamLevel(n); where nis bigger 1
+//
+
 //-------------------------------------------------------
 
 
 #include <TFile.h>
 #include <TObjArray.h>
 #include <TTree.h>
-
+#include "AliLog.h"
 #include "AliComplexCluster.h"
-#include "AliESD.h"
-#include "AliESDkink.h"
+#include "AliESDEvent.h"
+#include "AliESDtrack.h"
+#include "AliESDVertex.h"
+#include "AliKink.h"
+#include "AliV0.h"
 #include "AliHelix.h"
 #include "AliRunLoader.h"
 #include "AliTPCClustersRow.h"
 #include "AliTPCParam.h"
 #include "AliTPCReconstructor.h"
-#include "AliTPCclusterMI.h"
 #include "AliTPCpolyTrack.h"
 #include "AliTPCreco.h"
 #include "AliTPCseed.h" 
 #include "AliTPCtrackerMI.h"
 #include "TStopwatch.h"
 #include "AliTPCReconstructor.h"
-#include "AliESDkink.h"
 #include "AliPID.h"
 #include "TTreeStream.h"
 #include "AliAlignObj.h"
 #include "AliTrackPointArray.h"
+#include "TRandom.h"
+#include "AliTPCcalibDB.h"
+#include "AliTPCTransform.h"
 
 //
 
@@ -88,7 +145,33 @@ Double_t AliTPCFastMath::FastAsin(Double_t x){
   Int_t index = int(x*10000);
   return -(fgFastAsin[2*index]+(x*10000.-index)*fgFastAsin[2*index+1]);
 }
-
+//__________________________________________________________________
+AliTPCtrackerMI::AliTPCtrackerMI()
+                :AliTracker(),
+                fkNIS(0),
+                fInnerSec(0),
+                fkNOS(0),
+                fOuterSec(0),
+                fN(0),
+                fSectors(0),
+                fInput(0),
+                fOutput(0),
+                fSeedTree(0),
+                fTreeDebug(0),
+                fEvent(0),
+                fDebug(0),
+                fNewIO(kFALSE),
+                fNtracks(0),
+                fSeeds(0),
+                fIteration(0),
+                fParam(0),
+                fDebugStreamer(0)
+{
+  //
+  // default constructor
+  //
+}
+//_____________________________________________________________________
 
 
 
@@ -97,63 +180,63 @@ Int_t AliTPCtrackerMI::UpdateTrack(AliTPCseed * track, Int_t accept){
   //update track information using current cluster - track->fCurrentCluster
 
 
-  AliTPCclusterMI* c =track->fCurrentCluster;
-  if (accept>0) track->fCurrentClusterIndex1 |=0x8000;  //sign not accepted clusters
+  AliTPCclusterMI* c =track->GetCurrentCluster();
+  if (accept>0) track->SetCurrentClusterIndex1(track->GetCurrentClusterIndex1() | 0x8000);  //sign not accepted clusters
 
-  UInt_t i = track->fCurrentClusterIndex1;
+  UInt_t i = track->GetCurrentClusterIndex1();
 
   Int_t sec=(i&0xff000000)>>24; 
   //Int_t row = (i&0x00ff0000)>>16; 
-  track->fRow=(i&0x00ff0000)>>16;
-  track->fSector = sec;
+  track->SetRow((i&0x00ff0000)>>16);
+  track->SetSector(sec);
   //  Int_t index = i&0xFFFF;
-  if (sec>=fParam->GetNInnerSector()) track->fRow += fParam->GetNRowLow(); 
-  track->SetClusterIndex2(track->fRow, i);  
+  if (sec>=fParam->GetNInnerSector()) track->SetRow(track->GetRow()+fParam->GetNRowLow()); 
+  track->SetClusterIndex2(track->GetRow(), i);  
   //track->fFirstPoint = row;
   //if ( track->fLastPoint<row) track->fLastPoint =row;
   //  if (track->fRow<0 || track->fRow>160) {
   //  printf("problem\n");
   //}
-  if (track->fFirstPoint>track->fRow
-    track->fFirstPoint = track->fRow;
-  if (track->fLastPoint<track->fRow
-    track->fLastPoint  = track->fRow;
+  if (track->GetFirstPoint()>track->GetRow()
+    track->SetFirstPoint(track->GetRow());
+  if (track->GetLastPoint()<track->GetRow()
+    track->SetLastPoint(track->GetRow());
   
 
-  track->fClusterPointer[track->fRow] = c;  
+  track->SetClusterPointer(track->GetRow(),c);  
   //
 
   Double_t angle2 = track->GetSnp()*track->GetSnp();
-  angle2 = TMath::Sqrt(angle2/(1-angle2)); 
   //
   //SET NEW Track Point
   //
-  //  if (debug)
+  if (angle2<1) //PH sometimes angle2 is very big. To be investigated...
   {
-    AliTPCTrackerPoint   &point =*(track->GetTrackPoint(track->fRow));
+    angle2 = TMath::Sqrt(angle2/(1-angle2)); 
+    AliTPCTrackerPoint   &point =*(track->GetTrackPoint(track->GetRow()));
     //
-    point.SetSigmaY(c->GetSigmaY2()/track->fCurrentSigmaY2);
-    point.SetSigmaZ(c->GetSigmaZ2()/track->fCurrentSigmaZ2);
-    point.SetErrY(sqrt(track->fErrorY2));
-    point.SetErrZ(sqrt(track->fErrorZ2));
+    point.SetSigmaY(c->GetSigmaY2()/track->GetCurrentSigmaY2());
+    point.SetSigmaZ(c->GetSigmaZ2()/track->GetCurrentSigmaZ2());
+    point.SetErrY(sqrt(track->GetErrorY2()));
+    point.SetErrZ(sqrt(track->GetErrorZ2()));
     //
     point.SetX(track->GetX());
     point.SetY(track->GetY());
     point.SetZ(track->GetZ());
     point.SetAngleY(angle2);
     point.SetAngleZ(track->GetTgl());
-    if (point.fIsShared){
-      track->fErrorY2 *= 4;
-      track->fErrorZ2 *= 4;
+    if (point.IsShared()){
+      track->SetErrorY2(track->GetErrorY2()*4);
+      track->SetErrorZ2(track->GetErrorZ2()*4);
     }
   }  
 
-  Double_t chi2 = track->GetPredictedChi2(track->fCurrentCluster);
+  Double_t chi2 = track->GetPredictedChi2(track->GetCurrentCluster());
   //
-  track->fErrorY2 *= 1.3;
-  track->fErrorY2 += 0.01;    
-  track->fErrorZ2 *= 1.3;   
-  track->fErrorZ2 += 0.005;      
+  track->SetErrorY2(track->GetErrorY2()*1.3);
+  track->SetErrorY2(track->GetErrorY2()+0.01);    
+  track->SetErrorZ2(track->GetErrorZ2()*1.3);   
+  track->SetErrorZ2(track->GetErrorZ2()+0.005);      
     //}
   if (accept>0) return 0;
   if (track->GetNumberOfClusters()%20==0){
@@ -163,7 +246,7 @@ Int_t AliTPCtrackerMI::UpdateTrack(AliTPCseed * track, Int_t accept){
     //  new(larr[ihelix]) AliHelix(*track) ;    
     //}
   }
-  track->fNoCluster =0;
+  track->SetNoCluster(0);
   return track->Update(c,chi2,i);
 }
 
@@ -183,10 +266,10 @@ Int_t AliTPCtrackerMI::AcceptCluster(AliTPCseed * seed, AliTPCclusterMI * cluste
   Double_t sdistancey2 = sy2+seed->GetSigmaY2();
   Double_t sdistancez2 = sz2+seed->GetSigmaZ2();
   
-  Double_t rdistancey2 = (seed->fCurrentCluster->GetY()-seed->GetY())*
-    (seed->fCurrentCluster->GetY()-seed->GetY())/sdistancey2;
-  Double_t rdistancez2 = (seed->fCurrentCluster->GetZ()-seed->GetZ())*
-    (seed->fCurrentCluster->GetZ()-seed->GetZ())/sdistancez2;
+  Double_t rdistancey2 = (seed->GetCurrentCluster()->GetY()-seed->GetY())*
+    (seed->GetCurrentCluster()->GetY()-seed->GetY())/sdistancey2;
+  Double_t rdistancez2 = (seed->GetCurrentCluster()->GetZ()-seed->GetZ())*
+    (seed->GetCurrentCluster()->GetZ()-seed->GetZ())/sdistancez2;
   
   Double_t rdistance2  = rdistancey2+rdistancez2;
   //Int_t  accept =0;
@@ -203,7 +286,7 @@ Int_t AliTPCtrackerMI::AcceptCluster(AliTPCseed * seed, AliTPCclusterMI * cluste
   
   if ( (rdistancey2>1.*factor || rdistancez2>6.25*factor ) 
        && cluster->GetType()<0){
-    seed->fNFoundable--;
+    seed->SetNFoundable(seed->GetNFoundable()-1);
     return 2;    
   }
   return 0;
@@ -214,7 +297,25 @@ Int_t AliTPCtrackerMI::AcceptCluster(AliTPCseed * seed, AliTPCclusterMI * cluste
 
 //_____________________________________________________________________________
 AliTPCtrackerMI::AliTPCtrackerMI(const AliTPCParam *par): 
-AliTracker(), fkNIS(par->GetNInnerSector()/2), fkNOS(par->GetNOuterSector()/2)
+AliTracker(), 
+                fkNIS(par->GetNInnerSector()/2),
+                fInnerSec(0),
+                fkNOS(par->GetNOuterSector()/2),
+                fOuterSec(0),
+                fN(0),
+                fSectors(0),
+                fInput(0),
+                fOutput(0),
+                fSeedTree(0),
+                fTreeDebug(0),
+                fEvent(0),
+                fDebug(0),
+                fNewIO(0),
+                fNtracks(0),
+                fSeeds(0),
+                fIteration(0),
+                fParam(0),
+                fDebugStreamer(0)
 {
   //---------------------------------------------------------------------
   // The main TPC tracker constructor
@@ -226,10 +327,6 @@ AliTracker(), fkNIS(par->GetNInnerSector()/2), fkNOS(par->GetNOuterSector()/2)
   for (i=0; i<fkNIS; i++) fInnerSec[i].Setup(par,0);
   for (i=0; i<fkNOS; i++) fOuterSec[i].Setup(par,1);
 
-  fN=0;  fSectors=0;
-
-  fSeeds=0;
-  fNtracks = 0;
   fParam = par;  
   Int_t nrowlow = par->GetNRowLow();
   Int_t nrowup = par->GetNRowUp();
@@ -247,26 +344,35 @@ AliTracker(), fkNIS(par->GetNInnerSector()/2), fkNOS(par->GetNOuterSector()/2)
     fPadLength[i+nrowlow] = par->GetPadPitchLength(60,i);
     fYMax[i+nrowlow]      = fXRow[i+nrowlow]*TMath::Tan(0.5*par->GetOuterAngle());
   }
-  fSeeds=0;
-  //
-  fInput    = 0;
-  fOutput   = 0;
-  fSeedTree = 0;
-  fTreeDebug =0;
-  fNewIO     =0;
-  fDebug     =0;
-  fEvent     =0;
+
   fDebugStreamer = new TTreeSRedirector("TPCdebug.root");
 }
 //________________________________________________________________________
 AliTPCtrackerMI::AliTPCtrackerMI(const AliTPCtrackerMI &t):
   AliTracker(t),
-  fkNIS(t.fkNIS),
-  fkNOS(t.fkNOS)
+                fkNIS(t.fkNIS),
+                fInnerSec(0),
+                fkNOS(t.fkNOS),
+                fOuterSec(0),
+                fN(0),
+                fSectors(0),
+                fInput(0),
+                fOutput(0),
+                fSeedTree(0),
+                fTreeDebug(0),
+                fEvent(0),
+                fDebug(0),
+                fNewIO(kFALSE),
+                fNtracks(0),
+                fSeeds(0),
+                fIteration(0),
+                fParam(0),
+                fDebugStreamer(0)
 {
   //------------------------------------
   // dummy copy constructor
   //------------------------------------------------------------------
+  fOutput=t.fOutput;
 }
 AliTPCtrackerMI & AliTPCtrackerMI::operator=(const AliTPCtrackerMI& /*r*/){
   //------------------------------
@@ -303,7 +409,7 @@ void AliTPCtrackerMI::SetIO()
 }
 
 
-void AliTPCtrackerMI::SetIO(TTree * input, TTree * output, AliESD * event)
+void AliTPCtrackerMI::SetIO(TTree * input, TTree * output, AliESDEvent * event)
 {
 
   // set input
@@ -335,8 +441,8 @@ void AliTPCtrackerMI::SetIO(TTree * input, TTree * output, AliESD * event)
     arrtr->ExpandCreateFast(160);
     TClonesArray * arre = new TClonesArray("AliTPCExactPoint",160);
     //
-    vseed->fPoints = arrtr;
-    vseed->fEPoints = arre;
+    vseed->SetPoints(arrtr);
+    vseed->SetEPoints(arre);
     //    vseed->fClusterPoints = arrcl;
     fSeedTree->Branch("seeds","AliTPCseed",&vseed,32000,99);
     delete arrtr;
@@ -382,7 +488,7 @@ void AliTPCtrackerMI::FillESD(TObjArray* arr)
        continue;
       }
        
-      if ( (pt->GetNumberOfClusters()>70)&& (Float_t(pt->GetNumberOfClusters())/Float_t(pt->fNFoundable))>0.55) {
+      if ( (pt->GetNumberOfClusters()>70)&& (Float_t(pt->GetNumberOfClusters())/Float_t(pt->GetNFoundable()))>0.55) {
        AliESDtrack iotrack;
        iotrack.UpdateTrackParams(pt,AliESDtrack::kTPCin);
        iotrack.SetTPCPoints(pt->GetPoints());
@@ -396,10 +502,10 @@ void AliTPCtrackerMI::FillESD(TObjArray* arr)
       //
       // short tracks  - maybe decays
 
-      if ( (pt->GetNumberOfClusters()>30) && (Float_t(pt->GetNumberOfClusters())/Float_t(pt->fNFoundable))>0.70) {
+      if ( (pt->GetNumberOfClusters()>30) && (Float_t(pt->GetNumberOfClusters())/Float_t(pt->GetNFoundable()))>0.70) {
        Int_t found,foundable,shared;
        pt->GetClusterStatistic(0,60,found, foundable,shared,kFALSE);
-       if ( (found>20) && (pt->fNShared/float(pt->GetNumberOfClusters())<0.2)){
+       if ( (found>20) && (pt->GetNShared()/float(pt->GetNumberOfClusters())<0.2)){
          AliESDtrack iotrack;
          iotrack.UpdateTrackParams(pt,AliESDtrack::kTPCin);    
          //iotrack.SetTPCindex(i);
@@ -412,11 +518,11 @@ void AliTPCtrackerMI::FillESD(TObjArray* arr)
        }
       }       
       
-      if ( (pt->GetNumberOfClusters()>20) && (Float_t(pt->GetNumberOfClusters())/Float_t(pt->fNFoundable))>0.8) {
+      if ( (pt->GetNumberOfClusters()>20) && (Float_t(pt->GetNumberOfClusters())/Float_t(pt->GetNFoundable()))>0.8) {
        Int_t found,foundable,shared;
        pt->GetClusterStatistic(0,60,found, foundable,shared,kFALSE);
        if (found<20) continue;
-       if (pt->fNShared/float(pt->GetNumberOfClusters())>0.2) continue;
+       if (pt->GetNShared()/float(pt->GetNumberOfClusters())>0.2) continue;
        //
        AliESDtrack iotrack;
        iotrack.UpdateTrackParams(pt,AliESDtrack::kTPCin);      
@@ -433,7 +539,7 @@ void AliTPCtrackerMI::FillESD(TObjArray* arr)
       if ( (pt->GetNumberOfClusters()>30) ) {
        Int_t found,foundable,shared;
        pt->GetClusterStatistic(128,158,found, foundable,shared,kFALSE);
-       if ( (found>20) && (pt->fNShared/float(pt->GetNumberOfClusters())<0.2) &&float(found)/float(foundable)>0.8){
+       if ( (found>20) && (pt->GetNShared()/float(pt->GetNumberOfClusters())<0.2) &&float(found)/float(foundable)>0.8){
          AliESDtrack iotrack;
          iotrack.UpdateTrackParams(pt,AliESDtrack::kTPCin);    
          iotrack.SetTPCPoints(pt->GetPoints());
@@ -450,7 +556,8 @@ void AliTPCtrackerMI::FillESD(TObjArray* arr)
        Int_t found,foundable,shared;
        pt->GetClusterStatistic(138,158,found, foundable,shared,kFALSE);
        if (found<15) continue;
-       if (pt->fNShared/float(pt->GetNumberOfClusters())>0.2) continue;
+       if (foundable<=0) continue;
+       if (pt->GetNShared()/float(pt->GetNumberOfClusters())>0.2) continue;
        if (float(found)/float(foundable)<0.8) continue;
        //
        AliESDtrack iotrack;
@@ -507,7 +614,7 @@ void AliTPCtrackerMI::WriteTracks()
       if (!pt) continue;    
       AliTPCtrack * track = new AliTPCtrack(*pt);
       iotrack = track;
-      pt->fLab2 =i
+      pt->SetLab2(i)
       //      br->SetAddress(&iotrack);
       fOutput->Fill();
       delete track;
@@ -529,8 +636,8 @@ void AliTPCtrackerMI::WriteTracks()
     //arrcl->ExpandCreateFast(160);
     TClonesArray * arre = new TClonesArray("AliTPCExactPoint",160);
     //
-    vseed->fPoints = arrtr;
-    vseed->fEPoints = arre;
+    vseed->SetPoints(arrtr);
+    vseed->SetEPoints(arre);
     //    vseed->fClusterPoints = arrcl;
     //TBranch * brseed = seedtree->Branch("seeds","AliTPCseed",&vseed,32000,99);
     TBranch * brseed = fSeedTree->GetBranch("seeds");
@@ -540,15 +647,15 @@ void AliTPCtrackerMI::WriteTracks()
     for (Int_t i=0; i<nseed; i++) {
       AliTPCseed *pt=(AliTPCseed*)fSeeds->UncheckedAt(i);    
       if (!pt) continue;     
-      pt->fPoints = arrtr;
+      pt->SetPoints(arrtr);
       //      pt->fClusterPoints = arrcl;
-      pt->fEPoints       = arre;
+      pt->SetEPoints(arre);
       pt->RebuildSeed();
       vseed = pt;
       brseed->SetAddress(&vseed);
       fSeedTree->Fill();
-      pt->fPoints  = 0;
-      pt->fEPoints = 0;
+      pt->SetPoints(0);
+      pt->SetEPoints(0);
       //      pt->fClusterPoints = 0;
     }
     fSeedTree->Write();
@@ -637,14 +744,14 @@ Double_t AliTPCtrackerMI::ErrY2(AliTPCseed* seed, AliTPCclusterMI * cl){
     return 1.;
   }
   Float_t snoise2;
-  Float_t z = TMath::Abs(fParam->GetZLength()-TMath::Abs(seed->GetZ()));
+  Float_t z = TMath::Abs(fParam->GetZLength(0)-TMath::Abs(seed->GetZ()));
   Int_t ctype = cl->GetType();  
-  Float_t padlength= GetPadPitchLength(seed->fRow);
+  Float_t padlength= GetPadPitchLength(seed->GetRow());
   Double_t angle2 = seed->GetSnp()*seed->GetSnp();
   angle2 = angle2/(1-angle2); 
   //
   //cluster "quality"
-  Int_t rsigmay = int(100.*cl->GetSigmaY2()/(seed->fCurrentSigmaY2));
+  Int_t rsigmay = int(100.*cl->GetSigmaY2()/(seed->GetCurrentSigmaY2()));
   Float_t res;
   //
   if (fSectors==fInnerSec){
@@ -771,16 +878,16 @@ Double_t AliTPCtrackerMI::ErrZ2(AliTPCseed* seed, AliTPCclusterMI * cl){
     return 1.;
   }
   Float_t snoise2;
-  Float_t z = TMath::Abs(fParam->GetZLength()-TMath::Abs(seed->GetZ()));
+  Float_t z = TMath::Abs(fParam->GetZLength(0)-TMath::Abs(seed->GetZ()));
   Int_t ctype = cl->GetType();  
-  Float_t padlength= GetPadPitchLength(seed->fRow);
+  Float_t padlength= GetPadPitchLength(seed->GetRow());
   //
   Double_t angle2 = seed->GetSnp()*seed->GetSnp();
   //  if (angle2<0.6) angle2 = 0.6;
   angle2 = seed->GetTgl()*seed->GetTgl()*(1+angle2/(1-angle2)); 
   //
   //cluster "quality"
-  Int_t rsigmaz = int(100.*cl->GetSigmaZ2()/(seed->fCurrentSigmaZ2));
+  Int_t rsigmaz = int(100.*cl->GetSigmaZ2()/(seed->GetCurrentSigmaZ2()));
   Float_t res;
   //
   if (fSectors==fInnerSec){
@@ -839,7 +946,7 @@ Double_t AliTPCtrackerMI::ErrZ2(AliTPCseed* seed, AliTPCclusterMI * cl){
   //return 0.1;
 
   Float_t snoise2;
-  Float_t z = TMath::Abs(fParam->GetZLength()-TMath::Abs(seed->GetZ()));
+  Float_t z = TMath::Abs(fParam->GetZLength(0)-TMath::Abs(seed->GetZ()));
   //
   Float_t rsigmaz = cl->GetSigmaZ2()/(seed->fCurrentSigmaZ2);
   Int_t ctype = cl->GetType();
@@ -919,11 +1026,11 @@ void AliTPCtrackerMI::RotateToLocal(AliTPCseed *seed)
   Float_t ymax = x*TMath::Tan(0.5*fSectors->GetAlpha());
   
   if (y > ymax) {
-    seed->fRelativeSector= (seed->fRelativeSector+1) % fN;
+    seed->SetRelativeSector((seed->GetRelativeSector()+1) % fN);
     if (!seed->Rotate(fSectors->GetAlpha())) 
       return;
   } else if (y <-ymax) {
-    seed->fRelativeSector= (seed->fRelativeSector-1+fN) % fN;
+    seed->SetRelativeSector((seed->GetRelativeSector()-1+fN) % fN);
     if (!seed->Rotate(-fSectors->GetAlpha())) 
       return;
   }   
@@ -1126,6 +1233,9 @@ Int_t  AliTPCtrackerMI::LoadClusters()
     //  
     Int_t sec,row;
     fParam->AdjustSectorRow(clrow->GetID(),sec,row);
+    for (Int_t icl=0; icl<clrow->GetArray()->GetEntriesFast(); icl++){
+      Transform((AliTPCclusterMI*)(clrow->GetArray()->At(icl)));
+    }
     //
     AliTPCRow * tpcrow=0;
     Int_t left=0;
@@ -1138,16 +1248,16 @@ Int_t  AliTPCtrackerMI::LoadClusters()
       left = (sec-fkNIS*2)/fkNOS;
     }
     if (left ==0){
-      tpcrow->fN1 = clrow->GetArray()->GetEntriesFast();
-      tpcrow->fClusters1 = new AliTPCclusterMI[tpcrow->fN1];
-      for (Int_t i=0;i<tpcrow->fN1;i++) 
-       tpcrow->fClusters1[i] = *(AliTPCclusterMI*)(clrow->GetArray()->At(i));
+      tpcrow->SetN1(clrow->GetArray()->GetEntriesFast());
+      tpcrow->SetClusters1(new AliTPCclusterMI[tpcrow->GetN1()]);
+      for (Int_t i=0;i<tpcrow->GetN1();i++) 
+       tpcrow->SetCluster1(i, *(AliTPCclusterMI*)(clrow->GetArray()->At(i)));
     }
     if (left ==1){
-      tpcrow->fN2 = clrow->GetArray()->GetEntriesFast();
-      tpcrow->fClusters2 = new AliTPCclusterMI[tpcrow->fN2];
-      for (Int_t i=0;i<tpcrow->fN2;i++) 
-       tpcrow->fClusters2[i] = *(AliTPCclusterMI*)(clrow->GetArray()->At(i));
+      tpcrow->SetN2(clrow->GetArray()->GetEntriesFast());
+      tpcrow->SetClusters2(new AliTPCclusterMI[tpcrow->GetN2()]);
+      for (Int_t i=0;i<tpcrow->GetN2();i++) 
+       tpcrow->SetCluster2(i,*(AliTPCclusterMI*)(clrow->GetArray()->At(i)));
     }
   }
   //
@@ -1188,6 +1298,56 @@ void AliTPCtrackerMI::UnloadClusters()
   return ;
 }
 
+void   AliTPCtrackerMI::Transform(AliTPCclusterMI * cluster){
+  //
+  //
+  //
+  AliTPCTransform *transform = AliTPCcalibDB::Instance()->GetTransform() ;
+  if (!transform) {
+    AliFatal("Tranformations not in calibDB");
+  }
+  Double_t x[3]={cluster->GetRow(),cluster->GetPad(),cluster->GetTimeBin()};
+  Int_t i[1]={cluster->GetDetector()};
+  transform->Transform(x,i,0,1);  
+  if (!AliTPCReconstructor::GetRecoParam()->GetBYMirror()){
+    if (cluster->GetDetector()%36>17){
+      x[1]*=-1;
+    }
+  }
+
+  //
+  // in debug mode  check the transformation
+  //
+  if (AliTPCReconstructor::StreamLevel()>1) {
+    TTreeSRedirector &cstream = *fDebugStreamer;
+    cstream<<"Transform"<<
+      "x0="<<x[0]<<
+      "x1="<<x[1]<<
+      "x2="<<x[2]<<
+      "Cl.="<<cluster<<
+      "\n"; 
+  }
+  cluster->SetX(x[0]);
+  cluster->SetY(x[1]);
+  cluster->SetZ(x[2]);
+  // The old stuff:
+
+  //
+  // 
+  //
+  //if (!fParam->IsGeoRead()) fParam->ReadGeoMatrices();
+  TGeoHMatrix  *mat = fParam->GetClusterMatrix(cluster->GetDetector());
+  //TGeoHMatrix  mat;
+  Double_t pos[3]= {cluster->GetX(),cluster->GetY(),cluster->GetZ()};
+  Double_t posC[3]={cluster->GetX(),cluster->GetY(),cluster->GetZ()};
+  if (mat) mat->LocalToMaster(pos,posC);
+  else{
+    // chack Loading of Geo matrices from GeoManager - TEMPORARY FIX
+  }
+  cluster->SetX(posC[0]);
+  cluster->SetY(posC[1]);
+  cluster->SetZ(posC[2]);
+}
 
 //_____________________________________________________________________________
 Int_t AliTPCtrackerMI::LoadOuterSectors() {
@@ -1201,16 +1361,16 @@ Int_t AliTPCtrackerMI::LoadOuterSectors() {
       AliTPCRow*  tpcrow = &(fOuterSec[sec%fkNOS][row]);  
       Int_t sec2 = sec+2*fkNIS;
       //left
-      Int_t ncl = tpcrow->fN1;
+      Int_t ncl = tpcrow->GetN1();
       while (ncl--) {
-       AliTPCclusterMI *c= &(tpcrow->fClusters1[ncl]);
+       AliTPCclusterMI *c= (tpcrow->GetCluster1(ncl));
        index=(((sec2<<8)+row)<<16)+ncl;
        tpcrow->InsertCluster(c,index);
       }
       //right
-      ncl = tpcrow->fN2;
+      ncl = tpcrow->GetN2();
       while (ncl--) {
-       AliTPCclusterMI *c= &(tpcrow->fClusters2[ncl]);
+       AliTPCclusterMI *c= (tpcrow->GetCluster2(ncl));
        index=((((sec2+fkNOS)<<8)+row)<<16)+ncl;
        tpcrow->InsertCluster(c,index);
       }
@@ -1218,17 +1378,17 @@ Int_t AliTPCtrackerMI::LoadOuterSectors() {
       // write indexes for fast acces
       //
       for (Int_t i=0;i<510;i++)
-       tpcrow->fFastCluster[i]=-1;
+       tpcrow->SetFastCluster(i,-1);
       for (Int_t i=0;i<tpcrow->GetN();i++){
         Int_t zi = Int_t((*tpcrow)[i]->GetZ()+255.);
-       tpcrow->fFastCluster[zi]=i;  // write index
+       tpcrow->SetFastCluster(zi,i);  // write index
       }
       Int_t last = 0;
       for (Int_t i=0;i<510;i++){
-       if (tpcrow->fFastCluster[i]<0)
-         tpcrow->fFastCluster[i] = last;
+       if (tpcrow->GetFastCluster(i)<0)
+         tpcrow->SetFastCluster(i,last);
        else
-         last = tpcrow->fFastCluster[i];
+         last = tpcrow->GetFastCluster(i);
       }
     }  
   fN=fkNOS;
@@ -1249,16 +1409,16 @@ Int_t  AliTPCtrackerMI::LoadInnerSectors() {
       AliTPCRow*  tpcrow = &(fInnerSec[sec%fkNIS][row]);
       //
       //left
-      Int_t ncl = tpcrow->fN1;
+      Int_t ncl = tpcrow->GetN1();
       while (ncl--) {
-       AliTPCclusterMI *c= &(tpcrow->fClusters1[ncl]);
+       AliTPCclusterMI *c= (tpcrow->GetCluster1(ncl));
        index=(((sec<<8)+row)<<16)+ncl;
        tpcrow->InsertCluster(c,index);
       }
       //right
-      ncl = tpcrow->fN2;
+      ncl = tpcrow->GetN2();
       while (ncl--) {
-       AliTPCclusterMI *c= &(tpcrow->fClusters2[ncl]);
+       AliTPCclusterMI *c= (tpcrow->GetCluster2(ncl));
        index=((((sec+fkNIS)<<8)+row)<<16)+ncl;
        tpcrow->InsertCluster(c,index);
       }
@@ -1266,17 +1426,17 @@ Int_t  AliTPCtrackerMI::LoadInnerSectors() {
       // write indexes for fast acces
       //
       for (Int_t i=0;i<510;i++)
-       tpcrow->fFastCluster[i]=-1;
+       tpcrow->SetFastCluster(i,-1);
       for (Int_t i=0;i<tpcrow->GetN();i++){
         Int_t zi = Int_t((*tpcrow)[i]->GetZ()+255.);
-       tpcrow->fFastCluster[zi]=i;  // write index
+       tpcrow->SetFastCluster(zi,i);  // write index
       }
       Int_t last = 0;
       for (Int_t i=0;i<510;i++){
-       if (tpcrow->fFastCluster[i]<0)
-         tpcrow->fFastCluster[i] = last;
+       if (tpcrow->GetFastCluster(i)<0)
+         tpcrow->SetFastCluster(i,last);
        else
-         last = tpcrow->fFastCluster[i];
+         last = tpcrow->GetFastCluster(i);
       }
 
     }  
@@ -1293,6 +1453,7 @@ AliTPCclusterMI *AliTPCtrackerMI::GetClusterMI(Int_t index) const {
   //--------------------------------------------------------------------
   //       Return pointer to a given cluster
   //--------------------------------------------------------------------
+  if (index<0) return 0; // no cluster
   Int_t sec=(index&0xff000000)>>24; 
   Int_t row=(index&0x00ff0000)>>16; 
   Int_t ncl=(index&0x00007fff)>>00;
@@ -1300,17 +1461,22 @@ AliTPCclusterMI *AliTPCtrackerMI::GetClusterMI(Int_t index) const {
   const AliTPCRow * tpcrow=0;
   AliTPCclusterMI * clrow =0;
 
+  if (sec<0 || sec>=fkNIS*4) {
+    AliWarning(Form("Wrong sector %d",sec));
+    return 0x0;
+  }
+
   if (sec<fkNIS*2){
     tpcrow = &(fInnerSec[sec%fkNIS][row]);
     if (tpcrow==0) return 0;
 
     if (sec<fkNIS) {
-      if (tpcrow->fN1<=ncl) return 0;
-      clrow = tpcrow->fClusters1;
+      if (tpcrow->GetN1()<=ncl) return 0;
+      clrow = tpcrow->GetClusters1();
     }
     else {
-      if (tpcrow->fN2<=ncl) return 0;
-      clrow = tpcrow->fClusters2;
+      if (tpcrow->GetN2()<=ncl) return 0;
+      clrow = tpcrow->GetClusters2();
     }
   }
   else {
@@ -1318,12 +1484,12 @@ AliTPCclusterMI *AliTPCtrackerMI::GetClusterMI(Int_t index) const {
     if (tpcrow==0) return 0;
 
     if (sec-2*fkNIS<fkNOS) {
-      if (tpcrow->fN1<=ncl) return 0;
-      clrow = tpcrow->fClusters1;
+      if (tpcrow->GetN1()<=ncl) return 0;
+      clrow = tpcrow->GetClusters1();
     }
     else {
-      if (tpcrow->fN2<=ncl) return 0;
-      clrow = tpcrow->fClusters2;
+      if (tpcrow->GetN2()<=ncl) return 0;
+      clrow = tpcrow->GetClusters2();
     }
   }
 
@@ -1351,9 +1517,9 @@ Int_t AliTPCtrackerMI::FollowToNext(AliTPCseed& t, Int_t nr) {
     //        
     if (tpcindex==-1) return 0; //track in dead zone
     if (tpcindex>0){     //
-      cl = t.fClusterPointer[nr];
+      cl = t.GetClusterPointer(nr);
       if ( (cl==0) ) cl = GetClusterMI(tpcindex);
-      t.fCurrentClusterIndex1 = tpcindex
+      t.SetCurrentClusterIndex1(tpcindex)
     }
     if (cl){      
       Int_t relativesector = ((tpcindex&0xff000000)>>24)%18;  // if previously accepted cluster in different sector
@@ -1364,24 +1530,24 @@ Int_t AliTPCtrackerMI::FollowToNext(AliTPCseed& t, Int_t nr) {
       
       if (TMath::Abs(angle-t.GetAlpha())>0.001){
        Double_t rotation = angle-t.GetAlpha();
-       t.fRelativeSector= relativesector;
+       t.SetRelativeSector(relativesector);
        if (!t.Rotate(rotation)) return 0;      
       }
       if (!t.PropagateTo(x)) return 0;
       //
-      t.fCurrentCluster = cl
-      t.fRow = nr;
-      Int_t accept = AcceptCluster(&t,t.fCurrentCluster,1.);
+      t.SetCurrentCluster(cl)
+      t.SetRow(nr);
+      Int_t accept = AcceptCluster(&t,t.GetCurrentCluster(),1.);
       if ((tpcindex&0x8000)==0) accept =0;
       if (accept<3) { 
        //if founded cluster is acceptible
        if (cl->IsUsed(11)) {  // id cluster is shared inrease uncertainty
-         t.fErrorY2 += 0.03;
-         t.fErrorZ2 += 0.03
-         t.fErrorY2 *= 3;
-         t.fErrorZ2 *= 3
+         t.SetErrorY2(t.GetErrorY2()+0.03);
+         t.SetErrorZ2(t.GetErrorZ2()+0.03)
+         t.SetErrorY2(t.GetErrorY2()*3);
+         t.SetErrorZ2(t.GetErrorZ2()*3)
        }
-       t.fNFoundable++;
+       t.SetNFoundable(t.GetNFoundable()+1);
        UpdateTrack(&t,accept);
        return 1;
       }    
@@ -1390,7 +1556,7 @@ Int_t AliTPCtrackerMI::FollowToNext(AliTPCseed& t, Int_t nr) {
   if (TMath::Abs(t.GetSnp())>AliTPCReconstructor::GetMaxSnpTracker()) return 0;  // cut on angle
   if (fIteration>1){
     // not look for new cluster during refitting    
-    t.fNFoundable++; 
+    t.SetNFoundable(t.GetNFoundable()+1);
     return 0;
   }
   //
@@ -1399,11 +1565,11 @@ Int_t AliTPCtrackerMI::FollowToNext(AliTPCseed& t, Int_t nr) {
   Double_t  y=t.GetYat(x);
   if (TMath::Abs(y)>ymax){
     if (y > ymax) {
-      t.fRelativeSector= (t.fRelativeSector+1) % fN;
+      t.SetRelativeSector((t.GetRelativeSector()+1) % fN);
       if (!t.Rotate(fSectors->GetAlpha())) 
        return 0;
     } else if (y <-ymax) {
-      t.fRelativeSector= (t.fRelativeSector-1+fN) % fN;
+      t.SetRelativeSector((t.GetRelativeSector()-1+fN) % fN);
       if (!t.Rotate(-fSectors->GetAlpha())) 
        return 0;
     }
@@ -1411,26 +1577,38 @@ Int_t AliTPCtrackerMI::FollowToNext(AliTPCseed& t, Int_t nr) {
   }
   //
   if (!t.PropagateTo(x)) {
-    if (fIteration==0) t.fRemoval = 10;
+    if (fIteration==0) t.SetRemoval(10);
     return 0;
   }
   y=t.GetY(); 
   Double_t z=t.GetZ();
   //
-  const AliTPCRow &krow=GetRow(t.fRelativeSector,nr);
+
+  if (!IsActive(t.GetRelativeSector(),nr)) {
+    t.SetInDead(kTRUE);
+    t.SetClusterIndex2(nr,-1); 
+    return 0;
+  }
+  //AliInfo(Form("A - Sector%d phi %f - alpha %f", t.fRelativeSector,y/x, t.GetAlpha()));
+  Bool_t isActive  = IsActive(t.GetRelativeSector(),nr);
+  Bool_t isActive2 = (nr>=fInnerSec->GetNRows()) ? fOuterSec[t.GetRelativeSector()][nr-fInnerSec->GetNRows()].GetN()>0:fInnerSec[t.GetRelativeSector()][nr].GetN()>0;
+  
+  if (!isActive || !isActive2) return 0;
+
+  const AliTPCRow &krow=GetRow(t.GetRelativeSector(),nr);
   if ( (t.GetSigmaY2()<0) || t.GetSigmaZ2()<0) return 0;
   Double_t  roady  =1.;
   Double_t  roadz = 1.;
   //
-  if (TMath::Abs(TMath::Abs(y)-ymax)<krow.fDeadZone){
-    t.fInDead = kTRUE;
+  if (TMath::Abs(TMath::Abs(y)-ymax)<krow.GetDeadZone()){
+    t.SetInDead(kTRUE);
     t.SetClusterIndex2(nr,-1); 
     return 0;
   } 
   else
     {
-      if (TMath::Abs(z)<(AliTPCReconstructor::GetCtgRange()*x+10) && TMath::Abs(z)<fParam->GetZLength() && (TMath::Abs(t.GetSnp())<AliTPCReconstructor::GetMaxSnpTracker())) 
-       t.fNFoundable++;
+      if (TMath::Abs(z)<(AliTPCReconstructor::GetCtgRange()*x+10) && TMath::Abs(z)<fParam->GetZLength(0) && (TMath::Abs(t.GetSnp())<AliTPCReconstructor::GetMaxSnpTracker())) 
+       t.SetNFoundable(t.GetNFoundable()+1);
       else
        return 0;
     }   
@@ -1438,18 +1616,18 @@ Int_t AliTPCtrackerMI::FollowToNext(AliTPCseed& t, Int_t nr) {
   if (krow) {
     //    cl = krow.FindNearest2(y+10.,z,roady,roadz,index);    
     cl = krow.FindNearest2(y,z,roady,roadz,index);    
-    if (cl) t.fCurrentClusterIndex1 = krow.GetIndex(index);       
+    if (cl) t.SetCurrentClusterIndex1(krow.GetIndex(index));       
   }  
   if (cl) {
-    t.fCurrentCluster = cl
-    t.fRow = nr;
+    t.SetCurrentCluster(cl)
+    t.SetRow(nr);
     if (fIteration==2&&cl->IsUsed(10)) return 0; 
-    Int_t accept = AcceptCluster(&t,t.fCurrentCluster,1.);
+    Int_t accept = AcceptCluster(&t,t.GetCurrentCluster(),1.);
     if (fIteration==2&&cl->IsUsed(11)) {
-      t.fErrorY2 += 0.03;
-      t.fErrorZ2 += 0.03
-      t.fErrorY2 *= 3;
-      t.fErrorZ2 *= 3
+      t.SetErrorY2(t.GetErrorY2()+0.03);
+      t.SetErrorZ2(t.GetErrorZ2()+0.03)
+      t.SetErrorY2(t.GetErrorY2()*3);
+      t.SetErrorZ2(t.GetErrorZ2()*3)
     }
     /*    
     if (t.fCurrentCluster->IsUsed(10)){
@@ -1466,7 +1644,7 @@ Int_t AliTPCtrackerMI::FollowToNext(AliTPCseed& t, Int_t nr) {
     if (accept<3) UpdateTrack(&t,accept);
 
   } else {  
-    if ( fIteration==0 && t.fNFoundable*0.5 > t.GetNumberOfClusters()) t.fRemoval=10;
+    if ( fIteration==0 && t.GetNFoundable()*0.5 > t.GetNumberOfClusters()) t.SetRemoval(10);
     
   }
   return 1;
@@ -1480,7 +1658,7 @@ Int_t AliTPCtrackerMI::FollowToNextFast(AliTPCseed& t, Int_t nr) {
   Double_t  x= GetXrow(nr), ymax=GetMaxY(nr);
   Double_t y,z; 
   if (!t.GetProlongation(x,y,z)) {
-    t.fRemoval = 10;
+    t.SetRemoval(10);
     return 0;
   }
   //
@@ -1488,11 +1666,11 @@ Int_t AliTPCtrackerMI::FollowToNextFast(AliTPCseed& t, Int_t nr) {
   if (TMath::Abs(y)>ymax){
     
     if (y > ymax) {
-      t.fRelativeSector= (t.fRelativeSector+1) % fN;
+      t.SetRelativeSector((t.GetRelativeSector()+1) % fN);
       if (!t.Rotate(fSectors->GetAlpha())) 
        return 0;
     } else if (y <-ymax) {
-      t.fRelativeSector= (t.fRelativeSector-1+fN) % fN;
+      t.SetRelativeSector((t.GetRelativeSector()-1+fN) % fN);
       if (!t.Rotate(-fSectors->GetAlpha())) 
        return 0;
     }
@@ -1503,7 +1681,7 @@ Int_t AliTPCtrackerMI::FollowToNextFast(AliTPCseed& t, Int_t nr) {
   }
   //
   // update current shape info every 3 pad-row
-  if ( (nr%6==0) || t.GetNumberOfClusters()<2 || (t.fCurrentSigmaY2<0.0001) ){
+  if ( (nr%6==0) || t.GetNumberOfClusters()<2 || (t.GetCurrentSigmaY2()<0.0001) ){
     //    t.fCurrentSigmaY = GetSigmaY(&t);
     //t.fCurrentSigmaZ = GetSigmaZ(&t);
     GetShape(&t,nr);
@@ -1514,14 +1692,14 @@ Int_t AliTPCtrackerMI::FollowToNextFast(AliTPCseed& t, Int_t nr) {
   
   
   //Int_t nr2 = nr;
-  const AliTPCRow &krow=GetRow(t.fRelativeSector,nr);
+  const AliTPCRow &krow=GetRow(t.GetRelativeSector(),nr);
   if ( (t.GetSigmaY2()<0) || t.GetSigmaZ2()<0) return 0;
   Double_t  roady  =1.;
   Double_t  roadz = 1.;
   //
   Int_t row = nr;
-  if (TMath::Abs(TMath::Abs(y)-ymax)<krow.fDeadZone){
-    t.fInDead = kTRUE;
+  if (TMath::Abs(TMath::Abs(y)-ymax)<krow.GetDeadZone()){
+    t.SetInDead(kTRUE);
     t.SetClusterIndex2(row,-1); 
     return 0;
   } 
@@ -1535,15 +1713,15 @@ Int_t AliTPCtrackerMI::FollowToNextFast(AliTPCseed& t, Int_t nr) {
     //    cl = krow.FindNearest2(y+10,z,roady,roadz,index);    
     cl = krow.FindNearest2(y,z,roady,roadz,index);    
 
-    if (cl) t.fCurrentClusterIndex1 = krow.GetIndex(index);       
+    if (cl) t.SetCurrentClusterIndex1(krow.GetIndex(index));       
   }  
 
   if (cl) {
-    t.fCurrentCluster = cl
+    t.SetCurrentCluster(cl)
     //    Int_t accept = AcceptCluster(&t,t.fCurrentCluster,1.);        
     //if (accept<3){
       t.SetClusterIndex2(row,index);
-      t.fClusterPointer[row] = cl;
+      t.SetClusterPointer(row, cl);
       //}
   }
   return 1;
@@ -1559,9 +1737,10 @@ Bool_t AliTPCtrackerMI::GetTrackPoint(Int_t index, AliTrackPoint &p ) const
   AliTPCclusterMI *cl = GetClusterMI(index);
   if (!cl) return kFALSE;
   Int_t sector = (index&0xff000000)>>24;
-  Int_t row = (index&0x00ff0000)>>16;
+  //  Int_t row = (index&0x00ff0000)>>16;
   Float_t xyz[3];
-  xyz[0] = fParam->GetPadRowRadii(sector,row);
+  //  xyz[0] = fParam->GetPadRowRadii(sector,row);
+  xyz[0] = cl->GetX();
   xyz[1] = cl->GetY();
   xyz[2] = cl->GetZ();
   Float_t sin,cos;
@@ -1580,17 +1759,17 @@ Bool_t AliTPCtrackerMI::GetTrackPoint(Int_t index, AliTrackPoint &p ) const
   cov[4] = 0.;
   cov[5] = sigmaZ2;
   p.SetXYZ(x,y,xyz[2],cov);
-  AliAlignObj::ELayerID iLayer;
+  AliGeomManager::ELayerID iLayer;
   Int_t idet;
   if (sector < fParam->GetNInnerSector()) {
-    iLayer = AliAlignObj::kTPC1;
+    iLayer = AliGeomManager::kTPC1;
     idet = sector;
   }
   else {
-    iLayer = AliAlignObj::kTPC2;
+    iLayer = AliGeomManager::kTPC2;
     idet = sector - fParam->GetNInnerSector();
   }
-  UShort_t volid = AliAlignObj::LayerToVolUID(iLayer,idet);
+  UShort_t volid = AliGeomManager::LayerToVolUID(iLayer,idet);
   p.SetVolumeID(volid);
   return kTRUE;
 }
@@ -1601,8 +1780,8 @@ Int_t AliTPCtrackerMI::UpdateClusters(AliTPCseed& t,  Int_t nr) {
   //-----------------------------------------------------------------
   // This function tries to find a track prolongation to next pad row
   //-----------------------------------------------------------------
-  t.fCurrentCluster  = 0;
-  t.fCurrentClusterIndex1 = 0;   
+  t.SetCurrentCluster(0);
+  t.SetCurrentClusterIndex1(0);   
    
   Double_t xt=t.GetX();
   Int_t     row = GetRowNumber(xt)-1; 
@@ -1631,11 +1810,11 @@ Int_t AliTPCtrackerMI::UpdateClusters(AliTPCseed& t,  Int_t nr) {
 
   if (TMath::Abs(y)>ymax){
     if (y > ymax) {
-      t.fRelativeSector= (t.fRelativeSector+1) % fN;
+      t.SetRelativeSector((t.GetRelativeSector()+1) % fN);
       if (!t.Rotate(fSectors->GetAlpha())) 
        return 0;
     } else if (y <-ymax) {
-      t.fRelativeSector= (t.fRelativeSector-1+fN) % fN;
+      t.SetRelativeSector((t.GetRelativeSector()-1+fN) % fN);
       if (!t.Rotate(-fSectors->GetAlpha())) 
        return 0;
     }
@@ -1647,16 +1826,24 @@ Int_t AliTPCtrackerMI::UpdateClusters(AliTPCseed& t,  Int_t nr) {
   }
   //
   if (TMath::Abs(t.GetSnp())>AliTPCReconstructor::GetMaxSnpTracker()) return 0;
-  AliTPCRow &krow=GetRow(t.fRelativeSector,nr);
 
-  if (TMath::Abs(TMath::Abs(y)-ymax)<krow.fDeadZone){
-    t.fInDead = kTRUE;
+  if (!IsActive(t.GetRelativeSector(),nr)) {
+    t.SetInDead(kTRUE);
+    t.SetClusterIndex2(nr,-1); 
+    return 0;
+  }
+  //AliInfo(Form("A - Sector%d phi %f - alpha %f", t.fRelativeSector,y/x, t.GetAlpha()));
+
+  AliTPCRow &krow=GetRow(t.GetRelativeSector(),nr);
+
+  if (TMath::Abs(TMath::Abs(y)-ymax)<krow.GetDeadZone()){
+    t.SetInDead(kTRUE);
     t.SetClusterIndex2(nr,-1); 
     return 0;
   } 
   else
     {
-      if (TMath::Abs(t.GetZ())<(AliTPCReconstructor::GetCtgRange()*t.GetX()+10) && (TMath::Abs(t.GetSnp())<AliTPCReconstructor::GetMaxSnpTracker())) t.fNFoundable++;
+      if (TMath::Abs(t.GetZ())<(AliTPCReconstructor::GetCtgRange()*t.GetX()+10) && (TMath::Abs(t.GetSnp())<AliTPCReconstructor::GetMaxSnpTracker())) t.SetNFoundable(t.GetNFoundable()+1);
       else
        return 0;      
     }
@@ -1678,11 +1865,11 @@ Int_t AliTPCtrackerMI::UpdateClusters(AliTPCseed& t,  Int_t nr) {
   if (!cl){
     index = t.GetClusterIndex2(nr);    
     if ( (index>0) && (index&0x8000)==0){
-      cl = t.fClusterPointer[nr];
+      cl = t.GetClusterPointer(nr);
       if ( (cl==0) && (index>0)) cl = GetClusterMI(index);
-      t.fCurrentClusterIndex1 = index;
+      t.SetCurrentClusterIndex1(index);
       if (cl) {
-       t.fCurrentCluster  = cl;
+       t.SetCurrentCluster(cl);
        return 1;
       }
     }
@@ -1696,8 +1883,8 @@ Int_t AliTPCtrackerMI::UpdateClusters(AliTPCseed& t,  Int_t nr) {
     cl = krow.FindNearest2(y,z,roady,roadz,uindex);      
   }
 
-  if (cl) t.fCurrentClusterIndex1 = krow.GetIndex(uindex);   
-  t.fCurrentCluster  = cl;
+  if (cl) t.SetCurrentClusterIndex1(krow.GetIndex(uindex));   
+  t.SetCurrentCluster(cl);
 
   return 1;
 }
@@ -1710,18 +1897,18 @@ Int_t AliTPCtrackerMI::FollowToNextCluster(AliTPCseed & t, Int_t nr) {
 
   //update error according neighborhoud
 
-  if (t.fCurrentCluster) {
-    t.fRow = nr
-    Int_t accept = AcceptCluster(&t,t.fCurrentCluster,1.);
+  if (t.GetCurrentCluster()) {
+    t.SetRow(nr)
+    Int_t accept = AcceptCluster(&t,t.GetCurrentCluster(),1.);
     
-    if (t.fCurrentCluster->IsUsed(10)){
+    if (t.GetCurrentCluster()->IsUsed(10)){
       //
       //
       //  t.fErrorZ2*=2;
       //  t.fErrorY2*=2;
-      t.fNShared++;
-      if (t.fNShared>0.7*t.GetNumberOfClusters()) {
-       t.fRemoval =10;
+      t.SetNShared(t.GetNShared()+1);
+      if (t.GetNShared()>0.7*t.GetNumberOfClusters()) {
+       t.SetRemoval(10);
        return 0;
       }
     }   
@@ -1730,10 +1917,10 @@ Int_t AliTPCtrackerMI::FollowToNextCluster(AliTPCseed & t, Int_t nr) {
  
   } else {
     if (fIteration==0){
-      if ( ( (t.GetSigmaY2()+t.GetSigmaZ2())>0.16)&& t.GetNumberOfClusters()>18) t.fRemoval=10;      
-      if (  t.GetChi2()/t.GetNumberOfClusters()>6 &&t.GetNumberOfClusters()>18) t.fRemoval=10;      
+      if ( ( (t.GetSigmaY2()+t.GetSigmaZ2())>0.16)&& t.GetNumberOfClusters()>18) t.SetRemoval(10);      
+      if (  t.GetChi2()/t.GetNumberOfClusters()>6 &&t.GetNumberOfClusters()>18) t.SetRemoval(10);      
 
-      if (( (t.fNFoundable*0.5 > t.GetNumberOfClusters()) || t.fNoCluster>15)) t.fRemoval=10;
+      if (( (t.GetNFoundable()*0.5 > t.GetNumberOfClusters()) || t.GetNoCluster()>15)) t.SetRemoval(10);
     }
   }
   return 1;
@@ -1752,7 +1939,7 @@ Int_t AliTPCtrackerMI::FollowProlongation(AliTPCseed& t, Int_t rf, Int_t step) {
   if (alpha > 2.*TMath::Pi()) alpha -= 2.*TMath::Pi();  
   if (alpha < 0.            ) alpha += 2.*TMath::Pi();  
   //
-  t.fRelativeSector = Int_t(alpha/fSectors->GetAlpha()+0.0001)%fN;
+  t.SetRelativeSector(Int_t(alpha/fSectors->GetAlpha()+0.0001)%fN);
     
   Int_t first = GetRowNumber(xt)-1;
   for (Int_t nr= first; nr>=rf; nr-=step) {
@@ -1763,7 +1950,7 @@ Int_t AliTPCtrackerMI::FollowProlongation(AliTPCseed& t, Int_t rf, Int_t step) {
        if (index==0) break;
        if (index<0) continue;
        //
-       AliESDkink * kink = fEvent->GetKink(index-1);
+       AliKink * kink = (AliKink*)fEvent->GetKink(index-1);
        if (!kink){
          printf("PROBLEM\n");
        }
@@ -1803,7 +1990,7 @@ Int_t AliTPCtrackerMI::FollowProlongationFast(AliTPCseed& t, Int_t rf, Int_t ste
   Double_t alpha=t.GetAlpha() - fSectors->GetAlphaShift();
   if (alpha > 2.*TMath::Pi()) alpha -= 2.*TMath::Pi();  
   if (alpha < 0.            ) alpha += 2.*TMath::Pi();  
-  t.fRelativeSector = Int_t(alpha/fSectors->GetAlpha()+0.0001)%fN;
+  t.SetRelativeSector(Int_t(alpha/fSectors->GetAlpha()+0.0001)%fN);
     
   for (Int_t nr=GetRowNumber(xt)-1; nr>=rf; nr-=step) {
     
@@ -1827,9 +2014,9 @@ Int_t AliTPCtrackerMI::FollowBackProlongation(AliTPCseed& t, Int_t rf) {
   Double_t alpha=t.GetAlpha() - fSectors->GetAlphaShift();
   if (alpha > 2.*TMath::Pi()) alpha -= 2.*TMath::Pi();  
   if (alpha < 0.            ) alpha += 2.*TMath::Pi();  
-  t.fRelativeSector = Int_t(alpha/fSectors->GetAlpha()+0.0001)%fN;
+  t.SetRelativeSector(Int_t(alpha/fSectors->GetAlpha()+0.0001)%fN);
     
-  Int_t first = t.fFirstPoint;
+  Int_t first = t.GetFirstPoint();
   if (first<GetRowNumber(xt)+1) first = GetRowNumber(xt)+1;
   //
   if (first<0) first=0;
@@ -1841,7 +2028,7 @@ Int_t AliTPCtrackerMI::FollowBackProlongation(AliTPCseed& t, Int_t rf) {
        if (index==0) break;
        if (index>0) continue;
        index = TMath::Abs(index);
-       AliESDkink * kink = fEvent->GetKink(index-1);
+       AliKink * kink = (AliKink*)fEvent->GetKink(index-1);
        if (!kink){
          printf("PROBLEM\n");
        }
@@ -1861,6 +2048,7 @@ Int_t AliTPCtrackerMI::FollowBackProlongation(AliTPCseed& t, Int_t rf) {
       fSectors = fInnerSec;
     else
       fSectors = fOuterSec;
+
     FollowToNext(t,nr);                                                             
   }   
   return 1;
@@ -1887,8 +2075,8 @@ Float_t AliTPCtrackerMI::OverlapFactor(AliTPCseed * s1, AliTPCseed * s2, Int_t &
   if (distance>4.) return 0; // if there are far away  - not overlap - to reduce combinatorics
  
   //  Int_t offset =0;
-  Int_t firstpoint = TMath::Min(s1->fFirstPoint,s2->fFirstPoint);
-  Int_t lastpoint = TMath::Max(s1->fLastPoint,s2->fLastPoint);
+  Int_t firstpoint = TMath::Min(s1->GetFirstPoint(),s2->GetFirstPoint());
+  Int_t lastpoint = TMath::Max(s1->GetLastPoint(),s2->GetLastPoint());
   if (lastpoint>160) 
     lastpoint =160;
   if (firstpoint<0) 
@@ -1917,31 +2105,32 @@ void  AliTPCtrackerMI::SignShared(AliTPCseed * s1, AliTPCseed * s2)
 {
   //
   //
-  if (TMath::Abs(s1->GetC()-s2->GetC())>0.004) return;
-  if (TMath::Abs(s1->GetTgl()-s2->GetTgl())>0.6) return;
-
-  Float_t dz2 =(s1->GetZ() - s2->GetZ());
-  dz2*=dz2;
-  Float_t dy2 =(s1->GetY() - s2->GetY());
-  dy2*=dy2;
-  Float_t distance = dz2+dy2;
-  if (distance>325.) return ; // if there are far away  - not overlap - to reduce combinatorics
+  Float_t thetaCut = 0.2;//+10.*TMath::Sqrt(s1->GetSigmaTglZ()+ s2->GetSigmaTglZ());
+  if (TMath::Abs(s1->GetTgl()-s2->GetTgl())>thetaCut) return;
+  Float_t minCl = TMath::Min(s1->GetNumberOfClusters(),s2->GetNumberOfClusters());
+  Int_t cutN0 = TMath::Max(5,TMath::Nint(0.1*minCl));
   
   //
   Int_t sumshared=0;
   //
-  Int_t firstpoint = TMath::Max(s1->fFirstPoint,s2->fFirstPoint);
-  Int_t lastpoint = TMath::Min(s1->fLastPoint,s2->fLastPoint);
+  //Int_t firstpoint = TMath::Max(s1->GetFirstPoint(),s2->GetFirstPoint());
+  //Int_t lastpoint = TMath::Min(s1->GetLastPoint(),s2->GetLastPoint());
+  Int_t firstpoint = 0;
+  Int_t lastpoint = 160;
   //
-  if (firstpoint>=lastpoint-5) return;;
+  //  if (firstpoint>=lastpoint-5) return;;
 
   for (Int_t i=firstpoint;i<lastpoint;i++){
     //    if ( (s1->GetClusterIndex2(i)&0xFFFF8FFF)==(s2->GetClusterIndex2(i)&0xFFFF8FFF) && s1->GetClusterIndex2(i)>0) {
     if ( (s1->GetClusterIndex2(i))==(s2->GetClusterIndex2(i)) && s1->GetClusterIndex2(i)>0) {
       sumshared++;
+      s1->SetSharedMapBit(i, kTRUE);
+      s2->SetSharedMapBit(i, kTRUE);
     }
+    if (s1->GetClusterIndex2(i)>0)
+      s1->SetClusterMapBit(i, kTRUE);
   }
-  if (sumshared>4){
+  if (sumshared>cutN0){
     // sign clusters
     //
     for (Int_t i=firstpoint;i<lastpoint;i++){
@@ -1950,32 +2139,31 @@ void  AliTPCtrackerMI::SignShared(AliTPCseed * s1, AliTPCseed * s2)
        AliTPCTrackerPoint *p1  = s1->GetTrackPoint(i);
        AliTPCTrackerPoint *p2  = s2->GetTrackPoint(i);; 
        if (s1->IsActive()&&s2->IsActive()){
-         p1->fIsShared = kTRUE;
-         p2->fIsShared = kTRUE;
+         p1->SetShared(kTRUE);
+         p2->SetShared(kTRUE);
        }       
       }
     }
   }
   //  
-  if (sumshared>10){
+  if (sumshared>cutN0){
     for (Int_t i=0;i<4;i++){
-      if (s1->fOverlapLabels[3*i]==0){
-       s1->fOverlapLabels[3*i] = s2->GetLabel();
-       s1->fOverlapLabels[3*i+1] = sumshared;
-       s1->fOverlapLabels[3*i+2] = s2->GetUniqueID();
+      if (s1->GetOverlapLabel(3*i)==0){
+       s1->SetOverlapLabel(3*i,  s2->GetLabel());
+       s1->SetOverlapLabel(3*i+1,sumshared);
+       s1->SetOverlapLabel(3*i+2,s2->GetUniqueID());
        break;
       }        
     }
     for (Int_t i=0;i<4;i++){
-      if (s2->fOverlapLabels[3*i]==0){
-       s2->fOverlapLabels[3*i] = s1->GetLabel();
-       s2->fOverlapLabels[3*i+1] = sumshared;
-       s2->fOverlapLabels[3*i+2] = s1->GetUniqueID();
+      if (s2->GetOverlapLabel(3*i)==0){
+       s2->SetOverlapLabel(3*i,  s1->GetLabel());
+       s2->SetOverlapLabel(3*i+1,sumshared);
+       s2->SetOverlapLabel(3*i+2,s1->GetUniqueID());
        break;
       }        
     }    
   }
-  
 }
 
 void  AliTPCtrackerMI::SignShared(TObjArray * arr)
@@ -1987,10 +2175,10 @@ void  AliTPCtrackerMI::SignShared(TObjArray * arr)
     AliTPCseed *pt=(AliTPCseed*)arr->UncheckedAt(i);    
     if (!pt) continue;
     //if (pt) RotateToLocal(pt);
-    pt->fSort = 0;
+    pt->SetSort(0);
   }
   arr->UnSort();
-  arr->Sort();  // sorting according z
+  arr->Sort();  // sorting according relative sectors
   arr->Expand(arr->GetEntries());
   //
   //
@@ -1999,110 +2187,25 @@ void  AliTPCtrackerMI::SignShared(TObjArray * arr)
     AliTPCseed *pt=(AliTPCseed*)arr->UncheckedAt(i);    
     if (!pt) continue;
     for (Int_t j=0;j<=12;j++){
-      pt->fOverlapLabels[j] =0;
+      pt->SetOverlapLabel(j,0);
     }
   }
   for (Int_t i=0; i<nseed; i++) {
     AliTPCseed *pt=(AliTPCseed*)arr->UncheckedAt(i);    
     if (!pt) continue;
-    if (pt->fRemoval>10) continue;
+    if (pt->GetRemoval()>10) continue;
     for (Int_t j=i+1; j<nseed; j++){
       AliTPCseed *pt2=(AliTPCseed*)arr->UncheckedAt(j);
+      if (TMath::Abs(pt->GetRelativeSector()-pt2->GetRelativeSector())>1) continue;
       //      if (pt2){
-      if (pt2->fRemoval<=10) {
-       if ( TMath::Abs(pt->fRelativeSector-pt2->fRelativeSector)>0) break;
+      if (pt2->GetRemoval()<=10) {
+       //if ( TMath::Abs(pt->GetRelativeSector()-pt2->GetRelativeSector())>0) break;
        SignShared(pt,pt2);
       }
     }  
   }
 }
 
-void  AliTPCtrackerMI::RemoveDouble(TObjArray * arr, Float_t factor1, Float_t factor2,  Int_t removalindex)
-{
-  //
-  //sort trackss according sectors
-  //
-  if (fDebug&1) {
-    Info("RemoveDouble","Number of tracks before double removal- %d\n",arr->GetEntries());
-  }
-  //
-  for (Int_t i=0; i<arr->GetEntriesFast(); i++) {
-    AliTPCseed *pt=(AliTPCseed*)arr->UncheckedAt(i);    
-    if (!pt) continue;
-    pt->fSort = 0;
-  }
-  arr->UnSort();
-  arr->Sort();  // sorting according z
-  arr->Expand(arr->GetEntries());
-  //
-  //reset overlap labels
-  //
-  Int_t nseed=arr->GetEntriesFast();
-  for (Int_t i=0; i<nseed; i++) {
-    AliTPCseed *pt=(AliTPCseed*)arr->UncheckedAt(i);    
-    if (!pt) continue;
-    pt->SetUniqueID(i);
-    for (Int_t j=0;j<=12;j++){
-      pt->fOverlapLabels[j] =0;
-    }
-  }
-  //
-  //sign shared tracks
-  for (Int_t i=0; i<nseed; i++) {
-    AliTPCseed *pt=(AliTPCseed*)arr->UncheckedAt(i);    
-    if (!pt) continue;
-    if (pt->fRemoval>10) continue;
-    Float_t deltac = pt->GetC()*0.1;
-    for (Int_t j=i+1; j<nseed; j++){
-      AliTPCseed *pt2=(AliTPCseed*)arr->UncheckedAt(j);
-      //      if (pt2){
-      if (pt2->fRemoval<=10) {
-       if ( TMath::Abs(pt->fRelativeSector-pt2->fRelativeSector)>0) break;
-       if (TMath::Abs(pt->GetC()  -pt2->GetC())>deltac) continue;
-       if (TMath::Abs(pt->GetTgl()-pt2->GetTgl())>0.05) continue;
-       //
-       SignShared(pt,pt2);
-      }
-    }
-  }
-  //
-  // remove highly shared tracks
-  for (Int_t i=0; i<nseed; i++) {
-    AliTPCseed *pt=(AliTPCseed*)arr->UncheckedAt(i);    
-    if (!pt) continue;
-    if (pt->fRemoval>10) continue;
-    //
-    Int_t sumshared =0;
-    for (Int_t j=0;j<4;j++){
-      sumshared = pt->fOverlapLabels[j*3+1];      
-    }
-    Float_t factor = factor1;
-    if (pt->fRemoval>0) factor = factor2;
-    if (sumshared/pt->GetNumberOfClusters()>factor){
-      for (Int_t j=0;j<4;j++){
-       if (pt->fOverlapLabels[3*j]==0) continue;
-       if (pt->fOverlapLabels[3*j+1]<5) continue; 
-       if (pt->fRemoval==removalindex) continue;      
-       AliTPCseed * pt2 = (AliTPCseed*)arr->UncheckedAt(pt->fOverlapLabels[3*j+2]);
-       if (!pt2) continue;
-       if (pt2->GetSigma2C()<pt->GetSigma2C()){
-         //      pt->fRemoval = removalindex;
-         delete arr->RemoveAt(i);        
-         break;
-       }
-      }      
-    }
-  }
-  arr->Compress();
-  if (fDebug&1) {
-    Info("RemoveDouble","Number of tracks after double removal- %d\n",arr->GetEntries());
-  }
-}
-
-
-
-
-
 
 void AliTPCtrackerMI::SortTracks(TObjArray * arr, Int_t mode) const
 {
@@ -2114,85 +2217,33 @@ void AliTPCtrackerMI::SortTracks(TObjArray * arr, Int_t mode) const
     if (!pt) {
       continue;
     }
-    pt->fSort = mode;
-  }
-  arr->UnSort();
-  arr->Sort();
-}
-
-void AliTPCtrackerMI::RemoveUsed(TObjArray * arr, Float_t factor1,  Float_t factor2, Int_t removalindex)
-{
-
-  //Loop over all tracks and remove "overlaps"
-  //
-  //
-  Int_t nseed = arr->GetEntriesFast();  
-  Int_t good =0;
-
-  for (Int_t i=0; i<nseed; i++) {
-    AliTPCseed *pt=(AliTPCseed*)arr->UncheckedAt(i);    
-    if (!pt) {
-      delete arr->RemoveAt(i);
-    }
-    else{
-      pt->fSort =1;
-      pt->fBSigned = kFALSE;
-    }
+    pt->SetSort(mode);
   }
-  arr->Compress();
-  nseed = arr->GetEntriesFast();
   arr->UnSort();
   arr->Sort();
-  //
-  //unsign used
-  UnsignClusters();
-  //
-  for (Int_t i=0; i<nseed; i++) {
-    AliTPCseed *pt=(AliTPCseed*)arr->UncheckedAt(i);    
-    if (!pt) {
-      continue;
-    }    
-    Int_t found,foundable,shared;
-    if (pt->IsActive()) 
-      pt->GetClusterStatistic(0,160,found, foundable,shared,kFALSE);
-    else
-      pt->GetClusterStatistic(0,160,found, foundable,shared,kTRUE); 
-    //
-    Double_t factor = factor2;
-    if (pt->fBConstrain) factor = factor1;
-
-    if ((Float_t(shared)/Float_t(found))>factor){
-      pt->Desactivate(removalindex);
-      continue;
-    }
-
-    good++;
-    for (Int_t i=0; i<160; i++) {
-      Int_t index=pt->GetClusterIndex2(i);
-      if (index<0 || index&0x8000 ) continue;
-      AliTPCclusterMI *c= pt->fClusterPointer[i];        
-      if (!c) continue;
-      //      if (!c->IsUsed(10)) c->Use(10);
-      //if (pt->IsActive()) 
-      c->Use(10);  
-      //else
-      //       c->Use(5);
-    }
-    
-  }
-  fNtracks = good;
-  if (fDebug>0){
-    Info("RemoveUsed","\n*****\nNumber of good tracks after shared removal\t%d\n",fNtracks);
-  }
 }
 
 
 void AliTPCtrackerMI::RemoveUsed2(TObjArray * arr, Float_t factor1,  Float_t factor2, Int_t minimal)
 {
-
-  //Loop over all tracks and remove "overlaps"
   //
+  // Loop over all tracks and remove overlaped tracks (with lower quality)
+  // Algorithm:
+  //    1. Unsign clusters
+  //    2. Sort tracks according quality
+  //       Quality is defined by the number of cluster between first and last points 
+  //       
+  //    3. Loop over tracks - decreasing quality order
+  //       a.) remove - If the fraction of shared cluster less than factor (1- n or 2) 
+  //       b.) remove - If the minimal number of clusters less than minimal and not ITS
+  //       c.) if track accepted - sign clusters
   //
+  //Called in - AliTPCtrackerMI::Clusters2Tracks()
+  //          - AliTPCtrackerMI::PropagateBack()
+  //          - AliTPCtrackerMI::RefitInward()
+  //
+
   UnsignClusters();
   //
   Int_t nseed = arr->GetEntriesFast();  
@@ -2210,15 +2261,18 @@ void AliTPCtrackerMI::RemoveUsed2(TObjArray * arr, Float_t factor1,  Float_t fac
     pt->UpdatePoints();    //select first last max dens points
     Float_t * points = pt->GetPoints();
     if (points[3]<0.8) quality[i] =-1;
-    //
     quality[i] = (points[2]-points[0])+pt->GetNumberOfClusters();
+    //prefer high momenta tracks if overlaps
+    quality[i] *= TMath::Sqrt(TMath::Abs(pt->Pt())+0.5); 
   }
   TMath::Sort(nseed,quality,indexes);
   //
   //
   for (Int_t itrack=0; itrack<nseed; itrack++) {
     Int_t trackindex = indexes[itrack];
-    AliTPCseed *pt=(AliTPCseed*)arr->UncheckedAt(trackindex);    
+    AliTPCseed *pt=(AliTPCseed*)arr->UncheckedAt(trackindex);   
+    if (!pt) continue;
+    //
     if (quality[trackindex]<0){
       if (pt) {
        delete arr->RemoveAt(trackindex);
@@ -2229,17 +2283,18 @@ void AliTPCtrackerMI::RemoveUsed2(TObjArray * arr, Float_t factor1,  Float_t fac
       continue;
     }
     //
+    //
     Int_t first = Int_t(pt->GetPoints()[0]);
     Int_t last  = Int_t(pt->GetPoints()[2]);
-    Double_t factor = (pt->fBConstrain) ? factor1: factor2;
+    Double_t factor = (pt->GetBConstrain()) ? factor1: factor2;
     //
     Int_t found,foundable,shared;
-    pt->GetClusterStatistic(first,last, found, foundable,shared,kFALSE);
-    Float_t sharedfactor = Float_t(shared+1)/Float_t(found+1);
+    pt->GetClusterStatistic(first,last, found, foundable,shared,kFALSE); // better to get statistic in "high-dens"  region do't use full track as in line bellow
+    //    pt->GetClusterStatistic(0,160, found, foundable,shared,kFALSE);
     Bool_t itsgold =kFALSE;
-    if (pt->fEsd){
-      UInt_t dummy[12];
-      if (pt->fEsd->GetITSclusters(dummy)>4) itsgold= kTRUE;
+    if (pt->GetESD()){
+      Int_t dummy[12];
+      if (pt->GetESD()->GetITSclusters(dummy)>4) itsgold= kTRUE;
     }
     if (!itsgold){
       //
@@ -2256,13 +2311,16 @@ void AliTPCtrackerMI::RemoveUsed2(TObjArray * arr, Float_t factor1,  Float_t fac
     }
 
     good++;
-    if (sharedfactor>0.4) continue;
+    //if (sharedfactor>0.4) continue;
     if (pt->GetKinkIndexes()[0]>0) continue;
+    //Remove tracks with undefined properties - seems
+    if (pt->GetSigmaY2()<kAlmost0) continue; // ? what is the origin ? 
+    //
     for (Int_t i=first; i<last; i++) {
       Int_t index=pt->GetClusterIndex2(i);
       // if (index<0 || index&0x8000 ) continue;
       if (index<0 || index&0x8000 ) continue;
-      AliTPCclusterMI *c= pt->fClusterPointer[i];        
+      AliTPCclusterMI *c= pt->GetClusterPointer(i);        
       if (!c) continue;
       c->Use(10);  
     }    
@@ -2283,12 +2341,12 @@ void AliTPCtrackerMI::UnsignClusters()
   
   for (Int_t sec=0;sec<fkNIS;sec++){
     for (Int_t row=0;row<fInnerSec->GetNRows();row++){
-      AliTPCclusterMI *cl = fInnerSec[sec][row].fClusters1;
-      for (Int_t icl =0;icl< fInnerSec[sec][row].fN1;icl++)
+      AliTPCclusterMI *cl = fInnerSec[sec][row].GetClusters1();
+      for (Int_t icl =0;icl< fInnerSec[sec][row].GetN1();icl++)
        //      if (cl[icl].IsUsed(10))         
        cl[icl].Use(-1);
-      cl = fInnerSec[sec][row].fClusters2;
-      for (Int_t icl =0;icl< fInnerSec[sec][row].fN2;icl++)
+      cl = fInnerSec[sec][row].GetClusters2();
+      for (Int_t icl =0;icl< fInnerSec[sec][row].GetN2();icl++)
        //if (cl[icl].IsUsed(10))       
          cl[icl].Use(-1);      
     }
@@ -2296,12 +2354,12 @@ void AliTPCtrackerMI::UnsignClusters()
   
   for (Int_t sec=0;sec<fkNOS;sec++){
     for (Int_t row=0;row<fOuterSec->GetNRows();row++){
-      AliTPCclusterMI *cl = fOuterSec[sec][row].fClusters1;
-      for (Int_t icl =0;icl< fOuterSec[sec][row].fN1;icl++)
+      AliTPCclusterMI *cl = fOuterSec[sec][row].GetClusters1();
+      for (Int_t icl =0;icl< fOuterSec[sec][row].GetN1();icl++)
        //if (cl[icl].IsUsed(10))       
          cl[icl].Use(-1);
-      cl = fOuterSec[sec][row].fClusters2;
-      for (Int_t icl =0;icl< fOuterSec[sec][row].fN2;icl++)
+      cl = fOuterSec[sec][row].GetClusters2();
+      for (Int_t icl =0;icl< fOuterSec[sec][row].GetN2();icl++)
        //if (cl[icl].IsUsed(10))       
        cl[icl].Use(-1);      
     }
@@ -2338,7 +2396,7 @@ void AliTPCtrackerMI::SignClusters(TObjArray * arr, Float_t fnumber, Float_t fde
       continue;
     }    
     if (!(pt->IsActive())) continue;
-    Float_t dens = pt->GetNumberOfClusters()/Float_t(pt->fNFoundable);
+    Float_t dens = pt->GetNumberOfClusters()/Float_t(pt->GetNFoundable());
     if ( (dens>0.7) && (pt->GetNumberOfClusters()>70)){
       sumdens += dens;
       sumdens2+= dens*dens;
@@ -2366,13 +2424,22 @@ void AliTPCtrackerMI::SignClusters(TObjArray * arr, Float_t fnumber, Float_t fde
     meanchi  = sumchi/sum;
     //
     sdensity = sumdens2/sum-mdensity*mdensity;
-    sdensity = TMath::Sqrt(sdensity);
+    if (sdensity >= 0)
+       sdensity = TMath::Sqrt(sdensity);
+    else
+       sdensity = 0.1;
     //
     smeann   = sumn2/sum-meann*meann;
-    smeann   = TMath::Sqrt(smeann);
+    if (smeann >= 0)
+      smeann   = TMath::Sqrt(smeann);
+    else 
+      smeann   = 10;
     //
     smeanchi = sumchi2/sum - meanchi*meanchi;
-    smeanchi = TMath::Sqrt(smeanchi);
+    if (smeanchi >= 0)
+      smeanchi = TMath::Sqrt(smeanchi);
+    else
+      smeanchi = 0.4;
   }
 
 
@@ -2383,8 +2450,8 @@ void AliTPCtrackerMI::SignClusters(TObjArray * arr, Float_t fnumber, Float_t fde
     if (!pt) {
       continue;
     }
-    if (pt->fBSigned) continue;
-    if (pt->fBConstrain) continue;    
+    if (pt->GetBSigned()) continue;
+    if (pt->GetBConstrain()) continue;    
     //if (!(pt->IsActive())) continue;
     /*
     Int_t found,foundable,shared;    
@@ -2397,9 +2464,9 @@ void AliTPCtrackerMI::SignClusters(TObjArray * arr, Float_t fnumber, Float_t fde
     }
     */
     Bool_t isok =kFALSE;
-    if ( (pt->fNShared/pt->GetNumberOfClusters()<0.5) &&pt->GetNumberOfClusters()>60)
+    if ( (pt->GetNShared()/pt->GetNumberOfClusters()<0.5) &&pt->GetNumberOfClusters()>60)
       isok = kTRUE;
-    if ((TMath::Abs(1/pt->GetC())<100.) && (pt->fNShared/pt->GetNumberOfClusters()<0.7))
+    if ((TMath::Abs(1/pt->GetC())<100.) && (pt->GetNShared()/pt->GetNumberOfClusters()<0.7))
       isok =kTRUE;
     if  (TMath::Abs(pt->GetZ()/pt->GetX())>1.1)
       isok =kTRUE;
@@ -2410,7 +2477,7 @@ void AliTPCtrackerMI::SignClusters(TObjArray * arr, Float_t fnumber, Float_t fde
       for (Int_t i=0; i<160; i++) {    
        Int_t index=pt->GetClusterIndex2(i);
        if (index<0) continue;
-       AliTPCclusterMI *c= pt->fClusterPointer[i];
+       AliTPCclusterMI *c= pt->GetClusterPointer(i);
        if (!c) continue;
        //if (!(c->IsUsed(10))) c->Use();  
        c->Use(10);  
@@ -2427,12 +2494,12 @@ void AliTPCtrackerMI::SignClusters(TObjArray * arr, Float_t fnumber, Float_t fde
       continue;
     }    
     //if (!(pt->IsActive())) continue;
-    if (pt->fBSigned) continue;
+    if (pt->GetBSigned()) continue;
     Double_t chi     = pt->GetChi2()/pt->GetNumberOfClusters();
     if (chi>maxchi) continue;
 
     Float_t bfactor=1;
-    Float_t dens = pt->GetNumberOfClusters()/Float_t(pt->fNFoundable);
+    Float_t dens = pt->GetNumberOfClusters()/Float_t(pt->GetNFoundable());
    
     //sign only tracks with enoug big density at the beginning
     
@@ -2443,17 +2510,17 @@ void AliTPCtrackerMI::SignClusters(TObjArray * arr, Float_t fnumber, Float_t fde
     Double_t minn    = TMath::Max(Int_t(meann-fnumber*smeann*bfactor),50);
    
     //    if (pt->fBConstrain) mindens = TMath::Max(mdensity-sdensity*fdensity*bfactor,0.65);
-    if ( (pt->fRemoval==10) && (pt->GetSnp()>0.8)&&(dens>mindens))
+    if ( (pt->GetRemoval()==10) && (pt->GetSnp()>0.8)&&(dens>mindens))
       minn=0;
 
     if ((dens>mindens && pt->GetNumberOfClusters()>minn) && chi<maxchi ){
       //Int_t noc=pt->GetNumberOfClusters();
-      pt->fBSigned = kTRUE;
+      pt->SetBSigned(kTRUE);
       for (Int_t i=0; i<160; i++) {
 
        Int_t index=pt->GetClusterIndex2(i);
        if (index<0) continue;
-       AliTPCclusterMI *c= pt->fClusterPointer[i];
+       AliTPCclusterMI *c= pt->GetClusterPointer(i);
        if (!c) continue;
        //      if (!(c->IsUsed(10))) c->Use();  
        c->Use(10);  
@@ -2496,8 +2563,8 @@ void  AliTPCtrackerMI::StopNotActive(AliTPCseed * seed, Int_t row0, Float_t th0,
   Int_t sumgood1  = 0;
   Int_t sumgood2  = 0;
   Int_t foundable = 0;
-  Int_t maxindex = seed->fLastPoint;  //last foundable row
-  if (seed->fNFoundable*th0 > seed->GetNumberOfClusters()) {
+  Int_t maxindex = seed->GetLastPoint();  //last foundable row
+  if (seed->GetNFoundable()*th0 > seed->GetNumberOfClusters()) {
     seed->Desactivate(10) ;
     return;
   }
@@ -2522,17 +2589,27 @@ void  AliTPCtrackerMI::StopNotActive(AliTPCseed * seed, Int_t row0, Float_t th0,
 }
 
 
-Int_t AliTPCtrackerMI::RefitInward(AliESD *event)
+Int_t AliTPCtrackerMI::RefitInward(AliESDEvent *event)
 {
   //
   // back propagation of ESD tracks
   //
   //return 0;
+  const Int_t kMaxFriendTracks=2000;
   fEvent = event;
   ReadSeeds(event,2);
   fIteration=2;
   //PrepareForProlongation(fSeeds,1);
   PropagateForward2(fSeeds);
+  RemoveUsed2(fSeeds,0.4,0.4,20);
+
+  TObjArray arraySeed(fSeeds->GetEntries());
+  for (Int_t i=0;i<fSeeds->GetEntries();i++) {
+    arraySeed.AddAt(fSeeds->At(i),i);    
+  }
+  SignShared(&arraySeed);
+  //  FindCurling(fSeeds, event,2); // find multi found tracks
+  FindSplitted(fSeeds, event,2); // find multi found tracks
 
   Int_t ntracks=0;
   Int_t nseed = fSeeds->GetEntriesFast();
@@ -2543,25 +2620,37 @@ Int_t AliTPCtrackerMI::RefitInward(AliESD *event)
 
     seed->PropagateTo(fParam->GetInnerRadiusLow());
     seed->UpdatePoints();
+    MakeBitmaps(seed);
     AliESDtrack *esd=event->GetTrack(i);
     seed->CookdEdx(0.02,0.6);
     CookLabel(seed,0.1); //For comparison only
+    esd->SetTPCClusterMap(seed->GetClusterMap());
+    esd->SetTPCSharedMap(seed->GetSharedMap());
     //
-    if (AliTPCReconstructor::StreamLevel()>0 && seed!=0&&esd!=0) {
+    if (AliTPCReconstructor::StreamLevel()>1 && seed!=0&&esd!=0) {
       TTreeSRedirector &cstream = *fDebugStreamer;
       cstream<<"Crefit"<<
        "Esd.="<<esd<<
        "Track.="<<seed<<
        "\n"; 
     }
+
     if (seed->GetNumberOfClusters()>15){
       esd->UpdateTrackParams(seed,AliESDtrack::kTPCrefit); 
       esd->SetTPCPoints(seed->GetPoints());
-      esd->SetTPCPointsF(seed->fNFoundable);
-      Int_t ndedx   = seed->fNCDEDX[0]+seed->fNCDEDX[1]+seed->fNCDEDX[2]+seed->fNCDEDX[3];
-      Float_t sdedx = (seed->fSDEDX[0]+seed->fSDEDX[1]+seed->fSDEDX[2]+seed->fSDEDX[3])*0.25;
+      esd->SetTPCPointsF(seed->GetNFoundable());
+      Int_t ndedx   = seed->GetNCDEDX(0)+seed->GetNCDEDX(1)+seed->GetNCDEDX(2)+seed->GetNCDEDX(3);
+      Float_t sdedx = (seed->GetSDEDX(0)+seed->GetSDEDX(1)+seed->GetSDEDX(2)+seed->GetSDEDX(3))*0.25;
       Float_t dedx  = seed->GetdEdx();
       esd->SetTPCsignal(dedx, sdedx, ndedx);
+      //
+      // add seed to the esd track in Calib level
+      //
+      Bool_t storeFriend = gRandom->Rndm()<(kMaxFriendTracks)/Float_t(nseed);
+      if (AliTPCReconstructor::StreamLevel()>0 &&storeFriend){
+       AliTPCseed * seedCopy = new AliTPCseed(*seed, kTRUE); 
+       esd->AddCalibObject(seedCopy);
+      }
       ntracks++;
     }
     else{
@@ -2576,7 +2665,7 @@ Int_t AliTPCtrackerMI::RefitInward(AliESD *event)
 }
 
 
-Int_t AliTPCtrackerMI::PropagateBack(AliESD *event)
+Int_t AliTPCtrackerMI::PropagateBack(AliESDEvent *event)
 {
   //
   // back propagation of ESD tracks
@@ -2587,6 +2676,9 @@ Int_t AliTPCtrackerMI::PropagateBack(AliESD *event)
   ReadSeeds(event,1);
   PropagateBack(fSeeds); 
   RemoveUsed2(fSeeds,0.4,0.4,20);
+  //FindCurling(fSeeds, fEvent,1);  
+  FindSplitted(fSeeds, event,1); // find multi found tracks
+
   //
   Int_t nseed = fSeeds->GetEntriesFast();
   Int_t ntracks=0;
@@ -2601,23 +2693,27 @@ Int_t AliTPCtrackerMI::PropagateBack(AliESD *event)
     if (seed->GetNumberOfClusters()>15){
       esd->UpdateTrackParams(seed,AliESDtrack::kTPCout);
       esd->SetTPCPoints(seed->GetPoints());
-      esd->SetTPCPointsF(seed->fNFoundable);
-      Int_t ndedx   = seed->fNCDEDX[0]+seed->fNCDEDX[1]+seed->fNCDEDX[2]+seed->fNCDEDX[3];
-      Float_t sdedx = (seed->fSDEDX[0]+seed->fSDEDX[1]+seed->fSDEDX[2]+seed->fSDEDX[3])*0.25;
+      esd->SetTPCPointsF(seed->GetNFoundable());
+      Int_t ndedx   = seed->GetNCDEDX(0)+seed->GetNCDEDX(1)+seed->GetNCDEDX(2)+seed->GetNCDEDX(3);
+      Float_t sdedx = (seed->GetSDEDX(0)+seed->GetSDEDX(1)+seed->GetSDEDX(2)+seed->GetSDEDX(3))*0.25;
       Float_t dedx  = seed->GetdEdx();
       esd->SetTPCsignal(dedx, sdedx, ndedx);
       ntracks++;
-      Int_t eventnumber = event->GetEventNumber();// patch 28 fev 06
-      (*fDebugStreamer)<<"Cback"<<
-       "Tr0.="<<seed<<
-       "EventNr="<<eventnumber<<
-       "\n"; // patch 28 fev 06   
+      Int_t eventnumber = event->GetEventNumberInFile();// patch 28 fev 06
+      // This is most likely NOT the event number you'd like to use. It has nothing to do with the 'real' event number      
+      if (AliTPCReconstructor::StreamLevel()>1) {
+       (*fDebugStreamer)<<"Cback"<<
+         "Tr0.="<<seed<<
+         "EventNrInFile="<<eventnumber<<
+         "\n"; // patch 28 fev 06         
+      }
     }
   }
   //FindKinks(fSeeds,event);
   Info("PropagateBack","Number of back propagated tracks %d",ntracks);
   fEvent =0;
   //WriteTracks();
+  
   return 0;
 }
 
@@ -2626,16 +2722,18 @@ void AliTPCtrackerMI::DeleteSeeds()
 {
   //
   //delete Seeds
+
   Int_t nseed = fSeeds->GetEntriesFast();
   for (Int_t i=0;i<nseed;i++){
     AliTPCseed * seed = (AliTPCseed*)fSeeds->At(i);
     if (seed) delete fSeeds->RemoveAt(i);
   }
   delete fSeeds;
+
   fSeeds =0;
 }
 
-void AliTPCtrackerMI::ReadSeeds(AliESD *event, Int_t direction)
+void AliTPCtrackerMI::ReadSeeds(AliESDEvent *event, Int_t direction)
 {
   //
   //read seeds from the event
@@ -2659,6 +2757,7 @@ void AliTPCtrackerMI::ReadSeeds(AliESD *event, Int_t direction)
     t.SetNumberOfClusters(0);
     //    AliTPCseed *seed = new AliTPCseed(t,t.GetAlpha());
     AliTPCseed *seed = new AliTPCseed(t/*,t.GetAlpha()*/);
+    seed->SetUniqueID(esd->GetID());
     for (Int_t ikink=0;ikink<3;ikink++) {
       Int_t index = esd->GetKinkIndex(ikink);
       seed->GetKinkIndexes()[ikink] = index;
@@ -2675,8 +2774,8 @@ void AliTPCtrackerMI::ReadSeeds(AliESD *event, Int_t direction)
       }
 
     }
-    if (((status&AliESDtrack::kITSout)==0)&&(direction==1)) seed->ResetCovariance(); 
-    if ( direction ==2 &&(status & AliESDtrack::kTRDrefit) == 0 ) seed->ResetCovariance();
+    if (((status&AliESDtrack::kITSout)==0)&&(direction==1)) seed->ResetCovariance(10.); 
+    if ( direction ==2 &&(status & AliESDtrack::kTRDrefit) == 0 ) seed->ResetCovariance(10.);
     if ( direction ==2 && ((status & AliESDtrack::kTPCout) == 0) ) {
       fSeeds->AddAt(0,i);
       delete seed;
@@ -2692,7 +2791,7 @@ void AliTPCtrackerMI::ReadSeeds(AliESD *event, Int_t direction)
       if (esd->GetTRDncls()>0) trdchi2 = esd->GetTRDchi2()/esd->GetTRDncls();
       //reset covariance if suspicious 
       if ( (delta1>0.1) || (delta2>0.006) ||trdchi2>7.)
-       seed->ResetCovariance();
+       seed->ResetCovariance(10.);
     }
 
     //
@@ -2712,7 +2811,7 @@ void AliTPCtrackerMI::ReadSeeds(AliESD *event, Int_t direction)
       delete seed;
       continue;
     }
-    seed->fEsd = esd;
+    seed->SetESD(esd);
     // sign clusters
     if (esd->GetKinkIndex(0)<=0){
       for (Int_t irow=0;irow<160;irow++){
@@ -2720,7 +2819,7 @@ void AliTPCtrackerMI::ReadSeeds(AliESD *event, Int_t direction)
        if (index>0){ 
          //
          AliTPCclusterMI * cl = GetClusterMI(index);
-         seed->fClusterPointer[irow] = cl;
+         seed->SetClusterPointer(irow,cl);
          if (cl){
            if ((index & 0x8000)==0){
              cl->Use(10);  // accepted cluster   
@@ -2760,7 +2859,7 @@ void AliTPCtrackerMI::MakeSeeds3(TObjArray * arr, Int_t sec, Int_t i1, Int_t i2,
   Double_t x[5], c[15];
   //  Int_t di = i1-i2;
   //
-  AliTPCseed * seed = new AliTPCseed;
+  AliTPCseed * seed = new AliTPCseed();
   Double_t alpha=fSectors->GetAlpha(), shift=fSectors->GetAlphaShift();
   Double_t cs=cos(alpha), sn=sin(alpha);
   //
@@ -2779,8 +2878,8 @@ void AliTPCtrackerMI::MakeSeeds3(TObjArray * arr, Int_t sec, Int_t i1, Int_t i2,
   Int_t ns =sec;   
 
   const AliTPCRow& kr1=GetRow(ns,i1);
-  Double_t ymax  = GetMaxY(i1)-kr1.fDeadZone-1.5;  
-  Double_t ymaxm = GetMaxY(imiddle)-kr1.fDeadZone-1.5;  
+  Double_t ymax  = GetMaxY(i1)-kr1.GetDeadZone()-1.5;  
+  Double_t ymaxm = GetMaxY(imiddle)-kr1.GetDeadZone()-1.5;  
 
   //
   // change cut on curvature if it can't reach this layer
@@ -2970,12 +3069,13 @@ void AliTPCtrackerMI::MakeSeeds3(TObjArray * arr, Int_t sec, Int_t i1, Int_t i2,
        //      if (!BuildSeed(kr1[is],kcl,0,x1,x2,x3,x,c)) continue;
        
         UInt_t index=kr1.GetIndex(is);
-       AliTPCseed *track=new(seed) AliTPCseed(index, x, c, x1, ns*alpha+shift);
+       seed->~AliTPCseed(); // this does not set the pointer to 0...
+       AliTPCseed *track=new(seed) AliTPCseed(x1, ns*alpha+shift, x, c, index);
        
-       track->fIsSeeding = kTRUE;
-       track->fSeed1 = i1;
-       track->fSeed2 = i2;
-       track->fSeedType=3;
+       track->SetIsSeeding(kTRUE);
+       track->SetSeed1(i1);
+       track->SetSeed2(i2);
+       track->SetSeedType(3);
 
        
        //if (dsec==0) {
@@ -2994,37 +3094,34 @@ void AliTPCtrackerMI::MakeSeeds3(TObjArray * arr, Int_t sec, Int_t i1, Int_t i2,
        
        
        //Int_t rc = 1;
-       track->fBConstrain =1;
+       track->SetBConstrain(1);
        //      track->fLastPoint = i1+fInnerSec->GetNRows();  // first cluster in track position
-       track->fLastPoint = i1;  // first cluster in track position
-       track->fFirstPoint = track->fLastPoint;
+       track->SetLastPoint(i1);  // first cluster in track position
+       track->SetFirstPoint(track->GetLastPoint());
        
        if (track->GetNumberOfClusters()<(i1-i2)*0.5 || 
-           track->GetNumberOfClusters() < track->fNFoundable*0.6 || 
-           track->fNShared>0.4*track->GetNumberOfClusters() ) {
+           track->GetNumberOfClusters() < track->GetNFoundable()*0.6 || 
+           track->GetNShared()>0.4*track->GetNumberOfClusters() ) {
          seed->Reset();
          seed->~AliTPCseed();
          continue;
        }
        nout1++;
         // Z VERTEX CONDITION
-       Double_t zv;
-        zv = track->GetZ()+track->GetTgl()/track->GetC()*
-         ( asin(-track->GetEta()) - asin(track->GetX()*track->GetC()-track->GetEta()));
+       Double_t zv, bz=GetBz();
+        if ( !track->GetZAt(0.,bz,zv) ) continue;
        if (TMath::Abs(zv-z3)>cuts[2]) {
          FollowProlongation(*track, TMath::Max(i2-20,0));
-         zv = track->GetZ()+track->GetTgl()/track->GetC()*
-           ( asin(-track->GetEta()) - asin(track->GetX()*track->GetC()-track->GetEta()));
+          if ( !track->GetZAt(0.,bz,zv) ) continue;
          if (TMath::Abs(zv-z3)>cuts[2]){
            FollowProlongation(*track, TMath::Max(i2-40,0));
-           zv = track->GetZ()+track->GetTgl()/track->GetC()*
-             ( asin(-track->GetEta()) - asin(track->GetX()*track->GetC()-track->GetEta()));
-           if (TMath::Abs(zv-z3)>cuts[2] &&(track->GetNumberOfClusters() > track->fNFoundable*0.7)){
+            if ( !track->GetZAt(0.,bz,zv) ) continue;
+           if (TMath::Abs(zv-z3)>cuts[2] &&(track->GetNumberOfClusters() > track->GetNFoundable()*0.7)){
              // make seed without constrain
              AliTPCseed * track2 = MakeSeed(track,0.2,0.5,1.);
              FollowProlongation(*track2, i2,1);
-             track2->fBConstrain = kFALSE;
-             track2->fSeedType = 1;
+             track2->SetBConstrain(kFALSE);
+             track2->SetSeedType(1);
              arr->AddLast(track2); 
              seed->Reset();
              seed->~AliTPCseed();
@@ -3038,13 +3135,13 @@ void AliTPCtrackerMI::MakeSeeds3(TObjArray * arr, Int_t sec, Int_t i1, Int_t i2,
            }
          }
        }
-       
-       track->fSeedType =0;
+      
+       track->SetSeedType(0);
        arr->AddLast(track); 
        seed = new AliTPCseed;  
        nout2++;
        // don't consider other combinations
-       if (track->GetNumberOfClusters() > track->fNFoundable*0.8)
+       if (track->GetNumberOfClusters() > track->GetNFoundable()*0.8)
          break;
       }
     }
@@ -3089,7 +3186,7 @@ void AliTPCtrackerMI::MakeSeeds5(TObjArray * arr, Int_t sec, Int_t i1, Int_t i2,
   // first 3 padrows
   Double_t x1 = GetXrow(i1-1);
   const    AliTPCRow& kr1=GetRow(sec,i1-1);
-  Double_t y1max  = GetMaxY(i1-1)-kr1.fDeadZone-1.5;  
+  Double_t y1max  = GetMaxY(i1-1)-kr1.GetDeadZone()-1.5;  
   //
   Double_t x1p = GetXrow(i1);
   const    AliTPCRow& kr1p=GetRow(sec,i1);
@@ -3261,14 +3358,15 @@ void AliTPCtrackerMI::MakeSeeds5(TObjArray * arr, Int_t sec, Int_t i1, Int_t i2,
       //       if (!BuildSeed(kr1[is],kcl,0,x1,x2,x3,x,c)) continue;
       
       UInt_t index=kr1.GetIndex(is);
-      AliTPCseed *track=new(seed) AliTPCseed(index, x, c, x1, sec*alpha+shift);
+      seed->~AliTPCseed();
+      AliTPCseed *track=new(seed) AliTPCseed(x1, sec*alpha+shift, x, c, index);
       
-      track->fIsSeeding = kTRUE;
+      track->SetIsSeeding(kTRUE);
 
       nin++;      
       FollowProlongation(*track, i1-7,1);
-      if (track->GetNumberOfClusters() < track->fNFoundable*0.75 || 
-         track->fNShared>0.6*track->GetNumberOfClusters() || ( track->GetSigmaY2()+ track->GetSigmaZ2())>0.6){
+      if (track->GetNumberOfClusters() < track->GetNFoundable()*0.75 || 
+         track->GetNShared()>0.6*track->GetNumberOfClusters() || ( track->GetSigmaY2()+ track->GetSigmaZ2())>0.6){
        seed->Reset();
        seed->~AliTPCseed();
        continue;
@@ -3277,13 +3375,13 @@ void AliTPCtrackerMI::MakeSeeds5(TObjArray * arr, Int_t sec, Int_t i1, Int_t i2,
       nout2++; 
       //Int_t rc = 1;
       FollowProlongation(*track, i2,1);
-      track->fBConstrain =0;
-      track->fLastPoint = i1+fInnerSec->GetNRows();  // first cluster in track position
-      track->fFirstPoint = track->fLastPoint;
+      track->SetBConstrain(0);
+      track->SetLastPoint(i1+fInnerSec->GetNRows());  // first cluster in track position
+      track->SetFirstPoint(track->GetLastPoint());
       
       if (track->GetNumberOfClusters()<(i1-i2)*0.5 || 
-         track->GetNumberOfClusters()<track->fNFoundable*0.7 || 
-         track->fNShared>2. || track->GetChi2()/track->GetNumberOfClusters()>6 || ( track->GetSigmaY2()+ track->GetSigmaZ2())>0.5 ) {
+         track->GetNumberOfClusters()<track->GetNFoundable()*0.7 || 
+         track->GetNShared()>2. || track->GetChi2()/track->GetNumberOfClusters()>6 || ( track->GetSigmaY2()+ track->GetSigmaZ2())>0.5 ) {
        seed->Reset();
        seed->~AliTPCseed();
        continue;
@@ -3293,8 +3391,8 @@ void AliTPCtrackerMI::MakeSeeds5(TObjArray * arr, Int_t sec, Int_t i1, Int_t i2,
        FollowProlongation(*track, TMath::Max(i2-10,0),1);
        AliTPCseed * track2 = MakeSeed(track,0.2,0.5,0.9);
        FollowProlongation(*track2, i2,1);
-       track2->fBConstrain = kFALSE;
-       track2->fSeedType = 4;
+       track2->SetBConstrain(kFALSE);
+       track2->SetSeedType(4);
        arr->AddLast(track2); 
        seed->Reset();
        seed->~AliTPCseed();
@@ -3372,7 +3470,7 @@ void AliTPCtrackerMI::MakeSeeds2(TObjArray * arr, Int_t sec, Int_t i1, Int_t i2,
       Float_t erry = 0;
       Float_t errz = 0;
       
-      Double_t ymax = fSectors->GetMaxY(row0)-kr0.fDeadZone-1.5;
+      Double_t ymax = fSectors->GetMaxY(row0)-kr0.GetDeadZone()-1.5;
       if (deltay>0 && TMath::Abs(ymax-TMath::Abs(y0))> deltay ) continue;  // seed only at the edge
       
       erry = (0.5)*cl->GetSigmaY2()/TMath::Sqrt(cl->GetQ())*6;     
@@ -3421,7 +3519,7 @@ void AliTPCtrackerMI::MakeSeeds2(TObjArray * arr, Int_t sec, Int_t i1, Int_t i2,
          Int_t row = row0+ddrow*delta;
          kr = &(fSectors[sec][row]);
          Double_t xn = kr->GetX();
-         Double_t ymax = fSectors->GetMaxY(row)-kr->fDeadZone-1.5;
+         Double_t ymax = fSectors->GetMaxY(row)-kr->GetDeadZone()-1.5;
          polytrack.GetFitPoint(xn,yn,zn);
          if (TMath::Abs(yn)>ymax) continue;
          nfoundable++;
@@ -3540,18 +3638,19 @@ void AliTPCtrackerMI::MakeSeeds2(TObjArray * arr, Int_t sec, Int_t i1, Int_t i2,
 
        UInt_t index=0;
        //kr0.GetIndex(is);
-       AliTPCseed *track=new (seed) AliTPCseed(index, x, c, x1, sec*alpha+shift);
-       track->fIsSeeding = kTRUE;
+       seed->~AliTPCseed();
+       AliTPCseed *track=new(seed) AliTPCseed(x1,sec*alpha+shift,x,c,index);
+       track->SetIsSeeding(kTRUE);
        Int_t rc=FollowProlongation(*track, i2);        
-       if (constrain) track->fBConstrain =1;
+       if (constrain) track->SetBConstrain(1);
        else
-         track->fBConstrain =0;
-       track->fLastPoint = row1+fInnerSec->GetNRows();  // first cluster in track position
-       track->fFirstPoint = track->fLastPoint;
+         track->SetBConstrain(0);
+       track->SetLastPoint(row1+fInnerSec->GetNRows());  // first cluster in track position
+       track->SetFirstPoint(track->GetLastPoint());
 
        if (rc==0 || track->GetNumberOfClusters()<(i1-i2)*0.5 || 
-           track->GetNumberOfClusters() < track->fNFoundable*0.6 || 
-           track->fNShared>0.4*track->GetNumberOfClusters()) {
+           track->GetNumberOfClusters() < track->GetNFoundable()*0.6 || 
+           track->GetNShared()>0.4*track->GetNumberOfClusters()) {
          //delete track;
          seed->Reset();
          seed->~AliTPCseed();
@@ -3592,7 +3691,7 @@ AliTPCseed *AliTPCtrackerMI::MakeSeed(AliTPCseed *track, Float_t r0, Float_t r1,
   Int_t index=-1;
   Int_t clindex;
   for (Int_t i=0;i<160;i++){
-    if (track->fClusterPointer[i]){
+    if (track->GetClusterPointer(i)){
       index++;
       AliTPCTrackerPoint   *trpoint =track->GetTrackPoint(i);
       if ( (index<p0) || x0[0]<0 ){
@@ -3689,14 +3788,14 @@ AliTPCseed *AliTPCtrackerMI::MakeSeed(AliTPCseed *track, Float_t r0, Float_t r1,
   c[14]=f40*sy1*f40+f42*sy2*f42+f43*sy3*f43;
   
   //  Int_t row1 = fSectors->GetRowNumber(x2[0]);
-  AliTPCseed *seed=new  AliTPCseed(0, x, c, x2[0], sec2*fSectors->GetAlpha()+fSectors->GetAlphaShift());
+  AliTPCseed *seed=new  AliTPCseed(x2[0], sec2*fSectors->GetAlpha()+fSectors->GetAlphaShift(), x, c, 0);
   //  Double_t y0,z0,y1,z1, y2,z2;
   //seed->GetProlongation(x0[0],y0,z0);
   // seed->GetProlongation(x1[0],y1,z1);
   //seed->GetProlongation(x2[0],y2,z2);
   //  seed =0;
-  seed->fLastPoint  = pp2;
-  seed->fFirstPoint = pp2;
+  seed->SetLastPoint(pp2);
+  seed->SetFirstPoint(pp2);
   
 
   return seed;
@@ -3809,9 +3908,9 @@ AliTPCseed *AliTPCtrackerMI::ReSeed(AliTPCseed *track, Float_t r0, Float_t r1, F
   c[14]=f40*sy1*f40+f42*sy2*f42+f43*sy3*f43;
   
   //  Int_t row1 = fSectors->GetRowNumber(xyz[2][0]);
-  AliTPCseed *seed=new  AliTPCseed(0, x, c, xyz[2][0], sec[2]*fSectors->GetAlpha()+fSectors->GetAlphaShift());
-  seed->fLastPoint  = row[2];
-  seed->fFirstPoint = row[2];  
+  AliTPCseed *seed=new  AliTPCseed(xyz[2][0], sec[2]*fSectors->GetAlpha()+fSectors->GetAlphaShift(), x, c, 0);
+  seed->SetLastPoint(row[2]);
+  seed->SetFirstPoint(row[2]);  
   return seed;
 }
 
@@ -3958,110 +4057,690 @@ AliTPCseed *AliTPCtrackerMI::ReSeed(AliTPCseed *track,Int_t r0, Bool_t forward)
   c[14]=f40*sy1*f40+f42*sy2*f42+f43*sy3*f43;
   
   //  Int_t row1 = fSectors->GetRowNumber(xyz[2][0]);
-  AliTPCseed *seed=new  AliTPCseed(0, x, c, xyz[2][0], sec[2]*fSectors->GetAlpha()+fSectors->GetAlphaShift());
-  seed->fLastPoint  = row[2];
-  seed->fFirstPoint = row[2];  
+  AliTPCseed *seed=new  AliTPCseed(xyz[2][0], sec[2]*fSectors->GetAlpha()+fSectors->GetAlphaShift(), x, c, 0);
+  seed->SetLastPoint(row[2]);
+  seed->SetFirstPoint(row[2]);  
   for (Int_t i=row[0];i<row[2];i++){
-    seed->fIndex[i] = track->fIndex[i];
+    seed->SetClusterIndex(i, track->GetClusterIndex(i));
   }
 
   return seed;
 }
 
-void  AliTPCtrackerMI::FindKinks(TObjArray * array, AliESD *esd)
+
+
+void  AliTPCtrackerMI::FindMultiMC(TObjArray * array, AliESDEvent */*esd*/, Int_t iter)
 {
   //
-  //  find kinks
+  //  find multi tracks - THIS FUNCTION IS ONLY FOR DEBUG PURPOSES
+  //                      USES MC LABELS
+  //  Use AliTPCReconstructor::StreamLevel()>2 if you want to tune parameters - cuts
   //
+  //  Two reasons to have multiple find tracks
+  //  1. Curling tracks can be find more than once
+  //  2. Splitted tracks 
+  //     a.) Multiple seeding to increase tracking efficiency - (~ 100% reached)        
+  //     b.) Edge effect on the sector boundaries
   //
+  //
+  //  Algorithm done in 2 phases - because of CPU consumption
+  //  it is n^2 algorithm - for lead-lead 20000x20000 combination are investigated                           
+  //
+  //  Algorihm for curling tracks sign:
+  //    1 phase -makes a very rough fast cuts to minimize combinatorics
+  //                 a.) opposite sign
+  //                 b.) one of the tracks - not pointing to the primary vertex - 
+  //                 c.) delta tan(theta)
+  //                 d.) delta phi
+  //    2 phase - calculates DCA between tracks  - time consument
 
-  TObjArray *kinks= new TObjArray(10000);
-  //  TObjArray *v0s= new TObjArray(10000);
-  Int_t nentries = array->GetEntriesFast();
+  //
+  //    fast cuts 
+  //
+  //    General cuts    - for splitted tracks and for curling tracks
+  //
+  const Float_t kMaxdPhi      = 0.2;  // maximal distance in phi
+  //
+  //    Curling tracks cuts
+  //
+  //
+  //
+  //
+  Int_t nentries = array->GetEntriesFast();  
   AliHelix *helixes      = new AliHelix[nentries];
-  Int_t    *sign         = new Int_t[nentries];
-  Int_t    *nclusters    = new Int_t[nentries];
-  Float_t  *alpha        = new Float_t[nentries];
-  AliESDkink * kink      = new AliESDkink();
-  Int_t      * usage     = new Int_t[nentries];
-  Float_t  *zm           = new Float_t[nentries];
-  Float_t  *z0           = new Float_t[nentries]; 
-  Float_t  *fim          = new Float_t[nentries];
-  Float_t  *shared       = new Float_t[nentries];
-  Bool_t   *circular     = new Bool_t[nentries];
-  Float_t *dca          = new Float_t[nentries];
-  //const AliESDVertex * primvertex = esd->GetVertex();
+  Float_t  *xm           = new Float_t[nentries];
+  Float_t  *dz0           = new Float_t[nentries];
+  Float_t  *dz1           = new Float_t[nentries];
   //
-  //  nentries = array->GetEntriesFast();
   //
-  
+  TStopwatch timer;
+  timer.Start();
   //
+  // Find track COG in x direction - point with best defined parameters
   //
   for (Int_t i=0;i<nentries;i++){
-    sign[i]=0;
-    usage[i]=0;
     AliTPCseed* track = (AliTPCseed*)array->At(i);    
     if (!track) continue;
-    track->fCircular =0;
-    shared[i] = kFALSE;
-    track->UpdatePoints();
-    if (( track->GetPoints()[2]- track->GetPoints()[0])>5 && track->GetPoints()[3]>0.8){
-    }
-    nclusters[i]=track->GetNumberOfClusters();
-    alpha[i] = track->GetAlpha();
+    track->SetCircular(0);
     new (&helixes[i]) AliHelix(*track);
-    Double_t xyz[3];
-    helixes[i].Evaluate(0,xyz);
-    sign[i] = (track->GetC()>0) ? -1:1;
-    Double_t x,y,z;
-    x=160;
-    if (track->GetProlongation(x,y,z)){
-      zm[i]  = z;
-      fim[i] = alpha[i]+TMath::ATan2(y,x);
+    Int_t ncl=0;
+    xm[i]=0;
+    Float_t dz[2];
+    track->GetDZ(GetX(),GetY(),GetZ(),GetBz(),dz);
+    dz0[i]=dz[0];
+    dz1[i]=dz[1];
+    for (Int_t icl=0; icl<160; icl++){
+      AliTPCclusterMI * cl =  track->GetClusterPointer(icl);
+      if (cl) {
+       xm[i]+=cl->GetX();
+       ncl++;
+      }
     }
-    else{
-      zm[i]  = track->GetZ();
-      fim[i] = alpha[i];
-    }   
-    z0[i]=1000;
-    circular[i]= kFALSE;
-    if (track->GetProlongation(0,y,z))  z0[i] = z;
-    dca[i] = track->GetD(0,0);    
-  }
-  //
-  //
-  TStopwatch timer;
-  timer.Start();
-  Int_t ncandidates =0;
-  Int_t nall =0;
-  Int_t ntracks=0; 
-  Double_t phase[2][2],radius[2];
-
-  //
-  // Find circling track
+    if (ncl>0) xm[i]/=Float_t(ncl);
+  }  
   TTreeSRedirector &cstream = *fDebugStreamer;
   //
   for (Int_t i0=0;i0<nentries;i0++){
     AliTPCseed * track0 = (AliTPCseed*)array->At(i0);
     if (!track0) continue;    
-    if (track0->fN<40) continue;
-    if (TMath::Abs(1./track0->fP4)>200) continue;
+    Float_t xc0 = helixes[i0].GetHelix(6);
+    Float_t yc0 = helixes[i0].GetHelix(7);
+    Float_t r0  = helixes[i0].GetHelix(8);
+    Float_t rc0 = TMath::Sqrt(xc0*xc0+yc0*yc0);
+    Float_t fi0 = TMath::ATan2(yc0,xc0);
+    
     for (Int_t i1=i0+1;i1<nentries;i1++){
       AliTPCseed * track1 = (AliTPCseed*)array->At(i1);
-      if (!track1) continue;
-      if (track1->fN<40)                  continue;
-      if ( TMath::Abs(track1->fP3+track0->fP3)>0.1) continue;
-      if (track0->fBConstrain&&track1->fBConstrain) continue;
-      if (TMath::Abs(1./track1->fP4)>200) continue;
-      if (track1->fP4*track0->fP4>0)      continue;
-      if (track1->fP3*track0->fP3>0)      continue;
-      if (max(TMath::Abs(1./track0->fP4),TMath::Abs(1./track1->fP4))>190) continue;
-      if (track0->fBConstrain&&TMath::Abs(track1->fP4)<TMath::Abs(track0->fP4)) continue; //returning - lower momenta
-      if (track1->fBConstrain&&TMath::Abs(track0->fP4)<TMath::Abs(track1->fP4)) continue; //returning - lower momenta
+      if (!track1) continue;      
+      Int_t lab0=track0->GetLabel();
+      Int_t lab1=track1->GetLabel();
+      if (TMath::Abs(lab0)!=TMath::Abs(lab1)) continue;
       //
-      Float_t mindcar = TMath::Min(TMath::Abs(dca[i0]),TMath::Abs(dca[i1]));
-      if (mindcar<5)   continue;
-      Float_t mindcaz = TMath::Min(TMath::Abs(z0[i0]-GetZ()),TMath::Abs(z0[i1]-GetZ()));
+      Float_t xc1 = helixes[i1].GetHelix(6);
+      Float_t yc1 = helixes[i1].GetHelix(7);
+      Float_t r1  = helixes[i1].GetHelix(8);
+      Float_t rc1 = TMath::Sqrt(xc1*xc1+yc1*yc1);
+      Float_t fi1 = TMath::ATan2(yc1,xc1);
+      //
+      Float_t dfi = fi0-fi1;
+      //
+      //
+      if (dfi>1.5*TMath::Pi())  dfi-=TMath::Pi();  // take care about edge effect 
+      if (dfi<-1.5*TMath::Pi()) dfi+=TMath::Pi();  // 
+      if (TMath::Abs(dfi)>kMaxdPhi&&helixes[i0].GetHelix(4)*helixes[i1].GetHelix(4)<0){
+       //
+       // if short tracks with undefined sign 
+       fi1 =  -TMath::ATan2(yc1,-xc1);
+       dfi = fi0-fi1;
+      }
+      Float_t dtheta = TMath::Abs(track0->GetTgl()-track1->GetTgl())<TMath::Abs(track0->GetTgl()+track1->GetTgl())? track0->GetTgl()-track1->GetTgl():track0->GetTgl()+track1->GetTgl();
+      
+      //
+      // debug stream to tune "fast cuts" 
+      //
+      Double_t dist[3];   // distance at X 
+      Double_t mdist[3]={0,0,0};  // mean distance X+-40cm
+      track0->GetDistance(track1,0.5*(xm[i0]+xm[i1])-40.,dist,AliTracker::GetBz());
+      for (Int_t i=0;i<3;i++) mdist[i]+=TMath::Abs(dist[i]);
+      track0->GetDistance(track1,0.5*(xm[i0]+xm[i1])+40.,dist,AliTracker::GetBz());
+      for (Int_t i=0;i<3;i++) mdist[i]+=TMath::Abs(dist[i]);
+      track0->GetDistance(track1,0.5*(xm[i0]+xm[i1]),dist,AliTracker::GetBz());
+      for (Int_t i=0;i<3;i++) mdist[i]+=TMath::Abs(dist[i]);
+      for (Int_t i=0;i<3;i++) mdist[i]*=0.33333;
+      
+      Float_t sum =0;
+      Float_t sums=0;
+      for (Int_t icl=0; icl<160; icl++){
+       AliTPCclusterMI * cl0 =  track0->GetClusterPointer(icl);
+       AliTPCclusterMI * cl1 =  track1->GetClusterPointer(icl);
+       if (cl0&&cl1) {
+         sum++;
+         if (cl0==cl1) sums++;
+       }
+      }
+      //
+      cstream<<"Multi"<<
+       "iter="<<iter<<
+       "lab0="<<lab0<<
+       "lab1="<<lab1<<   
+       "Tr0.="<<track0<<       // seed0
+       "Tr1.="<<track1<<       // seed1
+       "h0.="<<&helixes[i0]<<
+       "h1.="<<&helixes[i1]<<
+       //
+       "sum="<<sum<<           //the sum of rows with cl in both
+       "sums="<<sums<<         //the sum of shared clusters
+       "xm0="<<xm[i0]<<        // the center of track
+       "xm1="<<xm[i1]<<        // the x center of track
+       // General cut variables                   
+       "dfi="<<dfi<<           // distance in fi angle
+       "dtheta="<<dtheta<<     // distance int theta angle
+       //
+       "dz00="<<dz0[i0]<<
+       "dz01="<<dz0[i1]<<
+       "dz10="<<dz1[i1]<<
+       "dz11="<<dz1[i1]<<
+       "dist0="<<dist[0]<<     //distance x
+       "dist1="<<dist[1]<<     //distance y
+       "dist2="<<dist[2]<<     //distance z
+       "mdist0="<<mdist[0]<<   //distance x
+       "mdist1="<<mdist[1]<<   //distance y
+       "mdist2="<<mdist[2]<<   //distance z
+       //
+       "r0="<<r0<<
+       "rc0="<<rc0<<
+       "fi0="<<fi0<<
+       "fi1="<<fi1<<
+       "r1="<<r1<<
+       "rc1="<<rc1<<
+       "\n";
+    }
+  }    
+  delete [] helixes;
+  delete [] xm;
+  if (AliTPCReconstructor::StreamLevel()>1) {
+    AliInfo("Time for curling tracks removal DEBUGGING MC");
+    timer.Print();
+  }
+}
+
+
+void  AliTPCtrackerMI::FindSplitted(TObjArray * array, AliESDEvent */*esd*/, Int_t iter)
+{
+  //
+  //
+  //  Two reasons to have multiple find tracks
+  //  1. Curling tracks can be find more than once
+  //  2. Splitted tracks 
+  //     a.) Multiple seeding to increase tracking efficiency - (~ 100% reached)        
+  //     b.) Edge effect on the sector boundaries
+  //
+  //  This function tries to find tracks closed in the parametric space
+  //
+  // cut logic if distance is bigger than cut continue - Do Nothing
+  const Float_t kMaxdTheta    = 0.05;  // maximal distance in theta
+  const Float_t kMaxdPhi      = 0.05;   // maximal deistance in phi
+  const Float_t kdelta        = 40.;   //delta r to calculate track distance
+  //
+  //  const Float_t kMaxDist0     = 1.;    // maximal distance 0 
+  //const Float_t kMaxDist1     = 0.3;   // maximal distance 1 - cut if track in separate rows 
+  //
+  /*
+    TCut csec("csec","abs(Tr0.fRelativeSector-Tr1.fRelativeSector)<2");
+    TCut cdtheta("cdtheta","abs(dtheta)<0.05");
+  */ 
+  //
+  //
+  //
+  Int_t nentries = array->GetEntriesFast();  
+  AliHelix *helixes      = new AliHelix[nentries];
+  Float_t  *xm           = new Float_t[nentries];
+  //
+  //
+  TStopwatch timer;
+  timer.Start();
+  //
+  //Sort tracks according quality
+  //
+  Int_t nseed = array->GetEntriesFast();  
+  Float_t * quality = new Float_t[nseed];
+  Int_t   * indexes = new Int_t[nseed];
+  for (Int_t i=0; i<nseed; i++) {
+    AliTPCseed *pt=(AliTPCseed*)array->UncheckedAt(i);    
+    if (!pt){
+      quality[i]=-1;
+      continue;
+    }
+    pt->UpdatePoints();    //select first last max dens points
+    Float_t * points = pt->GetPoints();
+    if (points[3]<0.8) quality[i] =-1;
+    quality[i] = (points[2]-points[0])+pt->GetNumberOfClusters();
+    //prefer high momenta tracks if overlaps
+    quality[i] *= TMath::Sqrt(TMath::Abs(pt->Pt())+0.5); 
+  }
+  TMath::Sort(nseed,quality,indexes);
+
+
+  //
+  // Find track COG in x direction - point with best defined parameters
+  //
+  for (Int_t i=0;i<nentries;i++){
+    AliTPCseed* track = (AliTPCseed*)array->At(i);    
+    if (!track) continue;
+    track->SetCircular(0);
+    new (&helixes[i]) AliHelix(*track);
+    Int_t ncl=0;
+    xm[i]=0;
+    for (Int_t icl=0; icl<160; icl++){
+      AliTPCclusterMI * cl =  track->GetClusterPointer(icl);
+      if (cl) {
+       xm[i]+=cl->GetX();
+       ncl++;
+      }
+    }
+    if (ncl>0) xm[i]/=Float_t(ncl);
+  }  
+  TTreeSRedirector &cstream = *fDebugStreamer;
+  //
+  for (Int_t is0=0;is0<nentries;is0++){
+    Int_t i0 = indexes[is0];
+    AliTPCseed * track0 = (AliTPCseed*)array->At(i0);
+    if (!track0) continue;     
+    if (track0->GetKinkIndexes()[0]!=0) continue;
+    Float_t xc0 = helixes[i0].GetHelix(6);
+    Float_t yc0 = helixes[i0].GetHelix(7);
+    Float_t fi0 = TMath::ATan2(yc0,xc0);
+    
+    for (Int_t is1=is0+1;is1<nentries;is1++){
+      Int_t i1 = indexes[is1];
+      AliTPCseed * track1 = (AliTPCseed*)array->At(i1);
+      if (!track1) continue;      
+      //
+      if (TMath::Abs(track0->GetRelativeSector()-track1->GetRelativeSector())>1) continue;
+      if (track1->GetKinkIndexes()[0]>0 &&track0->GetKinkIndexes()[0]<0) continue;
+      if (track1->GetKinkIndexes()[0]!=0) continue;
+
+      Float_t dtheta = TMath::Abs(track0->GetTgl()-track1->GetTgl())<TMath::Abs(track0->GetTgl()+track1->GetTgl())? track0->GetTgl()-track1->GetTgl():track0->GetTgl()+track1->GetTgl();
+      if (TMath::Abs(dtheta)>kMaxdTheta) continue;      
+      //
+      Float_t xc1 = helixes[i1].GetHelix(6);
+      Float_t yc1 = helixes[i1].GetHelix(7);
+      Float_t fi1 = TMath::ATan2(yc1,xc1);
+      //
+      Float_t dfi = fi0-fi1;
+      if (dfi>1.5*TMath::Pi())  dfi-=TMath::Pi();  // take care about edge effect 
+      if (dfi<-1.5*TMath::Pi()) dfi+=TMath::Pi();  // 
+      if (TMath::Abs(dfi)>kMaxdPhi&&helixes[i0].GetHelix(4)*helixes[i1].GetHelix(4)<0){
+       //
+       // if short tracks with undefined sign 
+       fi1 =  -TMath::ATan2(yc1,-xc1);
+       dfi = fi0-fi1;
+      }
+      if (TMath::Abs(dfi)>kMaxdPhi) continue;
+      //
+      //      
+      Float_t sum =0;
+      Float_t sums=0;
+      Float_t sum0=0;
+      Float_t sum1=0;
+      for (Int_t icl=0; icl<160; icl++){
+       Int_t index0=track0->GetClusterIndex2(icl);
+       Int_t index1=track1->GetClusterIndex2(icl);       
+       Bool_t used0 = (index0>0 && !(index0&0x8000));
+       Bool_t used1 = (index1>0 && !(index1&0x8000));
+       //
+       if (used0) sum0++;  // used cluster0
+       if (used1) sum1++;  // used clusters1
+       if (used0&&used1) sum++;
+       if (index0==index1 && used0 && used1) sums++;
+      } 
+     
+      //
+      if (sums<10) continue;
+      if (sum<40) continue;
+      if (sums/Float_t(TMath::Min(sum0,sum1))<0.5) continue;
+      //
+      Double_t dist[5][4];   // distance at X 
+      Double_t mdist[4]={0,0,0,0};  // mean distance on range +-delta
+     
+      //
+      //            
+      track0->GetDistance(track1,xm[i0],dist[0],AliTracker::GetBz());
+      for (Int_t i=0;i<3;i++) mdist[i]+=TMath::Abs(dist[0][i]);
+      track0->GetDistance(track1,xm[i1],dist[1],AliTracker::GetBz());
+      for (Int_t i=0;i<3;i++) mdist[i]+=TMath::Abs(dist[1][i]);
+      //
+      track0->GetDistance(track1,TMath::Min(xm[i1],xm[i0])-kdelta,dist[2],AliTracker::GetBz());
+      for (Int_t i=0;i<3;i++) mdist[i]+=TMath::Abs(dist[2][i]);
+      track0->GetDistance(track1,TMath::Max(xm[i1],xm[i0])+kdelta,dist[3],AliTracker::GetBz());
+      for (Int_t i=0;i<3;i++) mdist[i]+=TMath::Abs(dist[3][i]);     
+      //
+      track0->GetDistance(track1,(xm[i1]+xm[i0])*0.5,dist[4],AliTracker::GetBz());
+      for (Int_t i=0;i<3;i++) mdist[i]+=TMath::Abs(dist[4][i]);     
+      for (Int_t i=0;i<3;i++) mdist[i]*=0.2;
+      //
+      //
+      Int_t lab0=track0->GetLabel();
+      Int_t lab1=track1->GetLabel();
+      cstream<<"Splitted"<<
+       "iter="<<iter<<
+       "lab0="<<lab0<<
+       "lab1="<<lab1<<   
+       "Tr0.="<<track0<<       // seed0
+       "Tr1.="<<track1<<       // seed1
+       "h0.="<<&helixes[i0]<<
+       "h1.="<<&helixes[i1]<<
+       //
+       "sum="<<sum<<           //the sum of rows with cl in both
+       "sum0="<<sum0<<           //the sum of rows with cl in 0 track
+       "sum1="<<sum1<<           //the sum of rows with cl in 1 track
+       "sums="<<sums<<         //the sum of shared clusters
+       "xm0="<<xm[i0]<<        // the center of track
+       "xm1="<<xm[i1]<<        // the x center of track
+       // General cut variables                   
+       "dfi="<<dfi<<           // distance in fi angle
+       "dtheta="<<dtheta<<     // distance int theta angle
+       //
+       //
+       "dist0="<<dist[4][0]<<     //distance x
+       "dist1="<<dist[4][1]<<     //distance y
+       "dist2="<<dist[4][2]<<     //distance z
+       "mdist0="<<mdist[0]<<   //distance x
+       "mdist1="<<mdist[1]<<   //distance y
+       "mdist2="<<mdist[2]<<   //distance z
+
+       "\n";
+      delete array->RemoveAt(i1);
+    }
+  }    
+  delete [] helixes;
+  delete [] xm;
+  AliInfo("Time for splitted tracks removal");
+  timer.Print();
+}
+
+
+
+void  AliTPCtrackerMI::FindCurling(TObjArray * array, AliESDEvent */*esd*/, Int_t iter)
+{
+  //
+  //  find Curling tracks
+  //  Use AliTPCReconstructor::StreamLevel()>1 if you want to tune parameters - cuts
+  //
+  //
+  //  Algorithm done in 2 phases - because of CPU consumption
+  //  it is n^2 algorithm - for lead-lead 20000x20000 combination are investigated                           
+  //  see detal in MC part what can be used to cut
+  //
+  //    
+  //
+  const Float_t kMaxC         = 400;  // maximal curvature to of the track
+  const Float_t kMaxdTheta    = 0.15;  // maximal distance in theta
+  const Float_t kMaxdPhi      = 0.15;  // maximal distance in phi
+  const Float_t kPtRatio      = 0.3; // ratio between pt
+  const Float_t kMinDCAR      = 2.;   // distance to the primary vertex in r - see cpipe cut      
+
+  //
+  //    Curling tracks cuts
+  //
+  //
+  const Float_t kMaxDeltaRMax = 40;   // distance in outer radius
+  const Float_t kMaxDeltaRMin = 5.;   // distance in lower radius - see cpipe cut
+  const Float_t kMinAngle     = 2.9;  // angle between tracks
+  const Float_t kMaxDist      = 5;    // biggest distance 
+  //
+  // The cuts can be tuned using the "MC information stored in Multi tree ==> see FindMultiMC
+  /* 
+     Fast cuts:
+     TCut csign("csign","Tr0.fP[4]*Tr1.fP[4]<0"); //opposite sign
+     TCut cmax("cmax","abs(Tr0.GetC())>1/400");
+     TCut cda("cda","sqrt(dtheta^2+dfi^2)<0.15");
+     TCut ccratio("ccratio","abs((Tr0.fP[4]+Tr1.fP[4])/(abs(Tr0.fP[4])+abs(Tr1.fP[4])))<0.3");
+     TCut cpipe("cpipe", "min(abs(r0-rc0),abs(r1-rc1))>5");    
+     //
+     TCut cdrmax("cdrmax","abs(abs(rc0+r0)-abs(rc1+r1))<40")
+     TCut cdrmin("cdrmin","abs(abs(rc0+r0)-abs(rc1+r1))<10")
+     //
+     Multi->Draw("dfi","iter==0"+csign+cmax+cda+ccratio); ~94% of curling tracks fulfill 
+     Multi->Draw("min(abs(r0-rc0),abs(r1-rc1))","iter==0&&abs(lab1)==abs(lab0)"+csign+cmax+cda+ccratio+cpipe+cdrmin+cdrmax); //80%
+     //
+     Curling2->Draw("dfi","iter==0&&abs(lab0)==abs(lab1)"+csign+cmax+cdtheta+cdfi+ccratio)
+
+  */
+  //  
+  //
+  //
+  Int_t nentries = array->GetEntriesFast();  
+  AliHelix *helixes      = new AliHelix[nentries];
+  for (Int_t i=0;i<nentries;i++){
+    AliTPCseed* track = (AliTPCseed*)array->At(i);    
+    if (!track) continue;
+    track->SetCircular(0);
+    new (&helixes[i]) AliHelix(*track);
+  }
+  //
+  //
+  TStopwatch timer;
+  timer.Start();
+  Double_t phase[2][2],radius[2];
+  //
+  // Find tracks
+  //
+  TTreeSRedirector &cstream = *fDebugStreamer;
+  //
+  for (Int_t i0=0;i0<nentries;i0++){
+    AliTPCseed * track0 = (AliTPCseed*)array->At(i0);
+    if (!track0) continue;    
+    if (TMath::Abs(track0->GetC())<1/kMaxC) continue;
+    Float_t xc0 = helixes[i0].GetHelix(6);
+    Float_t yc0 = helixes[i0].GetHelix(7);
+    Float_t r0  = helixes[i0].GetHelix(8);
+    Float_t rc0 = TMath::Sqrt(xc0*xc0+yc0*yc0);
+    Float_t fi0 = TMath::ATan2(yc0,xc0);
+    
+    for (Int_t i1=i0+1;i1<nentries;i1++){
+      AliTPCseed * track1 = (AliTPCseed*)array->At(i1);
+      if (!track1) continue;      
+      if (TMath::Abs(track1->GetC())<1/kMaxC) continue;    
+      Float_t xc1 = helixes[i1].GetHelix(6);
+      Float_t yc1 = helixes[i1].GetHelix(7);
+      Float_t r1  = helixes[i1].GetHelix(8);
+      Float_t rc1 = TMath::Sqrt(xc1*xc1+yc1*yc1);
+      Float_t fi1 = TMath::ATan2(yc1,xc1);
+      //
+      Float_t dfi = fi0-fi1;
+      //
+      //
+      if (dfi>1.5*TMath::Pi())  dfi-=TMath::Pi();  // take care about edge effect 
+      if (dfi<-1.5*TMath::Pi()) dfi+=TMath::Pi();  // 
+      Float_t dtheta = TMath::Abs(track0->GetTgl()-track1->GetTgl())<TMath::Abs(track0->GetTgl()+track1->GetTgl())? track0->GetTgl()-track1->GetTgl():track0->GetTgl()+track1->GetTgl();
+      //
+      //
+      // FIRST fast cuts
+      if (track0->GetBConstrain()&&track1->GetBConstrain())  continue;  // not constrained
+      if (track1->GetSigned1Pt()*track0->GetSigned1Pt()>0)   continue; // not the same sign
+      if ( TMath::Abs(track1->GetTgl()+track0->GetTgl())>kMaxdTheta) continue; //distance in the Theta
+      if ( TMath::Abs(dfi)>kMaxdPhi) continue;  //distance in phi
+      if ( TMath::Sqrt(dfi*dfi+dtheta*dtheta)>kMaxdPhi) continue; //common angular offset
+      //
+      Float_t pt0 = track0->GetSignedPt();
+      Float_t pt1 = track1->GetSignedPt();
+      if ((TMath::Abs(pt0+pt1)/(TMath::Abs(pt0)+TMath::Abs(pt1)))>kPtRatio) continue;      
+      if ((iter==1) && TMath::Abs(TMath::Abs(rc0+r0)-TMath::Abs(rc1+r1))>kMaxDeltaRMax) continue;
+      if ((iter!=1) &&TMath::Abs(TMath::Abs(rc0-r0)-TMath::Abs(rc1-r1))>kMaxDeltaRMin) continue;
+      if (TMath::Min(TMath::Abs(rc0-r0),TMath::Abs(rc1-r1))<kMinDCAR) continue;
+      //
+      //
+      // Now find closest approach
+      //
+      //
+      //
+      Int_t npoints = helixes[i0].GetRPHIintersections(helixes[i1], phase, radius,10);
+      if (npoints==0) continue;
+      helixes[i0].GetClosestPhases(helixes[i1], phase);
+      //
+      Double_t xyz0[3];
+      Double_t xyz1[3];
+      Double_t hangles[3];
+      helixes[i0].Evaluate(phase[0][0],xyz0);
+      helixes[i1].Evaluate(phase[0][1],xyz1);
+
+      helixes[i0].GetAngle(phase[0][0],helixes[i1],phase[0][1],hangles);
+      Double_t deltah[2],deltabest;
+      if (TMath::Abs(hangles[2])<kMinAngle) continue;
+
+      if (npoints>0){
+       Int_t ibest=0;
+       helixes[i0].ParabolicDCA(helixes[i1],phase[0][0],phase[0][1],radius[0],deltah[0],2);
+       if (npoints==2){
+         helixes[i0].ParabolicDCA(helixes[i1],phase[1][0],phase[1][1],radius[1],deltah[1],2);
+         if (deltah[1]<deltah[0]) ibest=1;
+       }
+       deltabest  = TMath::Sqrt(deltah[ibest]);
+       helixes[i0].Evaluate(phase[ibest][0],xyz0);
+       helixes[i1].Evaluate(phase[ibest][1],xyz1);
+       helixes[i0].GetAngle(phase[ibest][0],helixes[i1],phase[ibest][1],hangles);
+       Double_t radiusbest = TMath::Sqrt(radius[ibest]);
+       //
+       if (deltabest>kMaxDist) continue;
+       //      if (mindcar+mindcaz<40 && (TMath::Abs(hangles[2])<kMinAngle ||deltabest>3)) continue;
+       Bool_t sign =kFALSE;
+       if (hangles[2]>kMinAngle) sign =kTRUE;
+       //
+       if (sign){
+         //      circular[i0] = kTRUE;
+         //      circular[i1] = kTRUE;
+         if (track0->OneOverPt()<track1->OneOverPt()){
+           track0->SetCircular(track0->GetCircular()+1);
+           track1->SetCircular(track1->GetCircular()+2);
+         }
+         else{
+           track1->SetCircular(track1->GetCircular()+1);
+           track0->SetCircular(track0->GetCircular()+2);
+         }
+       }               
+       if (AliTPCReconstructor::StreamLevel()>1){        
+         //
+         //debug stream to tune "fine" cuts      
+         Int_t lab0=track0->GetLabel();
+         Int_t lab1=track1->GetLabel();
+         cstream<<"Curling2"<<
+           "iter="<<iter<<
+           "lab0="<<lab0<<
+           "lab1="<<lab1<<   
+           "Tr0.="<<track0<<
+           "Tr1.="<<track1<<
+           //
+           "r0="<<r0<<
+           "rc0="<<rc0<<
+           "fi0="<<fi0<<
+           "r1="<<r1<<
+           "rc1="<<rc1<<
+           "fi1="<<fi1<<
+           "dfi="<<dfi<<
+           "dtheta="<<dtheta<<
+           //
+           "npoints="<<npoints<<                      
+           "hangles0="<<hangles[0]<<
+           "hangles1="<<hangles[1]<<
+           "hangles2="<<hangles[2]<<                    
+           "xyz0="<<xyz0[2]<<
+           "xyzz1="<<xyz1[2]<<
+           "radius="<<radiusbest<<
+           "deltabest="<<deltabest<< 
+           "phase0="<<phase[ibest][0]<<
+           "phase1="<<phase[ibest][1]<<
+           "\n";                 
+
+       }
+      }
+    }
+  }
+  delete [] helixes;
+  if (AliTPCReconstructor::StreamLevel()>1) {
+    AliInfo("Time for curling tracks removal");
+    timer.Print();
+  }
+}
+
+
+
+
+
+void  AliTPCtrackerMI::FindKinks(TObjArray * array, AliESDEvent *esd)
+{
+  //
+  //  find kinks
+  //
+  //
+
+  TObjArray *kinks= new TObjArray(10000);
+  //  TObjArray *v0s= new TObjArray(10000);
+  Int_t nentries = array->GetEntriesFast();
+  AliHelix *helixes      = new AliHelix[nentries];
+  Int_t    *sign         = new Int_t[nentries];
+  Int_t    *nclusters    = new Int_t[nentries];
+  Float_t  *alpha        = new Float_t[nentries];
+  AliKink  *kink         = new AliKink();
+  Int_t      * usage     = new Int_t[nentries];
+  Float_t  *zm           = new Float_t[nentries];
+  Float_t  *z0           = new Float_t[nentries]; 
+  Float_t  *fim          = new Float_t[nentries];
+  Float_t  *shared       = new Float_t[nentries];
+  Bool_t   *circular     = new Bool_t[nentries];
+  Float_t *dca          = new Float_t[nentries];
+  //const AliESDVertex * primvertex = esd->GetVertex();
+  //
+  //  nentries = array->GetEntriesFast();
+  //
+  
+  //
+  //
+  for (Int_t i=0;i<nentries;i++){
+    sign[i]=0;
+    usage[i]=0;
+    AliTPCseed* track = (AliTPCseed*)array->At(i);    
+    if (!track) continue;
+    track->SetCircular(0);
+    shared[i] = kFALSE;
+    track->UpdatePoints();
+    if (( track->GetPoints()[2]- track->GetPoints()[0])>5 && track->GetPoints()[3]>0.8){
+    }
+    nclusters[i]=track->GetNumberOfClusters();
+    alpha[i] = track->GetAlpha();
+    new (&helixes[i]) AliHelix(*track);
+    Double_t xyz[3];
+    helixes[i].Evaluate(0,xyz);
+    sign[i] = (track->GetC()>0) ? -1:1;
+    Double_t x,y,z;
+    x=160;
+    if (track->GetProlongation(x,y,z)){
+      zm[i]  = z;
+      fim[i] = alpha[i]+TMath::ATan2(y,x);
+    }
+    else{
+      zm[i]  = track->GetZ();
+      fim[i] = alpha[i];
+    }   
+    z0[i]=1000;
+    circular[i]= kFALSE;
+    if (track->GetProlongation(0,y,z))  z0[i] = z;
+    dca[i] = track->GetD(0,0);    
+  }
+  //
+  //
+  TStopwatch timer;
+  timer.Start();
+  Int_t ncandidates =0;
+  Int_t nall =0;
+  Int_t ntracks=0; 
+  Double_t phase[2][2],radius[2];
+
+  //
+  // Find circling track
+  TTreeSRedirector &cstream = *fDebugStreamer;
+  //
+  for (Int_t i0=0;i0<nentries;i0++){
+    AliTPCseed * track0 = (AliTPCseed*)array->At(i0);
+    if (!track0) continue;    
+    if (track0->GetNumberOfClusters()<40) continue;
+    if (TMath::Abs(1./track0->GetC())>200) continue;
+    for (Int_t i1=i0+1;i1<nentries;i1++){
+      AliTPCseed * track1 = (AliTPCseed*)array->At(i1);
+      if (!track1) continue;
+      if (track1->GetNumberOfClusters()<40)                  continue;
+      if ( TMath::Abs(track1->GetTgl()+track0->GetTgl())>0.1) continue;
+      if (track0->GetBConstrain()&&track1->GetBConstrain()) continue;
+      if (TMath::Abs(1./track1->GetC())>200) continue;
+      if (track1->GetSigned1Pt()*track0->GetSigned1Pt()>0)      continue;
+      if (track1->GetTgl()*track0->GetTgl()>0)      continue;
+      if (TMath::Max(TMath::Abs(1./track0->GetC()),TMath::Abs(1./track1->GetC()))>190) continue;
+      if (track0->GetBConstrain()&&track1->OneOverPt()<track0->OneOverPt()) continue; //returning - lower momenta
+      if (track1->GetBConstrain()&&track0->OneOverPt()<track1->OneOverPt()) continue; //returning - lower momenta
+      //
+      Float_t mindcar = TMath::Min(TMath::Abs(dca[i0]),TMath::Abs(dca[i1]));
+      if (mindcar<5)   continue;
+      Float_t mindcaz = TMath::Min(TMath::Abs(z0[i0]-GetZ()),TMath::Abs(z0[i1]-GetZ()));
       if (mindcaz<5) continue;
       if (mindcar+mindcaz<20) continue;
       //
@@ -4092,14 +4771,6 @@ void  AliTPCtrackerMI::FindKinks(TObjArray * array, AliESD *esd)
       helixes[i0].GetAngle(phase[0][0],helixes[i1],phase[0][1],hangles);
       Double_t deltah[2],deltabest;
       if (hangles[2]<2.8) continue;
-      /*
-      cstream<<"C"<<track0->fLab<<track1->fLab<<
-       track0->fP3<<track1->fP3<<
-       track0->fP4<<track1->fP4<<
-       delta<<rmean<<npoints<<
-       hangles[0]<<hangles[2]<<
-       xyz0[2]<<xyz1[2]<<radius[0]<<"\n"; 
-      */
       if (npoints>0){
        Int_t ibest=0;
        helixes[i0].ParabolicDCA(helixes[i1],phase[0][0],phase[0][1],radius[0],deltah[0],2);
@@ -4121,20 +4792,22 @@ void  AliTPCtrackerMI::FindKinks(TObjArray * array, AliESD *esd)
        if (sign){
          circular[i0] = kTRUE;
          circular[i1] = kTRUE;
-         if (TMath::Abs(track0->fP4)<TMath::Abs(track1->fP4)){
-           track0->fCircular += 1;
-           track1->fCircular += 2;
+         if (track0->OneOverPt()<track1->OneOverPt()){
+           track0->SetCircular(track0->GetCircular()+1);
+           track1->SetCircular(track1->GetCircular()+2);
          }
          else{
-           track1->fCircular += 1;
-           track0->fCircular += 2;
+           track1->SetCircular(track1->GetCircular()+1);
+           track0->SetCircular(track0->GetCircular()+2);
          }
        }               
        if (sign&&AliTPCReconstructor::StreamLevel()>1){          
          //debug stream          
+         Int_t lab0=track0->GetLabel();
+         Int_t lab1=track1->GetLabel();
          cstream<<"Curling"<<
-           "lab0="<<track0->fLab<<
-           "lab1="<<track1->fLab<<   
+           "lab0="<<lab0<<
+           "lab1="<<lab1<<   
            "Tr0.="<<track0<<
            "Tr1.="<<track1<<      
            "dca0="<<dca[i0]<<
@@ -4166,6 +4839,10 @@ void  AliTPCtrackerMI::FindKinks(TObjArray * array, AliESD *esd)
   for (Int_t i =0;i<nentries;i++){
     if (sign[i]==0) continue;
     AliTPCseed * track0 = (AliTPCseed*)array->At(i);
+    if (track0==0) {
+      AliInfo("seed==0");
+      continue;
+    }
     ntracks++;
     //
     Double_t cradius0 = 40*40;
@@ -4269,7 +4946,7 @@ void  AliTPCtrackerMI::FindKinks(TObjArray * array, AliESD *esd)
       if (TMath::Abs(ktrack0->GetC())>5) continue; // cut on the curvature for mother particle
       AliExternalTrackParam paramm(*ktrack0);
       AliExternalTrackParam paramd(*ktrack1);
-      if (row0>60&&ktrack1->GetReference().GetX()>90.) new (&paramd) AliExternalTrackParam(ktrack1->GetReference()); 
+      if (row0>60&&ktrack1->GetReference().GetX()>90.)new (&paramd) AliExternalTrackParam(ktrack1->GetReference()); 
       //
       //
       kink->SetMother(paramm);
@@ -4296,7 +4973,7 @@ void  AliTPCtrackerMI::FindKinks(TObjArray * array, AliESD *esd)
 
       if (mpt<1){
        //for high momenta momentum not defined well in first iteration
-       Double_t qt   =  TMath::Sin(kink->GetAngle(2))*ktrack1->P();
+       Double_t qt   =  TMath::Sin(kink->GetAngle(2))*ktrack1->GetP();
        if (qt>0.35) continue; 
       }
       
@@ -4323,12 +5000,12 @@ void  AliTPCtrackerMI::FindKinks(TObjArray * array, AliESD *esd)
        //      angle and densities  not defined yet
        if (kink->GetTPCDensityFactor()<0.8) continue;
        if ((2-kink->GetTPCDensityFactor())*kink->GetDistance() >0.25) continue;
-       if (kink->GetAngle(2)*ktrack0->P()<0.003) continue; //too small angle
+       if (kink->GetAngle(2)*ktrack0->GetP()<0.003) continue; //too small angle
        if (kink->GetAngle(2)>0.2&&kink->GetTPCDensityFactor()<1.15) continue;
        if (kink->GetAngle(2)>0.2&&kink->GetTPCDensity(0,1)>0.05) continue;
 
-       Float_t criticalangle = track0->fC22+track0->fC33;
-       criticalangle+= track1->fC22+track1->fC33;
+       Float_t criticalangle = track0->GetSigmaSnp2()+track0->GetSigmaTgl2();
+       criticalangle+= track1->GetSigmaSnp2()+track1->GetSigmaTgl2();
        criticalangle= 3*TMath::Sqrt(criticalangle);
        if (criticalangle>0.02) criticalangle=0.02;
        if (kink->GetAngle(2)<criticalangle) continue;
@@ -4340,12 +5017,12 @@ void  AliTPCtrackerMI::FindKinks(TObjArray * array, AliESD *esd)
       for ( Int_t row = row0-drow; row<row0+drow;row++){
        if (row<0) continue;
        if (row>155) continue;
-       if (ktrack0->fClusterPointer[row]){
+       if (ktrack0->GetClusterPointer(row)){
          AliTPCTrackerPoint *point =ktrack0->GetTrackPoint(row);
          shapesum+=point->GetSigmaY()+point->GetSigmaZ();
          sum++;
        }
-       if (ktrack1->fClusterPointer[row]){
+       if (ktrack1->GetClusterPointer(row)){
          AliTPCTrackerPoint *point =ktrack1->GetTrackPoint(row);
          shapesum+=point->GetSigmaY()+point->GetSigmaZ();
          sum++;
@@ -4359,7 +5036,7 @@ void  AliTPCtrackerMI::FindKinks(TObjArray * array, AliESD *esd)
       }      
       //      esd->AddKink(kink);
       kinks->AddLast(kink);
-      kink = new AliESDkink;
+      kink = new AliKink;
       ncandidates++;
     }
   }
@@ -4375,7 +5052,7 @@ void  AliTPCtrackerMI::FindKinks(TObjArray * array, AliESD *esd)
   //
   for (Int_t i=0;i<nkinks;i++){
     quality[i] =100000;
-    AliESDkink *kink = (AliESDkink*)kinks->At(i);
+    AliKink *kink = (AliKink*)kinks->At(i);
     //
     // refit kinks towards vertex
     // 
@@ -4384,7 +5061,7 @@ void  AliTPCtrackerMI::FindKinks(TObjArray * array, AliESD *esd)
     AliTPCseed * ktrack0 = (AliTPCseed*)array->At(index0);
     AliTPCseed * ktrack1 = (AliTPCseed*)array->At(index1);
     //
-    Int_t sumn=ktrack0->fN+ktrack1->fN;
+    Int_t sumn=ktrack0->GetNumberOfClusters()+ktrack1->GetNumberOfClusters();
     //
     // Refit Kink under if too small angle
     //
@@ -4396,22 +5073,22 @@ void  AliTPCtrackerMI::FindKinks(TObjArray * array, AliESD *esd)
       //
       Int_t last  = row0-drow;
       if (last<40) last=40;
-      if (last<ktrack0->fFirstPoint+25) last = ktrack0->fFirstPoint+25;
+      if (last<ktrack0->GetFirstPoint()+25) last = ktrack0->GetFirstPoint()+25;
       AliTPCseed* seed0 = ReSeed(ktrack0,last,kFALSE);
       //
       //
       Int_t first = row0+drow;
       if (first>130) first=130;
-      if (first>ktrack1->fLastPoint-25) first = TMath::Max(ktrack1->fLastPoint-25,30);
+      if (first>ktrack1->GetLastPoint()-25) first = TMath::Max(ktrack1->GetLastPoint()-25,30);
       AliTPCseed* seed1 = ReSeed(ktrack1,first,kTRUE);
       //
       if (seed0 && seed1){
        kink->SetStatus(1,8);
        if (RefitKink(*seed0,*seed1,*kink)) kink->SetStatus(1,9);
        row0 = GetRowNumber(kink->GetR());
-       sumn = seed0->fN+seed1->fN;
-       new (&mothers[i])   AliTPCseed(*seed0);
-       new (&daughters[i]) AliTPCseed(*seed1); 
+       sumn = seed0->GetNumberOfClusters()+seed1->GetNumberOfClusters();
+       mothers[i] = *seed0;
+       daughters[i] = *seed1;
       }
       else{
        delete kinks->RemoveAt(i);
@@ -4437,12 +5114,12 @@ void  AliTPCtrackerMI::FindKinks(TObjArray * array, AliESD *esd)
   //remove double find kinks
   //
   for (Int_t ikink0=1;ikink0<nkinks;ikink0++){
-    AliESDkink * kink0 = (AliESDkink*) kinks->At(indexes[ikink0]);
+    AliKink * kink0 = (AliKink*) kinks->At(indexes[ikink0]);
     if (!kink0) continue;
     //
     for (Int_t ikink1=0;ikink1<ikink0;ikink1++){
       if (!kink0) continue;
-      AliESDkink * kink1 = (AliESDkink*) kinks->At(indexes[ikink1]);
+      AliKink * kink1 = (AliKink*) kinks->At(indexes[ikink1]);
       if (!kink1) continue;
       // if not close kink continue
       if (TMath::Abs(kink1->GetPosition()[2]-kink0->GetPosition()[2])>10) continue;
@@ -4463,10 +5140,10 @@ void  AliTPCtrackerMI::FindKinks(TObjArray * array, AliESD *esd)
       Int_t bothd = 0;
       //
       for (Int_t i=0;i<row0;i++){
-       if (mother0.fIndex[i]>0 && mother1.fIndex[i]>0){
+       if (mother0.GetClusterIndex(i)>0 && mother1.GetClusterIndex(i)>0){
          both++;
          bothm++;
-         if (mother0.fIndex[i]==mother1.fIndex[i]){
+         if (mother0.GetClusterIndex(i)==mother1.GetClusterIndex(i)){
            same++;
            samem++;
          }
@@ -4474,10 +5151,10 @@ void  AliTPCtrackerMI::FindKinks(TObjArray * array, AliESD *esd)
       }
 
       for (Int_t i=row0;i<158;i++){
-       if (daughter0.fIndex[i]>0 && daughter0.fIndex[i]>0){
+       if (daughter0.GetClusterIndex(i)>0 && daughter0.GetClusterIndex(i)>0){
          both++;
          bothd++;
-         if (mother0.fIndex[i]==mother1.fIndex[i]){
+         if (mother0.GetClusterIndex(i)==mother1.GetClusterIndex(i)){
            same++;
            samed++;
          }
@@ -4487,8 +5164,8 @@ void  AliTPCtrackerMI::FindKinks(TObjArray * array, AliESD *esd)
       Float_t ratiom = Float_t(samem+1)/Float_t(bothm+1);
       Float_t ratiod = Float_t(samed+1)/Float_t(bothd+1);
       if (ratio>0.3 && ratiom>0.5 &&ratiod>0.5) {
-       Int_t sum0 = mother0.fN+daughter0.fN;
-       Int_t sum1 = mother1.fN+daughter1.fN;
+       Int_t sum0 = mother0.GetNumberOfClusters()+daughter0.GetNumberOfClusters();
+       Int_t sum1 = mother1.GetNumberOfClusters()+daughter1.GetNumberOfClusters();
        if (sum1>sum0){
          shared[kink0->GetIndex(0)]= kTRUE;
          shared[kink0->GetIndex(1)]= kTRUE;      
@@ -4505,7 +5182,7 @@ void  AliTPCtrackerMI::FindKinks(TObjArray * array, AliESD *esd)
 
 
   for (Int_t i=0;i<nkinks;i++){
-    AliESDkink * kink = (AliESDkink*) kinks->At(indexes[i]);
+    AliKink * kink = (AliKink*) kinks->At(indexes[i]);
     if (!kink) continue;
     kink->SetTPCRow0(GetRowNumber(kink->GetR()));
     Int_t index0 = kink->GetIndex(0);
@@ -4524,15 +5201,15 @@ void  AliTPCtrackerMI::FindKinks(TObjArray * array, AliESD *esd)
     Int_t index = esd->AddKink(kink);
     //
     //
-    if ( ktrack0->fKinkIndexes[0]==0 && ktrack1->fKinkIndexes[0]==0) {  //best kink
-      if (mothers[indexes[i]].fN>20 && daughters[indexes[i]].fN>20 && (mothers[indexes[i]].fN+daughters[indexes[i]].fN)>100){
-       new (ktrack0) AliTPCseed(mothers[indexes[i]]);
-       new (ktrack1) AliTPCseed(daughters[indexes[i]]);
+    if ( ktrack0->GetKinkIndex(0)==0 && ktrack1->GetKinkIndex(0)==0) {  //best kink
+      if (mothers[indexes[i]].GetNumberOfClusters()>20 && daughters[indexes[i]].GetNumberOfClusters()>20 && (mothers[indexes[i]].GetNumberOfClusters()+daughters[indexes[i]].GetNumberOfClusters())>100){
+       *ktrack0 = mothers[indexes[i]];
+       *ktrack1 = daughters[indexes[i]];
       }
     }
     //
-    ktrack0->fKinkIndexes[usage[index0]] = -(index+1);
-    ktrack1->fKinkIndexes[usage[index1]] =  (index+1);
+    ktrack0->SetKinkIndex(usage[index0],-(index+1));
+    ktrack1->SetKinkIndex(usage[index1], (index+1));
     usage[index0]++;
     usage[index1]++;
   }
@@ -4542,7 +5219,7 @@ void  AliTPCtrackerMI::FindKinks(TObjArray * array, AliESD *esd)
   for (Int_t i=0;i<nentries;i++){
     AliTPCseed * track0 = (AliTPCseed*)array->At(i);
     if (!track0) continue;
-    if (track0->fKinkIndexes[0]!=0) continue;
+    if (track0->GetKinkIndex(0)!=0) continue;
     if (shared[i]) delete array->RemoveAt(i);
   }
 
@@ -4564,28 +5241,29 @@ void  AliTPCtrackerMI::FindKinks(TObjArray * array, AliESD *esd)
     //remove double high momenta tracks - overlapped with kink candidates
     Int_t shared=0;
     Int_t all   =0;
-    for (Int_t icl=track0->fFirstPoint;icl<track0->fLastPoint; icl++){
-      if (track0->fClusterPointer[icl]!=0){
+    for (Int_t icl=track0->GetFirstPoint();icl<track0->GetLastPoint(); icl++){
+      if (track0->GetClusterPointer(icl)!=0){
        all++;
-       if (track0->fClusterPointer[icl]->IsUsed(10)) shared++;
+       if (track0->GetClusterPointer(icl)->IsUsed(10)) shared++;
       }
     }
-    if (Float_t(shared+1)/Float_t(nall+1)>0.5) {
+    if (Float_t(shared+1)/Float_t(all+1)>0.5) {  
       delete array->RemoveAt(i);
+      continue;
     }
     //
-    if (track0->fKinkIndexes[0]!=0) continue;
+    if (track0->GetKinkIndex(0)!=0) continue;
     if (track0->GetNumberOfClusters()<80) continue;
 
     AliTPCseed *pmother = new AliTPCseed();
     AliTPCseed *pdaughter = new AliTPCseed();
-    AliESDkink *pkink = new AliESDkink;
+    AliKink *pkink = new AliKink;
 
     AliTPCseed & mother = *pmother;
     AliTPCseed & daughter = *pdaughter;
-    AliESDkink & kink = *pkink;
+    AliKink & kink = *pkink;
     if (CheckKinkPoint(track0,mother,daughter, kink)){
-      if (mother.fN<30||daughter.fN<20) {
+      if (mother.GetNumberOfClusters()<30||daughter.GetNumberOfClusters()<20) {
        delete pmother;
        delete pdaughter;
        delete pkink;
@@ -4606,9 +5284,9 @@ void  AliTPCtrackerMI::FindKinks(TObjArray * array, AliESD *esd)
       }
       //
       Int_t index = esd->AddKink(&kink);      
-      mother.fKinkIndexes[0] = -(index+1);
-      daughter.fKinkIndexes[0] = index+1;
-      if (mother.fN>50) {
+      mother.SetKinkIndex(0,-(index+1));
+      daughter.SetKinkIndex(0,index+1);
+      if (mother.GetNumberOfClusters()>50) {
        delete array->RemoveAt(i);
        array->AddAt(new AliTPCseed(mother),i);
       }
@@ -4617,11 +5295,11 @@ void  AliTPCtrackerMI::FindKinks(TObjArray * array, AliESD *esd)
       }
       array->AddLast(new AliTPCseed(daughter));      
       for (Int_t icl=0;icl<row0;icl++) {
-       if (mother.fClusterPointer[icl]) mother.fClusterPointer[icl]->Use(20);
+       if (mother.GetClusterPointer(icl)) mother.GetClusterPointer(icl)->Use(20);
       }
       //
       for (Int_t icl=row0;icl<158;icl++) {
-       if (daughter.fClusterPointer[icl]) daughter.fClusterPointer[icl]->Use(20);
+       if (daughter.GetClusterPointer(icl)) daughter.GetClusterPointer(icl)->Use(20);
       }
       //
     }
@@ -4656,7 +5334,7 @@ void  AliTPCtrackerMI::FindKinks(TObjArray * array, AliESD *esd)
   timer.Print();
 }
 
-void  AliTPCtrackerMI::FindV0s(TObjArray * array, AliESD *esd)
+void  AliTPCtrackerMI::FindV0s(TObjArray * array, AliESDEvent *esd)
 {
   //
   //  find V0s
@@ -4702,19 +5380,19 @@ void  AliTPCtrackerMI::FindV0s(TObjArray * array, AliESD *esd)
     // 
     // dca error parrameterezation + pulls
     //
-    sdcar[i]      = TMath::Sqrt(0.150*0.150+(100*track->fP4)*(100*track->fP4));
-    if (TMath::Abs(track->fP3)>1) sdcar[i]*=2.5;
-    cdcar[i]      = TMath::Exp((TMath::Abs(track->fP4)-0.0106)*525.3);
+    sdcar[i]      = TMath::Sqrt(0.150*0.150+(100*track->GetC())*(100*track->GetC()));
+    if (TMath::Abs(track->GetTgl())>1) sdcar[i]*=2.5;
+    cdcar[i]      = TMath::Exp((TMath::Abs(track->GetC())-0.0106)*525.3);
     pulldcar[i]   = (dca[i]-cdcar[i])/sdcar[i];
     pulldcaz[i]   = (z0[i]-zvertex)/sdcar[i];
     pulldca[i]    = TMath::Sqrt(pulldcar[i]*pulldcar[i]+pulldcaz[i]*pulldcaz[i]);
-    if (track->fTPCr[1]+track->fTPCr[2]+track->fTPCr[3]>0.5) {
+    if (track->TPCrPID(1)+track->TPCrPID(2)+track->TPCrPID(3)>0.5) {
       if (pulldca[i]<3.) isPrim[i]=kTRUE;  //pion, muon and Kaon  3 sigma cut
     }
-    if (track->fTPCr[4]>0.5) {
+    if (track->TPCrPID(4)>0.5) {
       if (pulldca[i]<0.5) isPrim[i]=kTRUE;  //proton 0.5 sigma cut
     }
-    if (track->fTPCr[0]>0.4) {
+    if (track->TPCrPID(0)>0.4) {
       isPrim[i]=kFALSE;  //electron no  sigma cut
     }
   }
@@ -4733,7 +5411,7 @@ void  AliTPCtrackerMI::FindV0s(TObjArray * array, AliESD *esd)
   // //  
   TTreeSRedirector &cstream = *fDebugStreamer; 
   Float_t fprimvertex[3]={GetX(),GetY(),GetZ()};
-  AliESDV0MI vertex; 
+  AliV0 vertex; 
   Double_t cradius0 = 10*10;
   Double_t cradius1 = 200*200;
   Double_t cdist1=3.;
@@ -4745,7 +5423,7 @@ void  AliTPCtrackerMI::FindV0s(TObjArray * array, AliESD *esd)
     if (sign[i]==0) continue;
     AliTPCseed * track0 = (AliTPCseed*)array->At(i);
     if (!track0) continue;
-    if (AliTPCReconstructor::StreamLevel()>0){
+    if (AliTPCReconstructor::StreamLevel()>1){
       cstream<<"Tracks"<<
        "Tr0.="<<track0<<
        "dca="<<dca[i]<<
@@ -4760,7 +5438,7 @@ void  AliTPCtrackerMI::FindV0s(TObjArray * array, AliESD *esd)
        "\n";
     }
     //
-    if (track0->fP4<0) continue;
+    if (track0->GetSigned1Pt()<0) continue;
     if (track0->GetKinkIndex(0)>0||isPrim[i]) continue;   //daughter kink
     //
     if (TMath::Abs(helixes[i].GetHelix(4))<0.000000001) continue;
@@ -4774,7 +5452,7 @@ void  AliTPCtrackerMI::FindV0s(TObjArray * array, AliESD *esd)
       if (track1->GetKinkIndex(0)>0 || isPrim[j]) continue; //daughter kink
       if (sign[j]*sign[i]>0) continue; 
       if (TMath::Abs(helixes[j].GetHelix(4))<0.000001) continue;
-      if (track0->fCircular+track1->fCircular>1) continue;    //circling -returning track
+      if (track0->GetCircular()+track1->GetCircular()>1) continue;    //circling -returning track
       nall++;
       //
       // DCA to prim vertex cut
@@ -4806,23 +5484,26 @@ void  AliTPCtrackerMI::FindV0s(TObjArray * array, AliESD *esd)
       if (pointAngle<cpointAngle) continue;
       //
       Bool_t isGamma = kFALSE;
-      vertex.SetP(*track0); //track0 - plus
-      vertex.SetM(*track1); //track1 - minus
+      vertex.SetParamP(*track0); //track0 - plus
+      vertex.SetParamN(*track1); //track1 - minus
       vertex.Update(fprimvertex);
-      if (track0->fTPCr[0]>0.3&&track1->fTPCr[0]>0.3&&vertex.GetAnglep()[2]<0.15) isGamma=kTRUE;              // gamma conversion candidate
-      Double_t pointAngle2 = vertex.GetPointAngle();
+      if (track0->TPCrPID(0)>0.3&&track1->TPCrPID(0)>0.3&&vertex.GetAnglep()[2]<0.15) isGamma=kTRUE;              // gamma conversion candidate
+      Double_t pointAngle2 = vertex.GetV0CosineOfPointingAngle();
       //continue;
-      if (vertex.GetPointAngle()<cpointAngle && (!isGamma)) continue; // point angle cut
-      if (vertex.GetDist2()>2&&(!isGamma)) continue;         // point angle cut
+      if (vertex.GetV0CosineOfPointingAngle()<cpointAngle && (!isGamma)) continue;// point angle cut
+      //Bo:      if (vertex.GetDist2()>2&&(!isGamma)) continue;      // point angle cut
+      if (vertex.GetDcaV0Daughters()>2&&(!isGamma)) continue;//Bo:   // point angle cut
       Float_t sigmae     = 0.15*0.15;
       if (vertex.GetRr()<80) 
        sigmae += (sdcar[i]*sdcar[i]+sdcar[j]*sdcar[j])*(1.-vertex.GetRr()/80.)*(1.-vertex.GetRr()/80.);
       sigmae+= TMath::Sqrt(sigmae);
-      if (vertex.GetDist2()/sigmae>3.&&(!isGamma)) continue; 
+      //Bo:      if (vertex.GetDist2()/sigmae>3.&&(!isGamma)) continue; 
+      if (vertex.GetDcaV0Daughters()/sigmae>3.&&(!isGamma)) continue; 
       Float_t densb0=0,densb1=0,densa0=0,densa1=0;
       Int_t row0 = GetRowNumber(vertex.GetRr());
       if (row0>15){
-       if (vertex.GetDist2()>0.2) continue;             
+       //Bo:   if (vertex.GetDist2()>0.2) continue;             
+       if (vertex.GetDcaV0Daughters()>0.2) continue;             
        densb0     = track0->Density2(0,row0-5);          
        densb1     = track1->Density2(0,row0-5);         
        if (densb0>0.3|| densb1>0.3) continue;            //clusters before vertex
@@ -4835,30 +5516,35 @@ void  AliTPCtrackerMI::FindV0s(TObjArray * array, AliESD *esd)
        densa1     = track1->Density2(0,40);  //cluster density
        if ((vertex.GetRr()<80&&densa0+densa1<1.)&&(!isGamma)) continue;
       }
-      vertex.SetLab(0,track0->GetLabel());
-      vertex.SetLab(1,track1->GetLabel());
+//Bo:        vertex.SetLab(0,track0->GetLabel());
+//Bo:        vertex.SetLab(1,track1->GetLabel());
       vertex.SetChi2After((densa0+densa1)*0.5);
       vertex.SetChi2Before((densb0+densb1)*0.5);
       vertex.SetIndex(0,i);
       vertex.SetIndex(1,j);
-      vertex.SetStatus(1); // TPC v0 candidate
-      vertex.SetRp(track0->fTPCr);
-      vertex.SetRm(track1->fTPCr);
-      tpcv0s->AddLast(new AliESDV0MI(vertex));      
+//Bo:      vertex.SetStatus(1); // TPC v0 candidate
+      vertex.SetOnFlyStatus(2);//Bo: // TPC v0 candidate
+//Bo:        vertex.SetRp(track0->TPCrPIDs());
+//Bo:        vertex.SetRm(track1->TPCrPIDs());
+      tpcv0s->AddLast(new AliESDv0(vertex));      
       ncandidates++;
       {
-       Int_t eventNr = esd->GetEventNumber();
+       Int_t eventNr = esd->GetEventNumberInFile(); // This is most likely NOT the event number you'd like to use. It has nothing to do with the 'real' event number
        Double_t radiusm= (delta[0]<delta[1])? TMath::Sqrt(radius[0]):TMath::Sqrt(radius[1]);  
        Double_t deltam= (delta[0]<delta[1])? TMath::Sqrt(delta[0]):TMath::Sqrt(delta[1]);  
-       if (AliTPCReconstructor::StreamLevel()>0)
+       if (AliTPCReconstructor::StreamLevel()>1) {
+         Int_t lab0=track0->GetLabel();
+         Int_t lab1=track1->GetLabel();
+         Char_t c0=track0->GetCircular();
+         Char_t c1=track1->GetCircular();
          cstream<<"V0"<<
          "Event="<<eventNr<<
          "vertex.="<<&vertex<<
          "Tr0.="<<track0<<
-         "lab0="<<track0->fLab<<
+         "lab0="<<lab0<<
          "Helix0.="<<&helixes[i]<<     
          "Tr1.="<<track1<<
-         "lab1="<<track1->fLab<<
+         "lab1="<<lab1<<
          "Helix1.="<<&helixes[j]<<
          "pointAngle="<<pointAngle<<
          "pointAngle2="<<pointAngle2<<
@@ -4867,8 +5553,8 @@ void  AliTPCtrackerMI::FindV0s(TObjArray * array, AliESD *esd)
          "z0="<<z0[i]<<
          "z1="<<z0[j]<<
          "zvertex="<<zvertex<<
-         "circular0="<<track0->fCircular<<
-         "circular1="<<track1->fCircular<<
+         "circular0="<<c0<<
+         "circular1="<<c1<<
          "npoints="<<npoints<<
          "radius0="<<radius[0]<<
          "delta0="<<delta[0]<<
@@ -4891,7 +5577,7 @@ void  AliTPCtrackerMI::FindV0s(TObjArray * array, AliESD *esd)
          "densa0="<<densa0<<
          "densa1="<<densa1<<
          "sigmae="<<sigmae<<
-         "\n";
+           "\n";}
       }
     }
   }    
@@ -4900,24 +5586,29 @@ void  AliTPCtrackerMI::FindV0s(TObjArray * array, AliESD *esd)
   Int_t naccepted =0;
   for (Int_t i=0;i<ncandidates;i++){
     quality[i]     = 0; 
-    AliESDV0MI *v0 = (AliESDV0MI*)tpcv0s->At(i);
-    quality[i]     = 1./(1.00001-v0->GetPointAngle());   //base point angle
+    AliESDv0 *v0 = (AliESDv0*)tpcv0s->At(i);
+    quality[i]     = 1./(1.00001-v0->GetV0CosineOfPointingAngle());   //base point angle
     // quality[i]    /= (0.5+v0->GetDist2());  
     // quality[i]    *= v0->GetChi2After();               //density factor
-    Double_t minpulldca = TMath::Min(2.+pulldca[v0->GetIndex(0)],(2.+pulldca[v0->GetIndex(1)]) );     //pull
+
     Int_t index0 = v0->GetIndex(0);
     Int_t index1 = v0->GetIndex(1);
+    //Bo:    Double_t minpulldca = TMath::Min(2.+pulldca[v0->GetIndex(0)],(2.+pulldca[v0->GetIndex(1)]) );     //pull
+    Double_t minpulldca = TMath::Min(2.+pulldca[index0],(2.+pulldca[index1]) );//Bo:
+
+
+
     AliTPCseed * track0 = (AliTPCseed*)array->At(index0);
     AliTPCseed * track1 = (AliTPCseed*)array->At(index1);
-    if (track0->fTPCr[0]>0.3&&track1->fTPCr[0]>0.3&&v0->GetAnglep()[2]<0.15) quality[i]+=1000000;              // gamma conversion candidate
-    if (track0->fTPCr[4]>0.9||track1->fTPCr[4]>0.9&&minpulldca>4) quality[i]*=10;    // lambda candidate candidate
+    if (track0->TPCrPID(0)>0.3&&track1->TPCrPID(0)>0.3&&v0->GetAnglep()[2]<0.15) quality[i]+=1000000;              // gamma conversion candidate
+    if (track0->TPCrPID(4)>0.9||track1->TPCrPID(4)>0.9&&minpulldca>4) quality[i]*=10;    // lambda candidate candidate
   }
 
   TMath::Sort(ncandidates,quality,indexes,kTRUE);
   //
   //
   for (Int_t i=0;i<ncandidates;i++){
-    AliESDV0MI * v0 = (AliESDV0MI*)tpcv0s->At(indexes[i]);
+    AliESDv0 * v0 = (AliESDv0*)tpcv0s->At(indexes[i]);
     if (!v0) continue;
     Int_t index0 = v0->GetIndex(0);
     Int_t index1 = v0->GetIndex(1);
@@ -4939,28 +5630,31 @@ void  AliTPCtrackerMI::FindV0s(TObjArray * array, AliESD *esd)
     if (v0indexes0[2]!=0) {order0=3; accept=kFALSE;}
     if (v0indexes0[2]!=0) {order1=3; accept=kFALSE;}
     //
-    AliESDV0MI * v02 = v0;
+    AliESDv0 * v02 = v0;
     if (accept){
-      v0->SetOrder(0,order0);
-      v0->SetOrder(1,order1);
-      v0->SetOrder(1,order0+order1);     
-      Int_t index = esd->AddV0MI(v0);
-      v02 = esd->GetV0MI(index);
+      //Bo:      v0->SetOrder(0,order0);
+      //Bo:      v0->SetOrder(1,order1);
+      //Bo:      v0->SetOrder(1,order0+order1);     
+      v0->SetOnFlyStatus(kTRUE);
+      Int_t index = esd->AddV0(v0);
+      v02 = esd->GetV0(index);
       v0indexes0[order0]=index;
       v0indexes1[order1]=index;
       naccepted++;
     }
     {
-      Int_t eventNr = esd->GetEventNumber();
-      if (AliTPCReconstructor::StreamLevel()>0)
+      Int_t eventNr = esd->GetEventNumberInFile(); // This is most likely NOT the event number you'd like to use. It has nothing to do with the 'real' event number
+      if (AliTPCReconstructor::StreamLevel()>1) {
+       Int_t lab0=track0->GetLabel();
+       Int_t lab1=track1->GetLabel();
        cstream<<"V02"<<
        "Event="<<eventNr<<
        "vertex.="<<v0<<        
        "vertex2.="<<v02<<
        "Tr0.="<<track0<<
-       "lab0="<<track0->fLab<<
+       "lab0="<<lab0<<
        "Tr1.="<<track1<<
-       "lab1="<<track1->fLab<<
+       "lab1="<<lab1<<
        "dca0="<<dca[index0]<<
        "dca1="<<dca[index1]<<
        "order0="<<order0<<
@@ -4970,7 +5664,7 @@ void  AliTPCtrackerMI::FindV0s(TObjArray * array, AliESD *esd)
        "pulldca0="<<pulldca[index0]<<
        "pulldca1="<<pulldca[index1]<<
        "index="<<i<<
-       "\n";
+         "\n";}
     }
   }    
 
@@ -4996,12 +5690,14 @@ void  AliTPCtrackerMI::FindV0s(TObjArray * array, AliESD *esd)
   timer.Print();
 }
 
-Int_t AliTPCtrackerMI::RefitKink(AliTPCseed &mother, AliTPCseed &daughter, AliESDkink &kink)
+Int_t AliTPCtrackerMI::RefitKink(AliTPCseed &mother, AliTPCseed &daughter, AliESDkink &knk)
 {
   //
   // refit kink towards to the vertex
   //
   //
+  AliKink &kink=(AliKink &)knk;
+
   Int_t row0 = GetRowNumber(kink.GetR());
   FollowProlongation(mother,0);
   mother.Reset(kFALSE);
@@ -5016,7 +5712,7 @@ Int_t AliTPCtrackerMI::RefitKink(AliTPCseed &mother, AliTPCseed &daughter, AliES
   const Int_t kNdiv =5;
   AliTPCseed  param0[kNdiv];  // parameters along the track
   AliTPCseed  param1[kNdiv];  // parameters along the track
-  AliESDkink   kinks[kNdiv];   // corresponding kink parameters
+  AliKink     kinks[kNdiv];   // corresponding kink parameters
   //
   Int_t rows[kNdiv];
   for (Int_t irow=0; irow<kNdiv;irow++){
@@ -5027,13 +5723,13 @@ Int_t AliTPCtrackerMI::RefitKink(AliTPCseed &mother, AliTPCseed &daughter, AliES
   for (Int_t irow=0;irow<kNdiv;irow++){
     FollowBackProlongation(mother, rows[irow]);
     FollowProlongation(daughter,rows[kNdiv-1-irow]);       
-    new(&param0[irow])     AliTPCseed(mother);
-    new(&param1[kNdiv-1-irow])   AliTPCseed(daughter);
+    param0[irow] = mother;
+    param1[kNdiv-1-irow] = daughter;
   }
   //
   // define kinks 
   for (Int_t irow=0; irow<kNdiv-1;irow++){
-    if (param0[irow].fN<kNdiv||param1[irow].fN<kNdiv) continue;
+    if (param0[irow].GetNumberOfClusters()<kNdiv||param1[irow].GetNumberOfClusters()<kNdiv) continue;
     kinks[irow].SetMother(param0[irow]);
     kinks[irow].SetDaughter(param1[irow]);
     kinks[irow].Update();
@@ -5043,12 +5739,12 @@ Int_t AliTPCtrackerMI::RefitKink(AliTPCseed &mother, AliTPCseed &daughter, AliES
   Int_t index =-1;
   Double_t mindist = 10000;
   for (Int_t irow=0;irow<kNdiv;irow++){
-    if (param0[irow].fN<20||param1[irow].fN<20) continue;
+    if (param0[irow].GetNumberOfClusters()<20||param1[irow].GetNumberOfClusters()<20) continue;
     if (TMath::Abs(kinks[irow].GetR())>240.) continue;
     if (TMath::Abs(kinks[irow].GetR())<100.) continue;
     //
-    Float_t normdist = TMath::Abs(param0[irow].fX-kinks[irow].GetR())*(0.1+kink.GetDistance());
-    normdist/= (param0[irow].fN+param1[irow].fN+40.);
+    Float_t normdist = TMath::Abs(param0[irow].GetX()-kinks[irow].GetR())*(0.1+kink.GetDistance());
+    normdist/= (param0[irow].GetNumberOfClusters()+param1[irow].GetNumberOfClusters()+40.);
     if (normdist < mindist){
       mindist = normdist;
       index = irow;
@@ -5061,15 +5757,15 @@ Int_t AliTPCtrackerMI::RefitKink(AliTPCseed &mother, AliTPCseed &daughter, AliES
   param0[index].Reset(kTRUE);
   FollowProlongation(param0[index],0);
   //
-  new (&mother) AliTPCseed(param0[index]);
-  new (&daughter) AliTPCseed(param1[index]);  // daughter in vertex
+  mother = param0[index];
+  daughter = param1[index];  // daughter in vertex
   //
   kink.SetMother(mother);
   kink.SetDaughter(daughter);
   kink.Update();
   kink.SetTPCRow0(GetRowNumber(kink.GetR()));
-  kink.SetTPCncls(param0[index].fN,0);
-  kink.SetTPCncls(param1[index].fN,1);
+  kink.SetTPCncls(param0[index].GetNumberOfClusters(),0);
+  kink.SetTPCncls(param1[index].GetNumberOfClusters(),1);
   kink.SetLabel(CookLabel(&mother,0.4, 0,kink.GetTPCRow0()),0);
   kink.SetLabel(CookLabel(&daughter,0.4, kink.GetTPCRow0(),160),1);
   mother.SetLabel(kink.GetLabel(0));
@@ -5089,10 +5785,8 @@ void AliTPCtrackerMI::UpdateKinkQualityM(AliTPCseed * seed){
     if (index>=0) break;
     index = TMath::Abs(index)-1;
     AliESDkink * kink = fEvent->GetKink(index);
-    //kink->fTPCdensity2[0][0]=-1;
-    //kink->fTPCdensity2[0][1]=-1;
-    kink->SetTPCDensity2(-1,0,0);
-    kink->SetTPCDensity2(1,0,1);
+    kink->SetTPCDensity(-1,0,0);
+    kink->SetTPCDensity(1,0,1);
     //
     Int_t row0 = kink->GetTPCRow0() - 2 - Int_t( 0.5/ (0.05+kink->GetAngle(2)));
     if (row0<15) row0=15;
@@ -5102,9 +5796,9 @@ void AliTPCtrackerMI::UpdateKinkQualityM(AliTPCseed * seed){
     //
     Int_t found,foundable,shared;
     seed->GetClusterStatistic(0,row0, found, foundable,shared,kFALSE);
-    if (foundable>5)   kink->SetTPCDensity2(Float_t(found)/Float_t(foundable),0,0);
+    if (foundable>5)   kink->SetTPCDensity(Float_t(found)/Float_t(foundable),0,0);
     seed->GetClusterStatistic(row1,155, found, foundable,shared,kFALSE);
-    if (foundable>5)   kink->SetTPCDensity2(Float_t(found)/Float_t(foundable),0,1);
+    if (foundable>5)   kink->SetTPCDensity(Float_t(found)/Float_t(foundable),0,1);
   }
     
 }
@@ -5119,8 +5813,8 @@ void AliTPCtrackerMI::UpdateKinkQualityD(AliTPCseed * seed){
     if (index<=0) break;
     index = TMath::Abs(index)-1;
     AliESDkink * kink = fEvent->GetKink(index);
-    kink->SetTPCDensity2(-1,1,0);
-    kink->SetTPCDensity2(-1,1,1);
+    kink->SetTPCDensity(-1,1,0);
+    kink->SetTPCDensity(-1,1,1);
     //
     Int_t row0 = kink->GetTPCRow0() -2 - Int_t( 0.5/ (0.05+kink->GetAngle(2)));
     if (row0<15) row0=15;
@@ -5130,15 +5824,15 @@ void AliTPCtrackerMI::UpdateKinkQualityD(AliTPCseed * seed){
     //
     Int_t found,foundable,shared;
     seed->GetClusterStatistic(0,row0, found, foundable,shared,kFALSE);
-    if (foundable>5)   kink->SetTPCDensity2(Float_t(found)/Float_t(foundable),1,0);
+    if (foundable>5)   kink->SetTPCDensity(Float_t(found)/Float_t(foundable),1,0);
     seed->GetClusterStatistic(row1,155, found, foundable,shared,kFALSE);
-    if (foundable>5)   kink->SetTPCDensity2(Float_t(found)/Float_t(foundable),1,1);
+    if (foundable>5)   kink->SetTPCDensity(Float_t(found)/Float_t(foundable),1,1);
   }
     
 }
 
 
-Int_t  AliTPCtrackerMI::CheckKinkPoint(AliTPCseed*seed,AliTPCseed &mother, AliTPCseed &daughter, AliESDkink &kink)
+Int_t  AliTPCtrackerMI::CheckKinkPoint(AliTPCseed*seed,AliTPCseed &mother, AliTPCseed &daughter, AliESDkink &knk)
 {
   //
   // check kink point for given track
@@ -5146,20 +5840,21 @@ Int_t  AliTPCtrackerMI::CheckKinkPoint(AliTPCseed*seed,AliTPCseed &mother, AliTP
   // otherwise seed0 correspond to mother particle
   //           seed1 correspond to daughter particle
   //           kink  parameter of kink point
+  AliKink &kink=(AliKink &)knk;
 
-  Int_t middlerow = (seed->fFirstPoint+seed->fLastPoint)/2;
-  Int_t first = seed->fFirstPoint
-  Int_t last  = seed->fLastPoint;
+  Int_t middlerow = (seed->GetFirstPoint()+seed->GetLastPoint())/2;
+  Int_t first = seed->GetFirstPoint()
+  Int_t last  = seed->GetLastPoint();
   if (last-first<20) return 0;          // shortest length - 2*30 = 60 pad-rows
 
   
   AliTPCseed *seed1 = ReSeed(seed,middlerow+20, kTRUE);  //middle of chamber
   if (!seed1) return 0;
-  FollowProlongation(*seed1,seed->fLastPoint-20);
+  FollowProlongation(*seed1,seed->GetLastPoint()-20);
   seed1->Reset(kTRUE);
   FollowProlongation(*seed1,158);
   seed1->Reset(kTRUE);  
-  last = seed1->fLastPoint;
+  last = seed1->GetLastPoint();
   //
   AliTPCseed *seed0 = new AliTPCseed(*seed);
   seed0->Reset(kFALSE);
@@ -5167,7 +5862,7 @@ Int_t  AliTPCtrackerMI::CheckKinkPoint(AliTPCseed*seed,AliTPCseed &mother, AliTP
   //
   AliTPCseed  param0[20];  // parameters along the track
   AliTPCseed  param1[20];  // parameters along the track
-  AliESDkink            kinks[20];   // corresponding kink parameters
+  AliKink     kinks[20];   // corresponding kink parameters
   Int_t rows[20];
   for (Int_t irow=0; irow<20;irow++){
     rows[irow] = first +((last-first)*irow)/19;
@@ -5177,8 +5872,8 @@ Int_t  AliTPCtrackerMI::CheckKinkPoint(AliTPCseed*seed,AliTPCseed &mother, AliTP
   for (Int_t irow=0;irow<20;irow++){
     FollowBackProlongation(*seed0, rows[irow]);
     FollowProlongation(*seed1,rows[19-irow]);       
-    new(&param0[irow])     AliTPCseed(*seed0);
-    new(&param1[19-irow])   AliTPCseed(*seed1);
+    param0[irow] = *seed0;
+    param1[19-irow] = *seed1;
   }
   //
   // define kinks 
@@ -5194,7 +5889,7 @@ Int_t  AliTPCtrackerMI::CheckKinkPoint(AliTPCseed*seed,AliTPCseed &mother, AliTP
   for (Int_t irow=1;irow<19;irow++){
     if (TMath::Abs(kinks[irow].GetR())>240.) continue;
     if (TMath::Abs(kinks[irow].GetR())<110.) continue;
-    Float_t quality = TMath::Abs(kinks[irow].GetAngle(2))/(3.+TMath::Abs(kinks[irow].GetR()-param0[irow].fX));
+    Float_t quality = TMath::Abs(kinks[irow].GetAngle(2))/(3.+TMath::Abs(kinks[irow].GetR()-param0[irow].GetX()));
     if ( quality > maxchange){
       maxchange = quality;
       index = irow;
@@ -5210,15 +5905,15 @@ Int_t  AliTPCtrackerMI::CheckKinkPoint(AliTPCseed*seed,AliTPCseed &mother, AliTP
   seed1 = new AliTPCseed(param1[index]);
   seed0->Reset(kFALSE);
   seed1->Reset(kFALSE);
-  seed0->ResetCovariance();
-  seed1->ResetCovariance();
+  seed0->ResetCovariance(10.);
+  seed1->ResetCovariance(10.);
   FollowProlongation(*seed0,0);
   FollowBackProlongation(*seed1,158);
-  new (&mother) AliTPCseed(*seed0);  // backup mother at position 0
+  mother = *seed0; // backup mother at position 0
   seed0->Reset(kFALSE);  
   seed1->Reset(kFALSE);
-  seed0->ResetCovariance();
-  seed1->ResetCovariance();
+  seed0->ResetCovariance(10.);
+  seed1->ResetCovariance(10.);
   //
   first = TMath::Max(row0-20,0);
   last  = TMath::Min(row0+20,158);
@@ -5231,8 +5926,8 @@ Int_t  AliTPCtrackerMI::CheckKinkPoint(AliTPCseed*seed,AliTPCseed &mother, AliTP
   for (Int_t irow=0;irow<20;irow++){
     FollowBackProlongation(*seed0, rows[irow]);
     FollowProlongation(*seed1,rows[19-irow]);       
-    new(&param0[irow])     AliTPCseed(*seed0);
-    new(&param1[19-irow])   AliTPCseed(*seed1);
+    param0[irow] = *seed0;
+    param1[19-irow] = *seed1;
   }
   //
   // define kinks 
@@ -5250,7 +5945,7 @@ Int_t  AliTPCtrackerMI::CheckKinkPoint(AliTPCseed*seed,AliTPCseed &mother, AliTP
   for (Int_t irow=0;irow<20;irow++){
     if (TMath::Abs(kinks[irow].GetR())>250.) continue;
     if (TMath::Abs(kinks[irow].GetR())<90.) continue;
-    Float_t quality = TMath::Abs(kinks[irow].GetAngle(2))/(3.+TMath::Abs(kinks[irow].GetR()-param0[irow].fX));
+    Float_t quality = TMath::Abs(kinks[irow].GetAngle(2))/(3.+TMath::Abs(kinks[irow].GetR()-param0[irow].GetX()));
     if ( quality > maxchange){
       maxchange = quality;
       index = irow;
@@ -5259,7 +5954,7 @@ Int_t  AliTPCtrackerMI::CheckKinkPoint(AliTPCseed*seed,AliTPCseed &mother, AliTP
   }
   //
   //
-  if (index==-1 || param0[index].fN+param1[index].fN<100){
+  if (index==-1 || param0[index].GetNumberOfClusters()+param1[index].GetNumberOfClusters()<100){
     delete seed0;
     delete seed1;
     return 0;
@@ -5274,17 +5969,17 @@ Int_t  AliTPCtrackerMI::CheckKinkPoint(AliTPCseed*seed,AliTPCseed &mother, AliTP
   kink.SetLabel(CookLabel(seed0,0.5,0,row0),0);
   kink.SetLabel(CookLabel(seed1,0.5,row0,158),1);
   kink.SetIndex(-10,0);
-  kink.SetIndex(int(param0[index].fN+param1[index].fN),1);
-  kink.SetTPCncls(param0[index].fN,0);
-  kink.SetTPCncls(param1[index].fN,1);
+  kink.SetIndex(int(param0[index].GetNumberOfClusters()+param1[index].GetNumberOfClusters()),1);
+  kink.SetTPCncls(param0[index].GetNumberOfClusters(),0);
+  kink.SetTPCncls(param1[index].GetNumberOfClusters(),1);
   //
   //
   //  new (&mother) AliTPCseed(param0[index]);
-  new (&daughter) AliTPCseed(param1[index]);
+  daughter = param1[index];
   daughter.SetLabel(kink.GetLabel(1));  
   param0[index].Reset(kTRUE);
   FollowProlongation(param0[index],0);  
-  new (&mother) AliTPCseed(param0[index]);
+  mother = param0[index];
   mother.SetLabel(kink.GetLabel(0));
   delete seed0;
   delete seed1;
@@ -5304,11 +5999,11 @@ AliTPCseed*  AliTPCtrackerMI::ReSeed(AliTPCseed *t)
   //  Int_t last  = fSectors->GetNRows()-1;
   //
   if (fSectors == fOuterSec){
-    first = TMath::Max(first, t->fFirstPoint-fInnerSec->GetNRows());
+    first = TMath::Max(first, t->GetFirstPoint()-fInnerSec->GetNRows());
     //last  = 
   }
   else
-    first = t->fFirstPoint;
+    first = t->GetFirstPoint();
   //
   AliTPCseed * seed = MakeSeed(t,0.1,0.5,0.9);
   FollowBackProlongation(*t,fSectors->GetNRows()-1);
@@ -5360,7 +6055,7 @@ Int_t AliTPCtrackerMI::ReadSeeds(const TFile *inp) {
   return 0;
 }
 
-Int_t AliTPCtrackerMI::Clusters2Tracks (AliESD *esd)
+Int_t AliTPCtrackerMI::Clusters2Tracks (AliESDEvent *esd)
 {
   //
   if (fSeeds) DeleteSeeds();
@@ -5397,7 +6092,7 @@ Int_t AliTPCtrackerMI::Clusters2Tracks() {
       continue;
     } 
     CookLabel(pt,0.1); 
-    if (pt->fRemoval==10) {
+    if (pt->GetRemoval()==10) {
       if (pt->GetDensityFirst(20)>0.8 || pt->GetDensityFirst(30)>0.8 || pt->GetDensityFirst(40)>0.7)
        pt->Desactivate(10);  // make track again active
       else{
@@ -5408,47 +6103,16 @@ Int_t AliTPCtrackerMI::Clusters2Tracks() {
   }
   //
   RemoveUsed2(fSeeds,0.85,0.85,0);
-  FindKinks(fSeeds,fEvent);
+  if (AliTPCReconstructor::GetRecoParam()->GetDoKinks()) FindKinks(fSeeds,fEvent);
+  //FindCurling(fSeeds, fEvent,0);  
+  if (AliTPCReconstructor::StreamLevel()>2)  FindMultiMC(fSeeds, fEvent,0); // find multi found tracks
   RemoveUsed2(fSeeds,0.5,0.4,20);
+  FindSplitted(fSeeds, fEvent,0); // find multi found tracks
+
  //  //
 //   // refit short tracks
 //   //
   Int_t nseed=fSeeds->GetEntriesFast();
-//   for (Int_t i=0; i<nseed; i++) {
-//     AliTPCseed *pt=(AliTPCseed*)fSeeds->UncheckedAt(i), &t=*pt;    
-//     if (!pt) continue;    
-//     Int_t nc=t.GetNumberOfClusters();
-//     if (nc<15) {
-//       delete fSeeds->RemoveAt(i);
-//       continue;
-//     }
-//     if (pt->GetKinkIndexes()[0]!=0) continue; // ignore kink candidates
-//     if (nc>100) continue;                     // hopefully, enough for ITS
-//     AliTPCseed *seed2 = new AliTPCseed(*pt);
-//     //seed2->Reset(kFALSE);
-//     //pt->ResetCovariance();
-//     seed2->Modify(1);
-//     FollowBackProlongation(*seed2,158);
-//     //seed2->Reset(kFALSE);
-//     seed2->Modify(10);
-//     FollowProlongation(*seed2,0);
-//     TTreeSRedirector &cstream = *fDebugStreamer;
-//     cstream<<"Crefit"<<
-//       "Tr0.="<<pt<<
-//       "Tr1.="<<seed2<<
-//       "\n";     
-//     if (seed2->fN>pt->fN){
-//       delete fSeeds->RemoveAt(i);
-//       fSeeds->AddAt(seed2,i);
-//     }else{
-//       delete seed2;
-//     }
-//   }
-//   RemoveUsed2(fSeeds,0.6,0.6,50);
-
-//  FindV0s(fSeeds,fEvent);  
-  //RemoveDouble(fSeeds,0.2,0.6,11);
-
   //
   Int_t found = 0;
   for (Int_t i=0; i<nseed; i++) {
@@ -5461,10 +6125,10 @@ Int_t AliTPCtrackerMI::Clusters2Tracks() {
     }
     CookLabel(pt,0.1); //For comparison only
     //if ((pt->IsActive() || (pt->fRemoval==10) )&& nc>50 &&pt->GetNumberOfClusters()>0.4*pt->fNFoundable){
-    if ((pt->IsActive() || (pt->fRemoval==10) )){
+    if ((pt->IsActive() || (pt->GetRemoval()==10) )){
       found++;      
       if (fDebug>0) cerr<<found<<'\r';      
-      pt->fLab2 = i;
+      pt->SetLab2(i);
     }
     else
       delete fSeeds->RemoveAt(i);
@@ -5489,12 +6153,12 @@ Int_t AliTPCtrackerMI::Clusters2Tracks() {
     t.CookdEdx(0.02,0.6);
     //    CheckKinkPoint(&t,0.05);
     //if ((pt->IsActive() || (pt->fRemoval==10) )&& nc>50 &&pt->GetNumberOfClusters()>0.4*pt->fNFoundable){
-    if ((pt->IsActive() || (pt->fRemoval==10) )){
+    if ((pt->IsActive() || (pt->GetRemoval()==10) )){
       found++;
       if (fDebug>0){
        cerr<<found<<'\r';      
       }
-      pt->fLab2 = i;
+      pt->SetLab2(i);
     }
     else
       delete fSeeds->RemoveAt(i);
@@ -5606,6 +6270,7 @@ TObjArray * AliTPCtrackerMI::Tracking()
 {
   //
   //
+  if (AliTPCReconstructor::GetRecoParam()->GetSpecialSeeding()) return TrackingSpecial();
   TStopwatch timer;
   timer.Start();
   Int_t nup=fOuterSec->GetNRows()+fInnerSec->GetNRows();
@@ -5728,8 +6393,10 @@ TObjArray * AliTPCtrackerMI::Tracking()
   fdensity = 2.;
   cuts[0]=0.0080;
 
+  Int_t fLastSeedRowSec=AliTPCReconstructor::GetRecoParam()->GetLastSeedRowSec();
+
   // find secondaries
-  for (Int_t delta = 30; delta<90; delta+=10){
+  for (Int_t delta = 30; delta<fLastSeedRowSec; delta+=10){
     //
     cuts[0] = 0.3;
     cuts[1] = 3.5;
@@ -5756,7 +6423,50 @@ TObjArray * AliTPCtrackerMI::Tracking()
 }
 
 
-void AliTPCtrackerMI::SumTracks(TObjArray *arr1,TObjArray *arr2) const
+TObjArray * AliTPCtrackerMI::TrackingSpecial()
+{
+  //
+  // seeding adjusted for laser and cosmic tests - short tracks with big inclination angle
+  // no primary vertex seeding tried
+  //
+  TStopwatch timer;
+  timer.Start();
+  Int_t nup=fOuterSec->GetNRows()+fInnerSec->GetNRows();
+
+  TObjArray * seeds = new TObjArray;
+  TObjArray * arr=0;
+  
+  Int_t   gap  = 15;
+  Float_t cuts[4];
+  Float_t fnumber  = 3.0;
+  Float_t fdensity = 3.0;
+  
+  // find secondaries
+  cuts[0] = AliTPCReconstructor::GetRecoParam()->GetMaxC();   // max curvature
+  cuts[1] = 3.5;    // max tan(phi) angle for seeding
+  cuts[2] = 3.;     // not used (cut on z primary vertex)     
+  cuts[3] = 3.5;    // max tan(theta) angle for seeding
+
+  for (Int_t delta = 0; nup-delta-gap-1>0; delta+=3){
+    //
+    arr = Tracking(4,nup-1-delta,nup-1-delta-gap,cuts,-1);
+    SumTracks(seeds,arr);   
+    SignClusters(seeds,fnumber,fdensity);   
+  } 
+  if (fDebug>0){
+    Info("Tracking()","\n\nSecondary seeding\t%d\n\n",seeds->GetEntriesFast());
+    timer.Print();
+    timer.Start();
+  }
+
+  return seeds;
+  //
+      
+}
+
+
+void AliTPCtrackerMI::SumTracks(TObjArray *arr1,TObjArray *&arr2) const
 {
   //
   //sum tracks to common container
@@ -5765,6 +6475,13 @@ void AliTPCtrackerMI::SumTracks(TObjArray *arr1,TObjArray *arr2) const
   for (Int_t i=0;i<nseed;i++){
     AliTPCseed *pt=(AliTPCseed*)arr2->UncheckedAt(i);    
     if (pt){
+      //
+      // remove tracks with too big curvature
+      //
+      if (TMath::Abs(pt->GetC())>AliTPCReconstructor::GetRecoParam()->GetMaxC()){
+       delete arr2->RemoveAt(i);
+       continue;
+      }
        // REMOVE VERY SHORT  TRACKS
       if (pt->GetNumberOfClusters()<20){ 
        delete arr2->RemoveAt(i);
@@ -5776,7 +6493,7 @@ void AliTPCtrackerMI::SumTracks(TObjArray *arr1,TObjArray *arr2) const
        continue;
       }
       //remove not usable tracks
-      if (pt->fRemoval!=10){
+      if (pt->GetRemoval()!=10){
        delete arr2->RemoveAt(i);
        continue;
       }
@@ -5789,7 +6506,7 @@ void AliTPCtrackerMI::SumTracks(TObjArray *arr1,TObjArray *arr2) const
       }
     }
   }
-  delete arr2;  
+  delete arr2;  arr2 = 0;
 }
 
 
@@ -5806,7 +6523,7 @@ void  AliTPCtrackerMI::ParallelTracking(TObjArray * arr, Int_t rfirst, Int_t rla
     if (!pt) continue;
     if (!t.IsActive()) continue;
     // follow prolongation to the first layer
-    if ( (fSectors ==fInnerSec) || (t.fFirstPoint-fParam->GetNRowLow()>rfirst+1) )  
+    if ( (fSectors ==fInnerSec) || (t.GetFirstPoint()-fParam->GetNRowLow()>rfirst+1) )  
       FollowProlongation(t, rfirst+1);
   }
 
@@ -5826,7 +6543,7 @@ void  AliTPCtrackerMI::ParallelTracking(TObjArray * arr, Int_t rfirst, Int_t rla
       if (nr==80) pt->UpdateReference();
       if (!pt->IsActive()) continue;
       //      if ( (fSectors ==fOuterSec) && (pt->fFirstPoint-fParam->GetNRowLow())<nr) continue;
-      if (pt->fRelativeSector>17) {
+      if (pt->GetRelativeSector()>17) {
        continue;
       }
       UpdateClusters(t,nr);
@@ -5837,7 +6554,7 @@ void  AliTPCtrackerMI::ParallelTracking(TObjArray * arr, Int_t rfirst, Int_t rla
       if (!pt) continue;
       if (!pt->IsActive()) continue; 
       // if ((fSectors ==fOuterSec) && (pt->fFirstPoint-fParam->GetNRowLow())<nr) continue;
-      if (pt->fRelativeSector>17) {
+      if (pt->GetRelativeSector()>17) {
        continue;
       }
       FollowToNextCluster(*pt,nr);
@@ -5858,7 +6575,7 @@ void AliTPCtrackerMI::PrepareForBackProlongation(TObjArray * arr,Float_t fac) co
       pt->Modify(fac);
       //
       //rotate to current local system at first accepted  point    
-      Int_t index  = pt->GetClusterIndex2(pt->fFirstPoint); 
+      Int_t index  = pt->GetClusterIndex2(pt->GetFirstPoint()); 
       Int_t sec    = (index&0xff000000)>>24;
       sec = sec%18;
       Float_t angle1 = fInnerSec->GetAlpha()*sec+fInnerSec->GetAlphaShift();
@@ -5892,7 +6609,7 @@ void AliTPCtrackerMI::PrepareForProlongation(TObjArray * arr, Float_t fac) const
     AliTPCseed *pt = (AliTPCseed*)arr->UncheckedAt(i);
     if (pt) {
       pt->Modify(fac);
-      pt->fFirstPoint = pt->fLastPoint
+      pt->SetFirstPoint(pt->GetLastPoint())
     }
     
   }
@@ -5921,11 +6638,11 @@ Int_t AliTPCtrackerMI::PropagateBack(TObjArray * arr)
     }
     if (pt&& pt->GetKinkIndex(0)>0) {
       AliESDkink * kink = fEvent->GetKink(pt->GetKinkIndex(0)-1);
-      pt->fFirstPoint = kink->GetTPCRow0();
+      pt->SetFirstPoint(kink->GetTPCRow0());
       fSectors = fInnerSec;
       FollowBackProlongation(*pt,fInnerSec->GetNRows()+fOuterSec->GetNRows()-1);  
     }
-    
+    CookLabel(pt,0.3);
   }
   return 0;
 }
@@ -5942,7 +6659,9 @@ Int_t AliTPCtrackerMI::PropagateForward2(TObjArray * arr)
     AliTPCseed *pt = (AliTPCseed*)arr->UncheckedAt(i);
     if (pt) { 
       FollowProlongation(*pt,0);
+      CookLabel(pt,0.3);
     }
+    
   }
   return 0;
 }
@@ -5961,7 +6680,7 @@ Int_t AliTPCtrackerMI::PropagateForward()
       Double_t alpha=t.GetAlpha() - fSectors->GetAlphaShift();
       if (alpha > 2.*TMath::Pi()) alpha -= 2.*TMath::Pi();  
       if (alpha < 0.            ) alpha += 2.*TMath::Pi();  
-      t.fRelativeSector = Int_t(alpha/fSectors->GetAlpha()+0.0001)%fN;
+      t.SetRelativeSector(Int_t(alpha/fSectors->GetAlpha()+0.0001)%fN);
     }
   }
   
@@ -6014,18 +6733,18 @@ void  AliTPCtrackerMI::GetShape(AliTPCseed * seed, Int_t row)
 {
   //
   //
-  Float_t sd2 = TMath::Abs((fParam->GetZLength()-TMath::Abs(seed->GetZ())))*fParam->GetDiffL()*fParam->GetDiffL();
+  Float_t sd2 = TMath::Abs((fParam->GetZLength(0)-TMath::Abs(seed->GetZ())))*fParam->GetDiffL()*fParam->GetDiffL();
   //  Float_t padlength =  fParam->GetPadPitchLength(seed->fSector);
   Float_t padlength =  GetPadPitchLength(row);
   //
-  Float_t sresy = (seed->fSector < fParam->GetNSector()/2) ? 0.2 :0.3;
+  Float_t sresy = (seed->GetSector() < fParam->GetNSector()/2) ? 0.2 :0.3;
   Double_t angulary  = seed->GetSnp();
   angulary = angulary*angulary/(1-angulary*angulary);
-  seed->fCurrentSigmaY2 = sd2+padlength*padlength*angulary/12.+sresy*sresy;  
+  seed->SetCurrentSigmaY2(sd2+padlength*padlength*angulary/12.+sresy*sresy);  
   //
   Float_t sresz = fParam->GetZSigma();
   Float_t angularz  = seed->GetTgl();
-  seed->fCurrentSigmaZ2 = sd2+padlength*padlength*angularz*angularz*(1+angulary)/12.+sresz*sresz;
+  seed->SetCurrentSigmaZ2(sd2+padlength*padlength*angularz*angularz*(1+angulary)/12.+sresz*sresz);
   /*
   Float_t wy = GetSigmaY(seed);
   Float_t wz = GetSigmaZ(seed);
@@ -6042,9 +6761,9 @@ Float_t  AliTPCtrackerMI::GetSigmaY(AliTPCseed * seed)
 {
   //
   //  
-  Float_t sd2 = TMath::Abs((fParam->GetZLength()-TMath::Abs(seed->GetZ())))*fParam->GetDiffL()*fParam->GetDiffL();
-  Float_t padlength =  fParam->GetPadPitchLength(seed->fSector);
-  Float_t sres = (seed->fSector < fParam->GetNSector()/2) ? 0.2 :0.3;
+  Float_t sd2 = TMath::Abs((fParam->GetZLength(0)-TMath::Abs(seed->GetZ())))*fParam->GetDiffL()*fParam->GetDiffL();
+  Float_t padlength =  fParam->GetPadPitchLength(seed->GetSector());
+  Float_t sres = (seed->GetSector() < fParam->GetNSector()/2) ? 0.2 :0.3;
   Float_t angular  = seed->GetSnp();
   angular = angular*angular/(1-angular*angular);
   //  angular*=angular;
@@ -6056,8 +6775,8 @@ Float_t  AliTPCtrackerMI::GetSigmaZ(AliTPCseed * seed)
 {
   //
   //
-  Float_t sd2 = TMath::Abs((fParam->GetZLength()-TMath::Abs(seed->GetZ())))*fParam->GetDiffL()*fParam->GetDiffL();
-  Float_t padlength =  fParam->GetPadPitchLength(seed->fSector);
+  Float_t sd2 = TMath::Abs((fParam->GetZLength(0)-TMath::Abs(seed->GetZ())))*fParam->GetDiffL()*fParam->GetDiffL();
+  Float_t padlength =  fParam->GetPadPitchLength(seed->GetSector());
   Float_t sres = fParam->GetZSigma();
   Float_t angular  = seed->GetTgl();
   Float_t res = TMath::Sqrt(sd2+padlength*padlength*angular*angular/12.+sres*sres);
@@ -6070,7 +6789,12 @@ void AliTPCtrackerMI::CookLabel(AliKalmanTrack *tk, Float_t wrong) const {
   //--------------------------------------------------------------------
   //This function "cooks" a track label. If label<0, this track is fake.
   //--------------------------------------------------------------------
-  AliTPCseed * t = (AliTPCseed*)tk;
+  AliTPCseed * t = dynamic_cast<AliTPCseed*>(tk);
+  if(!t){
+    printf("%s:%d wrong type \n",(char*)__FILE__,__LINE__);
+    return;
+  }
+
   Int_t noc=t->GetNumberOfClusters();
   if (noc<10){
     //printf("\nnot founded prolongation\n\n\n");
@@ -6095,8 +6819,8 @@ void AliTPCtrackerMI::CookLabel(AliKalmanTrack *tk, Float_t wrong) const {
      if (index&0x8000) continue;
      //     
      //clusters[current]=GetClusterMI(index);
-     if (t->fClusterPointer[i]){
-       clusters[current]=t->fClusterPointer[i];     
+     if (t->GetClusterPointer(i)){
+       clusters[current]=t->GetClusterPointer(i);     
        current++;
      }
   }
@@ -6179,8 +6903,8 @@ Int_t AliTPCtrackerMI::CookLabel(AliTPCseed *t, Float_t wrong,Int_t first, Int_t
      if (index&0x8000) continue;
      //     
      //clusters[current]=GetClusterMI(index);
-     if (t->fClusterPointer[i]){
-       clusters[current]=t->fClusterPointer[i];     
+     if (t->GetClusterPointer(i)){
+       clusters[current]=t->GetClusterPointer(i);     
        current++;
      }
   }
@@ -6279,10 +7003,11 @@ void AliTPCtrackerMI::AliTPCSector::Setup(const AliTPCParam *par, Int_t f) {
      fPadPitchWidth=par->GetInnerPadPitchWidth();
      fPadPitchLength=par->GetInnerPadPitchLength();
      fN=par->GetNRowLow();
+     if(fRow)delete [] fRow;fRow = 0;
      fRow=new AliTPCRow[fN];
      for (Int_t i=0; i<fN; i++) {
        fRow[i].SetX(par->GetPadRowRadiiLow(i));
-       fRow[i].fDeadZone =1.5;  //1.5 cm of dead zone
+       fRow[i].SetDeadZone(1.5);  //1.5 cm of dead zone
      }
   } else {
      fAlpha=par->GetOuterAngle();
@@ -6291,29 +7016,38 @@ void AliTPCtrackerMI::AliTPCSector::Setup(const AliTPCParam *par, Int_t f) {
      fPadPitchLength = par->GetOuter1PadPitchLength();
      f1PadPitchLength = par->GetOuter1PadPitchLength();
      f2PadPitchLength = par->GetOuter2PadPitchLength();
-
      fN=par->GetNRowUp();
+     if(fRow)delete [] fRow;fRow = 0;
      fRow=new AliTPCRow[fN];
      for (Int_t i=0; i<fN; i++) {
        fRow[i].SetX(par->GetPadRowRadiiUp(i)); 
-       fRow[i].fDeadZone =1.5;  // 1.5 cm of dead zone
+       fRow[i].SetDeadZone(1.5);  // 1.5 cm of dead zone
      }
   } 
 }
 
-AliTPCtrackerMI::AliTPCRow::AliTPCRow() {
+AliTPCtrackerMI::AliTPCRow::AliTPCRow():
+  fDeadZone(0.),
+  fClusters1(0),
+  fN1(0),
+  fClusters2(0),
+  fN2(0),
+  fN(0),
+  fX(0.)
+{
   //
   // default constructor
-  fN=0;
-  fN1=0;
-  fN2=0;
-  fClusters1=0;
-  fClusters2=0;
+  //
 }
 
 AliTPCtrackerMI::AliTPCRow::~AliTPCRow(){
   //
-
+  for (Int_t i = 0; i < fN1; i++)
+    fClusters1[i].~AliTPCclusterMI();
+  delete [] fClusters1;
+  for (Int_t i = 0; i < fN2; i++)
+    fClusters2[i].~AliTPCclusterMI();
+  delete [] fClusters2;
 }
 
 
@@ -6327,6 +7061,10 @@ AliTPCtrackerMI::AliTPCRow::InsertCluster(const AliTPCclusterMI* c, UInt_t index
   if (fN==kMaxClusterPerRow) {
     cerr<<"AliTPCRow::InsertCluster(): Too many clusters !\n"; return;
   }
+  if (fN>=fN1+fN2) {
+    cout<<"AliTPCRow::InsertCluster(): Too many clusters !\n";
+  }
+
   if (fN==0) {fIndex[0]=index; fClusters[fN++]=c; return;}
   Int_t i=Find(c->GetZ());
   memmove(fClusters+i+1 ,fClusters+i,(fN-i)*sizeof(AliTPCclusterMI*));
@@ -6337,15 +7075,20 @@ AliTPCtrackerMI::AliTPCRow::InsertCluster(const AliTPCclusterMI* c, UInt_t index
 void AliTPCtrackerMI::AliTPCRow::ResetClusters() {
    //
    // reset clusters
+   // MvL: Need to call destructors for AliTPCclusterMI, to delete fInfo
+   for (Int_t i = 0; i < fN1; i++)
+     fClusters1[i].~AliTPCclusterMI();
+   delete [] fClusters1;  fClusters1=0;
+   for (Int_t i = 0; i < fN2; i++)
+     fClusters2[i].~AliTPCclusterMI();
+   delete [] fClusters2;  fClusters2=0;
+
    fN  = 0; 
    fN1 = 0;
    fN2 = 0;
    //delete[] fClusterArray; 
-   if (fClusters1) delete []fClusters1; 
-   if (fClusters2) delete []fClusters2; 
+
    //fClusterArray=0;
-   fClusters1 = 0;
-   fClusters2 = 0;
 }
 
 
@@ -6399,11 +7142,11 @@ AliTPCclusterMI * AliTPCtrackerMI::AliTPCRow::FindNearest2(Double_t y, Double_t
   //PH Check boundaries. 510 is the size of fFastCluster
   Int_t iz1 = Int_t(z-roadz+254.5);
   if (iz1<0 || iz1>=510) return cl;
-  iz1 = TMath::Max(fFastCluster[iz1]-1,0);
+  iz1 = TMath::Max(GetFastCluster(iz1)-1,0);
   Int_t iz2 = Int_t(z+roadz+255.5);
   if (iz2<0 || iz2>=510) return cl;
-  iz2 = TMath::Min(fFastCluster[iz2]+1,fN);
-
+  iz2 = TMath::Min(GetFastCluster(iz2)+1,fN);
+  Bool_t skipUsed = !(AliTPCReconstructor::GetRecoParam()->GetClusterSharing());
   //FindNearest3(y,z,roady,roadz,index);
   //  for (Int_t i=Find(z-roadz); i<fN; i++) {
   for (Int_t i=iz1; i<iz2; i++) {
@@ -6411,6 +7154,7 @@ AliTPCclusterMI * AliTPCtrackerMI::AliTPCRow::FindNearest2(Double_t y, Double_t
       if (c->GetZ() > z+roadz) break;
       if ( c->GetY()-y >  roady ) continue;
       if ( y-c->GetY() >  roady ) continue;
+      if (skipUsed && c->IsUsed(11)) continue;
       Float_t distance = (c->GetZ()-z)*(c->GetZ()-z)+(c->GetY()-y)*(c->GetY()-y);
       if (maxdistance>distance) {
        maxdistance = distance;
@@ -6423,41 +7167,41 @@ AliTPCclusterMI * AliTPCtrackerMI::AliTPCRow::FindNearest2(Double_t y, Double_t
 }
 
 
-
-AliTPCclusterMI * AliTPCtrackerMI::AliTPCRow::FindNearest3(Double_t y, Double_t z, Double_t roady, Double_t roadz,UInt_t & index) const 
-{
-  //-----------------------------------------------------------------------
-  // Return the index of the nearest cluster in z y 
-  //-----------------------------------------------------------------------
-  Float_t maxdistance = roady*roady + roadz*roadz;
-  //  Int_t iz = Int_t(z+255.);
-  AliTPCclusterMI *cl =0;
-  for (Int_t i=Find(z-roadz); i<fN; i++) {
-    //for (Int_t i=fFastCluster[iz-2]; i<fFastCluster[iz+2]; i++) {
-      AliTPCclusterMI *c=(AliTPCclusterMI*)(fClusters[i]);
-      if (c->GetZ() > z+roadz) break;
-      if ( c->GetY()-y >  roady ) continue;
-      if ( y-c->GetY() >  roady ) continue;
-      Float_t distance = (c->GetZ()-z)*(c->GetZ()-z)+(c->GetY()-y)*(c->GetY()-y);
-      if (maxdistance>distance) {
-       maxdistance = distance;
-       cl=c;       
-       index =i;
-       //roady = TMath::Sqrt(maxdistance);
-      }
+void AliTPCtrackerMI::AliTPCRow::SetFastCluster(Int_t i, Short_t cl){
+  //
+  // Set cluster info for fast navigation
+  //
+  if (i>510|| i<0){
+  }else{
+    fFastCluster[i]=cl;
   }
-  return cl;      
 }
 
 
 
 
+void AliTPCtrackerMI::MakeBitmaps(AliTPCseed *t)
+{
+  //-----------------------------------------------------------------------
+  // Fill the cluster and sharing bitmaps of the track
+  //-----------------------------------------------------------------------
 
-// AliTPCTrackerPoint * AliTPCseed::GetTrackPoint(Int_t i)
-// {
-//   //
-//   // 
-//   return &fTrackPoints[i];
-// }
-
-
+  Int_t firstpoint = 0;
+  Int_t lastpoint = 159;
+  AliTPCTrackerPoint *point;
+  
+  for (int iter=firstpoint; iter<lastpoint; iter++) {
+    point = t->GetTrackPoint(iter);
+    if (point) {
+      t->SetClusterMapBit(iter, kTRUE);
+      if (point->IsShared())
+       t->SetSharedMapBit(iter,kTRUE);
+      else
+       t->SetSharedMapBit(iter, kFALSE);
+    }
+    else {
+      t->SetClusterMapBit(iter, kFALSE);
+      t->SetSharedMapBit(iter, kFALSE);
+    }
+  }
+}