]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - TOF/AliTOFtracker.cxx
Added macro to lauch TOF QA task with extended functionality via plugin
[u/mrichter/AliRoot.git] / TOF / AliTOFtracker.cxx
index 9b642f24221076cb7bfcd16949f3cdfc6ce5a139..a711dcf26577a38ac6d7675433d683eab77c6145 100644 (file)
  * about the suitability of this software for any purpose. It is          *
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
-// AliTOFtracker Class
-// Task: Perform association of the ESD tracks to TOF Clusters
-// and Update ESD track with associated TOF Cluster parameters 
-//
-// -- Authors : S. Arcelli, C. Zampolli (Bologna University and INFN) 
-// -- Contacts: Annalisa.De.Caro@cern.ch
-// --         : Chiara.Zampolli@bo.infn.it
-// --         : Silvia.Arcelli@bo.infn.it
-//--------------------------------------------------------------------
+
+//--------------------------------------------------------------------//
+//                                                                    //
+// AliTOFtracker Class                                                //
+// Task: Perform association of the ESD tracks to TOF Clusters        //
+// and Update ESD track with associated TOF Cluster parameters        //
+//                                                                    //
+// -- Authors : S. Arcelli, C. Zampolli (Bologna University and INFN) //
+// -- Contacts: Annalisa.De.Caro@cern.ch                              //
+// --         : Chiara.Zampolli@bo.infn.it                            //
+// --         : Silvia.Arcelli@bo.infn.it                             //
+//                                                                    //
+//--------------------------------------------------------------------//
 
 #include <Rtypes.h>
-#include "AliTOFtracker.h"
-#include "AliTOFtrack.h"
-#include "TClonesArray.h"
+#include <TROOT.h>
+
+#include <TSeqCollection.h>
+#include <TClonesArray.h>
+#include <TObjArray.h>
+#include <TGeoManager.h>
+#include <TTree.h>
+#include <TFile.h>
+#include <TH2F.h>
+
+#include "AliGeomManager.h"
+#include "AliESDtrack.h"
+#include "AliESDEvent.h"
+#include "AliESDpid.h"
 #include "AliLog.h"
-#include "AliTOFdigit.h"
+#include "AliTrackPointArray.h"
+#include "AliCDBManager.h"
+
+//#include "AliTOFpidESD.h"
+#include "AliTOFRecoParam.h"
+#include "AliTOFReconstructor.h"
+#include "AliTOFcluster.h"
 #include "AliTOFGeometry.h"
-#include "AliRun.h"
-#include "AliModule.h"
+#include "AliTOFtracker.h"
+#include "AliTOFtrack.h"
+
+extern TGeoManager *gGeoManager;
+extern TROOT *gROOT;
+
 
 ClassImp(AliTOFtracker)
 
 //_____________________________________________________________________________
-AliTOFtracker::AliTOFtracker(AliTOFGeometry * geom, Double_t parPID[2]) { 
+AliTOFtracker::AliTOFtracker():
+  fkRecoParam(0x0),
+  fGeom(0x0),
+  fN(0),
+  fNseeds(0),
+  fNseedsTOF(0),
+  fngoodmatch(0),
+  fnbadmatch(0),
+  fnunmatch(0),
+  fnmatch(0),
+  fTracks(new TClonesArray("AliTOFtrack")),
+  fSeeds(new TObjArray(100)),
+  fTOFtrackPoints(new TObjArray(10)),
+  fHDigClusMap(0x0),
+  fHDigNClus(0x0),
+  fHDigClusTime(0x0),
+  fHDigClusToT(0x0),
+  fHRecNClus(0x0),
+  fHRecDist(0x0),
+  fHRecSigYVsP(0x0),
+  fHRecSigZVsP(0x0),
+  fHRecSigYVsPWin(0x0),
+  fHRecSigZVsPWin(0x0),
+  fCalTree(0x0),
+  fIch(-1),
+  fToT(-1.),
+  fTime(-1.),
+  fExpTimePi(-1.),
+  fExpTimeKa(-1.),
+  fExpTimePr(-1.)
+{
   //AliTOFtracker main Ctor
 
-  fHoles=true;
-  fNseeds=0;
-  fNseedsTOF=0;
-  fngoodmatch=0;
-  fnbadmatch=0;
-  fnunmatch=0;
-  fnmatch=0;
-  fGeom = geom;
-  fTOFpid = new AliTOFpidESD(parPID);
-  fR=378.; 
-  fTOFHeigth=15.3;  
-  fdCut=3.; 
-  fDy=AliTOFGeometry::XPad(); 
-  fDz=AliTOFGeometry::ZPad(); 
-  fDx=1.5; 
-  fSeeds=0x0;
-  fTracks=0x0;
-  fN=0;
-  Init(); // temporary solution to know about Holes/no Holes
-}
-//_____________________________________________________________________________
-AliTOFtracker::AliTOFtracker(const AliTOFtracker &t):AliTracker() { 
-  //AliTOFtracker copy Ctor
-
-  fHoles=t.fHoles;
-  fNseeds=t.fNseeds;
-  fNseedsTOF=t.fNseedsTOF;
-  fngoodmatch=t.fngoodmatch;
-  fnbadmatch=t.fnbadmatch;
-  fnunmatch=t.fnunmatch;
-  fnmatch=t.fnmatch;
-  fGeom = t.fGeom;
-  fTOFpid = t.fTOFpid;
-  fR=t.fR; 
-  fTOFHeigth=t.fTOFHeigth;  
-  fdCut=t.fdCut; 
-  fDy=t.fDy; 
-  fDz=t.fDz; 
-  fDx=1.5; 
-  fSeeds=t.fSeeds;
-  fTracks=t.fTracks;
-  fN=t.fN;
+  for (Int_t ii=0; ii<kMaxCluster; ii++) fClusters[ii]=0x0;
+
+  // Getting the geometry
+  fGeom = new AliTOFGeometry();
+
+  InitCheckHists();
+
 }
 //_____________________________________________________________________________
-void AliTOFtracker::Init() { 
-
-// temporary solution to know about Holes/no Holes, will be implemented as 
-// an AliTOFGeometry getter
+AliTOFtracker::~AliTOFtracker() {
+  //
+  // Dtor
+  //
 
-  AliModule* frame=gAlice->GetModule("FRAME"); 
+  SaveCheckHists();
 
-  if(!frame) {
-    AliError("Could Not load FRAME! Assume Frame with Holes");
-    fHoles=true;
-  } else{
-    if(frame->IsVersion()==1) {fHoles=false;}    
-    else {fHoles=true;}      
+  if(!(AliCDBManager::Instance()->GetCacheFlag())){
+    delete fkRecoParam;
+  }
+  delete fGeom; 
+  delete fHDigClusMap;
+  delete fHDigNClus;
+  delete fHDigClusTime;
+  delete fHDigClusToT;
+  delete fHRecNClus;
+  delete fHRecDist;
+  delete fHRecSigYVsP;
+  delete fHRecSigZVsP;
+  delete fHRecSigYVsPWin;
+  delete fHRecSigZVsPWin;
+  delete fCalTree;
+  if (fTracks){
+    fTracks->Delete();
+    delete fTracks;
+    fTracks=0x0;
+  }
+  if (fSeeds){
+    fSeeds->Delete();
+    delete fSeeds;
+    fSeeds=0x0;
+  }
+  if (fTOFtrackPoints){
+    fTOFtrackPoints->Delete();
+    delete fTOFtrackPoints;
+    fTOFtrackPoints=0x0;
   }
+
+  for (Int_t ii=0; ii<kMaxCluster; ii++)
+    if (fClusters[ii]) fClusters[ii]->Delete();
+
 }
 //_____________________________________________________________________________
-Int_t AliTOFtracker::PropagateBack(AliESD* event) {
+void AliTOFtracker::GetPidSettings(AliESDpid *esdPID) {
+  // 
+  // Sets TOF resolution from RecoParams
+  //
+  if (fkRecoParam)
+    esdPID->GetTOFResponse().SetTimeResolution(fkRecoParam->GetTimeResolution());
+  else
+    AliWarning("fkRecoParam not yet set; cannot set PID settings");
+} 
+//_____________________________________________________________________________
+Int_t AliTOFtracker::PropagateBack(AliESDEvent * const event) {
   //
   // Gets seeds from ESD event and Match with TOF Clusters
   //
 
+  // initialize RecoParam for current event
+  AliDebug(1,"Initializing params for TOF");
+
+  fkRecoParam = AliTOFReconstructor::GetRecoParam();  // instantiate reco param from STEER...
+
+  if (fkRecoParam == 0x0) { 
+    AliFatal("No Reco Param found for TOF!!!");
+  }
+  //fkRecoParam->Dump();
+  //if(fkRecoParam->GetApplyPbPbCuts())fkRecoParam=fkRecoParam->GetPbPbparam();
+  //fkRecoParam->PrintParameters();
 
   //Initialise some counters
 
@@ -115,16 +183,11 @@ Int_t AliTOFtracker::PropagateBack(AliESD* event) {
 
   Int_t ntrk=event->GetNumberOfTracks();
   fNseeds = ntrk;
-  fSeeds= new TClonesArray("AliESDtrack");
-  TClonesArray &aESDTrack = *fSeeds;
 
 
   //Load ESD tracks into a local Array of ESD Seeds
-
-  for (Int_t i=0; i<fNseeds; i++) {
-    AliESDtrack *t=event->GetTrack(i);
-    new(aESDTrack[i]) AliESDtrack(*t);
-  }
+  for (Int_t i=0; i<fNseeds; i++)
+    fSeeds->AddLast(event->GetTrack(i));
 
   //Prepare ESD tracks candidates for TOF Matching
   CollectESD();
@@ -135,232 +198,556 @@ Int_t AliTOFtracker::PropagateBack(AliESD* event) {
   //Second Step with Looser Matching Criterion
   MatchTracks(kTRUE);
 
-  AliInfo(Form("Number of matched tracks: %d",fnmatch));
-  AliInfo(Form("Number of good matched tracks: %d",fngoodmatch));
-  AliInfo(Form("Number of bad  matched tracks: %d",fnbadmatch));
+  AliInfo(Form("Number of matched tracks = %d (good = %d, bad = %d)",fnmatch,fngoodmatch,fnbadmatch));
 
   //Update the matched ESD tracks
 
   for (Int_t i=0; i<ntrk; i++) {
     AliESDtrack *t=event->GetTrack(i);
-    AliESDtrack *seed =(AliESDtrack*)fSeeds->UncheckedAt(i);
-    if(seed->GetTOFsignal()>0){
-      t->SetTOFsignal(seed->GetTOFsignal());
-      t->SetTOFcluster(seed->GetTOFcluster());
-      AliTOFtrack *track = new AliTOFtrack(*seed); 
-      t->UpdateTrackParams(track,AliESDtrack::kTOFout);    
-      delete track;
+    AliESDtrack *seed =(AliESDtrack*)fSeeds->At(i);
+
+    if ( (seed->GetStatus()&AliESDtrack::kTOFin)!=0 ) {
+      t->SetStatus(AliESDtrack::kTOFin);
+      //if(seed->GetTOFsignal()>0){
+      if ( (seed->GetStatus()&AliESDtrack::kTOFout)!=0 ) {
+       t->SetStatus(AliESDtrack::kTOFout);
+       t->SetTOFsignal(seed->GetTOFsignal());
+       t->SetTOFcluster(seed->GetTOFcluster());
+       t->SetTOFsignalToT(seed->GetTOFsignalToT());
+       t->SetTOFsignalRaw(seed->GetTOFsignalRaw());
+       t->SetTOFsignalDz(seed->GetTOFsignalDz());
+       t->SetTOFsignalDx(seed->GetTOFsignalDx());
+       t->SetTOFDeltaBC(seed->GetTOFDeltaBC());
+       t->SetTOFL0L1(seed->GetTOFL0L1());
+       t->SetTOFCalChannel(seed->GetTOFCalChannel());
+       Int_t tlab[3]; seed->GetTOFLabel(tlab);    
+       t->SetTOFLabel(tlab);
+
+       Double_t alphaA = (Double_t)t->GetAlpha();
+       Double_t xA = (Double_t)t->GetX();
+       Double_t yA = (Double_t)t->GetY();
+       Double_t zA = (Double_t)t->GetZ();
+       Double_t p1A = (Double_t)t->GetSnp();
+       Double_t p2A = (Double_t)t->GetTgl();
+       Double_t p3A = (Double_t)t->GetSigned1Pt();
+       const Double_t *covA = (Double_t*)t->GetCovariance();
+
+       // Make attention, please:
+       //      AliESDtrack::fTOFInfo array does not be stored in the AliESDs.root file
+       //      it is there only for a check during the reconstruction step.
+       Float_t info[10]; seed->GetTOFInfo(info);
+       t->SetTOFInfo(info);
+       AliDebug(3,Form(" distance=%f; residual in the pad reference frame: dX=%f, dZ=%f", info[0],info[1],info[2]));
+
+       // Check done:
+       //       by calling the AliESDtrack::UpdateTrackParams,
+       //       the current track parameters are changed
+       //       and it could cause refit problems.
+       //       We need to update only the following track parameters:
+        //            the track length and expected times.
+       //       Removed AliESDtrack::UpdateTrackParams call
+       //       Called AliESDtrack::SetIntegratedTimes(...) and
+       //       AliESDtrack::SetIntegratedLength() routines.
+       /*
+         AliTOFtrack *track = new AliTOFtrack(*seed);
+         t->UpdateTrackParams(track,AliESDtrack::kTOFout); // to be checked - AdC
+         delete track;
+         Double_t time[10]; t->GetIntegratedTimes(time);
+       */
+
+       Double_t time[10]; seed->GetIntegratedTimes(time);
+       t->SetIntegratedTimes(time);
+
+       Double_t length =  seed->GetIntegratedLength();
+       t->SetIntegratedLength(length);
+
+       Double_t alphaB = (Double_t)t->GetAlpha();
+       Double_t xB = (Double_t)t->GetX();
+       Double_t yB = (Double_t)t->GetY();
+       Double_t zB = (Double_t)t->GetZ();
+       Double_t p1B = (Double_t)t->GetSnp();
+       Double_t p2B = (Double_t)t->GetTgl();
+       Double_t p3B = (Double_t)t->GetSigned1Pt();
+       const Double_t *covB = (Double_t*)t->GetCovariance();
+       AliDebug(2,"Track params -now(before)-:");
+       AliDebug(2,Form("    X: %f(%f), Y: %f(%f), Z: %f(%f) --- alpha: %f(%f)",
+                       xB,xA,
+                       yB,yA,
+                       zB,zA,
+                       alphaB,alphaA));
+       AliDebug(2,Form("    p1: %f(%f), p2: %f(%f), p3: %f(%f)",
+                       p1B,p1A,
+                       p2B,p2A,
+                       p3B,p3A));
+       AliDebug(2,Form("    cov1: %f(%f), cov2: %f(%f), cov3: %f(%f)"
+                       " cov4: %f(%f), cov5: %f(%f), cov6: %f(%f)"
+                       " cov7: %f(%f), cov8: %f(%f), cov9: %f(%f)"
+                       " cov10: %f(%f), cov11: %f(%f), cov12: %f(%f)"
+                       " cov13: %f(%f), cov14: %f(%f), cov15: %f(%f)",
+                       covB[0],covA[0],
+                       covB[1],covA[1],
+                       covB[2],covA[2],
+                       covB[3],covA[3],
+                       covB[4],covA[4],
+                       covB[5],covA[5],
+                       covB[6],covA[6],
+                       covB[7],covA[7],
+                       covB[8],covA[8],
+                       covB[9],covA[9],
+                       covB[10],covA[10],
+                       covB[11],covA[11],
+                       covB[12],covA[12],
+                       covB[13],covA[13],
+                       covB[14],covA[14]
+                       ));
+       AliDebug(3,Form(" TOF params: %6d  %f %f %f %f %f %6d %3d %f  %f %f %f %f %f",
+                       i,
+                       t->GetTOFsignalRaw(),
+                       t->GetTOFsignal(),
+                       t->GetTOFsignalToT(),
+                       t->GetTOFsignalDz(),
+                       t->GetTOFsignalDx(),
+                       t->GetTOFCalChannel(),
+                       t->GetTOFcluster(),
+                       t->GetIntegratedLength(),
+                       time[0], time[1], time[2], time[3], time[4]
+                       )
+                );
+      }
     }
   }
 
-
   //Make TOF PID
-  fTOFpid->MakePID(event);
+  // Now done in AliESDpid
+  // fPid->MakePID(event,timeZero);
 
-  if (fSeeds) {
-    fSeeds->Delete();
-    delete fSeeds;
-    fSeeds = 0x0;
-  }
-  if (fTracks) {
-    fTracks->Delete();
-    delete fTracks;
-    fTracks = 0x0;
-  }
+  fSeeds->Clear();
+  //fTracks->Delete();
+  fTracks->Clear();
   return 0;
   
 }
 //_________________________________________________________________________
 void AliTOFtracker::CollectESD() {
    //prepare the set of ESD tracks to be matched to clusters in TOF
+
+  Int_t seedsTOF1=0;
+  Int_t seedsTOF3=0;
+  Int_t seedsTOF2=0;
  
-  fTracks= new TClonesArray("AliTOFtrack");
   TClonesArray &aTOFTrack = *fTracks;
   for (Int_t i=0; i<fNseeds; i++) {
 
-    AliESDtrack *t =(AliESDtrack*)fSeeds->UncheckedAt(i);
+    AliESDtrack *t =(AliESDtrack*)fSeeds->At(i);
     if ((t->GetStatus()&AliESDtrack::kTPCout)==0)continue;
 
-    // TRD good tracks, already propagated at 371 cm
-
     AliTOFtrack *track = new AliTOFtrack(*t); // New
-    Double_t x = track->GetX(); //New
-
-    if (((t->GetStatus()&AliESDtrack::kTRDout)!=0 ) && 
-        ( x >= AliTOFGeometry::RinTOF()) ){
-      track->SetSeedIndex(i);
-      t->UpdateTrackParams(track,AliESDtrack::kTOFout);    
-      new(aTOFTrack[fNseedsTOF]) AliTOFtrack(*track);
-      fNseedsTOF++;
-      delete track;
+    Float_t x = (Float_t)track->GetX(); //New
+
+    // TRD 'good' tracks
+    if ( ( (t->GetStatus()&AliESDtrack::kTRDout)!=0 ) ) {
+
+      AliDebug(1,Form(" Before propagation till inner TOF radius, ESDtrackLength=%f, TOFtrackLength=%f",t->GetIntegratedLength(),track->GetIntegratedLength()));
+
+      // TRD 'good' tracks, already propagated at 371 cm
+      if( x >= AliTOFGeometry::Rmin() ) {
+
+       if  ( track->PropagateToInnerTOF() ) {
+
+         AliDebug(1,Form(" TRD propagated track till rho = %fcm."
+                         " And then the track has been propagated till rho = %fcm.",
+                         x, (Float_t)track->GetX()));
+
+         track->SetSeedIndex(i);
+         t->UpdateTrackParams(track,AliESDtrack::kTOFin);
+         new(aTOFTrack[fNseedsTOF]) AliTOFtrack(*track);
+         fNseedsTOF++;
+         seedsTOF1++;
+
+         AliDebug(1,Form(" After propagation till inner TOF radius, ESDtrackLength=%f, TOFtrackLength=%f",t->GetIntegratedLength(),track->GetIntegratedLength()));
+       }
+       delete track;
+
+      }
+      else { // TRD 'good' tracks, propagated rho<371cm
+
+       if  ( track->PropagateToInnerTOF() ) {
+
+         AliDebug(1,Form(" TRD propagated track till rho = %fcm."
+                         " And then the track has been propagated till rho = %fcm.",
+                         x, (Float_t)track->GetX()));
+
+         track->SetSeedIndex(i);
+         t->UpdateTrackParams(track,AliESDtrack::kTOFin);
+         new(aTOFTrack[fNseedsTOF]) AliTOFtrack(*track);
+         fNseedsTOF++;
+         seedsTOF3++;
+
+         AliDebug(1,Form(" After propagation till inner TOF radius, ESDtrackLength=%f, TOFtrackLength=%f",t->GetIntegratedLength(),track->GetIntegratedLength()));
+       }
+       delete track;
+
+      }
+      //delete track;
     }
 
-    // Propagate the rest of TPCbp  
+    else { // Propagate the rest of TPCbp
+
+      AliDebug(1,Form(" Before propagation till inner TOF radius, ESDtrackLength=%f, TOFtrackLength=%f",t->GetIntegratedLength(),track->GetIntegratedLength()));
+
+      if ( track->PropagateToInnerTOF() ) { 
+
+       AliDebug(1,Form(" TPC propagated track till rho = %fcm."
+                       " And then the track has been propagated till rho = %fcm.",
+                       x, (Float_t)track->GetX()));
 
-    else {
-      if(track->PropagateToInnerTOF(fHoles)){ // temporary solution
-       //      if(track->PropagateToInnerTOF(fGeom->GetHoles())){
        track->SetSeedIndex(i);
-       t->UpdateTrackParams(track,AliESDtrack::kTOFout);    
+       t->UpdateTrackParams(track,AliESDtrack::kTOFin);
        new(aTOFTrack[fNseedsTOF]) AliTOFtrack(*track);
        fNseedsTOF++;
+       seedsTOF2++;
+
+       AliDebug(1,Form(" After propagation till inner TOF radius, ESDtrackLength=%f, TOFtrackLength=%f",t->GetIntegratedLength(),track->GetIntegratedLength()));
       }
       delete track;
     }
   }
 
+  AliInfo(Form("Number of TOF seeds = %d (kTRDout371 = %d, kTRDoutLess371 = %d, !kTRDout = %d)",fNseedsTOF,seedsTOF1,seedsTOF3,seedsTOF2));
+
   // Sort according uncertainties on track position 
   fTracks->Sort();
 
 }
+
 //_________________________________________________________________________
 void AliTOFtracker::MatchTracks( Bool_t mLastStep){
 
+  // Parameters used/regulating the reconstruction
+
+  //static Float_t corrLen=0.;//0.75;
+  static Float_t detDepth=18.;
+  static Float_t padDepth=0.5;
+
+  const Float_t kSpeedOfLight= 2.99792458e-2; // speed of light [cm/ps]
+  const Float_t kTimeOffset = 0.; // time offset for tracking algorithm [ps]
+
+  Float_t dY=AliTOFGeometry::XPad(); 
+  Float_t dZ=AliTOFGeometry::ZPad(); 
+
+  Float_t sensRadius = fkRecoParam->GetSensRadius();
+  Float_t stepSize   = fkRecoParam->GetStepSize();
+  Float_t scaleFact  = fkRecoParam->GetWindowScaleFact();
+  Float_t dyMax=fkRecoParam->GetWindowSizeMaxY(); 
+  Float_t dzMax=fkRecoParam->GetWindowSizeMaxZ();
+  Float_t dCut=fkRecoParam->GetDistanceCut();
+  if (dCut==3. && fNseedsTOF<=10) {
+    dCut=10.;
+    AliInfo(Form("Matching window=%f, since low multiplicity event (fNseedsTOF=%d)",
+                dCut, fNseedsTOF));
+  }
+  Double_t maxChi2=fkRecoParam->GetMaxChi2TRD();
+  Bool_t timeWalkCorr    = fkRecoParam->GetTimeWalkCorr();
+  if(!mLastStep){
+    AliDebug(1,"++++++++++++++TOF Reconstruction Parameters:++++++++++++ \n");
+    AliDebug(1,Form("TOF sens radius: %f",sensRadius));
+    AliDebug(1,Form("TOF step size: %f",stepSize));
+    AliDebug(1,Form("TOF Window scale factor: %f",scaleFact));
+    AliDebug(1,Form("TOF Window max dy: %f",dyMax));
+    AliDebug(1,Form("TOF Window max dz: %f",dzMax));
+    AliDebug(1,Form("TOF distance Cut: %f",dCut));
+    AliDebug(1,Form("TOF Max Chi2: %f",maxChi2));
+    AliDebug(1,Form("Time Walk Correction? : %d",timeWalkCorr));   
+  }
+
   //Match ESD tracks to clusters in TOF
 
-  static const Double_t kMasses[]={
-    0.000511, 0.105658, 0.139570, 0.493677, 0.938272, 1.875613
-  };
-  
-  Int_t nSteps=(Int_t)(fTOFHeigth/0.1);
+  // Get the number of propagation steps
+  Int_t nSteps=(Int_t)(detDepth/stepSize);
+  AliDebug(1,Form(" Number of steps to be done %d",nSteps));
 
   //PH Arrays (moved outside of the loop)
   Float_t * trackPos[4];
   for (Int_t ii=0; ii<4; ii++) trackPos[ii] = new Float_t[nSteps];
-  Int_t * clind[6];
-  for (Int_t ii=0;ii<6;ii++) clind[ii] = new Int_t[fN];
+  Int_t * clind = new Int_t[fN];
   
-  for (Int_t i=0; i<fNseedsTOF; i++) {
+  // Some init
+  const Int_t kNclusterMax = 1000; // related to fN value
+  TGeoHMatrix global[kNclusterMax];
 
-    AliTOFtrack *track =(AliTOFtrack*)fTracks->UncheckedAt(i);
-    AliESDtrack *t =(AliESDtrack*)fSeeds->UncheckedAt(track->GetSeedIndex());
-    if(t->GetTOFsignal()>0. ) continue;
-    AliTOFtrack *trackTOFin =new AliTOFtrack(*track);
+  //The matching loop
+  for (Int_t iseed=0; iseed<fNseedsTOF; iseed++) {
 
-    // Some init 
+    fTOFtrackPoints->Delete();
 
-    Int_t         index[10000];
-    Float_t        dist[10000];
-    Float_t       cxpos[10000];
-    Float_t       crecL[10000];
-     
-    // Determine a window around the track
+    for (Int_t ii=0; ii<kNclusterMax; ii++)
+      global[ii] = 0x0;
+    AliTOFtrack *track =(AliTOFtrack*)fTracks->UncheckedAt(iseed);
+    AliESDtrack *t =(AliESDtrack*)fSeeds->At(track->GetSeedIndex());
+    //if ( t->GetTOFsignal()>0. ) continue;
+    if ( (t->GetStatus()&AliESDtrack::kTOFout)!=0 ) continue;
+    AliTOFtrack *trackTOFin = new AliTOFtrack(*track);
 
+    // Determine a window around the track
     Double_t x,par[5]; 
     trackTOFin->GetExternalParameters(x,par);
     Double_t cov[15]; 
     trackTOFin->GetExternalCovariance(cov);
-    Float_t scalefact=3.;    
+
+    if (cov[0]<0. || cov[2]<0.) {
+      AliWarning(Form("Very strange track (%d)! At least one of its covariance matrix diagonal elements is negative!",iseed));
+      //delete trackTOFin;
+      //continue;
+    }
+
     Double_t dphi=
-      scalefact*
-      ((5*TMath::Sqrt(cov[0]) + 0.5*fDy + 2.5*TMath::Abs(par[2]))/fR); 
+      scaleFact*
+      ((5*TMath::Sqrt(TMath::Abs(cov[0])) + 0.5*dY + 2.5*TMath::Abs(par[2]))/sensRadius); 
     Double_t dz=
-      scalefact*
-      (5*TMath::Sqrt(cov[2]) + 0.5*fDz + 2.5*TMath::Abs(par[3]));
-    
+       scaleFact*
+       (5*TMath::Sqrt(TMath::Abs(cov[2])) + 0.5*dZ + 2.5*TMath::Abs(par[3]));
+
     Double_t phi=TMath::ATan2(par[0],x) + trackTOFin->GetAlpha();
     if (phi<-TMath::Pi())phi+=2*TMath::Pi();
     if (phi>=TMath::Pi())phi-=2*TMath::Pi();
     Double_t z=par[1];   
 
-    Int_t nc=0;
-    
-    // find the clusters in the window of the track
+    //upper limit on window's size.
+    if (dz> dzMax) dz=dzMax;
+    if (dphi*sensRadius> dyMax) dphi=dyMax/sensRadius;
+
 
+    // find the clusters in the window of the track
+    Int_t nc=0;
     for (Int_t k=FindClusterIndex(z-dz); k<fN; k++) {
+
+      if (nc>=kNclusterMax) {
+       AliWarning("No more matchable clusters can be stored! Please, increase the corresponding vectors size.");
+       break;
+      }
+
       AliTOFcluster *c=fClusters[k];
       if (c->GetZ() > z+dz) break;
       if (c->IsUsed()) continue;
-      
+      if (!c->GetStatus()) {
+       AliDebug(1,"Cluster in channel declared bad!");
+       continue; // skip bad channels as declared in OCDB
+      }
+
       Double_t dph=TMath::Abs(c->GetPhi()-phi);
       if (dph>TMath::Pi()) dph-=2.*TMath::Pi();
       if (TMath::Abs(dph)>dphi) continue;
-    
-      clind[0][nc] = c->GetDetInd(0);
-      clind[1][nc] = c->GetDetInd(1);
-      clind[2][nc] = c->GetDetInd(2);
-      clind[3][nc] = c->GetDetInd(3);
-      clind[4][nc] = c->GetDetInd(4);
-      clind[5][nc] = k;      
+
+      Double_t yc=(c->GetPhi() - trackTOFin->GetAlpha())*c->GetR();
+      Double_t p[2]={yc, c->GetZ()};
+      Double_t cov2[3]= {dY*dY/12., 0., dZ*dZ/12.};
+      if (trackTOFin->AliExternalTrackParam::GetPredictedChi2(p,cov2) > maxChi2)continue;
+
+      clind[nc] = k;      
+      Char_t path[200];
+      Int_t ind[5];
+      ind[0]=c->GetDetInd(0);
+      ind[1]=c->GetDetInd(1);
+      ind[2]=c->GetDetInd(2);
+      ind[3]=c->GetDetInd(3);
+      ind[4]=c->GetDetInd(4);
+      fGeom->GetVolumePath(ind,path);
+      gGeoManager->cd(path);
+      global[nc] = *gGeoManager->GetCurrentMatrix();
       nc++;
     }
 
+    AliDebug(1,Form(" Number of matchable TOF clusters for the track number %d: %d",iseed,nc));
+
+    if (nc == 0 ) {
+      fnunmatch++;
+      delete trackTOFin;
+      continue;
+    }
+
     //start fine propagation 
 
     Int_t nStepsDone = 0;
     for( Int_t istep=0; istep<nSteps; istep++){ 
 
-      Float_t xs=AliTOFGeometry::RinTOF()+istep*0.1;
-      Double_t ymax=xs*TMath::Tan(0.5*AliTOFGeometry::GetAlpha());
+      // First of all, propagate the track...
+      Float_t xs = AliTOFGeometry::RinTOF()+istep*stepSize;
+      if (!(trackTOFin->PropagateTo(xs))) break;
 
-      Bool_t skip=kFALSE;
-      Double_t ysect=trackTOFin->GetYat(xs,skip);
-      if(skip)break;
+      //  ...and then, if necessary, rotate the track
+      Double_t ymax = xs*TMath::Tan(0.5*AliTOFGeometry::GetAlpha());
+      Double_t ysect = trackTOFin->GetY();
       if (ysect > ymax) {
-       if (!trackTOFin->Rotate(AliTOFGeometry::GetAlpha())) {
-         break;
-       }
+       if (!(trackTOFin->Rotate(AliTOFGeometry::GetAlpha()))) break;
       } else if (ysect <-ymax) {
-       if (!trackTOFin->Rotate(-AliTOFGeometry::GetAlpha())) {
-         break;
-       }
-      }
-
-      if(!trackTOFin->PropagateTo(xs)) {
-       break;
+       if (!(trackTOFin->Rotate(-AliTOFGeometry::GetAlpha()))) break;
       }
 
       nStepsDone++;
+      AliDebug(2,Form(" current step %d (%d) - nStepsDone=%d",istep,nSteps,nStepsDone));
 
       // store the running point (Globalrf) - fine propagation     
 
-      Double_t x,y,z;
-      trackTOFin->GetGlobalXYZ(x,y,z);
-      trackPos[0][istep]= (Float_t) x;
-      trackPos[1][istep]= (Float_t) y;
-      trackPos[2][istep]= (Float_t) z;   
-      trackPos[3][istep]= trackTOFin->GetIntegratedLength();
+      Double_t r[3];
+      trackTOFin->GetXYZ(r);
+      trackPos[0][nStepsDone-1]= (Float_t) r[0];
+      trackPos[1][nStepsDone-1]= (Float_t) r[1];
+      trackPos[2][nStepsDone-1]= (Float_t) r[2];   
+      trackPos[3][nStepsDone-1]= trackTOFin->GetIntegratedLength();
     }
 
 
+#if 0
+    /*****************/
+    /**** OLD CODE ***/
+    /*****************/
+
     Int_t nfound = 0;
+    Bool_t accept = kFALSE;
+    Bool_t isInside = kFALSE;
     for (Int_t istep=0; istep<nStepsDone; istep++) {
 
-      Bool_t isInside =kFALSE;
       Float_t ctrackPos[3];    
-
-      ctrackPos[0]= trackPos[0][istep];
-      ctrackPos[1]= trackPos[1][istep];
-      ctrackPos[2]= trackPos[2][istep];
+      ctrackPos[0] = trackPos[0][istep];
+      ctrackPos[1] = trackPos[1][istep];
+      ctrackPos[2] = trackPos[2][istep];
 
       //now see whether the track matches any of the TOF clusters            
 
-      for (Int_t i=0; i<nc; i++){
-       Int_t cind[5];
-       cind[0]= clind[0][i];
-       cind[1]= clind[1][i];
-       cind[2]= clind[2][i];
-       cind[3]= clind[3][i];
-       cind[4]= clind[4][i];
-        Bool_t accept = kFALSE;
-        if( mLastStep)accept = (fGeom->DistanceToPad(cind,ctrackPos)<fdCut);
-        if(!mLastStep)accept = (fGeom->IsInsideThePad(cind,ctrackPos));
-       if(accept){
-         if(!mLastStep)isInside=kTRUE;
-         dist[nfound]=fGeom->DistanceToPad(cind,ctrackPos);
-         crecL[nfound]=trackPos[3][istep];
-         index[nfound]=clind[5][i]; // store cluster id            
-         cxpos[nfound]=AliTOFGeometry::RinTOF()+istep*0.1; //store prop.radius
+      Float_t dist3d[3];
+      accept = kFALSE;
+      for (Int_t i=0; i<nc; i++) {
+        isInside = fGeom->IsInsideThePad((TGeoHMatrix*)(&global[i]),ctrackPos,dist3d);
+
+        if ( mLastStep ) {
+          Float_t yLoc = dist3d[1];
+          Float_t rLoc = TMath::Sqrt(dist3d[0]*dist3d[0]+dist3d[2]*dist3d[2]);
+         accept = (TMath::Abs(yLoc)<padDepth*0.5 && rLoc<dCut);
+         AliDebug(2," I am in the case mLastStep==kTRUE ");
+       }
+       else {
+         accept = isInside;
+       }
+       if (accept) {
+
+         fTOFtrackPoints->AddLast(new AliTOFtrackPoint(clind[i],
+                                                       TMath::Sqrt(dist3d[0]*dist3d[0] + dist3d[1]*dist3d[1] + dist3d[2]*dist3d[2]),
+                                                       dist3d[2],dist3d[0],dist3d[1],
+                                                       AliTOFGeometry::RinTOF()+istep*stepSize,trackPos[3][istep]));
+
+         AliDebug(2,Form(" dist3dLoc[0] = %f, dist3dLoc[1] = %f, dist3dLoc[2] = %f ",dist3d[0],dist3d[1],dist3d[2]));
          nfound++;
-         if(isInside)break;
+         if(accept &&!mLastStep)break;
        }//end if accept
+
       } //end for on the clusters
+      if(accept &&!mLastStep)break;
+    } //end for on the steps     
 
+    /*****************/
+    /**** OLD CODE ***/
+    /*****************/
+#endif
+
+    AliDebug(1,Form(" Number of steps done for the track number %d: %d",iseed,nStepsDone));
+
+    if ( nStepsDone == 0 ) {
+      fnunmatch++;
+      delete trackTOFin;
+      continue;
+    }
+
+    /*****************/
+    /**** NEW CODE ***/
+    /*****************/
+
+    Int_t nfound = 0;
+    Bool_t accept = kFALSE;
+    Bool_t isInside = kFALSE;
+    for (Int_t istep=0; istep<nStepsDone; istep++) {
+
+      Bool_t gotInsideCluster = kFALSE;
+      Int_t trackInsideCluster = -1;
+
+      Float_t ctrackPos[3];     
+      ctrackPos[0] = trackPos[0][istep];
+      ctrackPos[1] = trackPos[1][istep];
+      ctrackPos[2] = trackPos[2][istep];
+
+      //now see whether the track matches any of the TOF clusters            
 
-      if(isInside)break;
+      Float_t dist3d[3]={0.,0.,0.};
+      accept = kFALSE;
+      for (Int_t i=0; i<nc; i++) {
+
+        // ***** NEW *****
+        /* check whether track was inside another cluster
+         * and in case inhibit this cluster.
+         * this will allow to only go on and add track points for
+         * that cluster where the track got inside first */
+        if (gotInsideCluster && trackInsideCluster != i) {
+         AliDebug(2,Form(" A - istep=%d ~ %d %d ~ nfound=%d",istep,trackInsideCluster,i,nfound));
+          continue;
+       }
+       AliDebug(2,Form(" B - istep=%d ~ %d %d ~ nfound=%d",istep,trackInsideCluster,i,nfound));
+
+        /* check whether track is inside this cluster */
+       for (Int_t hh=0; hh<3; hh++) dist3d[hh]=0.;
+       isInside = fGeom->IsInsideThePad((TGeoHMatrix*)(&global[i]),ctrackPos,dist3d);
+
+        // ***** NEW *****
+        /* if track is inside this cluster set flags which will then
+         * inhibit to add track points for the other clusters */
+        if (isInside) {
+          gotInsideCluster = kTRUE;
+          trackInsideCluster = i;
+        }
+
+        if ( mLastStep ) {
+          Float_t yLoc = dist3d[1];
+          Float_t rLoc = TMath::Sqrt(dist3d[0]*dist3d[0]+dist3d[2]*dist3d[2]);
+          accept = (TMath::Abs(yLoc)<padDepth*0.5 && rLoc<dCut);
+          AliDebug(2," I am in the case mLastStep==kTRUE ");
+        }
+
+       //***** NEW *****
+       /* add point everytime that:
+        * - the track is inside the cluster
+        * - the track got inside the cluster, even when it eventually exited the cluster
+        * - the tracks is within dCut from the cluster
+        */
+        if (accept || isInside || gotInsideCluster) {
+
+          fTOFtrackPoints->AddLast(new AliTOFtrackPoint(clind[i],
+                                                        TMath::Sqrt(dist3d[0]*dist3d[0] + dist3d[1]*dist3d[1] + dist3d[2]*dist3d[2]),
+                                                        dist3d[2],dist3d[0],dist3d[1],
+                                                        AliTOFGeometry::RinTOF()+istep*stepSize,trackPos[3][istep]));
+
+          AliDebug(2,Form(" dist3dLoc[0] = %f, dist3dLoc[1] = %f, dist3dLoc[2] = %f ",dist3d[0],dist3d[1],dist3d[2]));
+          nfound++;
+
+         AliDebug(2,Form(" C - istep=%d ~ %d %d ~ nfound=%d",istep,trackInsideCluster,i,nfound));
+        
+          // ***** NEW *****
+          /* do not break loop in any case
+           * if the track got inside a cluster all other clusters
+           * are inhibited */
+          //      if(accept &&!mLastStep)break;
+          
+        }//end if accept
+        
+      } //end for on the clusters
+      
+      // ***** NEW *****
+      /* do not break loop in any case
+      * if the track got inside a cluster all other clusters
+      * are inhibited but we want to go on adding track points */
+      //      if(accept &&!mLastStep)break;
+      
     } //end for on the steps     
 
 
+    AliDebug(1,Form(" Number of track points for the track number %d: %d",iseed,nfound));
 
     if (nfound == 0 ) {
       fnunmatch++;
@@ -368,37 +755,85 @@ void AliTOFtracker::MatchTracks( Bool_t mLastStep){
       continue;
     }
     
-    fnmatch++;
-
     // now choose the cluster to be matched with the track.
 
-    Int_t idclus=0;
+    Int_t idclus=-1;
     Float_t  recL = 0.;
     Float_t  xpos=0.;
     Float_t  mindist=1000.;
-    for (Int_t iclus= 0; iclus<nfound;iclus++){
-      if (dist[iclus]< mindist){
-       mindist = dist[iclus];
-       xpos = cxpos[iclus];
-        idclus =index[iclus]; 
-        recL=crecL[iclus]+fDx*0.5;
+    Float_t  mindistZ=0.;
+    Float_t  mindistY=0.;
+    Float_t  mindistX=stepSize;
+    for (Int_t iclus= 0; iclus<nfound;iclus++) {
+      AliTOFtrackPoint *matchableTOFcluster = (AliTOFtrackPoint*)fTOFtrackPoints->At(iclus);
+      //if ( matchableTOFcluster->Distance()<mindist ) {
+      if ( TMath::Abs(matchableTOFcluster->DistanceX())<TMath::Abs(mindistX) &&
+          TMath::Abs(matchableTOFcluster->DistanceX())<=stepSize ) {
+       mindist = matchableTOFcluster->Distance();
+       mindistZ = matchableTOFcluster->DistanceZ(); // Z distance in the
+                                                    // RF of the hit pad
+                                                    // closest to the
+                                                    // reconstructed
+                                                    // track
+       mindistY = matchableTOFcluster->DistanceY(); // Y distance in the
+                                                    // RF of the hit pad
+                                                    // closest to the
+                                                    // reconstructed
+                                                    // track
+       mindistX = matchableTOFcluster->DistanceX(); // X distance in the
+                                                    // RF of the hit pad
+                                                    // closest to the
+                                                    // reconstructed
+                                                    // track
+       xpos = matchableTOFcluster->PropRadius();
+        idclus = matchableTOFcluster->Index();
+        recL = matchableTOFcluster->Length();// + corrLen*0.5;
+
+       AliDebug(1,Form(" %d(%d) --- %f (%f, %f, %f), step=%f -- idclus=%d --- seed=%d, trackId=%d, trackLab=%d", iclus,nfound,
+                       mindist,mindistX,mindistY,mindistZ,stepSize,idclus,iseed,track->GetSeedIndex(),track->GetLabel()));
+
       }
+    } // loop on found TOF track points
+
+    if (TMath::Abs(mindistX)>stepSize && idclus!=-1) {
+      AliInfo(Form("--------Not matched --- but idclus=%d, trackId=%d, trackLab=%d",
+                  idclus,track->GetSeedIndex(),track->GetLabel()));
+      idclus=-1;
     }
 
+    if (idclus==-1) {
+      AliDebug(1,Form("Reconstructed track %d doesn't match any TOF cluster", iseed));
+      fnunmatch++;
+      delete trackTOFin;
+      continue;
+    }
+
+    AliDebug(1,"--------Matched");
+
+    fnmatch++;
+
     AliTOFcluster *c=fClusters[idclus];
-    c->Use();
 
-    // Track length correction for matching Step 2 
+    AliDebug(2, Form("%7d     %7d     %10d     %10d  %10d  %10d      %7d",
+                    iseed,
+                    fnmatch-1,
+                    TMath::Abs(trackTOFin->GetLabel()),
+                    c->GetLabel(0), c->GetLabel(1), c->GetLabel(2),
+                    idclus)); // AdC
 
-    if(mLastStep){
-      Float_t rc=TMath::Sqrt(c->GetR()*c->GetR() + c->GetZ()*c->GetZ());
-      Float_t rt=TMath::Sqrt(trackPos[0][70]*trackPos[0][70]
-                            +trackPos[1][70]*trackPos[1][70]
-                            +trackPos[2][70]*trackPos[2][70]);
-      Float_t dlt=rc-rt;      
-      recL=trackPos[3][70]+dlt;
-    }    
+    c->Use(); 
 
+    // Track length correction for matching Step 2 
+    /*
+    if (mLastStep) {
+      Float_t rc = TMath::Sqrt(c->GetR()*c->GetR() + c->GetZ()*c->GetZ());
+      Float_t rt = TMath::Sqrt(trackPos[0][70]*trackPos[0][70]
+                              +trackPos[1][70]*trackPos[1][70]
+                              +trackPos[2][70]*trackPos[2][70]);
+      Float_t dlt=rc-rt;
+      recL=trackPos[3][70]+dlt;
+    }
+    */
     if (
        (c->GetLabel(0)==TMath::Abs(trackTOFin->GetLabel()))
        ||
@@ -407,72 +842,206 @@ void AliTOFtracker::MatchTracks( Bool_t mLastStep){
        (c->GetLabel(2)==TMath::Abs(trackTOFin->GetLabel()))
        ) {
       fngoodmatch++;
+
+       AliDebug(2,Form(" track label good %5d",trackTOFin->GetLabel()));
+
     }
-    else{
+    else {
       fnbadmatch++;
+
+      AliDebug(2,Form(" track label  bad %5d",trackTOFin->GetLabel()));
+
     }
 
     delete trackTOFin;
 
-    Double_t tof=50*c->GetTDC()+32; // in ps
-    t->SetTOFsignal(tof);
-    t->SetTOFcluster(c->GetIndex());
-    Double_t time[10]; t->GetIntegratedTimes(time);
+    //  Store quantities to be used in the TOF Calibration
+    Float_t tToT=AliTOFGeometry::ToTBinWidth()*c->GetToT()*1E-3; // in ns
+    t->SetTOFsignalToT(tToT);
+    Float_t rawTime=AliTOFGeometry::TdcBinWidth()*c->GetTDCRAW()+kTimeOffset; // RAW time,in ps
+    t->SetTOFsignalRaw(rawTime);
+    t->SetTOFsignalDz(mindistZ);
+    t->SetTOFsignalDx(mindistY);
+    t->SetTOFDeltaBC(c->GetDeltaBC());
+    t->SetTOFL0L1(c->GetL0L1Latency());
+
+    Float_t info[10] = {mindist,mindistY,mindistZ,
+                       0.,0.,0.,0.,0.,0.,0.};
+    t->SetTOFInfo(info);
+    AliDebug(2,Form(" distance=%f; residual in the pad reference frame: dX=%f, dZ=%f", info[0],info[1],info[2]));
+
+
+    Int_t ind[5];
+    ind[0]=c->GetDetInd(0);
+    ind[1]=c->GetDetInd(1);
+    ind[2]=c->GetDetInd(2);
+    ind[3]=c->GetDetInd(3);
+    ind[4]=c->GetDetInd(4);
+    Int_t calindex = AliTOFGeometry::GetIndex(ind);
+    t->SetTOFCalChannel(calindex);
+
+    // keep track of the track labels in the matched cluster
+    Int_t tlab[3];
+    tlab[0]=c->GetLabel(0);
+    tlab[1]=c->GetLabel(1);
+    tlab[2]=c->GetLabel(2);
+    AliDebug(2,Form(" tdc time of the matched track %6d = ",c->GetTDC()));    
+    Double_t tof=AliTOFGeometry::TdcBinWidth()*c->GetTDC()+kTimeOffset; // in ps
+    AliDebug(2,Form(" tof time of the matched track: %f = ",tof));    
+    Double_t tofcorr=tof;
+    if(timeWalkCorr)tofcorr=CorrectTimeWalk(mindistZ,tof);
+    AliDebug(2,Form(" tof time of the matched track, after TW corr: %f = ",tofcorr));    
+    //Set TOF time signal and pointer to the matched cluster
+    t->SetTOFsignal(tofcorr);
+    t->SetTOFcluster(idclus); // pointing to the recPoints tree
+
+    AliDebug(2,Form(" Setting TOF raw time: %f, z distance: %f  corrected time: %f ",rawTime,mindistZ,tofcorr));
+
+    //Tracking info
+    Double_t time[AliPID::kSPECIES]; t->GetIntegratedTimes(time); // in ps
     Double_t mom=t->GetP();
-    for(Int_t j=0;j<=5;j++){
-      Double_t mass=kMasses[j];
-      time[j]+=(recL-trackPos[3][0])/3e-2*TMath::Sqrt(mom*mom+mass*mass)/mom;
+    AliDebug(2,Form(" Momentum for track %d -> %f", iseed,mom));
+    for (Int_t j=0;j<AliPID::kSPECIES;j++) {
+      Double_t mass=AliPID::ParticleMass(j);
+      time[j]+=(recL-trackPos[3][0])/kSpeedOfLight*TMath::Sqrt(mom*mom+mass*mass)/mom;
     }
 
     AliTOFtrack *trackTOFout = new AliTOFtrack(*t); 
-    trackTOFout->PropagateTo(xpos);
-    t->UpdateTrackParams(trackTOFout,AliESDtrack::kTOFout);    
+    if (!(trackTOFout->PropagateTo(xpos))) {
+      delete trackTOFout;
+      continue;
+    }
+
+    // If necessary, rotate the track
+    Double_t yATxposMax=xpos*TMath::Tan(0.5*AliTOFGeometry::GetAlpha());
+    Double_t yATxpos=trackTOFout->GetY();
+    if (yATxpos > yATxposMax) {
+      if (!(trackTOFout->Rotate(AliTOFGeometry::GetAlpha()))) {
+       delete trackTOFout;
+       continue;
+      }
+    } else if (yATxpos < -yATxposMax) {
+      if (!(trackTOFout->Rotate(-AliTOFGeometry::GetAlpha()))) {
+       delete trackTOFout;
+       continue;
+      }
+    }
+
+    // Fill the track residual histograms.
+    FillResiduals(trackTOFout,c,kFALSE);
+
+    t->UpdateTrackParams(trackTOFout,AliESDtrack::kTOFout);
     t->SetIntegratedLength(recL);
     t->SetIntegratedTimes(time);
+    t->SetTOFLabel(tlab);
 
+    // Fill Reco-QA histos for Reconstruction
+    fHRecNClus->Fill(nc);
+    fHRecDist->Fill(mindist);
+    if (cov[0]>=0.)
+      fHRecSigYVsP->Fill(mom,TMath::Sqrt(cov[0]));
+    else
+      fHRecSigYVsP->Fill(mom,-TMath::Sqrt(-cov[0]));
+    if (cov[2]>=0.)
+      fHRecSigZVsP->Fill(mom,TMath::Sqrt(cov[2]));
+    else
+      fHRecSigZVsP->Fill(mom,-TMath::Sqrt(-cov[2]));
+    fHRecSigYVsPWin->Fill(mom,dphi*sensRadius);
+    fHRecSigZVsPWin->Fill(mom,dz);
+
+    // Fill Tree for on-the-fly offline Calibration
+
+    if ( !((t->GetStatus() & AliESDtrack::kTIME)==0 ) ) {
+      fIch=calindex;
+      fToT=tToT;
+      fTime=rawTime;
+      fExpTimePi=time[2];
+      fExpTimeKa=time[3];
+      fExpTimePr=time[4];
+      fCalTree->Fill();
+    }
     delete trackTOFout;
   }
+
   for (Int_t ii=0; ii<4; ii++) delete [] trackPos[ii];
-  for (Int_t ii=0;ii<6;ii++) delete [] clind[ii];
+  delete [] clind;
 }
 //_________________________________________________________________________
-Int_t AliTOFtracker::LoadClusters(TTree *dTree) {
+Int_t AliTOFtracker::LoadClusters(TTree *cTree) {
   //--------------------------------------------------------------------
   //This function loads the TOF clusters
   //--------------------------------------------------------------------
 
-  TBranch *branch=dTree->GetBranch("TOF");
+  Int_t npadX = AliTOFGeometry::NpadX();
+  Int_t npadZ = AliTOFGeometry::NpadZ();
+  Int_t nStripA = AliTOFGeometry::NStripA();
+  Int_t nStripB = AliTOFGeometry::NStripB();
+  Int_t nStripC = AliTOFGeometry::NStripC();
+
+  TBranch *branch=cTree->GetBranch("TOF");
   if (!branch) { 
-    AliError("can't get the branch with the TOF digits !");
+    AliError("can't get the branch with the TOF clusters !");
     return 1;
   }
 
-  TClonesArray dummy("AliTOFdigit",10000), *digits=&dummy;
-  branch->SetAddress(&digits);
+  static TClonesArray dummy("AliTOFcluster",10000);
+  dummy.Clear();
+  TClonesArray *clusters=&dummy;
+  branch->SetAddress(&clusters);
 
-  dTree->GetEvent(0);
-  Int_t nd=digits->GetEntriesFast();
-  AliInfo(Form("number of digits: %d",nd));
+  cTree->GetEvent(0);
+  Int_t nc=clusters->GetEntriesFast();
+  fHDigNClus->Fill(nc);
 
-  for (Int_t i=0; i<nd; i++) {
-    AliTOFdigit *d=(AliTOFdigit*)digits->UncheckedAt(i);
-    Int_t dig[5]; Float_t g[3];
-    dig[0]=d->GetSector();
-    dig[1]=d->GetPlate();
-    dig[2]=d->GetStrip();
-    dig[3]=d->GetPadz();
-    dig[4]=d->GetPadx();
+  AliInfo(Form("Number of clusters: %d",nc));
 
-    fGeom->GetPos(dig,g);
+  for (Int_t i=0; i<nc; i++) {
+    AliTOFcluster *c=(AliTOFcluster*)clusters->UncheckedAt(i);
+//PH    fClusters[i]=new AliTOFcluster(*c); fN++;
+    fClusters[i]=c; fN++;
+
+  // Fill Digits QA histos
+    Int_t isector = c->GetDetInd(0);
+    Int_t iplate = c->GetDetInd(1);
+    Int_t istrip = c->GetDetInd(2);
+    Int_t ipadX = c->GetDetInd(4);
+    Int_t ipadZ = c->GetDetInd(3);
+
+    Float_t time =(AliTOFGeometry::TdcBinWidth()*c->GetTDC())*1E-3; // in ns
+    Float_t tot = (AliTOFGeometry::TdcBinWidth()*c->GetToT())*1E-3;//in ns
+    Int_t stripOffset = 0;
+    switch (iplate) {
+    case 0:
+      stripOffset = 0;
+      break;
+    case 1:
+      stripOffset = nStripC;
+      break;
+    case 2:
+      stripOffset = nStripC+nStripB;
+      break;
+    case 3:
+      stripOffset = nStripC+nStripB+nStripA;
+      break;
+    case 4:
+      stripOffset = nStripC+nStripB+nStripA+nStripB;
+      break;
+    default:
+      AliError(Form("Wrong plate number in TOF (%d) !",iplate));
+      break;
+    };
+    Int_t zindex=npadZ*(istrip+stripOffset)+(ipadZ+1);
+    Int_t phiindex=npadX*isector+ipadX+1;
+    fHDigClusMap->Fill(zindex,phiindex);
+    fHDigClusTime->Fill(time);
+    fHDigClusToT->Fill(tot);
 
-    Double_t h[5];
-    h[0]=TMath::Sqrt(g[0]*g[0]+g[1]*g[1]);
-    h[1]=TMath::ATan2(g[1],g[0]); h[2]=g[2]; 
-    h[3]=d->GetTdc(); h[4]=d->GetAdc();
+  }
 
-    AliTOFcluster *cl=new AliTOFcluster(h,d->GetTracks(),dig,i);
-    InsertCluster(cl);
-  }  
 
   return 0;
 }
@@ -481,26 +1050,11 @@ void AliTOFtracker::UnloadClusters() {
   //--------------------------------------------------------------------
   //This function unloads TOF clusters
   //--------------------------------------------------------------------
-  for (Int_t i=0; i<fN; i++) delete fClusters[i];
-  fN=0;
-}
-
-//_________________________________________________________________________
-Int_t AliTOFtracker::InsertCluster(AliTOFcluster *c) {
-  //--------------------------------------------------------------------
-  //This function adds a cluster to the array of clusters sorted in Z
-  //--------------------------------------------------------------------
-  if (fN==kMaxCluster) {
-    AliError("Too many clusters !");
-    return 1;
+  for (Int_t i=0; i<fN; i++) {
+//PH    delete fClusters[i];
+    fClusters[i] = 0x0;
   }
-
-  if (fN==0) {fClusters[fN++]=c; return 0;}
-  Int_t i=FindClusterIndex(c->GetZ());
-  memmove(fClusters+i+1 ,fClusters+i,(fN-i)*sizeof(AliTOFcluster*));
-  fClusters[i]=c; fN++;
-
-  return 0;
+  fN=0;
 }
 
 //_________________________________________________________________________
@@ -519,3 +1073,189 @@ Int_t AliTOFtracker::FindClusterIndex(Double_t z) const {
   return m;
 }
 
+//_________________________________________________________________________
+Bool_t AliTOFtracker::GetTrackPoint(Int_t index, AliTrackPoint& p) const
+{
+  // Get track space point with index i
+  // Coordinates are in the global system
+  AliTOFcluster *cl = fClusters[index];
+  Float_t xyz[3];
+  xyz[0] = cl->GetR()*TMath::Cos(cl->GetPhi());
+  xyz[1] = cl->GetR()*TMath::Sin(cl->GetPhi());
+  xyz[2] = cl->GetZ();
+  Float_t phiangle = (Int_t(cl->GetPhi()*TMath::RadToDeg()/20.)+0.5)*20.*TMath::DegToRad();
+  Float_t sinphi = TMath::Sin(phiangle), cosphi = TMath::Cos(phiangle);
+  Float_t tiltangle = AliTOFGeometry::GetAngles(cl->GetDetInd(1),cl->GetDetInd(2))*TMath::DegToRad();
+  Float_t sinth = TMath::Sin(tiltangle), costh = TMath::Cos(tiltangle);
+  Float_t sigmay2 = AliTOFGeometry::XPad()*AliTOFGeometry::XPad()/12.;
+  Float_t sigmaz2 = AliTOFGeometry::ZPad()*AliTOFGeometry::ZPad()/12.;
+  Float_t cov[6];
+  cov[0] = sinphi*sinphi*sigmay2 + cosphi*cosphi*sinth*sinth*sigmaz2;
+  cov[1] = -sinphi*cosphi*sigmay2 + sinphi*cosphi*sinth*sinth*sigmaz2;
+  cov[2] = -cosphi*sinth*costh*sigmaz2;
+  cov[3] = cosphi*cosphi*sigmay2 + sinphi*sinphi*sinth*sinth*sigmaz2;
+  cov[4] = -sinphi*sinth*costh*sigmaz2;
+  cov[5] = costh*costh*sigmaz2;
+  p.SetXYZ(xyz[0],xyz[1],xyz[2],cov);
+
+  // Detector numbering scheme
+  Int_t nSector = AliTOFGeometry::NSectors();
+  Int_t nPlate  = AliTOFGeometry::NPlates();
+  Int_t nStripA = AliTOFGeometry::NStripA();
+  Int_t nStripB = AliTOFGeometry::NStripB();
+  Int_t nStripC = AliTOFGeometry::NStripC();
+
+  Int_t isector = cl->GetDetInd(0);
+  if (isector >= nSector)
+    AliError(Form("Wrong sector number in TOF (%d) !",isector));
+  Int_t iplate = cl->GetDetInd(1);
+  if (iplate >= nPlate)
+    AliError(Form("Wrong plate number in TOF (%d) !",iplate));
+  Int_t istrip = cl->GetDetInd(2);
+
+  Int_t stripOffset = 0;
+  switch (iplate) {
+  case 0:
+    stripOffset = 0;
+    break;
+  case 1:
+    stripOffset = nStripC;
+    break;
+  case 2:
+    stripOffset = nStripC+nStripB;
+    break;
+  case 3:
+    stripOffset = nStripC+nStripB+nStripA;
+    break;
+  case 4:
+    stripOffset = nStripC+nStripB+nStripA+nStripB;
+    break;
+  default:
+    AliError(Form("Wrong plate number in TOF (%d) !",iplate));
+    break;
+  };
+
+  Int_t idet = (2*(nStripC+nStripB)+nStripA)*isector +
+               stripOffset +
+               istrip;
+  UShort_t volid = AliGeomManager::LayerToVolUID(AliGeomManager::kTOF,idet);
+  p.SetVolumeID((UShort_t)volid);
+  return kTRUE;
+}
+//_________________________________________________________________________
+void AliTOFtracker::InitCheckHists() {
+
+  //Init histos for Digits/Reco QA and Calibration
+
+
+  TDirectory *dir = gDirectory;
+  TFile *logFileTOF = 0;
+
+  TSeqCollection *list = gROOT->GetListOfFiles();
+  int n = list->GetEntries();
+  Bool_t isThere=kFALSE;
+  for(int i=0; i<n; i++) {
+    logFileTOF = (TFile*)list->At(i);
+    if (strstr(logFileTOF->GetName(), "TOFQA.root")){
+      isThere=kTRUE;
+      break;
+    } 
+  }
+
+  if(!isThere)logFileTOF = new TFile( "TOFQA.root","RECREATE");
+  logFileTOF->cd(); 
+
+  fCalTree = new TTree("CalTree", "Tree for TOF calibration");
+  fCalTree->Branch("TOFchannelindex",&fIch,"iTOFch/I");
+  fCalTree->Branch("ToT",&fToT,"TOFToT/F");
+  fCalTree->Branch("TOFtime",&fTime,"TOFtime/F");
+  fCalTree->Branch("PionExpTime",&fExpTimePi,"PiExpTime/F");
+  fCalTree->Branch("KaonExpTime",&fExpTimeKa,"KaExpTime/F");
+  fCalTree->Branch("ProtonExpTime",&fExpTimePr,"PrExpTime/F");
+
+  //Digits "QA" 
+  fHDigClusMap = new TH2F("TOFDig_ClusMap", "",182,0.5,182.5,864, 0.5,864.5);  
+  fHDigNClus = new TH1F("TOFDig_NClus", "",200,0.5,200.5);  
+  fHDigClusTime = new TH1F("TOFDig_ClusTime", "",2000,0.,200.);  
+  fHDigClusToT = new TH1F("TOFDig_ClusToT", "",500,0.,100);  
+
+  //Reco "QA"
+  fHRecNClus =new TH1F("TOFRec_NClusW", "",50,0.5,50.5);
+  fHRecDist=new TH1F("TOFRec_Dist", "",50,0.5,10.5);
+  fHRecSigYVsP=new TH2F("TOFDig_SigYVsP", "",40,0.,4.,100, 0.,5.);
+  fHRecSigZVsP=new TH2F("TOFDig_SigZVsP", "",40,0.,4.,100, 0.,5.);
+  fHRecSigYVsPWin=new TH2F("TOFDig_SigYVsPWin", "",40,0.,4.,100, 0.,50.);
+  fHRecSigZVsPWin=new TH2F("TOFDig_SigZVsPWin", "",40,0.,4.,100, 0.,50.);
+
+  dir->cd();
+
+}
+
+//_________________________________________________________________________
+void AliTOFtracker::SaveCheckHists() {
+
+  //write histos for Digits/Reco QA and Calibration
+
+  TDirectory *dir = gDirectory;
+  TFile *logFileTOF = 0;
+
+  TSeqCollection *list = gROOT->GetListOfFiles();
+  int n = list->GetEntries();
+  Bool_t isThere=kFALSE;
+  for(int i=0; i<n; i++) {
+    logFileTOF = (TFile*)list->At(i);
+    if (strstr(logFileTOF->GetName(), "TOFQA.root")){
+      isThere=kTRUE;
+      break;
+    } 
+  }
+   
+  if(!isThere) {
+         AliError(Form("File TOFQA.root not found!! not wring histograms...."));
+         return;
+  }
+  logFileTOF->cd(); 
+  fHDigClusMap->Write(fHDigClusMap->GetName(), TObject::kOverwrite);
+  fHDigNClus->Write(fHDigNClus->GetName(), TObject::kOverwrite);
+  fHDigClusTime->Write(fHDigClusTime->GetName(), TObject::kOverwrite);
+  fHDigClusToT->Write(fHDigClusToT->GetName(), TObject::kOverwrite);
+  fHRecNClus->Write(fHRecNClus->GetName(), TObject::kOverwrite);
+  fHRecDist->Write(fHRecDist->GetName(), TObject::kOverwrite);
+  fHRecSigYVsP->Write(fHRecSigYVsP->GetName(), TObject::kOverwrite);
+  fHRecSigZVsP->Write(fHRecSigZVsP->GetName(), TObject::kOverwrite);
+  fHRecSigYVsPWin->Write(fHRecSigYVsPWin->GetName(), TObject::kOverwrite);
+  fHRecSigZVsPWin->Write(fHRecSigZVsPWin->GetName(), TObject::kOverwrite);
+  fCalTree->Write(fCalTree->GetName(),TObject::kOverwrite);
+  logFileTOF->Flush();  
+
+  dir->cd();
+  }
+//_________________________________________________________________________
+Float_t AliTOFtracker::CorrectTimeWalk( Float_t dist, Float_t tof) const {
+
+  //dummy, for the moment
+  Float_t tofcorr=0.;
+  if(dist<AliTOFGeometry::ZPad()*0.5){
+    tofcorr=tof;
+    //place here the actual correction
+  }else{
+    tofcorr=tof; 
+  } 
+  return tofcorr;
+}
+//_________________________________________________________________________
+
+void AliTOFtracker::FillClusterArray(TObjArray* arr) const
+{
+  //
+  // Returns the TOF cluster array
+  //
+
+  if (fN==0)
+    arr = 0x0;
+  else
+    for (Int_t i=0; i<fN; ++i) arr->Add(fClusters[i]);
+
+}
+//_________________________________________________________________________
+