]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - ITS/AliITStrackerMI.cxx
For Pythia with tune don't switch off MI in ConfigHeavyFlavor
[u/mrichter/AliRoot.git] / ITS / AliITStrackerMI.cxx
index 6ee80ca3870d8dec500415dfcfab99a0abb948ff..38a162b7957f104220004b3a745e890ad5a34078 100644 (file)
@@ -33,7 +33,6 @@
 #include <TRandom.h>
 #include <TTreeStream.h>
 
-
 #include "AliLog.h"
 #include "AliITSPlaneEff.h"
 #include "AliITSCalibrationSPD.h"
@@ -51,6 +50,7 @@
 #include "AliITSChannelStatus.h"
 #include "AliITSDetTypeRec.h"
 #include "AliITSRecPoint.h"
+#include "AliITSRecPointContainer.h"
 #include "AliITSgeomTGeo.h"
 #include "AliITSReconstructor.h"
 #include "AliITSClusterParam.h"
@@ -61,6 +61,7 @@
 #include "AliITSPlaneEffSSD.h"
 #include "AliITSV0Finder.h"
 #include "AliITStrackerMI.h"
+#include "AliMathBase.h"
 
 ClassImp(AliITStrackerMI)
 
@@ -144,9 +145,11 @@ fPlaneEff(0) {
     Int_t ndet=AliITSgeomTGeo::GetNDetectors(i);
 
     Double_t xyz[3], &x=xyz[0], &y=xyz[1], &z=xyz[2];
-    AliITSgeomTGeo::GetOrigTranslation(i,1,1,xyz); 
+    AliITSgeomTGeo::GetTranslation(i,1,1,xyz); 
     Double_t poff=TMath::ATan2(y,x);
     Double_t zoff=z;
+
+    AliITSgeomTGeo::GetOrigTranslation(i,1,1,xyz);
     Double_t r=TMath::Sqrt(x*x + y*y);
 
     AliITSgeomTGeo::GetOrigTranslation(i,1,2,xyz);
@@ -185,6 +188,7 @@ fPlaneEff(0) {
        
       } // end loop on detectors
     } // end loop on ladders
+    fForceSkippingOfLayer[i] = 0;
   } // end loop on layers
 
 
@@ -201,22 +205,33 @@ fPlaneEff(0) {
                     AliITSReconstructor::GetRecoParam()->GetSigmaZVdef()}; 
   SetVertex(xyzVtx,ersVtx);
 
-  for (Int_t i=0; i<AliITSgeomTGeo::GetNLayers(); i++) fLayersNotToSkip[i]=AliITSRecoParam::GetLayersNotToSkip(i);
   fLastLayerToTrackTo=AliITSRecoParam::GetLastLayerToTrackTo();
   for (Int_t i=0;i<100000;i++){
     fBestTrackIndex[i]=0;
   }
 
   // store positions of centre of SPD modules (in z)
+  //  The convetion is that fSPDdetzcentre is ordered from -z to +z
   Double_t tr[3];
-  AliITSgeomTGeo::GetTranslation(1,1,1,tr);
-  fSPDdetzcentre[0] = tr[2];
-  AliITSgeomTGeo::GetTranslation(1,1,2,tr);
-  fSPDdetzcentre[1] = tr[2];
-  AliITSgeomTGeo::GetTranslation(1,1,3,tr);
-  fSPDdetzcentre[2] = tr[2];
-  AliITSgeomTGeo::GetTranslation(1,1,4,tr);
-  fSPDdetzcentre[3] = tr[2];
+  if (tr[2]<0) { // old geom (up to v5asymmPPR)
+    AliITSgeomTGeo::GetTranslation(1,1,1,tr);
+    fSPDdetzcentre[0] = tr[2];
+    AliITSgeomTGeo::GetTranslation(1,1,2,tr);
+    fSPDdetzcentre[1] = tr[2];
+    AliITSgeomTGeo::GetTranslation(1,1,3,tr);
+    fSPDdetzcentre[2] = tr[2];
+    AliITSgeomTGeo::GetTranslation(1,1,4,tr);
+    fSPDdetzcentre[3] = tr[2];
+  } else { // new geom (from v11Hybrid)
+    AliITSgeomTGeo::GetTranslation(1,1,4,tr);
+    fSPDdetzcentre[0] = tr[2];
+    AliITSgeomTGeo::GetTranslation(1,1,3,tr);
+    fSPDdetzcentre[1] = tr[2];
+    AliITSgeomTGeo::GetTranslation(1,1,2,tr);
+    fSPDdetzcentre[2] = tr[2];
+    AliITSgeomTGeo::GetTranslation(1,1,1,tr);
+    fSPDdetzcentre[3] = tr[2];
+  }
 
   fUseTGeo = AliITSReconstructor::GetRecoParam()->GetUseTGeoInTracker();
   if(AliITSReconstructor::GetRecoParam()->GetExtendedEtaAcceptance() && fUseTGeo!=1 && fUseTGeo!=3) {
@@ -233,7 +248,7 @@ fPlaneEff(0) {
   if (AliITSReconstructor::GetRecoParam()->GetComputePlaneEff() &&
       AliITSReconstructor::GetRecoParam()->GetIPlanePlaneEff()>=0) {
     Int_t iplane=AliITSReconstructor::GetRecoParam()->GetIPlanePlaneEff();
-    if(AliITSReconstructor::GetRecoParam()->GetLayersToSkip(iplane))
+    if(!AliITSReconstructor::GetRecoParam()->GetLayersToSkip(iplane)==1)
       AliWarning(Form("Evaluation of Plane Eff for layer %d will be attempted without removing it from tracker",iplane));
     if (iplane<2) fPlaneEff = new AliITSPlaneEffSPD();
     else if (iplane<4) fPlaneEff = new AliITSPlaneEffSDD();
@@ -309,13 +324,6 @@ AliITStrackerMI::~AliITStrackerMI()
   if(fPlaneEff) delete fPlaneEff;
 }
 //------------------------------------------------------------------------
-void AliITStrackerMI::SetLayersNotToSkip(const Int_t *l) {
-  //--------------------------------------------------------------------
-  //This function set masks of the layers which must be not skipped
-  //--------------------------------------------------------------------
-  for (Int_t i=0; i<AliITSgeomTGeo::GetNLayers(); i++) fLayersNotToSkip[i]=l[i];
-}
-//------------------------------------------------------------------------
 void AliITStrackerMI::ReadBadFromDetTypeRec() {
   //--------------------------------------------------------------------
   //This function read ITS bad detectors, chips, channels from AliITSDetTypeRec
@@ -354,22 +362,23 @@ Int_t AliITStrackerMI::LoadClusters(TTree *cTree) {
   //--------------------------------------------------------------------
   //This function loads ITS clusters
   //--------------------------------------------------------------------
-  TBranch *branch=cTree->GetBranch("ITSRecPoints");
-  if (!branch) { 
-    Error("LoadClusters"," can't get the branch !\n");
-    return 1;
+  TClonesArray *clusters = NULL;
+  AliITSRecPointContainer* rpcont=AliITSRecPointContainer::Instance();
+  clusters=rpcont->FetchClusters(0,cTree);
+  if(!(rpcont->IsSPDActive() || rpcont->IsSDDActive() || rpcont->IsSSDActive())){
+      AliError("ITS is not in a known running configuration: SPD, SDD and SSD are not active");
+      return 1;
   }
-
-  static TClonesArray dummy("AliITSRecPoint",10000), *clusters=&dummy;
-  branch->SetAddress(&clusters);
-
   Int_t i=0,j=0,ndet=0;
   Int_t detector=0;
   for (i=0; i<AliITSgeomTGeo::GetNLayers(); i++) {
     ndet=fgLayers[i].GetNdetectors();
     Int_t jmax = j + fgLayers[i].GetNladders()*ndet;
     for (; j<jmax; j++) {           
-      if (!cTree->GetEvent(j)) continue;
+      //      if (!cTree->GetEvent(j)) continue;
+      clusters = rpcont->UncheckedGetClusters(j);
+      if(!clusters)continue;
       Int_t ncl=clusters->GetEntriesFast();
       SignDeltas(clusters,GetZ());
  
@@ -378,12 +387,17 @@ Int_t AliITStrackerMI::LoadClusters(TTree *cTree) {
         detector=c->GetDetectorIndex();
 
        if (!c->Misalign()) AliWarning("Can't misalign this cluster !");
-
-        fgLayers[i].InsertCluster(new AliITSRecPoint(*c));
+       
+       Int_t retval = fgLayers[i].InsertCluster(new AliITSRecPoint(*c));
+       if(retval) {
+         AliWarning(Form("Too many clusters on layer %d!",i));
+         break;  
+       } 
       }
-      clusters->Delete();
+
       // add dead zone "virtual" cluster in SPD, if there is a cluster within 
       // zwindow cm from the dead zone      
+      //  This method assumes that fSPDdetzcentre is ordered from -z to +z
       if (i<2 && AliITSReconstructor::GetRecoParam()->GetAddVirtualClustersInDeadZone()) {
        for (Float_t xdead = 0; xdead < AliITSRecoParam::GetSPDdetxlength(); xdead += (i+1.)*AliITSReconstructor::GetRecoParam()->GetXPassDeadZoneHits()) {
          Int_t lab[4]   = {0,0,0,detector};
@@ -423,7 +437,8 @@ Int_t AliITStrackerMI::LoadClusters(TTree *cTree) {
     fgLayers[i].SortClusters();
   }
 
-  dummy.Clear();
+  // check whether we have to skip some layers
+  SetForceSkippingOfLayer();
 
   return 0;
 }
@@ -479,6 +494,7 @@ Int_t AliITStrackerMI::Clusters2Tracks(AliESDEvent *event) {
   // The clusters must be already loaded !
   //--------------------------------------------------------------------
 
+  AliDebug(2,Form("SKIPPING %d %d %d %d %d %d",ForceSkippingOfLayer(0),ForceSkippingOfLayer(1),ForceSkippingOfLayer(2),ForceSkippingOfLayer(3),ForceSkippingOfLayer(4),ForceSkippingOfLayer(5)));
 
   fTrackingPhase="Clusters2Tracks";
 
@@ -496,11 +512,12 @@ Int_t AliITStrackerMI::Clusters2Tracks(AliESDEvent *event) {
     }
   }
   // temporary
-
+  Int_t noesd = 0;
   {/* Read ESD tracks */
     Double_t pimass = TDatabasePDG::Instance()->GetParticle(211)->Mass();
     Int_t nentr=event->GetNumberOfTracks();
-    Info("Clusters2Tracks", "Number of ESD tracks: %d\n", nentr);
+    noesd=nentr;
+    //    Info("Clusters2Tracks", "Number of ESD tracks: %d\n", nentr);
     while (nentr--) {
       AliESDtrack *esd=event->GetTrack(nentr);
       //  ---- for debugging:
@@ -604,10 +621,8 @@ Int_t AliITStrackerMI::Clusters2Tracks(AliESDEvent *event) {
      GetBestHypothesysMIP(itsTracks); 
   } // end loop on the two tracking passes
 
-  if(event->GetNumberOfV0s()>0) UpdateTPCV0(event);
-  if(AliITSReconstructor::GetRecoParam()->GetFindV0s()) FindV02(event);
-  //if(event->GetNumberOfV0s()>0) AliITSV0Finder::UpdateTPCV0(event,this);
-  //if(AliITSReconstructor::GetRecoParam()->GetFindV0s()) AliITSV0Finder::FindV02(event,this);
+  if(event->GetNumberOfV0s()>0) AliITSV0Finder::UpdateTPCV0(event,this);
+  if(AliITSReconstructor::GetRecoParam()->GetFindV0s()) AliITSV0Finder::FindV02(event,this);
   fAfterV0 = kTRUE;
   //
   itsTracks.Delete();
@@ -626,7 +641,7 @@ Int_t AliITStrackerMI::Clusters2Tracks(AliESDEvent *event) {
   fCoefficients=0;
   DeleteTrksMaterialLUT();
 
-  Info("Clusters2Tracks","Number of prolonged tracks: %d\n",ntrk);
+  AliInfo(Form("Number of prolonged tracks: %d out of %d ESD tracks",ntrk,noesd));
 
   fTrackingPhase="Default";
   
@@ -640,7 +655,7 @@ Int_t AliITStrackerMI::PropagateBack(AliESDEvent *event) {
   //--------------------------------------------------------------------
   fTrackingPhase="PropagateBack";
   Int_t nentr=event->GetNumberOfTracks();
-  Info("PropagateBack", "Number of ESD tracks: %d\n", nentr);
+  //  Info("PropagateBack", "Number of ESD tracks: %d\n", nentr);
 
   Int_t ntrk=0;
   for (Int_t i=0; i<nentr; i++) {
@@ -661,6 +676,7 @@ Int_t AliITStrackerMI::PropagateBack(AliESDEvent *event) {
 
      ResetTrackToFollow(*t);
 
+     /*
      // propagate to vertex [SR, GSI 17.02.2003]
      // Start Time measurement [SR, GSI 17.02.2003], corrected by I.Belikov
      if (CorrectForPipeMaterial(&fTrackToFollow,"inward")) {
@@ -668,7 +684,17 @@ Int_t AliITStrackerMI::PropagateBack(AliESDEvent *event) {
         fTrackToFollow.StartTimeIntegral();
        // from vertex to outside pipe
        CorrectForPipeMaterial(&fTrackToFollow,"outward");
+       }*/
+     // Start time integral and add distance from current position to vertex 
+     Double_t xyzTrk[3],xyzVtx[3]={GetX(),GetY(),GetZ()};
+     fTrackToFollow.GetXYZ(xyzTrk);
+     Double_t dst2 = 0.;
+     for (Int_t icoord=0; icoord<3; icoord++) {  
+       Double_t di = xyzTrk[icoord] - xyzVtx[icoord];
+       dst2 += di*di; 
      }
+     fTrackToFollow.StartTimeIntegral();
+     fTrackToFollow.AddTimeStep(TMath::Sqrt(dst2));
 
      fTrackToFollow.ResetCovariance(10.); fTrackToFollow.ResetClusters();
      if (RefitAt(AliITSRecoParam::GetrInsideITSscreen(),&fTrackToFollow,t)) {
@@ -686,7 +712,7 @@ Int_t AliITStrackerMI::PropagateBack(AliESDEvent *event) {
      delete t;
   }
 
-  Info("PropagateBack","Number of back propagated ITS tracks: %d\n",ntrk);
+  AliInfo(Form("Number of back propagated ITS tracks: %d out of %d ESD tracks",ntrk,nentr));
 
   fTrackingPhase="Default";
 
@@ -701,11 +727,10 @@ Int_t AliITStrackerMI::RefitInward(AliESDEvent *event) {
   //--------------------------------------------------------------------
   fTrackingPhase="RefitInward";
 
-  if(AliITSReconstructor::GetRecoParam()->GetFindV0s()) RefitV02(event);
-  //if(AliITSReconstructor::GetRecoParam()->GetFindV0s()) AliITSV0Finder::RefitV02(event,this);
+  if(AliITSReconstructor::GetRecoParam()->GetFindV0s()) AliITSV0Finder::RefitV02(event,this);
 
   Int_t nentr=event->GetNumberOfTracks();
-  Info("RefitInward", "Number of ESD tracks: %d\n", nentr);
+  //  Info("RefitInward", "Number of ESD tracks: %d\n", nentr);
 
   Int_t ntrk=0;
   for (Int_t i=0; i<nentr; i++) {
@@ -739,6 +764,7 @@ Int_t AliITStrackerMI::RefitInward(AliESDEvent *event) {
     //Refitting...
     Bool_t pe=(AliITSReconstructor::GetRecoParam()->GetComputePlaneEff() &&
                AliITSReconstructor::GetRecoParam()->GetIPlanePlaneEff()>=0);
+
     AliDebug(2,Form("Refit LABEL %d  %d",t->GetLabel(),t->GetNumberOfClusters()));
     if (RefitAt(AliITSRecoParam::GetrInsideSPD1(),&fTrackToFollow,t,kTRUE,pe)) {
        AliDebug(2,"  refit OK");
@@ -763,7 +789,7 @@ Int_t AliITStrackerMI::RefitInward(AliESDEvent *event) {
     delete t;
   }
 
-  Info("RefitInward","Number of refitted tracks: %d\n",ntrk);
+  AliInfo(Form("Number of refitted tracks: %d out of %d ESD tracks",ntrk,nentr));
 
   fTrackingPhase="Default";
 
@@ -796,6 +822,8 @@ Bool_t AliITStrackerMI::GetTrackPoint(Int_t index, AliTrackPoint& p) const {
   p.SetXYZ(xyz, cov);
   p.SetCharge(cl->GetQ());
   p.SetDriftTime(cl->GetDriftTime());
+  p.SetChargeRatio(cl->GetChargeRatio());
+  p.SetClusterType(cl->GetClusterType());
   AliGeomManager::ELayerID iLayer = AliGeomManager::kInvalidLayer; 
   switch (l) {
   case 0:
@@ -852,21 +880,23 @@ Bool_t AliITStrackerMI::GetTrackPointTrackingError(Int_t index,
   Float_t tgl = t->GetTgl(); // tgl about const along track
   Float_t expQ = TMath::Max(0.8*t->GetTPCsignal(),30.);
 
-  Float_t errlocalx,errlocalz;
+  Float_t errtrky,errtrkz,covyz;
   Bool_t addMisalErr=kFALSE;
-  AliITSClusterParam::GetError(l,cl,tgl,tgphi,expQ,errlocalx,errlocalz,addMisalErr);
+  AliITSClusterParam::GetError(l,cl,tgl,tgphi,expQ,errtrky,errtrkz,covyz,addMisalErr);
 
   Float_t xyz[3];
   Float_t cov[6];
   cl->GetGlobalXYZ(xyz);
   //  cl->GetGlobalCov(cov);
   Float_t pos[3] = {0.,0.,0.};
-  AliCluster tmpcl((UShort_t)cl->GetVolumeId(),pos[0],pos[1],pos[2],errlocalx*errlocalx,errlocalz*errlocalz,0);
+  AliCluster tmpcl((UShort_t)cl->GetVolumeId(),pos[0],pos[1],pos[2],errtrky*errtrky,errtrkz*errtrkz,covyz);
   tmpcl.GetGlobalCov(cov);
 
   p.SetXYZ(xyz, cov);
   p.SetCharge(cl->GetQ());
   p.SetDriftTime(cl->GetDriftTime());
+  p.SetChargeRatio(cl->GetChargeRatio());
+  p.SetClusterType(cl->GetClusterType());
 
   AliGeomManager::ELayerID iLayer = AliGeomManager::kInvalidLayer; 
   switch (l) {
@@ -1004,6 +1034,7 @@ void AliITStrackerMI::FollowProlongationTree(AliITStrackMI * otrack, Int_t esdin
        // apply correction for material of the current layer
        CorrectForLayerMaterial(vtrack,ilayer,trackGlobXYZ1,"inward");
        vtrack->SetNDeadZone(vtrack->GetNDeadZone()+1);
+       vtrack->SetDeadZoneProbability(ilayer,1.); // no penalty for missing cluster
        vtrack->SetClIndex(ilayer,-1);
        modstatus = (skip==1 ? 3 : 4); // skipped : out in z
        if(LocalModuleCoord(ilayer,idet,vtrack,xloc,zloc)) { // local module coords
@@ -1084,7 +1115,7 @@ void AliITStrackerMI::FollowProlongationTree(AliITStrackMI * otrack, Int_t esdin
          modstatus = 5; // no cls in road
        } else if (dead==1) {
          modstatus = 7; // holes in z in SPD
-       } else if (dead==2 || dead==3) {
+       } else if (dead==2 || dead==3 || dead==4) {
          modstatus = 2; // dead from OCDB
        }
        updatetrack->SetModuleIndexInfo(ilayer,idet,modstatus,xloc,zloc);
@@ -1102,12 +1133,16 @@ void AliITStrackerMI::FollowProlongationTree(AliITStrackMI * otrack, Int_t esdin
          }
          if (isPrim) updatetrack->Improve(budgetToPrimVertex,xyzVtx,ersVtx);
        }
+       updatetrack->SetNDeadZone(updatetrack->GetNDeadZone()+1);
        if (dead) {
-         updatetrack->SetNDeadZone(updatetrack->GetNDeadZone()+1);
          if (dead==1) { // dead zone at z=0,+-7cm in SPD
-           updatetrack->SetDeadZoneProbability(GetSPDDeadZoneProbability(updatetrack->GetZ(),TMath::Sqrt(updatetrack->GetSigmaZ2())));
+           updatetrack->SetDeadZoneProbability(ilayer,GetSPDDeadZoneProbability(updatetrack->GetZ(),TMath::Sqrt(updatetrack->GetSigmaZ2())));
            deadzoneSPD=kTRUE;
-         }
+         } else if (dead==2 || dead==3) { // dead module or chip from OCDB  
+           updatetrack->SetDeadZoneProbability(ilayer,1.); 
+         } else if (dead==4) { // at least a single dead channel from OCDB  
+           updatetrack->SetDeadZoneProbability(ilayer,0.); 
+         } 
        }
        ntracks[ilayer]++;
       }
@@ -1172,11 +1207,11 @@ void AliITStrackerMI::FollowProlongationTree(AliITStrackMI * otrack, Int_t esdin
              AliDebug(2,"update failed");
              continue;
            } 
-           updatetrack->SetSampledEdx(cl->GetQ(),updatetrack->GetNumberOfClusters()-1); //b.b.
+           updatetrack->SetSampledEdx(cl->GetQ(),ilayer-2); 
            modstatus = 1; // found
          } else {             // virtual cluster in dead zone
            updatetrack->SetNDeadZone(updatetrack->GetNDeadZone()+1);
-           updatetrack->SetDeadZoneProbability(GetSPDDeadZoneProbability(updatetrack->GetZ(),TMath::Sqrt(updatetrack->GetSigmaZ2())));
+           updatetrack->SetDeadZoneProbability(ilayer,GetSPDDeadZoneProbability(updatetrack->GetZ(),TMath::Sqrt(updatetrack->GetSigmaZ2())));
            modstatus = 7; // holes in z in SPD
          }
 
@@ -1225,21 +1260,8 @@ void AliITStrackerMI::FollowProlongationTree(AliITStrackMI * otrack, Int_t esdin
        vtrack->IncrementNSkipped();
        ntracks[ilayer]++;
       }
-
-      // allow one prolongation without clusters for tracks with |tgl|>1.1
-      if (constrain && itrack==0 && TMath::Abs(currenttrack1.GetTgl())>1.1) {  //big theta - for low flux
-       AliITStrackMI* vtrack = new (&tracks[ilayer][ntracks[ilayer]]) AliITStrackMI(currenttrack1);
-       // apply correction for material of the current layer
-       CorrectForLayerMaterial(vtrack,ilayer,trackGlobXYZ1,"inward");
-       vtrack->SetClIndex(ilayer,-1);
-       modstatus = 3; // skipped
-       vtrack->SetModuleIndexInfo(ilayer,idet,modstatus,xloc,zloc);
-       vtrack->Improve(budgetToPrimVertex,xyzVtx,ersVtx);
-       vtrack->SetNDeadZone(vtrack->GetNDeadZone()+1);
-       ntracks[ilayer]++;
-      }
-     
       
+
     } // loop over tracks in layer ilayer+1
 
     //loop over track candidates for the current layer
@@ -1413,6 +1435,7 @@ fYcs(0),
 fZcs(0),
 fNcs(0),
 fCurrentSlice(-1),
+fZmin(0),
 fZmax(0),
 fYmin(0),
 fYmax(0),
@@ -1420,7 +1443,11 @@ fI(0),
 fImax(0),
 fSkip(0),
 fAccepted(0),
-fRoad(0){
+fRoad(0),
+fMaxSigmaClY(0),
+fMaxSigmaClZ(0),
+fNMaxSigmaCl(3)
+{
   //--------------------------------------------------------------------
   //default AliITSlayer constructor
   //--------------------------------------------------------------------
@@ -1451,6 +1478,7 @@ fYcs(0),
 fZcs(0),
 fNcs(0),
 fCurrentSlice(-1),
+fZmin(0),
 fZmax(0),
 fYmin(0),
 fYmax(0),
@@ -1458,7 +1486,10 @@ fI(0),
 fImax(0),
 fSkip(0),
 fAccepted(0),
-fRoad(0) {
+fRoad(0),
+fMaxSigmaClY(0),
+fMaxSigmaClZ(0),
+fNMaxSigmaCl(3) {
   //--------------------------------------------------------------------
   //main AliITSlayer constructor
   //--------------------------------------------------------------------
@@ -1483,6 +1514,7 @@ fYcs(layer.fYcs),
 fZcs(layer.fZcs),
 fNcs(layer.fNcs),
 fCurrentSlice(layer.fCurrentSlice),
+fZmin(layer.fZmin),
 fZmax(layer.fZmax),
 fYmin(layer.fYmin),
 fYmax(layer.fYmax),
@@ -1490,7 +1522,11 @@ fI(layer.fI),
 fImax(layer.fImax),
 fSkip(layer.fSkip),
 fAccepted(layer.fAccepted),
-fRoad(layer.fRoad){
+fRoad(layer.fRoad),
+fMaxSigmaClY(layer.fMaxSigmaClY),
+fMaxSigmaClZ(layer.fMaxSigmaClZ),
+fNMaxSigmaCl(layer.fNMaxSigmaCl)
+{
   //Copy constructor
 }
 //------------------------------------------------------------------------
@@ -1560,18 +1596,26 @@ Int_t AliITStrackerMI::AliITSlayer::InsertCluster(AliITSRecPoint *cl) {
   //This function adds a cluster to this layer
   //--------------------------------------------------------------------
   if (fN==AliITSRecoParam::GetMaxClusterPerLayer()) {
-    ::Error("InsertCluster","Too many clusters !\n");
     return 1;
   }
   fCurrentSlice=-1;
   fClusters[fN]=cl;
   fN++;
   AliITSdetector &det=GetDetector(cl->GetDetectorIndex());    
+  //AD
+  Double_t nSigmaY=fNMaxSigmaCl*TMath::Sqrt(cl->GetSigmaY2());
+  Double_t nSigmaZ=fNMaxSigmaCl*TMath::Sqrt(cl->GetSigmaZ2()); 
+  if (cl->GetY()-nSigmaY<det.GetYmin()) det.SetYmin(cl->GetY()-nSigmaY);
+  if (cl->GetY()+nSigmaY>det.GetYmax()) det.SetYmax(cl->GetY()+nSigmaY);
+  if (cl->GetZ()-nSigmaZ<det.GetZmin()) det.SetZmin(cl->GetZ()-nSigmaZ);
+  if (cl->GetZ()+nSigmaZ>det.GetZmax()) det.SetZmax(cl->GetZ()+nSigmaZ);
+  //AD              
+  /*
   if (cl->GetY()<det.GetYmin()) det.SetYmin(cl->GetY());
   if (cl->GetY()>det.GetYmax()) det.SetYmax(cl->GetY());
   if (cl->GetZ()<det.GetZmin()) det.SetZmin(cl->GetZ());
   if (cl->GetZ()>det.GetZmax()) det.SetZmax(cl->GetZ());
-                            
+  */                
   return 0;
 }
 //------------------------------------------------------------------------
@@ -1584,8 +1628,14 @@ void  AliITStrackerMI::AliITSlayer::SortClusters()
   Float_t *z                = new Float_t[fN];
   Int_t   * index           = new Int_t[fN];
   //
+  fMaxSigmaClY=0.; //AD
+  fMaxSigmaClZ=0.; //AD
+
   for (Int_t i=0;i<fN;i++){
     z[i] = fClusters[i]->GetZ();
+    // save largest errors in y and z for this layer
+    fMaxSigmaClY=TMath::Max(fMaxSigmaClY,TMath::Sqrt(fClusters[i]->GetSigmaY2()));
+    fMaxSigmaClZ=TMath::Max(fMaxSigmaClZ,TMath::Sqrt(fClusters[i]->GetSigmaZ2()));
   }
   TMath::Sort(fN,z,index,kFALSE);
   for (Int_t i=0;i<fN;i++){
@@ -1764,7 +1814,17 @@ SelectClusters(Double_t zmin,Double_t zmax,Double_t ymin, Double_t ymax) {
   //--------------------------------------------------------------------
  
   Double_t circle=2*TMath::Pi()*fR;
-  fYmin = ymin; fYmax =ymax;
+  fYmin = ymin; 
+  fYmax = ymax;
+  fZmin = zmin;
+  fZmax = zmax;
+  // AD
+  // enlarge road in y by maximum cluster error on this layer (3 sigma)
+  fYmin -= fNMaxSigmaCl*fMaxSigmaClY;
+  fYmax += fNMaxSigmaCl*fMaxSigmaClY;
+  fZmin -= fNMaxSigmaCl*fMaxSigmaClZ;
+  fZmax += fNMaxSigmaCl*fMaxSigmaClZ;
+
   Float_t ymiddle = (fYmin+fYmax)*0.5;
   if (ymiddle<fYB[0]) {
     fYmin+=circle; fYmax+=circle; ymiddle+=circle;
@@ -1829,10 +1889,10 @@ SelectClusters(Double_t zmin,Double_t zmax,Double_t ymin, Double_t ymax) {
     }
   }  
   //  
-  fI=FindClusterIndex(zmin); fZmax=zmax;
-  fImax = TMath::Min(FindClusterIndex(zmax)+1,fNcs);
-  fSkip = 0;
-  fAccepted =0;
+  fI        = FindClusterIndex(fZmin); 
+  fImax     = TMath::Min(FindClusterIndex(fZmax)+1,fNcs);
+  fSkip     = 0;
+  fAccepted = 0;
 
   return;
 }
@@ -1859,16 +1919,25 @@ FindDetectorIndex(Double_t phi, Double_t z) const {
   Double_t dz=fZOffset-z;
   Double_t nnz = dz*(fNdetectors-1)*0.5/fZOffset+0.5;
   Int_t nz = (nnz<0 ? -1 : (Int_t)nnz);
-  if (nz>=fNdetectors) return -1;
-  if (nz<0)            return -1;
+  if (nz>=fNdetectors || nz<0) {
+    //printf("ndet %d phi %f z %f  np %d nz %d\n",fNdetectors,phi,z,np,nz);
+    return -1;
+  }
 
   // ad hoc correction for 3rd ladder of SDD inner layer,
   // which is reversed (rotated by pi around local y)
   // this correction is OK only from AliITSv11Hybrid onwards
   if (GetR()>12. && GetR()<20.) { // SDD inner
     if(np==2) { // 3rd ladder
-      nz = (fNdetectors-1) - nz;
-    } 
+      Double_t posMod252[3];
+      AliITSgeomTGeo::GetTranslation(252,posMod252);
+      // check the Z coordinate of Mod 252: if negative 
+      // (old SDD geometry in AliITSv11Hybrid)
+      // the swap of numeration whould be applied
+      if(posMod252[2]<0.){
+       nz = (fNdetectors-1) - nz;
+      } 
+    }
   }
   //printf("ndet %d phi %f z %f  np %d nz %d\n",fNdetectors,phi,z,np,nz);
 
@@ -1886,10 +1955,17 @@ const AliITSRecPoint *AliITStrackerMI::AliITSlayer::GetNextCluster(Int_t &ci,Boo
     Double_t rpi2 = 2.*fR*TMath::Pi();
     for (Int_t i=fI; i<fImax; i++) {
       Double_t y = fY[i];
+      Double_t z = fZ[i];
       if (fYmax<y) y -= rpi2;
       if (fYmin>y) y += rpi2;
       if (y<fYmin) continue;
       if (y>fYmax) continue;
+      // AD
+      // skip clusters that are in "extended" road but they 
+      // 3sigma error does not touch the original road
+      if (z+fNMaxSigmaCl*TMath::Sqrt(fClusters[i]->GetSigmaZ2())<fZmin+fNMaxSigmaCl*fMaxSigmaClZ) continue;
+      if (z-fNMaxSigmaCl*TMath::Sqrt(fClusters[i]->GetSigmaZ2())>fZmax-fNMaxSigmaCl*fMaxSigmaClZ) continue;
+      //
       if (fClusters[i]->GetQ()==0&&fSkip==2) continue;
       ci=i;
       if (!test) fI=i+1;
@@ -2186,7 +2262,7 @@ Bool_t AliITStrackerMI::RefitAt(Double_t xx,AliITStrackMI *track,
   for(innermostlayer=0; innermostlayer<AliITSgeomTGeo::GetNLayers(); innermostlayer++) {
     if(drphi < fgLayers[innermostlayer].GetR()) break;
   }
-  //printf(" drphi  %f  innermost %d\n",drphi,innermostlayer);
+  AliDebug(2,Form(" drphi  %f  innermost %d",drphi,innermostlayer));
 
   Int_t modstatus=1; // found
   Float_t xloc,zloc;
@@ -2203,6 +2279,7 @@ Bool_t AliITStrackerMI::RefitAt(Double_t xx,AliITStrackMI *track,
   for (Int_t ilayer = from; ilayer != to; ilayer += step) {
      AliITSlayer &layer=fgLayers[ilayer];
      Double_t r=layer.GetR();
+
      if (step<0 && xx>r) break;
 
      // material between SSD and SDD, SDD and SPD
@@ -2216,6 +2293,11 @@ Bool_t AliITStrackerMI::RefitAt(Double_t xx,AliITStrackMI *track,
      Double_t oldGlobXYZ[3];
      if (!track->GetXYZ(oldGlobXYZ)) return kFALSE;
 
+     // continue if we are already beyond this layer
+     Double_t oldGlobR = TMath::Sqrt(oldGlobXYZ[0]*oldGlobXYZ[0]+oldGlobXYZ[1]*oldGlobXYZ[1]);
+     if(step>0 && oldGlobR > r) continue; // going outward
+     if(step<0 && oldGlobR < r) continue; // going inward
+
      Double_t phi,z;
      if (!track->GetPhiZat(r,phi,z)) return kFALSE;
 
@@ -2237,7 +2319,11 @@ Bool_t AliITStrackerMI::RefitAt(Double_t xx,AliITStrackMI *track,
 
      if (idet<0) return kFALSE;
 
+
      const AliITSdetector &det=layer.GetDetector(idet);
+     // only for ITS-SA tracks refit
+     if (ilayer>1 && fTrackingPhase.Contains("RefitInward") && !(track->GetStatus()&AliESDtrack::kTPCin)) track->SetCheckInvariant(kFALSE);
+     // 
      if (!track->Propagate(det.GetPhi(),det.GetR())) return kFALSE;
 
      track->SetDetectorIndex(idet);
@@ -2286,13 +2372,13 @@ Bool_t AliITStrackerMI::RefitAt(Double_t xx,AliITStrackMI *track,
         dy = 0.5*(ymax-ymin);
         Int_t dead = CheckDeadZone(track,ilayer,idet,dz,dy,kTRUE);
         if (dead==1) modstatus = 7; // holes in z in SPD
-        if (dead==2 || dead==3) modstatus = 2; // dead from OCDB
+        if (dead==2 || dead==3 || dead==4) modstatus = 2; // dead from OCDB
        }
      }
      
      if (clAcc) {
        if (!UpdateMI(track,clAcc,maxchi2,idx)) return kFALSE;
-       track->SetSampledEdx(clAcc->GetQ(),track->GetNumberOfClusters()-1);
+       track->SetSampledEdx(clAcc->GetQ(),ilayer-2);
      }
      track->SetModuleIndexInfo(ilayer,idet,modstatus,xloc,zloc);
 
@@ -2331,7 +2417,7 @@ Bool_t AliITStrackerMI::RefitAt(Double_t xx,AliITStrackMI *track,
      // cross material
      // add time if going outward
      if(!CorrectForLayerMaterial(track,ilayer,oldGlobXYZ,dir)) return kFALSE;
-                 
+     track->SetCheckInvariant(kTRUE);
   } // end loop on layers
 
   if (!track->PropagateTo(xx,0.,0.)) return kFALSE;
@@ -2433,12 +2519,33 @@ Double_t AliITStrackerMI::GetNormalizedChi2(AliITStrackMI * track, Int_t mode)
     }
   }
   if (match<0) match=0;
-  Float_t deadzonefactor = (track->GetNDeadZone()>0) ? 3*(1.1-track->GetDeadZoneProbability()):0.;
+
+  // penalty factor for missing points (NDeadZone>0), but no penalty
+  // for layer with deadZoneProb close to 1 (either we wanted to skip layer
+  // or there is a dead from OCDB)
+  Float_t deadzonefactor = 0.; 
+  if (track->GetNDeadZone()>0.) {    
+    Int_t sumDeadZoneProbability=0; 
+    for(Int_t ilay=0;ilay<6;ilay++) {
+      if(track->GetDeadZoneProbability(ilay)>0.) sumDeadZoneProbability++;
+    }
+    Int_t nDeadZoneWithProbNot1=(Int_t)(track->GetNDeadZone())-sumDeadZoneProbability;
+    if(nDeadZoneWithProbNot1>0) {
+      Float_t deadZoneProbability = track->GetNDeadZone()-(Float_t)sumDeadZoneProbability;
+      AliDebug(2,Form("nDeadZone %f sumDZProbability %f nDZWithProbNot1 %f deadZoneProb %f\n",track->GetNDeadZone(),sumDeadZoneProbability,nDeadZoneWithProbNot1,deadZoneProbability));
+      deadZoneProbability /= (Float_t)nDeadZoneWithProbNot1;
+      Float_t one = 1.;
+      deadZoneProbability = TMath::Min(deadZoneProbability,one);
+      deadzonefactor = 3.*(1.1-deadZoneProbability);  
+    }
+  }  
+
   Double_t normchi2 = 2*track->GetNSkipped()+match+deadzonefactor+(1+(2*track->GetNSkipped()+deadzonefactor)/track->GetNumberOfClusters())*
     (chi2)/TMath::Max(double(sum-track->GetNSkipped()),
                                1./(1.+track->GetNSkipped()));     
- return normchi2;
+  AliDebug(2,Form("match %f deadzonefactor %f chi2 %f sum %f skipped\n",match,deadzonefactor,chi2,sum,track->GetNSkipped()));
+  AliDebug(2,Form("NormChi2 %f  cls %d\n",normchi2,track->GetNumberOfClusters()));
+  return normchi2;
 }
 //------------------------------------------------------------------------
 Double_t AliITStrackerMI::GetMatchingChi2(const AliITStrackMI * track1,const AliITStrackMI * track2)
@@ -2488,30 +2595,46 @@ Double_t  AliITStrackerMI::GetSPDDeadZoneProbability(Double_t zpos, Double_t zer
   //
   //  return probability that given point (characterized by z position and error) 
   //  is in SPD dead zone
+  //     This method assumes that fSPDdetzcentre is ordered from -z to +z
   //
   Double_t probability = 0.;
-  Double_t absz = TMath::Abs(zpos);
-  Double_t nearestz = (absz<2.) ? 0.5*(fSPDdetzcentre[1]+fSPDdetzcentre[2]) : 
-                                  0.5*(fSPDdetzcentre[2]+fSPDdetzcentre[3]);
-  if (TMath::Abs(absz-nearestz)>0.25+3.*zerr) return probability;
+  Double_t nearestz = 0.,distz=0.;
+  Int_t    nearestzone = -1;
+  Double_t mindistz = 1000.;
+
+  // find closest dead zone
+  for (Int_t i=0; i<3; i++) {
+    distz=TMath::Abs(zpos-0.5*(fSPDdetzcentre[i]+fSPDdetzcentre[i+1]));
+    if (distz<mindistz) {
+      nearestzone=i;
+      nearestz=0.5*(fSPDdetzcentre[i]+fSPDdetzcentre[i+1]);
+      mindistz=distz;
+    }
+  }
+
+  // too far from dead zone
+  if (TMath::Abs(zpos-nearestz)>0.25+3.*zerr) return probability;
+
+
   Double_t zmin, zmax;   
-  if (zpos<-6.) { // dead zone at z = -7
+  if (nearestzone==0) { // dead zone at z = -7
     zmin = fSPDdetzcentre[0] + 0.5*AliITSRecoParam::GetSPDdetzlength();
     zmax = fSPDdetzcentre[1] - 0.5*AliITSRecoParam::GetSPDdetzlength();
-  } else if (zpos>6.) { // dead zone at z = +7
-    zmin = fSPDdetzcentre[2] + 0.5*AliITSRecoParam::GetSPDdetzlength();
-    zmax = fSPDdetzcentre[3] - 0.5*AliITSRecoParam::GetSPDdetzlength();
-  } else if (absz<2.) { // dead zone at z = 0
+  } else if (nearestzone==1) { // dead zone at z = 0
     zmin = fSPDdetzcentre[1] + 0.5*AliITSRecoParam::GetSPDdetzlength();
     zmax = fSPDdetzcentre[2] - 0.5*AliITSRecoParam::GetSPDdetzlength();
+  } else if (nearestzone==2) { // dead zone at z = +7
+    zmin = fSPDdetzcentre[2] + 0.5*AliITSRecoParam::GetSPDdetzlength();
+    zmax = fSPDdetzcentre[3] - 0.5*AliITSRecoParam::GetSPDdetzlength();
   } else {
     zmin = 0.;
     zmax = 0.;
   }
   // probability that the true z is in the range [zmin,zmax] (i.e. inside 
   // dead zone)
-  probability = 0.5*( TMath::Erf((zpos-zmin)/zerr/TMath::Sqrt(2.)) - 
-                     TMath::Erf((zpos-zmax)/zerr/TMath::Sqrt(2.)) );
+  probability = 0.5*( AliMathBase::ErfFast((zpos-zmin)/zerr/TMath::Sqrt(2.)) - 
+                     AliMathBase::ErfFast((zpos-zmax)/zerr/TMath::Sqrt(2.)) );
+  AliDebug(2,Form("zpos %f +- %f nearestzone %d  zmin zmax %f %f prob %f\n",zpos,zerr,nearestzone,zmin,zmax,probability));
   return probability;
 }
 //------------------------------------------------------------------------
@@ -3123,6 +3246,7 @@ void AliITStrackerMI::SortTrackHypothesys(Int_t esdindex, Int_t maxcut, Int_t mo
   for (Int_t itrack=0;itrack<entries;itrack++){
     AliITStrackMI * track = (AliITStrackMI*)array->At(itrack);
     if (track){
+      AliDebug(2,Form("track %d  ncls %d\n",itrack,track->GetNumberOfClusters()));
       track->SetChi2MIP(0,GetNormalizedChi2(track, mode));            
       if (track->GetChi2MIP(0)<AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(0)) 
        chi2[itrack] = track->GetChi2MIP(0);
@@ -3136,6 +3260,7 @@ void AliITStrackerMI::SortTrackHypothesys(Int_t esdindex, Int_t maxcut, Int_t mo
   //
   TMath::Sort(entries,chi2,index,kFALSE);
   besttrack = (AliITStrackMI*)array->At(index[0]);
+  if(besttrack) AliDebug(2,Form("ncls best track %d\n",besttrack->GetNumberOfClusters()));
   if (besttrack&&besttrack->GetChi2MIP(0)<AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(0)){
     for (Int_t j=0;j<6;j++){
       if (besttrack->GetClIndex(j)>=0){
@@ -3152,7 +3277,8 @@ void AliITStrackerMI::SortTrackHypothesys(Int_t esdindex, Int_t maxcut, Int_t mo
   for (Int_t itrack=0;itrack<entries;itrack++){
     AliITStrackMI * track = (AliITStrackMI*)array->At(itrack);
     if (track){      
-      track->SetChi2MIP(0,GetNormalizedChi2(track,mode));            
+      track->SetChi2MIP(0,GetNormalizedChi2(track,mode));
+      AliDebug(2,Form("track %d  ncls %d\n",itrack,track->GetNumberOfClusters()));            
       if (track->GetChi2MIP(0)<AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(0)) 
        chi2[itrack] = track->GetChi2MIP(0)-0*(track->GetNumberOfClusters()+track->GetNDeadZone()); 
       else
@@ -3171,6 +3297,7 @@ void AliITStrackerMI::SortTrackHypothesys(Int_t esdindex, Int_t maxcut, Int_t mo
     TMath::Sort(entries,chi2,index,kFALSE);
     besttrack = (AliITStrackMI*)array->At(index[0]);
     if (besttrack){
+      AliDebug(2,Form("ncls best track %d     %f   %f\n",besttrack->GetNumberOfClusters(),besttrack->GetChi2MIP(0),chi2[index[0]]));
       //
       for (Int_t j=0;j<6;j++){
        if (besttrack->GetNz(j)>0&&besttrack->GetNy(j)>0){
@@ -3523,8 +3650,11 @@ void AliITStrackerMI::CookLabel(AliITStrackMI *track,Float_t wrong) const {
   //--------------------------------------------------------------------
   Int_t tpcLabel=-1; 
      
-  if ( track->GetESDtrack())   tpcLabel =  TMath::Abs(track->GetESDtrack()->GetTPCLabel());
-
+  if (track->GetESDtrack()){
+    tpcLabel = track->GetESDtrack()->GetTPCLabel();
+    ULong_t trStatus=track->GetESDtrack()->GetStatus();
+    if(!(trStatus&AliESDtrack::kTPCin)) tpcLabel=track->GetLabel(); // for ITSsa tracks
+  }
    track->SetChi2MIP(9,0);
    Int_t nwrong=0;
    for (Int_t i=0;i<track->GetNumberOfClusters();i++){
@@ -3533,9 +3663,8 @@ void AliITStrackerMI::CookLabel(AliITStrackMI *track,Float_t wrong) const {
      AliITSRecPoint *cl = (AliITSRecPoint*)GetCluster(cindex);
      Int_t isWrong=1;
      for (Int_t ind=0;ind<3;ind++){
-       if (tpcLabel>0)
-        if (cl->GetLabel(ind)==tpcLabel) isWrong=0;
-       AliDebug(2,Form("icl %d  ilab %d lab %d",i,ind,cl->GetLabel(ind)));
+       if (cl->GetLabel(ind)==TMath::Abs(tpcLabel)) isWrong=0;
+       //AliDebug(2,Form("icl %d  ilab %d lab %d",i,ind,cl->GetLabel(ind)));
      }
      track->SetChi2MIP(9,track->GetChi2MIP(9)+isWrong*(2<<l));
      nwrong+=isWrong;
@@ -3543,10 +3672,10 @@ void AliITStrackerMI::CookLabel(AliITStrackMI *track,Float_t wrong) const {
    Int_t nclusters = track->GetNumberOfClusters();
    if (nclusters > 0) //PH Some tracks don't have any cluster
      track->SetFakeRatio(double(nwrong)/double(nclusters));
-   if (tpcLabel>0){
-     if (track->GetFakeRatio()>wrong) track->SetLabel(-tpcLabel);
-     else
-       track->SetLabel(tpcLabel);
+   if (tpcLabel>0 && track->GetFakeRatio()>wrong) {
+     track->SetLabel(-tpcLabel);
+   } else {
+     track->SetLabel(tpcLabel);
    }
    AliDebug(2,Form(" nls %d wrong %d  label %d  tpcLabel %d\n",nclusters,nwrong,track->GetLabel(),tpcLabel));
    
@@ -3555,12 +3684,6 @@ void AliITStrackerMI::CookLabel(AliITStrackMI *track,Float_t wrong) const {
 void AliITStrackerMI::CookdEdx(AliITStrackMI* track)
 {
   //
-  //
-  //  Int_t list[6];
-  //AliITSRecPoint * clist[6];
-  //  Int_t shared = GetNumberOfSharedClusters(track,index,list,clist);
-  Float_t dedx[4];
-  Int_t accepted=0;
   track->SetChi2MIP(9,0);
   for (Int_t i=0;i<track->GetNumberOfClusters();i++){
     Int_t cindex = track->GetClusterIndex(i);
@@ -3572,33 +3695,10 @@ void AliITStrackerMI::CookdEdx(AliITStrackMI* track)
       if (cl->GetLabel(ind)==lab) isWrong=0;
     }
     track->SetChi2MIP(9,track->GetChi2MIP(9)+isWrong*(2<<l));
-    if (l<2) continue;
-    //if (l>3 && (cl->GetNy()>4) || (cl->GetNz()>4)) continue;  //shared track
-    //if (l>3&& !(cl->GetType()==1||cl->GetType()==10)) continue;
-    //if (l<4&& !(cl->GetType()==1)) continue;   
-    dedx[accepted]= track->GetSampledEdx(i);
-    //dedx[accepted]= track->fNormQ[l];
-    accepted++;
-  }
-  if (accepted<1) {
-    track->SetdEdx(0);
-    return;
   }
-  Int_t indexes[4];
-  TMath::Sort(accepted,dedx,indexes,kFALSE);
   Double_t low=0.;
   Double_t up=0.51;    
-  Double_t nl=low*accepted, nu =up*accepted;  
-  Float_t sumamp = 0;
-  Float_t sumweight =0;
-  for (Int_t i=0; i<accepted; i++) {
-    Float_t weight =1;
-    if (i<nl+0.1)     weight = TMath::Max(1.-(nl-i),0.);
-    if (i>nu-1)     weight = TMath::Max(nu-i,0.);
-    sumamp+= dedx[indexes[i]]*weight;
-    sumweight+=weight;
-  }
-  track->SetdEdx(sumamp/sumweight);
+  track->CookdEdx(low,up);
 }
 //------------------------------------------------------------------------
 void AliITStrackerMI::MakeCoefficients(Int_t ntracks){
@@ -3615,17 +3715,17 @@ Double_t AliITStrackerMI::GetPredictedChi2MI(AliITStrackMI* track, const AliITSR
   //
   // Compute predicted chi2
   //
-  Float_t erry,errz;
+  Float_t erry,errz,covyz;
   Float_t theta = track->GetTgl();
   Float_t phi   = track->GetSnp();
   phi = TMath::Abs(phi)*TMath::Sqrt(1./((1.-phi)*(1.+phi)));
-  AliITSClusterParam::GetError(layer,cluster,theta,phi,track->GetExpQ(),erry,errz);
+  AliITSClusterParam::GetError(layer,cluster,theta,phi,track->GetExpQ(),erry,errz,covyz);
   AliDebug(2,Form(" chi2: tr-cl   %f  %f   tr X %f cl X %f",track->GetY()-cluster->GetY(),track->GetZ()-cluster->GetZ(),track->GetX(),cluster->GetX()));
   // Take into account the mis-alignment (bring track to cluster plane)
   Double_t xTrOrig=track->GetX();
   if (!track->Propagate(xTrOrig+cluster->GetX())) return 1000.;
   AliDebug(2,Form(" chi2: tr-cl   %f  %f   tr X %f cl X %f",track->GetY()-cluster->GetY(),track->GetZ()-cluster->GetZ(),track->GetX(),cluster->GetX()));
-  Double_t chi2 = track->GetPredictedChi2MI(cluster->GetY(),cluster->GetZ(),erry,errz);
+  Double_t chi2 = track->GetPredictedChi2MI(cluster->GetY(),cluster->GetZ(),erry,errz,covyz);
   // Bring the track back to detector plane in ideal geometry
   // [mis-alignment will be accounted for in UpdateMI()]
   if (!track->Propagate(xTrOrig)) return 1000.;
@@ -3641,6 +3741,7 @@ Double_t AliITStrackerMI::GetPredictedChi2MI(AliITStrackMI* track, const AliITSR
   track->SetNz(layer,nz);
   track->SetSigmaY(layer,erry);
   track->SetSigmaZ(layer, errz);
+  track->SetSigmaYZ(layer,covyz);
   //track->fNormQ[layer] = cluster->GetQ()/TMath::Sqrt(1+theta*theta+phi*phi);
   track->SetNormQ(layer,cluster->GetQ()/TMath::Sqrt((1.+ track->GetTgl()*track->GetTgl())/((1.-track->GetSnp())*(1.+track->GetSnp()))));
   return chi2;
@@ -3672,18 +3773,17 @@ Int_t AliITStrackerMI::UpdateMI(AliITStrackMI* track, const AliITSRecPoint* cl,D
   AliDebug(2,Form(" xtr %f  xcl %f",track->GetX(),cl->GetX()));
 
   if (!track->Propagate(xTrOrig+cl->GetX())) return 0;
-
   
   AliCluster c(*cl);
   c.SetSigmaY2(track->GetSigmaY(layer)*track->GetSigmaY(layer));
   c.SetSigmaZ2(track->GetSigmaZ(layer)*track->GetSigmaZ(layer));
+  c.SetSigmaYZ(track->GetSigmaYZ(layer));
 
 
   Int_t updated = track->UpdateMI(&c,chi2,index);
-
   // Bring the track back to detector plane in ideal geometry
   if (!track->Propagate(xTrOrig)) return 0;
-
   if(!updated) AliDebug(2,"update failed");
   return updated;
 }
@@ -3800,831 +3900,6 @@ Int_t AliITStrackerMI::GetNearestLayer(const Double_t *xr) const{
   }
   return res;
 }
-
-//------------------------------------------------------------------------
-void AliITStrackerMI::UpdateTPCV0(const AliESDEvent *event){
-  //
-  //try to update, or reject TPC  V0s
-  //
-  Int_t nv0s = event->GetNumberOfV0s();
-  Int_t nitstracks = fTrackHypothesys.GetEntriesFast();
-
-  for (Int_t i=0;i<nv0s;i++){
-    AliESDv0 * vertex = event->GetV0(i);
-    Int_t ip = vertex->GetIndex(0);
-    Int_t im = vertex->GetIndex(1);
-    //
-    TObjArray * arrayp = (ip<nitstracks) ? (TObjArray*)fTrackHypothesys.At(ip):0;
-    TObjArray * arraym = (im<nitstracks) ? (TObjArray*)fTrackHypothesys.At(im):0;
-    AliITStrackMI * trackp = (arrayp!=0) ? (AliITStrackMI*)arrayp->At(0):0;
-    AliITStrackMI * trackm = (arraym!=0) ? (AliITStrackMI*)arraym->At(0):0;
-    //
-    //
-    if (trackp){
-      if (trackp->GetNumberOfClusters()+trackp->GetNDeadZone()>5.5){
-       if (trackp->GetConstrain()&&trackp->GetChi2MIP(0)<3) vertex->SetStatus(-100);
-       if (!trackp->GetConstrain()&&trackp->GetChi2MIP(0)<2) vertex->SetStatus(-100); 
-      }
-    }
-
-    if (trackm){
-      if (trackm->GetNumberOfClusters()+trackm->GetNDeadZone()>5.5){
-       if (trackm->GetConstrain()&&trackm->GetChi2MIP(0)<3) vertex->SetStatus(-100);
-       if (!trackm->GetConstrain()&&trackm->GetChi2MIP(0)<2) vertex->SetStatus(-100); 
-      }
-    }
-    if (vertex->GetStatus()==-100) continue;
-    //
-    Double_t xrp[3]; vertex->GetXYZ(xrp[0],xrp[1],xrp[2]);  //I.B.
-    Int_t clayer = GetNearestLayer(xrp);                    //I.B.
-    vertex->SetNBefore(clayer);        //
-    vertex->SetChi2Before(9*clayer);   //
-    vertex->SetNAfter(6-clayer);       //
-    vertex->SetChi2After(0);           //
-    //
-    if (clayer >1 ){ // calculate chi2 before vertex
-      Float_t chi2p = 0, chi2m=0;  
-      //
-      if (trackp){
-       for (Int_t ilayer=0;ilayer<clayer;ilayer++){
-         if (trackp->GetClIndex(ilayer)>=0){
-           chi2p+=trackp->GetDy(ilayer)*trackp->GetDy(ilayer)/(trackp->GetSigmaY(ilayer)*trackp->GetSigmaY(ilayer))+
-             trackp->GetDz(ilayer)*trackp->GetDz(ilayer)/(trackp->GetSigmaZ(ilayer)*trackp->GetSigmaZ(ilayer));
-         }
-         else{
-           chi2p+=9;
-         }
-       }
-      }else{
-       chi2p = 9*clayer;
-      }
-      //
-      if (trackm){
-       for (Int_t ilayer=0;ilayer<clayer;ilayer++){
-         if (trackm->GetClIndex(ilayer)>=0){
-           chi2m+=trackm->GetDy(ilayer)*trackm->GetDy(ilayer)/(trackm->GetSigmaY(ilayer)*trackm->GetSigmaY(ilayer))+
-             trackm->GetDz(ilayer)*trackm->GetDz(ilayer)/(trackm->GetSigmaZ(ilayer)*trackm->GetSigmaZ(ilayer));
-         }
-         else{
-           chi2m+=9;
-         }
-       }
-      }else{
-       chi2m = 9*clayer;
-      }
-      vertex->SetChi2Before(TMath::Min(chi2p,chi2m));
-      if (TMath::Min(chi2p,chi2m)/Float_t(clayer)<4) vertex->SetStatus(-10);  // track exist before vertex
-    }
-    
-    if (clayer < 5 ){ // calculate chi2 after vertex
-      Float_t chi2p = 0, chi2m=0;  
-      //
-      if (trackp&&TMath::Abs(trackp->GetTgl())<1.){
-       for (Int_t ilayer=clayer;ilayer<6;ilayer++){
-         if (trackp->GetClIndex(ilayer)>=0){
-           chi2p+=trackp->GetDy(ilayer)*trackp->GetDy(ilayer)/(trackp->GetSigmaY(ilayer)*trackp->GetSigmaY(ilayer))+
-             trackp->GetDz(ilayer)*trackp->GetDz(ilayer)/(trackp->GetSigmaZ(ilayer)*trackp->GetSigmaZ(ilayer));
-         }
-         else{
-           chi2p+=9;
-         }
-       }
-      }else{
-       chi2p = 0;
-      }
-      //
-      if (trackm&&TMath::Abs(trackm->GetTgl())<1.){
-       for (Int_t ilayer=clayer;ilayer<6;ilayer++){
-         if (trackm->GetClIndex(ilayer)>=0){
-           chi2m+=trackm->GetDy(ilayer)*trackm->GetDy(ilayer)/(trackm->GetSigmaY(ilayer)*trackm->GetSigmaY(ilayer))+
-             trackm->GetDz(ilayer)*trackm->GetDz(ilayer)/(trackm->GetSigmaZ(ilayer)*trackm->GetSigmaZ(ilayer));
-         }
-         else{
-           chi2m+=9;
-         }
-       }
-      }else{
-       chi2m = 0;
-      }
-      vertex->SetChi2After(TMath::Max(chi2p,chi2m));
-      if (TMath::Max(chi2m,chi2p)/Float_t(6-clayer)>9) vertex->SetStatus(-20);  // track not found in ITS
-    }
-  }
-  //
-}
-//------------------------------------------------------------------------
-void AliITStrackerMI::FindV02(AliESDEvent *event)
-{
-  //
-  // V0 finder
-  //
-  //  Cuts on DCA -  R dependent
-  //          max distance DCA between 2 tracks cut 
-  //          maxDist = TMath::Min(kMaxDist,kMaxDist0+pvertex->GetRr()*kMaxDist);
-  //
-  const Float_t kMaxDist0      = 0.1;    
-  const Float_t kMaxDist1      = 0.1;     
-  const Float_t kMaxDist       = 1;
-  const Float_t kMinPointAngle  = 0.85;
-  const Float_t kMinPointAngle2 = 0.99;
-  const Float_t kMinR           = 0.5;
-  const Float_t kMaxR           = 220;
-  //const Float_t kCausality0Cut   = 0.19;
-  //const Float_t kLikelihood01Cut = 0.25;
-  //const Float_t kPointAngleCut   = 0.9996;
-  const Float_t kCausality0Cut   = 0.19;
-  const Float_t kLikelihood01Cut = 0.45;
-  const Float_t kLikelihood1Cut  = 0.5;
-  const Float_t kCombinedCut     = 0.55;
-
-  //
-  //
-  TTreeSRedirector &cstream = *fDebugStreamer;
-  Int_t ntracks    = event->GetNumberOfTracks(); 
-  Int_t nitstracks = fTrackHypothesys.GetEntriesFast();
-  fOriginal.Expand(ntracks);
-  fTrackHypothesys.Expand(ntracks);
-  fBestHypothesys.Expand(ntracks);
-  //
-  AliHelix * helixes   = new AliHelix[ntracks+2];
-  TObjArray trackarray(ntracks+2);     //array with tracks - with vertex constrain
-  TObjArray trackarrayc(ntracks+2);    //array of "best    tracks" - without vertex constrain
-  TObjArray trackarrayl(ntracks+2);    //array of "longest tracks" - without vertex constrain
-  Bool_t * forbidden   = new Bool_t [ntracks+2];
-  Int_t   *itsmap      = new Int_t  [ntracks+2];
-  Float_t *dist        = new Float_t[ntracks+2];
-  Float_t *normdist0   = new Float_t[ntracks+2];
-  Float_t *normdist1   = new Float_t[ntracks+2];
-  Float_t *normdist    = new Float_t[ntracks+2];
-  Float_t *norm        = new Float_t[ntracks+2];
-  Float_t *maxr        = new Float_t[ntracks+2];
-  Float_t *minr        = new Float_t[ntracks+2];
-  Float_t *minPointAngle= new Float_t[ntracks+2];
-  //
-  AliV0 *pvertex      = new AliV0;
-  AliITStrackMI * dummy= new AliITStrackMI;
-  dummy->SetLabel(0);
-  AliITStrackMI  trackat0;    //temporary track for DCA calculation
-  //
-  Float_t primvertex[3]={GetX(),GetY(),GetZ()};
-  //
-  // make ITS -  ESD map
-  //
-  for (Int_t itrack=0;itrack<ntracks+2;itrack++) {
-    itsmap[itrack]        = -1;
-    forbidden[itrack]     = kFALSE;
-    maxr[itrack]          = kMaxR;
-    minr[itrack]          = kMinR;
-    minPointAngle[itrack] = kMinPointAngle;
-  }
-  for (Int_t itrack=0;itrack<nitstracks;itrack++){
-    AliITStrackMI * original =   (AliITStrackMI*)(fOriginal.At(itrack));
-    Int_t           esdindex =   original->GetESDtrack()->GetID();
-    itsmap[esdindex]         =   itrack;
-  }
-  //
-  // create ITS tracks from ESD tracks if not done before
-  //
-  for (Int_t itrack=0;itrack<ntracks;itrack++){
-    if (itsmap[itrack]>=0) continue;
-    AliITStrackMI * tpctrack = new AliITStrackMI(*(event->GetTrack(itrack)));
-    //tpctrack->fD[0] = tpctrack->GetD(GetX(),GetY());
-    //tpctrack->fD[1] = tpctrack->GetZat(GetX())-GetZ(); 
-    tpctrack->GetDZ(GetX(),GetY(),GetZ(),tpctrack->GetDP());   //I.B.
-    if (tpctrack->GetD(0)<20 && tpctrack->GetD(1)<20){
-      // tracks which can reach inner part of ITS
-      // propagate track to outer its volume - with correction for material
-      CorrectForTPCtoITSDeadZoneMaterial(tpctrack);  
-    }
-    itsmap[itrack] = nitstracks;
-    fOriginal.AddAt(tpctrack,nitstracks);
-    nitstracks++;
-  }
-  //
-  // fill temporary arrays
-  //
-  for (Int_t itrack=0;itrack<ntracks;itrack++){
-    AliESDtrack *  esdtrack = event->GetTrack(itrack);
-    Int_t          itsindex = itsmap[itrack];
-    AliITStrackMI *original = (AliITStrackMI*)fOriginal.At(itsmap[itrack]);
-    if (!original) continue;
-    AliITStrackMI *bestConst  = 0;
-    AliITStrackMI *bestLong   = 0;
-    AliITStrackMI *best       = 0;    
-    //
-    //
-    TObjArray * array    = (TObjArray*)  fTrackHypothesys.At(itsindex);
-    Int_t       hentries = (array==0) ?  0 : array->GetEntriesFast();
-    // Get best track with vertex constrain
-    for (Int_t ih=0;ih<hentries;ih++){
-      AliITStrackMI * trackh = (AliITStrackMI*)array->At(ih);
-      if (!trackh->GetConstrain()) continue;
-      if (!bestConst) bestConst = trackh;
-      if (trackh->GetNumberOfClusters()>5.0){
-       bestConst  = trackh;                         // full track -  with minimal chi2
-       break;
-      }
-      if (trackh->GetNumberOfClusters()+trackh->GetNDeadZone()<=bestConst->GetNumberOfClusters()+bestConst->GetNDeadZone())  continue;      
-      bestConst = trackh;
-      break;
-    }
-    // Get best long track without vertex constrain and best track without vertex constrain
-    for (Int_t ih=0;ih<hentries;ih++){
-      AliITStrackMI * trackh = (AliITStrackMI*)array->At(ih);
-      if (trackh->GetConstrain()) continue;
-      if (!best)     best     = trackh;
-      if (!bestLong) bestLong = trackh;
-      if (trackh->GetNumberOfClusters()>5.0){
-       bestLong  = trackh;                         // full track -  with minimal chi2
-       break;
-      }
-      if (trackh->GetNumberOfClusters()+trackh->GetNDeadZone()<=bestLong->GetNumberOfClusters()+bestLong->GetNDeadZone())  continue;      
-      bestLong = trackh;       
-    }
-    if (!best) {
-      best     = original;
-      bestLong = original;
-    }
-    //I.B. trackat0 = *bestLong;
-    new (&trackat0) AliITStrackMI(*bestLong);
-    Double_t xx,yy,zz,alpha; 
-    if (!bestLong->GetGlobalXYZat(bestLong->GetX(),xx,yy,zz)) continue;
-    alpha = TMath::ATan2(yy,xx);    
-    if (!trackat0.Propagate(alpha,0)) continue;      
-    // calculate normalized distances to the vertex 
-    //
-    Float_t ptfac  = (1.+100.*TMath::Abs(trackat0.GetC()));
-    if ( bestLong->GetNumberOfClusters()>3 ){      
-      dist[itsindex]      = trackat0.GetY();
-      norm[itsindex]      = ptfac*TMath::Sqrt(trackat0.GetSigmaY2());
-      normdist0[itsindex] = TMath::Abs(trackat0.GetY()/norm[itsindex]);
-      normdist1[itsindex] = TMath::Abs((trackat0.GetZ()-primvertex[2])/(ptfac*TMath::Sqrt(trackat0.GetSigmaZ2())));
-      normdist[itsindex]  = TMath::Sqrt(normdist0[itsindex]*normdist0[itsindex]+normdist1[itsindex]*normdist1[itsindex]);
-      if (!bestConst){
-       if (bestLong->GetNumberOfClusters()+bestLong->GetNDeadZone()<6) normdist[itsindex]*=2.;
-       if (bestLong->GetNumberOfClusters()+bestLong->GetNDeadZone()<5) normdist[itsindex]*=2.;
-       if (bestLong->GetNumberOfClusters()+bestLong->GetNDeadZone()<4) normdist[itsindex]*=2.;
-      }else{
-       if (bestConst->GetNumberOfClusters()+bestConst->GetNDeadZone()<6) normdist[itsindex]*=1.5;
-       if (bestConst->GetNumberOfClusters()+bestConst->GetNDeadZone()<5) normdist[itsindex]*=1.5;
-      }
-    }
-    else{      
-      if (bestConst&&bestConst->GetNumberOfClusters()+bestConst->GetNDeadZone()>4.5){
-       dist[itsindex] = bestConst->GetD(0);
-       norm[itsindex] = bestConst->GetDnorm(0);
-       normdist0[itsindex] = TMath::Abs(bestConst->GetD(0)/norm[itsindex]);
-       normdist1[itsindex] = TMath::Abs(bestConst->GetD(0)/norm[itsindex]);
-       normdist[itsindex]  = TMath::Sqrt(normdist0[itsindex]*normdist0[itsindex]+normdist1[itsindex]*normdist1[itsindex]);
-      }else{
-       dist[itsindex]      = trackat0.GetY();
-       norm[itsindex]      = ptfac*TMath::Sqrt(trackat0.GetSigmaY2());
-       normdist0[itsindex] = TMath::Abs(trackat0.GetY()/norm[itsindex]);
-       normdist1[itsindex] = TMath::Abs((trackat0.GetZ()-primvertex[2])/(ptfac*TMath::Sqrt(trackat0.GetSigmaZ2())));
-       normdist[itsindex]  = TMath::Sqrt(normdist0[itsindex]*normdist0[itsindex]+normdist1[itsindex]*normdist1[itsindex]);
-       if (TMath::Abs(trackat0.GetTgl())>1.05){
-         if (normdist[itsindex]<3) forbidden[itsindex]=kTRUE;
-         if (normdist[itsindex]>3) {
-           minr[itsindex] = TMath::Max(Float_t(40.),minr[itsindex]);
-         }
-       }
-      }
-    }
-    //
-    //-----------------------------------------------------------
-    //Forbid primary track candidates - 
-    //
-    //treetr->SetAlias("forbidden0","Tr0.fN<4&&Tr1.fN+Tr1.fNDeadZone>4.5");
-    //treetr->SetAlias("forbidden1","ND<3&&Tr1.fN+Tr1.fNDeadZone>5.5");
-    //treetr->SetAlias("forbidden2","ND<2&&Tr1.fClIndex[0]>0&&Tr1.fClIndex[0]>0");
-    //treetr->SetAlias("forbidden3","ND<1&&Tr1.fClIndex[0]>0");
-    //treetr->SetAlias("forbidden4","ND<4&&Tr1.fNormChi2[0]<2");
-    //treetr->SetAlias("forbidden5","ND<5&&Tr1.fNormChi2[0]<1");
-    //-----------------------------------------------------------
-    if (bestConst){
-      if (bestLong->GetNumberOfClusters()<4       && bestConst->GetNumberOfClusters()+bestConst->GetNDeadZone()>4.5)               forbidden[itsindex]=kTRUE;
-      if (normdist[itsindex]<3 && bestConst->GetNumberOfClusters()+bestConst->GetNDeadZone()>5.5)               forbidden[itsindex]=kTRUE;
-      if (normdist[itsindex]<2 && bestConst->GetClIndex(0)>=0 && bestConst->GetClIndex(1)>=0 ) forbidden[itsindex]=kTRUE;
-      if (normdist[itsindex]<1 && bestConst->GetClIndex(0)>=0)                              forbidden[itsindex]=kTRUE;
-      if (normdist[itsindex]<4 && bestConst->GetNormChi2(0)<2)                             forbidden[itsindex]=kTRUE;
-      if (normdist[itsindex]<5 && bestConst->GetNormChi2(0)<1)                             forbidden[itsindex]=kTRUE;      
-      if (bestConst->GetNormChi2(0)<2.5) {
-       minPointAngle[itsindex]= 0.9999;
-       maxr[itsindex]         = 10;
-      }
-    }
-    //
-    //forbid daughter kink candidates
-    //
-    if (esdtrack->GetKinkIndex(0)>0) forbidden[itsindex] = kTRUE;
-    Bool_t isElectron = kTRUE;
-    Bool_t isProton   = kTRUE;
-    Double_t pid[5];
-    esdtrack->GetESDpid(pid);
-    for (Int_t i=1;i<5;i++){
-      if (pid[0]<pid[i]) isElectron= kFALSE;
-      if (pid[4]<pid[i]) isProton= kFALSE;
-    }
-    if (isElectron){
-      forbidden[itsindex]=kFALSE;      
-      normdist[itsindex]*=-1;
-    }
-    if (isProton){
-      if (normdist[itsindex]>2) forbidden[itsindex]=kFALSE;    
-      normdist[itsindex]*=-1;
-    }
-
-    //
-    // Causality cuts in TPC volume
-    //
-    if (esdtrack->GetTPCdensity(0,10) >0.6)  maxr[itsindex] = TMath::Min(Float_t(110),maxr[itsindex]);
-    if (esdtrack->GetTPCdensity(10,30)>0.6)  maxr[itsindex] = TMath::Min(Float_t(120),maxr[itsindex]);
-    if (esdtrack->GetTPCdensity(20,40)>0.6)  maxr[itsindex] = TMath::Min(Float_t(130),maxr[itsindex]);
-    if (esdtrack->GetTPCdensity(30,50)>0.6)  maxr[itsindex] = TMath::Min(Float_t(140),maxr[itsindex]);
-    //
-    if (esdtrack->GetTPCdensity(0,60)<0.4&&bestLong->GetNumberOfClusters()<3) minr[itsindex]=100;    
-    //
-    //
-    if (kFALSE){
-      cstream<<"Track"<<
-       "Tr0.="<<best<<
-       "Tr1.="<<((bestConst)? bestConst:dummy)<<
-       "Tr2.="<<bestLong<<
-       "Tr3.="<<&trackat0<<
-       "Esd.="<<esdtrack<<
-       "Dist="<<dist[itsindex]<<
-       "ND0="<<normdist0[itsindex]<<
-       "ND1="<<normdist1[itsindex]<<
-       "ND="<<normdist[itsindex]<<
-       "Pz="<<primvertex[2]<<
-       "Forbid="<<forbidden[itsindex]<<
-       "\n";
-      //
-    }
-    trackarray.AddAt(best,itsindex);
-    trackarrayc.AddAt(bestConst,itsindex);
-    trackarrayl.AddAt(bestLong,itsindex);
-    new (&helixes[itsindex]) AliHelix(*best);
-  }
-  //
-  //
-  //
-  // first iterration of V0 finder
-  //
-  for (Int_t iesd0=0;iesd0<ntracks;iesd0++){
-    Int_t itrack0 = itsmap[iesd0];
-    if (forbidden[itrack0]) continue;
-    AliITStrackMI * btrack0 = (AliITStrackMI*)trackarray.At(itrack0);
-    if (!btrack0) continue;    
-    if (btrack0->GetSign()>0 && !AliITSReconstructor::GetRecoParam()->GetStoreLikeSignV0s()) continue;
-    AliITStrackMI *trackc0 = (AliITStrackMI*)trackarrayc.At(itrack0);
-    //
-    for (Int_t iesd1=iesd0+1;iesd1<ntracks;iesd1++){
-      Int_t itrack1 = itsmap[iesd1];
-      if (forbidden[itrack1]) continue;
-
-      AliITStrackMI * btrack1 = (AliITStrackMI*)trackarray.At(itrack1); 
-      if (!btrack1) continue;
-      if (btrack1->GetSign()<0 && !AliITSReconstructor::GetRecoParam()->GetStoreLikeSignV0s()) continue;
-      Bool_t isGold = kFALSE;
-      if (TMath::Abs(TMath::Abs(btrack0->GetLabel())-TMath::Abs(btrack1->GetLabel()))==1){
-       isGold = kTRUE;
-      }
-      AliITStrackMI *trackc1 = (AliITStrackMI*)trackarrayc.At(itrack1);
-      AliHelix &h1 = helixes[itrack0];
-      AliHelix &h2 = helixes[itrack1];
-      //
-      // find linear distance
-      Double_t rmin =0;
-      //
-      //
-      //
-      Double_t phase[2][2],radius[2];
-      Int_t  points = h1.GetRPHIintersections(h2, phase, radius);
-      if    (points==0)  continue;
-      Double_t delta[2]={1000000,1000000};        
-      rmin = radius[0];
-      h1.ParabolicDCA(h2,phase[0][0],phase[0][1],radius[0],delta[0]);
-      if (points==2){    
-       if (radius[1]<rmin) rmin = radius[1];
-       h1.ParabolicDCA(h2,phase[1][0],phase[1][1],radius[1],delta[1]);
-      }
-      rmin = TMath::Sqrt(rmin);
-      Double_t distance = 0;
-      Double_t radiusC  = 0;
-      Int_t    iphase   = 0;
-      if (points==1 || delta[0]<delta[1]){
-       distance = TMath::Sqrt(delta[0]);
-       radiusC  = TMath::Sqrt(radius[0]);
-      }else{
-       distance = TMath::Sqrt(delta[1]);
-       radiusC  = TMath::Sqrt(radius[1]);
-       iphase=1;
-      }
-      if (radiusC<TMath::Max(minr[itrack0],minr[itrack1]))    continue;
-      if (radiusC>TMath::Min(maxr[itrack0],maxr[itrack1]))     continue; 
-      Float_t maxDist  = TMath::Min(kMaxDist,Float_t(kMaxDist0+radiusC*kMaxDist1));      
-      if (distance>maxDist) continue;
-      Float_t pointAngle = h1.GetPointAngle(h2,phase[iphase],primvertex);
-      if (pointAngle<TMath::Max(minPointAngle[itrack0],minPointAngle[itrack1])) continue;
-      //
-      //
-      //      Double_t distance = TestV0(h1,h2,pvertex,rmin);
-      //
-      //       if (distance>maxDist)           continue;
-      //       if (pvertex->GetRr()<kMinR)     continue;
-      //       if (pvertex->GetRr()>kMaxR)     continue;
-      AliITStrackMI * track0=btrack0;
-      AliITStrackMI * track1=btrack1;
-      //      if (pvertex->GetRr()<3.5){  
-      if (radiusC<3.5){  
-       //use longest tracks inside the pipe
-       track0 = (AliITStrackMI*)trackarrayl.At(itrack0);
-       track1 = (AliITStrackMI*)trackarrayl.At(itrack1);
-      }      
-      //
-      //
-      pvertex->SetParamN(*track0);
-      pvertex->SetParamP(*track1);
-      pvertex->Update(primvertex);
-      pvertex->SetClusters(track0->ClIndex(),track1->ClIndex());  // register clusters
-
-      if (pvertex->GetRr()<kMinR) continue;
-      if (pvertex->GetRr()>kMaxR) continue;
-      if (pvertex->GetV0CosineOfPointingAngle()<kMinPointAngle) continue;
-//Bo:      if (pvertex->GetDist2()>maxDist) continue;
-      if (pvertex->GetDcaV0Daughters()>maxDist) continue;
-//Bo:        pvertex->SetLab(0,track0->GetLabel());
-//Bo:        pvertex->SetLab(1,track1->GetLabel());
-      pvertex->SetIndex(0,track0->GetESDtrack()->GetID());
-      pvertex->SetIndex(1,track1->GetESDtrack()->GetID());
-      //      
-      AliITStrackMI * htrackc0 = trackc0 ? trackc0:dummy;      
-      AliITStrackMI * htrackc1 = trackc1 ? trackc1:dummy;
-
-      //
-      //
-      TObjArray * array0b     = (TObjArray*)fBestHypothesys.At(itrack0);
-      if (!array0b&&pvertex->GetRr()<40 && TMath::Abs(track0->GetTgl())<1.1) {
-       fCurrentEsdTrack = itrack0;
-       FollowProlongationTree((AliITStrackMI*)fOriginal.At(itrack0),itrack0, kFALSE);
-      }
-      TObjArray * array1b    = (TObjArray*)fBestHypothesys.At(itrack1);
-      if (!array1b&&pvertex->GetRr()<40 && TMath::Abs(track1->GetTgl())<1.1) { 
-       fCurrentEsdTrack = itrack1;
-       FollowProlongationTree((AliITStrackMI*)fOriginal.At(itrack1),itrack1, kFALSE);
-      }
-      //
-      AliITStrackMI * track0b = (AliITStrackMI*)fOriginal.At(itrack0);       
-      AliITStrackMI * track1b = (AliITStrackMI*)fOriginal.At(itrack1);
-      AliITStrackMI * track0l = (AliITStrackMI*)fOriginal.At(itrack0);       
-      AliITStrackMI * track1l = (AliITStrackMI*)fOriginal.At(itrack1);
-      
-      Float_t minchi2before0=16;
-      Float_t minchi2before1=16;
-      Float_t minchi2after0 =16;
-      Float_t minchi2after1 =16;
-      Double_t xrp[3]; pvertex->GetXYZ(xrp[0],xrp[1],xrp[2]);  //I.B.
-      Int_t maxLayer = GetNearestLayer(xrp);                   //I.B.
-      
-      if (array0b) for (Int_t i=0;i<5;i++){
-       // best track after vertex
-       AliITStrackMI * btrack = (AliITStrackMI*)array0b->At(i);
-       if (!btrack) continue;
-       if (btrack->GetNumberOfClusters()>track0l->GetNumberOfClusters()) track0l = btrack;     
-       //      if (btrack->fX<pvertex->GetRr()-2.-0.5/(0.1+pvertex->GetAnglep()[2])) {
-       if (btrack->GetX()<pvertex->GetRr()-2.) {
-         if ( (maxLayer>i+2|| (i==0)) && btrack->GetNumberOfClusters()==(6-i)&&i<3){
-           Float_t sumchi2= 0;
-           Float_t sumn   = 0;
-           if (maxLayer<3){   // take prim vertex as additional measurement
-             if (normdist[itrack0]>0 && htrackc0){
-               sumchi2 += TMath::Min((3.-maxLayer)*normdist[itrack0]*normdist[itrack0],16.);
-             }else{
-               sumchi2 +=  TMath::Min((3.-maxLayer)*(3*normdist[itrack0]*normdist[itrack0]+3.),16.);
-             }
-             sumn    +=  3-maxLayer;
-           }
-           for (Int_t ilayer=i;ilayer<maxLayer;ilayer++){
-             sumn+=1.;       
-             if (btrack->GetClIndex(ilayer)<0){
-               sumchi2+=25;
-               continue;
-             }else{
-               Int_t c=( btrack->GetClIndex(ilayer) & 0x0fffffff);
-               for (Int_t itrack=0;itrack<4;itrack++){
-                 if (fgLayers[ilayer].GetClusterTracks(itrack,c)>=0 && fgLayers[ilayer].GetClusterTracks(itrack,c)!=itrack0){
-                   sumchi2+=18.;  //shared cluster
-                   break;
-                 }
-               }
-               sumchi2+=btrack->GetDy(ilayer)*btrack->GetDy(ilayer)/(btrack->GetSigmaY(ilayer)*btrack->GetSigmaY(ilayer));
-               sumchi2+=btrack->GetDz(ilayer)*btrack->GetDz(ilayer)/(btrack->GetSigmaZ(ilayer)*btrack->GetSigmaZ(ilayer));            
-             }
-           }
-           sumchi2/=sumn;
-           if (sumchi2<minchi2before0) minchi2before0=sumchi2; 
-         }
-         continue;   //safety space - Geo manager will give exact layer
-       }
-       track0b       = btrack;
-       minchi2after0 = btrack->GetNormChi2(i);
-       break;
-      }
-      if (array1b) for (Int_t i=0;i<5;i++){
-       // best track after vertex
-       AliITStrackMI * btrack = (AliITStrackMI*)array1b->At(i);
-       if (!btrack) continue;
-       if (btrack->GetNumberOfClusters()>track1l->GetNumberOfClusters()) track1l = btrack;     
-       //      if (btrack->fX<pvertex->GetRr()-2-0.5/(0.1+pvertex->GetAnglep()[2])){
-       if (btrack->GetX()<pvertex->GetRr()-2){
-         if ((maxLayer>i+2 || (i==0))&&btrack->GetNumberOfClusters()==(6-i)&&(i<3)){
-           Float_t sumchi2= 0;
-           Float_t sumn   = 0;
-           if (maxLayer<3){   // take prim vertex as additional measurement
-             if (normdist[itrack1]>0 && htrackc1){
-               sumchi2 +=  TMath::Min((3.-maxLayer)*normdist[itrack1]*normdist[itrack1],16.);
-             }else{
-               sumchi2 += TMath::Min((3.-maxLayer)*(3*normdist[itrack1]*normdist[itrack1]+3.),16.);
-             }
-             sumn    +=  3-maxLayer;
-           }
-           for (Int_t ilayer=i;ilayer<maxLayer;ilayer++){
-             sumn+=1.;
-             if (btrack->GetClIndex(ilayer)<0){
-               sumchi2+=30;
-               continue;
-             }else{
-               Int_t c=( btrack->GetClIndex(ilayer) & 0x0fffffff);
-               for (Int_t itrack=0;itrack<4;itrack++){
-                 if (fgLayers[ilayer].GetClusterTracks(itrack,c)>=0 && fgLayers[ilayer].GetClusterTracks(itrack,c)!=itrack1){
-                   sumchi2+=18.;  //shared cluster
-                   break;
-                 }
-               }
-               sumchi2+=btrack->GetDy(ilayer)*btrack->GetDy(ilayer)/(btrack->GetSigmaY(ilayer)*btrack->GetSigmaY(ilayer));
-               sumchi2+=btrack->GetDz(ilayer)*btrack->GetDz(ilayer)/(btrack->GetSigmaZ(ilayer)*btrack->GetSigmaZ(ilayer));            
-             }
-           }
-           sumchi2/=sumn;
-           if (sumchi2<minchi2before1) minchi2before1=sumchi2; 
-         }
-         continue;   //safety space - Geo manager will give exact layer           
-       }
-       track1b = btrack;
-       minchi2after1 = btrack->GetNormChi2(i);
-       break;
-      }
-      //
-      // position resolution - used for DCA cut
-      Float_t sigmad = track0b->GetSigmaY2()+track0b->GetSigmaZ2()+track1b->GetSigmaY2()+track1b->GetSigmaZ2()+
-       (track0b->GetX()-pvertex->GetRr())*(track0b->GetX()-pvertex->GetRr())*(track0b->GetSigmaSnp2()+track0b->GetSigmaTgl2())+
-       (track1b->GetX()-pvertex->GetRr())*(track1b->GetX()-pvertex->GetRr())*(track1b->GetSigmaSnp2()+track1b->GetSigmaTgl2());
-      sigmad =TMath::Sqrt(sigmad)+0.04;
-      if (pvertex->GetRr()>50){
-       Double_t cov0[15],cov1[15];
-       track0b->GetESDtrack()->GetInnerExternalCovariance(cov0);
-       track1b->GetESDtrack()->GetInnerExternalCovariance(cov1);
-       sigmad = cov0[0]+cov0[2]+cov1[0]+cov1[2]+
-         (80.-pvertex->GetRr())*(80.-pvertex->GetRr())*(cov0[5]+cov0[9])+
-         (80.-pvertex->GetRr())*(80.-pvertex->GetRr())*(cov1[5]+cov1[9]);
-       sigmad =TMath::Sqrt(sigmad)+0.05;
-      }
-      //       
-      AliV0 vertex2;
-      vertex2.SetParamN(*track0b);
-      vertex2.SetParamP(*track1b);
-      vertex2.Update(primvertex);
-      //Bo:      if (vertex2.GetDist2()<=pvertex->GetDist2()&&(vertex2.GetV0CosineOfPointingAngle()>=pvertex->GetV0CosineOfPointingAngle())){
-      if (vertex2.GetDcaV0Daughters()<=pvertex->GetDcaV0Daughters()&&(vertex2.GetV0CosineOfPointingAngle()>=pvertex->GetV0CosineOfPointingAngle())){
-       pvertex->SetParamN(*track0b);
-       pvertex->SetParamP(*track1b);
-       pvertex->Update(primvertex);
-       pvertex->SetClusters(track0b->ClIndex(),track1b->ClIndex());  // register clusters
-       pvertex->SetIndex(0,track0->GetESDtrack()->GetID());
-       pvertex->SetIndex(1,track1->GetESDtrack()->GetID());
-      }
-      pvertex->SetDistSigma(sigmad);
-      //Bo:      pvertex->SetDistNorm(pvertex->GetDist2()/sigmad);       
-      pvertex->SetNormDCAPrim(normdist[itrack0],normdist[itrack1]);
-      //
-      // define likelihhod and causalities
-      //
-      Float_t pa0=1, pa1=1, pb0=0.26, pb1=0.26;      
-      if (maxLayer<1){
-       Float_t fnorm0 = normdist[itrack0];
-       if (fnorm0<0) fnorm0*=-3;
-       Float_t fnorm1 = normdist[itrack1];
-       if (fnorm1<0) fnorm1*=-3;
-       if ((pvertex->GetAnglep()[2]>0.1) || ( (pvertex->GetRr()<10.5)&& pvertex->GetAnglep()[2]>0.05 ) || (pvertex->GetRr()<3)){
-         pb0    =  TMath::Exp(-TMath::Min(fnorm0,Float_t(16.))/12.);
-         pb1    =  TMath::Exp(-TMath::Min(fnorm1,Float_t(16.))/12.);
-       }
-       pvertex->SetChi2Before(normdist[itrack0]);
-       pvertex->SetChi2After(normdist[itrack1]);       
-       pvertex->SetNAfter(0);
-       pvertex->SetNBefore(0);
-      }else{
-       pvertex->SetChi2Before(minchi2before0);
-       pvertex->SetChi2After(minchi2before1);
-        if (pvertex->GetAnglep()[2]>0.1 || ( pvertex->GetRr()<10.5 && pvertex->GetAnglep()[2]>0.05) || pvertex->GetRr()<3){
-          pb0    =  TMath::Exp(-TMath::Min(minchi2before0,Float_t(16))/12.);
-          pb1    =  TMath::Exp(-TMath::Min(minchi2before1,Float_t(16))/12.);
-        }
-        pvertex->SetNAfter(maxLayer);
-        pvertex->SetNBefore(maxLayer);      
-      }
-      if (pvertex->GetRr()<90){
-       pa0  *= TMath::Min(track0->GetESDtrack()->GetTPCdensity(0,60),Double_t(1.));
-       pa1  *= TMath::Min(track1->GetESDtrack()->GetTPCdensity(0,60),Double_t(1.));
-      }
-      if (pvertex->GetRr()<20){
-       pa0  *= (0.2+TMath::Exp(-TMath::Min(minchi2after0,Float_t(16))/8.))/1.2;
-       pa1  *= (0.2+TMath::Exp(-TMath::Min(minchi2after1,Float_t(16))/8.))/1.2;
-      }
-      //
-      pvertex->SetCausality(pb0,pb1,pa0,pa1);
-      //
-      //  Likelihood calculations  - apply cuts
-      //         
-      Bool_t v0OK = kTRUE;
-      Float_t p12 = pvertex->GetParamP()->GetParameter()[4]*pvertex->GetParamP()->GetParameter()[4];
-      p12        += pvertex->GetParamN()->GetParameter()[4]*pvertex->GetParamN()->GetParameter()[4];
-      p12         = TMath::Sqrt(p12);                             // "mean" momenta
-      Float_t    sigmap0   = 0.0001+0.001/(0.1+pvertex->GetRr()); 
-      Float_t    sigmap    = 0.5*sigmap0*(0.6+0.4*p12);           // "resolution: of point angle - as a function of radius and momenta
-
-      Float_t causalityA  = (1.0-pvertex->GetCausalityP()[0])*(1.0-pvertex->GetCausalityP()[1]);
-      Float_t causalityB  = TMath::Sqrt(TMath::Min(pvertex->GetCausalityP()[2],Double_t(0.7))*
-                                       TMath::Min(pvertex->GetCausalityP()[3],Double_t(0.7)));
-      //
-      //Bo:      Float_t likelihood0 = (TMath::Exp(-pvertex->GetDistNorm())+0.1) *(pvertex->GetDist2()<0.5)*(pvertex->GetDistNorm()<5);
-      Float_t lDistNorm = pvertex->GetDcaV0Daughters()/pvertex->GetDistSigma();
-      Float_t likelihood0 = (TMath::Exp(-lDistNorm)+0.1) *(pvertex->GetDcaV0Daughters()<0.5)*(lDistNorm<5);
-
-      Float_t likelihood1 = TMath::Exp(-(1.0001-pvertex->GetV0CosineOfPointingAngle())/sigmap)+
-       0.4*TMath::Exp(-(1.0001-pvertex->GetV0CosineOfPointingAngle())/(4.*sigmap))+
-       0.4*TMath::Exp(-(1.0001-pvertex->GetV0CosineOfPointingAngle())/(8.*sigmap))+
-       0.1*TMath::Exp(-(1.0001-pvertex->GetV0CosineOfPointingAngle())/0.01);
-      //
-      if (causalityA<kCausality0Cut)                                          v0OK = kFALSE;
-      if (TMath::Sqrt(likelihood0*likelihood1)<kLikelihood01Cut)              v0OK = kFALSE;
-      if (likelihood1<kLikelihood1Cut)                                        v0OK = kFALSE;
-      if (TMath::Power(likelihood0*likelihood1*causalityB,0.33)<kCombinedCut) v0OK = kFALSE;
-      
-      //
-      //
-      if (kFALSE){     
-       Bool_t gold = TMath::Abs(TMath::Abs(track0->GetLabel())-TMath::Abs(track1->GetLabel()))==1;
-       cstream<<"It0"<<
-         "Tr0.="<<track0<<                       //best without constrain
-         "Tr1.="<<track1<<                       //best without constrain  
-         "Tr0B.="<<track0b<<                     //best without constrain  after vertex
-         "Tr1B.="<<track1b<<                     //best without constrain  after vertex 
-         "Tr0C.="<<htrackc0<<                    //best with constrain     if exist
-         "Tr1C.="<<htrackc1<<                    //best with constrain     if exist
-         "Tr0L.="<<track0l<<                     //longest best           
-         "Tr1L.="<<track1l<<                     //longest best
-         "Esd0.="<<track0->GetESDtrack()<<           // esd track0 params
-         "Esd1.="<<track1->GetESDtrack()<<           // esd track1 params
-         "V0.="<<pvertex<<                       //vertex properties
-         "V0b.="<<&vertex2<<                       //vertex properties at "best" track
-         "ND0="<<normdist[itrack0]<<             //normalize distance for track0
-         "ND1="<<normdist[itrack1]<<             //normalize distance for track1
-         "Gold="<<gold<<                         //
-         //      "RejectBase="<<rejectBase<<             //rejection in First itteration
-         "OK="<<v0OK<<
-         "rmin="<<rmin<<
-         "sigmad="<<sigmad<<
-         "\n";
-      }      
-      //if (rejectBase) continue;
-      //
-      pvertex->SetStatus(0);
-      //      if (rejectBase) {
-      //       pvertex->SetStatus(-100);
-      //}
-      if (pvertex->GetV0CosineOfPointingAngle()>kMinPointAngle2) {
-       //Bo:     pvertex->SetESDindexes(track0->GetESDtrack()->GetID(),track1->GetESDtrack()->GetID());
-       pvertex->SetIndex(0,track0->GetESDtrack()->GetID());//Bo: consistency 0 for neg
-       pvertex->SetIndex(1,track1->GetESDtrack()->GetID());//Bo: consistency 1 for pos
-       if (v0OK){
-         //      AliV0vertex vertexjuri(*track0,*track1);
-         //      vertexjuri.SetESDindexes(track0->fESDtrack->GetID(),track1->fESDtrack->GetID());
-         //      event->AddV0(&vertexjuri);
-         pvertex->SetStatus(100);
-       }
-        pvertex->SetOnFlyStatus(kTRUE);
-        pvertex->ChangeMassHypothesis(kK0Short);
-       event->AddV0(pvertex);
-      }
-    }
-  }
-  //
-  //
-  // delete temporary arrays
-  //  
-  delete[] forbidden;
-  delete[] minPointAngle;
-  delete[] maxr;
-  delete[] minr;
-  delete[] norm;
-  delete[] normdist;
-  delete[] normdist1;
-  delete[] normdist0;
-  delete[] dist;
-  delete[] itsmap;
-  delete[] helixes;
-  delete   pvertex;
-}
-//------------------------------------------------------------------------
-void AliITStrackerMI::RefitV02(const AliESDEvent *event)
-{
-  //
-  //try to refit  V0s in the third path of the reconstruction
-  //
-  TTreeSRedirector &cstream = *fDebugStreamer;
-  //
-  Int_t  nv0s = event->GetNumberOfV0s();
-  Float_t primvertex[3]={GetX(),GetY(),GetZ()};
-  AliV0 v0temp;
-  for (Int_t iv0 = 0; iv0<nv0s;iv0++){
-    AliV0 * v0mi = (AliV0*)event->GetV0(iv0);
-    if (!v0mi) continue;
-    Int_t     itrack0   = v0mi->GetIndex(0);
-    Int_t     itrack1   = v0mi->GetIndex(1);
-    AliESDtrack *esd0   = event->GetTrack(itrack0);
-    AliESDtrack *esd1   = event->GetTrack(itrack1);
-    if (!esd0||!esd1) continue;
-    AliITStrackMI tpc0(*esd0);  
-    AliITStrackMI tpc1(*esd1);
-    Double_t x,y,z; v0mi->GetXYZ(x,y,z); //I.B. 
-    Double_t alpha =TMath::ATan2(y,x);   //I.B.
-    if (v0mi->GetRr()>85){
-      if (tpc0.Propagate(alpha,v0mi->GetRr())&&tpc1.Propagate(alpha,v0mi->GetRr())){
-       v0temp.SetParamN(tpc0);
-       v0temp.SetParamP(tpc1);
-       v0temp.Update(primvertex);
-       if (kFALSE) cstream<<"Refit"<<
-         "V0.="<<v0mi<<
-         "V0refit.="<<&v0temp<<
-         "Tr0.="<<&tpc0<<
-         "Tr1.="<<&tpc1<<
-         "\n";
-       //Bo:   if (v0temp.GetDist2()<v0mi->GetDist2() || v0temp.GetV0CosineOfPointingAngle()>v0mi->GetV0CosineOfPointingAngle()){
-       if (v0temp.GetDcaV0Daughters()<v0mi->GetDcaV0Daughters() || v0temp.GetV0CosineOfPointingAngle()>v0mi->GetV0CosineOfPointingAngle()){
-         v0mi->SetParamN(tpc0);
-         v0mi->SetParamP(tpc1);
-         v0mi->Update(primvertex);
-       }
-      }
-      continue;
-    }
-    if (v0mi->GetRr()>35){
-      CorrectForTPCtoITSDeadZoneMaterial(&tpc0);
-      CorrectForTPCtoITSDeadZoneMaterial(&tpc1);
-      if (tpc0.Propagate(alpha,v0mi->GetRr())&&tpc1.Propagate(alpha,v0mi->GetRr())){
-       v0temp.SetParamN(tpc0);
-       v0temp.SetParamP(tpc1);
-       v0temp.Update(primvertex);
-       if (kFALSE) cstream<<"Refit"<<
-         "V0.="<<v0mi<<
-         "V0refit.="<<&v0temp<<
-         "Tr0.="<<&tpc0<<
-         "Tr1.="<<&tpc1<<
-         "\n";
-       //Bo:   if (v0temp.GetDist2()<v0mi->GetDist2() || v0temp.GetV0CosineOfPointingAngle()>v0mi->GetV0CosineOfPointingAngle()){
-       if (v0temp.GetDcaV0Daughters()<v0mi->GetDcaV0Daughters() || v0temp.GetV0CosineOfPointingAngle()>v0mi->GetV0CosineOfPointingAngle()){
-         v0mi->SetParamN(tpc0);
-         v0mi->SetParamP(tpc1);
-         v0mi->Update(primvertex);
-       }       
-      }
-      continue;
-    }
-    CorrectForTPCtoITSDeadZoneMaterial(&tpc0);
-    CorrectForTPCtoITSDeadZoneMaterial(&tpc1);    
-    //    if (tpc0.Propagate(alpha,v0mi->GetRr())&&tpc1.Propagate(alpha,v0mi->GetRr())){
-    if (RefitAt(v0mi->GetRr(),&tpc0, v0mi->GetClusters(0)) && RefitAt(v0mi->GetRr(),&tpc1, v0mi->GetClusters(1))){
-      v0temp.SetParamN(tpc0);
-      v0temp.SetParamP(tpc1);
-      v0temp.Update(primvertex);
-      if (kFALSE) cstream<<"Refit"<<
-       "V0.="<<v0mi<<
-       "V0refit.="<<&v0temp<<
-       "Tr0.="<<&tpc0<<
-       "Tr1.="<<&tpc1<<
-       "\n";
-      //Bo:      if (v0temp.GetDist2()<v0mi->GetDist2() || v0temp.GetV0CosineOfPointingAngle()>v0mi->GetV0CosineOfPointingAngle()){
-      if (v0temp.GetDcaV0Daughters()<v0mi->GetDcaV0Daughters() || v0temp.GetV0CosineOfPointingAngle()>v0mi->GetV0CosineOfPointingAngle()){
-       v0mi->SetParamN(tpc0);
-       v0mi->SetParamP(tpc1);
-       v0mi->Update(primvertex);
-      }        
-    }    
-  }
-}
-
 //------------------------------------------------------------------------
 void AliITStrackerMI::BuildMaterialLUT(TString material) {
   //--------------------------------------------------------------------
@@ -4833,6 +4108,13 @@ Int_t AliITStrackerMI::CorrectForShieldMaterial(AliITStrackMI *t,
     Error("CorrectForShieldMaterial"," Wrong shield name\n");
     return 0;
   }
+
+  // do nothing if we are already beyond the shield
+  Double_t rTrack = TMath::Sqrt(t->GetX()*t->GetX()+t->GetY()*t->GetY());
+  if(dir<0 && rTrack > rToGo) return 1; // going outward
+  if(dir>0 && rTrack < rToGo) return 1; // going inward
+
+
   Double_t xToGo;
   if (!t->GetLocalXat(rToGo,xToGo)) return 0;
 
@@ -5039,6 +4321,36 @@ void AliITStrackerMI::DeleteTrksMaterialLUT() {
   return;
 }
 //------------------------------------------------------------------------
+void AliITStrackerMI::SetForceSkippingOfLayer() {
+  //-----------------------------------------------------------------
+  // Check if we are forced to skip layers
+  // either we set to skip them in RecoParam
+  // or they were off during data-taking
+  //-----------------------------------------------------------------
+
+  const AliEventInfo *eventInfo = GetEventInfo();
+  
+  for(Int_t l=0; l<AliITSgeomTGeo::kNLayers; l++) {
+    fForceSkippingOfLayer[l] = 0;
+    // check reco param
+    if(AliITSReconstructor::GetRecoParam()->GetLayersToSkip(l)) fForceSkippingOfLayer[l] = 1;
+    // check run info
+
+    if(eventInfo && 
+       AliITSReconstructor::GetRecoParam()->GetSkipSubdetsNotInTriggerCluster()) {
+      AliDebug(2,Form("GetEventInfo->GetTriggerCluster: %s",eventInfo->GetTriggerCluster()));
+      if(l==0 || l==1)  {
+       if(!strstr(eventInfo->GetTriggerCluster(),"ITSSPD")) fForceSkippingOfLayer[l] = 1;
+      } else if(l==2 || l==3) {
+       if(!strstr(eventInfo->GetTriggerCluster(),"ITSSDD")) fForceSkippingOfLayer[l] = 1; 
+      } else {
+       if(!strstr(eventInfo->GetTriggerCluster(),"ITSSSD")) fForceSkippingOfLayer[l] = 1;
+      } 
+    }
+  }
+  return;
+}
+//------------------------------------------------------------------------
 Int_t AliITStrackerMI::CheckSkipLayer(const AliITStrackMI *track,
                                      Int_t ilayer,Int_t idet) const {
   //-----------------------------------------------------------------
@@ -5046,17 +4358,22 @@ Int_t AliITStrackerMI::CheckSkipLayer(const AliITStrackMI *track,
   // without clusters, because we want to skip the layer.
   // In this case the return value is > 0:
   // return 1: the user requested to skip a layer
-  // return 2: track outside z acceptance of SSD/SDD and will cross both SPD
+  // return 2: track outside z acceptance
   //-----------------------------------------------------------------
 
-  if (AliITSReconstructor::GetRecoParam()->GetLayersToSkip(ilayer)) return 1;
+  if (ForceSkippingOfLayer(ilayer)) return 1;
 
-  if (idet<0 && ilayer>1 && AliITSReconstructor::GetRecoParam()->GetExtendedEtaAcceptance()) {
+  Int_t innerLayCanSkip=0; // was 2, changed on 05.11.2009
+
+  if (idet<0 &&  // out in z
+      ilayer>innerLayCanSkip && 
+      AliITSReconstructor::GetRecoParam()->GetExtendedEtaAcceptance()) {
     // check if track will cross SPD outer layer
     Double_t phiAtSPD2,zAtSPD2;
     if (track->GetPhiZat(fgLayers[1].GetR(),phiAtSPD2,zAtSPD2)) {
       if (TMath::Abs(zAtSPD2)<2.*AliITSRecoParam::GetSPDdetzlength()) return 2;
     }
+    return 2; // always allow skipping, changed on 05.11.2009
   }
 
   return 0;
@@ -5071,8 +4388,10 @@ Int_t AliITStrackerMI::CheckDeadZone(AliITStrackMI *track,
   // without clusters, because there is a dead zone in the road.
   // In this case the return value is > 0:
   // return 1: dead zone at z=0,+-7cm in SPD
+  //     This method assumes that fSPDdetzcentre is ordered from -z to +z
   // return 2: all road is "bad" (dead or noisy) from the OCDB
-  // return 3: something "bad" (dead or noisy) from the OCDB
+  // return 3: at least a chip is "bad" (dead or noisy) from the OCDB
+  // return 4: at least a single channel is "bad" (dead or noisy) from the OCDB
   //-----------------------------------------------------------------
 
   // check dead zones at z=0,+-7cm in the SPD
@@ -5085,8 +4404,8 @@ Int_t AliITStrackerMI::CheckDeadZone(AliITStrackMI *track,
                          fSPDdetzcentre[3] - 0.5*AliITSRecoParam::GetSPDdetzlength()};
     for (Int_t i=0; i<3; i++)
       if (track->GetZ()-dz<zmaxdead[i] && track->GetZ()+dz>zmindead[i]) {
-       AliDebug(2,Form("crack SPD %d",ilayer));
-       return 1; 
+       AliDebug(2,Form("crack SPD %d track z %f   %f   %f  %f\n",ilayer,track->GetZ(),dz,zmaxdead[i],zmindead[i]));
+       if (GetSPDDeadZoneProbability(track->GetZ(),TMath::Sqrt(track->GetSigmaZ2()))>0.1) return 1; 
       } 
   }
 
@@ -5123,10 +4442,10 @@ Int_t AliITStrackerMI::CheckDeadZone(AliITStrackMI *track,
 
   // check if road goes out of detector
   Bool_t touchNeighbourDet=kFALSE; 
-  if (TMath::Abs(xlocmin)>0.5*detSizeX) {xlocmin=-0.5*detSizeX; touchNeighbourDet=kTRUE;} 
-  if (TMath::Abs(xlocmax)>0.5*detSizeX) {xlocmax=+0.5*detSizeX; touchNeighbourDet=kTRUE;} 
-  if (TMath::Abs(zlocmin)>0.5*detSizeZ) {zlocmin=-0.5*detSizeZ; touchNeighbourDet=kTRUE;} 
-  if (TMath::Abs(zlocmax)>0.5*detSizeZ) {zlocmax=+0.5*detSizeZ; touchNeighbourDet=kTRUE;} 
+  if (TMath::Abs(xlocmin)>0.5*detSizeX) {xlocmin=-0.4999*detSizeX; touchNeighbourDet=kTRUE;} 
+  if (TMath::Abs(xlocmax)>0.5*detSizeX) {xlocmax=+0.4999*detSizeX; touchNeighbourDet=kTRUE;} 
+  if (TMath::Abs(zlocmin)>0.5*detSizeZ) {zlocmin=-0.4999*detSizeZ; touchNeighbourDet=kTRUE;} 
+  if (TMath::Abs(zlocmax)>0.5*detSizeZ) {zlocmax=+0.4999*detSizeZ; touchNeighbourDet=kTRUE;} 
   AliDebug(2,Form("layer %d det %d zmim zmax %f %f xmin xmax %f %f   %f %f",ilayer,idet,zlocmin,zlocmax,xlocmin,xlocmax,detSizeZ,detSizeX));
 
   // check if this detector is bad
@@ -5170,18 +4489,17 @@ Int_t AliITStrackerMI::CheckDeadZone(AliITStrackMI *track,
 
 
   if (!AliITSReconstructor::GetRecoParam()->GetUseSingleBadChannelsFromOCDB()
-      || ilayer==4 || ilayer==5     // SSD
       || !noClusters) return 0;
 
   // There are no clusters in road: check if there is at least 
-  // a bad SPD pixel or SDD anode 
+  // a bad SPD pixel or SDD anode or SSD strips on both sides
 
   Int_t idetInITS=idet;
   for(Int_t l=0;l<ilayer;l++) idetInITS+=AliITSgeomTGeo::GetNLadders(l+1)*AliITSgeomTGeo::GetNDetectors(l+1);
 
   if (fITSChannelStatus->AnyBadInRoad(idetInITS,zlocmin,zlocmax,xlocmin,xlocmax)) {
     AliDebug(2,Form("Bad channel in det %d of layer %d\n",idet,ilayer));
-    return 3;
+    return 4;
   }
   //if (fITSChannelStatus->FractionOfBadInRoad(idet,zlocmin,zlocmax,xlocmin,xlocmax) > AliITSReconstructor::GetRecoParam()->GetMinFractionOfBadInRoad()) return 3;
 
@@ -5198,7 +4516,7 @@ Bool_t AliITStrackerMI::LocalModuleCoord(Int_t ilayer,Int_t idet,
   xloc=0.; 
   zloc=0.;
 
-  if(idet<0) return kFALSE;
+  if(idet<0) return kTRUE; // track out of z acceptance of layer
 
   Int_t ndet=AliITSgeomTGeo::GetNDetectors(ilayer+1); // layers from 1 to 6 
 
@@ -5482,3 +4800,4 @@ void AliITStrackerMI::UseTrackForPlaneEff(const AliITStrackMI* track, Int_t ilay
   }
 return;
 }
+