]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - TOF/AliTOFtracker.cxx
bugs corrected
[u/mrichter/AliRoot.git] / TOF / AliTOFtracker.cxx
index b44c706fe1f2da5949341ca491d0190d4184b89d..cf4023cb642b6270df07a3b82dc1e4a70424e5e7 100644 (file)
 //                                                                    //
 //--------------------------------------------------------------------//
 
-#include "Rtypes.h"
+#include <Rtypes.h>
+#include <TROOT.h>
 
-#include "TClonesArray.h"
-#include "TGeoManager.h"
-#include "TTree.h"
+#include <TSeqCollection.h>
+#include <TClonesArray.h>
+#include <TGeoManager.h>
+#include <TTree.h>
+#include <TFile.h>
+#include <TH2F.h>
 
-#include "AliAlignObj.h"
+#include "AliGeomManager.h"
 #include "AliESDtrack.h"
-#include "AliESD.h"
+#include "AliESDEvent.h"
 #include "AliLog.h"
 #include "AliTrackPointArray.h"
+#include "AliCDBManager.h"
 
-#include "AliTOFcalib.h"
+#include "AliTOFpidESD.h"
+#include "AliTOFRecoParam.h"
+#include "AliTOFReconstructor.h"
 #include "AliTOFcluster.h"
 #include "AliTOFGeometry.h"
 #include "AliTOFtracker.h"
 #include "AliTOFtrack.h"
 
 extern TGeoManager *gGeoManager;
+extern TROOT *gROOT;
 
 ClassImp(AliTOFtracker)
 
 //_____________________________________________________________________________
-AliTOFtracker::AliTOFtracker(AliTOFGeometry * geom, Double_t parPID[2]):
-  fGeom(geom),
-  fTOFpid(new AliTOFpidESD(parPID)),
-  fHoles(kFALSE),
+AliTOFtracker::AliTOFtracker():
+  fRecoParam(0x0),
+  fGeom(0x0),
+  fPid(0x0),
   fN(0),
   fNseeds(0),
   fNseedsTOF(0),
@@ -60,30 +68,40 @@ AliTOFtracker::AliTOFtracker(AliTOFGeometry * geom, Double_t parPID[2]):
   fnbadmatch(0),
   fnunmatch(0),
   fnmatch(0),
-  fR(378.), 
-  fTOFHeigth(15.3),  
-  fdCut(3.), 
-  fDx(1.5), 
-  fDy(0), 
-  fDz(0), 
-  fDzMax(35.), 
-  fDyMax(50.), 
-  fTracks(0x0),
-  fSeeds(0x0)
+  fTracks(new TClonesArray("AliTOFtrack")),
+  fSeeds(new TClonesArray("AliESDtrack")),
+  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
+   
+   // Gettimg the geometry 
+   fGeom= new AliTOFGeometry();
+
+   InitCheckHists();
 
-  //fHoles=true;
-  fDy=AliTOFGeometry::XPad(); 
-  fDz=AliTOFGeometry::ZPad(); 
-  fHoles = fGeom->GetHoles();
 }
 //_____________________________________________________________________________
 AliTOFtracker::AliTOFtracker(const AliTOFtracker &t):
   AliTracker(),
+  fRecoParam(0x0),
   fGeom(0x0),
-  fTOFpid(0x0),
-  fHoles(kFALSE),
+  fPid(0x0),
   fN(0),
   fNseeds(0),
   fNseedsTOF(0),
@@ -91,36 +109,37 @@ AliTOFtracker::AliTOFtracker(const AliTOFtracker &t):
   fnbadmatch(0),
   fnunmatch(0),
   fnmatch(0),
-  fR(378.), 
-  fTOFHeigth(15.3),  
-  fdCut(3.), 
-  fDx(1.5), 
-  fDy(0), 
-  fDz(0), 
-  fDzMax(35.), 
-  fDyMax(50.), 
-  fTracks(0x0),
-  fSeeds(0x0)
+  fTracks(new TClonesArray("AliTOFtrack")),
+  fSeeds(new TClonesArray("AliESDtrack")),
+  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 copy Ctor
 
-  fHoles=t.fHoles;
+  fNseeds=t.fNseeds;
   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=t.fDx; 
-  fDzMax=t.fDzMax; 
-  fDyMax=t.fDyMax; 
+  fRecoParam=t.fRecoParam;
+  fPid=t.fPid;
   fSeeds=t.fSeeds;
   fTracks=t.fTracks;
   fN=t.fN;
@@ -131,36 +150,80 @@ AliTOFtracker& AliTOFtracker::operator=(const AliTOFtracker &t)
 { 
   //AliTOFtracker assignment operator
 
-  this->fHoles=t.fHoles;
   this->fNseeds=t.fNseeds;
   this->fNseedsTOF=t.fNseedsTOF;
   this->fngoodmatch=t.fngoodmatch;
   this->fnbadmatch=t.fnbadmatch;
   this->fnunmatch=t.fnunmatch;
   this->fnmatch=t.fnmatch;
-  this->fGeom = t.fGeom;
-  this->fTOFpid = t.fTOFpid;
-  this->fR=t.fR; 
-  this->fTOFHeigth=t.fTOFHeigth;  
-  this->fdCut=t.fdCut; 
-  this->fDy=t.fDy; 
-  this->fDz=t.fDz; 
-  this->fDx=t.fDx; 
-  this->fDzMax=t.fDzMax; 
-  this->fDyMax=t.fDyMax; 
+  this->fRecoParam = t.fRecoParam;
+  this->fGeom=t.fGeom;
+  this->fPid = t.fPid;
   this->fSeeds=t.fSeeds;
   this->fTracks=t.fTracks;
   this->fN=t.fN;
   return *this;
 
 }
+//_____________________________________________________________________________
+AliTOFtracker::~AliTOFtracker() {
+  //
+  // Dtor
+  //
+
+  SaveCheckHists();
+
+  if(!(AliCDBManager::Instance()->GetCacheFlag())){
+    delete fRecoParam;
+  }
+  delete fGeom; 
+  delete fPid; 
+  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;
+  }
 
+}
 //_____________________________________________________________________________
-Int_t AliTOFtracker::PropagateBack(AliESD* event) {
+Int_t AliTOFtracker::PropagateBack(AliESDEvent* event) {
   //
   // Gets seeds from ESD event and Match with TOF Clusters
   //
 
+  // initialize RecoParam for current event
+
+  AliInfo("Initializing params for TOF... ");
+
+  fRecoParam = AliTOFReconstructor::GetRecoParam();  // instantiate reco param from STEER...
+
+  if (fRecoParam == 0x0) { 
+    AliFatal("No Reco Param found for TOF!!!");
+  }
+  //fRecoParam->Dump();
+  if(fRecoParam->GetApplyPbPbCuts())fRecoParam=fRecoParam->GetPbPbparam();
+  //fRecoParam->PrintParameters();
+
+  Double_t parPID[2];   
+  parPID[0]=fRecoParam->GetTimeResolution();
+  parPID[1]=fRecoParam->GetTimeNSigma();
+  fPid=new AliTOFpidESD(parPID);
 
   //Initialise some counters
 
@@ -173,7 +236,6 @@ Int_t AliTOFtracker::PropagateBack(AliESD* event) {
 
   Int_t ntrk=event->GetNumberOfTracks();
   fNseeds = ntrk;
-  fSeeds= new TClonesArray("AliESDtrack",ntrk);
   TClonesArray &aESDTrack = *fSeeds;
 
 
@@ -189,11 +251,6 @@ Int_t AliTOFtracker::PropagateBack(AliESD* event) {
 
   //First Step with Strict Matching Criterion
   MatchTracks(kFALSE);
-  /*
-  for (Int_t ijk=0; ijk<fN; ijk++) {
-    AliInfo(Form("%4i %4i  %f %f %f  %f %f   %2i %1i %2i %1i %2i",ijk, fClusters[ijk]->GetIndex(),fClusters[ijk]->GetZ(),fClusters[ijk]->GetR(),fClusters[ijk]->GetPhi(), fClusters[ijk]->GetTDC(),fClusters[ijk]->GetADC(),fClusters[ijk]->GetDetInd(0),fClusters[ijk]->GetDetInd(1),fClusters[ijk]->GetDetInd(2),fClusters[ijk]->GetDetInd(3),fClusters[ijk]->GetDetInd(4)));
-  }
-  */
 
   //Second Step with Looser Matching Criterion
   MatchTracks(kTRUE);
@@ -211,70 +268,90 @@ Int_t AliTOFtracker::PropagateBack(AliESD* event) {
       t->SetTOFsignal(seed->GetTOFsignal());
       t->SetTOFcluster(seed->GetTOFcluster());
       t->SetTOFsignalToT(seed->GetTOFsignalToT());
+      t->SetTOFsignalRaw(seed->GetTOFsignalRaw());
+      t->SetTOFsignalDz(seed->GetTOFsignalDz());
       t->SetTOFCalChannel(seed->GetTOFCalChannel());
+      Int_t tlab[3]; seed->GetTOFLabel(tlab);    
+      t->SetTOFLabel(tlab);
       AliTOFtrack *track = new AliTOFtrack(*seed); 
       t->UpdateTrackParams(track,AliESDtrack::kTOFout);   
       delete track;
     }
   }
 
+  //Handle Time Zero information
 
-  //Make TOF PID
-  fTOFpid->MakePID(event);
+  Double_t timeZero=0.;
+  Double_t timeZeroMax=99999.;
+  Bool_t usetimeZero     = fRecoParam->UseTimeZero();
+  Bool_t timeZeroFromT0  = fRecoParam->GetTimeZerofromT0();
+  Bool_t timeZeroFromTOF = fRecoParam->GetTimeZerofromTOF();
 
-  if (fSeeds) {
-    fSeeds->Delete();
-    delete fSeeds;
-    fSeeds = 0x0;
-  }
-  if (fTracks) {
-    fTracks->Delete();
-    delete fTracks;
-    fTracks = 0x0;
+  AliDebug(1,Form("Use Time Zero?: %d",usetimeZero));
+  AliDebug(1,Form("Time Zero from T0? : %d",timeZeroFromT0));
+  AliDebug(1,Form("Time Zero From TOF? : %d",timeZeroFromTOF));
+
+  if(usetimeZero){
+    if(timeZeroFromT0){
+      timeZero=GetTimeZerofromT0(event); 
+    }
+    if(timeZeroFromTOF && (timeZero>timeZeroMax || !timeZeroFromT0)){
+      timeZero=GetTimeZerofromTOF(event); 
+    }
   }
+  AliDebug(2,Form("time Zero used in PID: %f",timeZero));
+  //Make TOF PID
+  fPid->MakePID(event,timeZero);
+
+  fSeeds->Clear();
+  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 seedsTOF2=0;
  
-  fTracks= new TClonesArray("AliTOFtrack");
   TClonesArray &aTOFTrack = *fTracks;
   for (Int_t i=0; i<fNseeds; i++) {
 
     AliESDtrack *t =(AliESDtrack*)fSeeds->UncheckedAt(i);
     if ((t->GetStatus()&AliESDtrack::kTPCout)==0)continue;
 
-    // TRD good tracks, already propagated at 371 cm
+    // TRD 'good' tracks, already propagated at 372 cm
 
     AliTOFtrack *track = new AliTOFtrack(*t); // New
     Double_t x = track->GetX(); //New
-
     if (((t->GetStatus()&AliESDtrack::kTRDout)!=0 ) && 
-        ( x >= fGeom->RinTOF()) ){
+        ( x >= AliTOFGeometry::RinTOF()) ){
       track->SetSeedIndex(i);
       t->UpdateTrackParams(track,AliESDtrack::kTOFout);    
       new(aTOFTrack[fNseedsTOF]) AliTOFtrack(*track);
       fNseedsTOF++;
+      seedsTOF1++;
       delete track;
     }
 
     // Propagate the rest of TPCbp  
 
     else {
-      if(track->PropagateToInnerTOF(fHoles)){ // temporary solution
-       //      if(track->PropagateToInnerTOF(fGeom->GetHoles())){
+      if(track->PropagateToInnerTOF()){ 
        track->SetSeedIndex(i);
        t->UpdateTrackParams(track,AliESDtrack::kTOFout);    
        new(aTOFTrack[fNseedsTOF]) AliTOFtrack(*track);
        fNseedsTOF++;
+       seedsTOF2++;
       }
       delete track;
     }
   }
 
-  AliInfo(Form("Number of TOF seedds %i",fNseedsTOF));
+  AliInfo(Form("Number of TOF seeds %i",fNseedsTOF));
+  AliInfo(Form("Number of TOF seeds Type 1 %i",seedsTOF1));
+  AliInfo(Form("Number of TOF seeds Type 2 %i",seedsTOF2));
 
   // Sort according uncertainties on track position 
   fTracks->Sort();
@@ -283,17 +360,47 @@ void AliTOFtracker::CollectESD() {
 //_________________________________________________________________________
 void AliTOFtracker::MatchTracks( Bool_t mLastStep){
 
+
+  // Parameters used/regulating the reconstruction
+
+  static Float_t corrLen=0.75;
+  static Float_t detDepth=15.3;
+  static Float_t padDepth=0.5;
+
+  Float_t dY=AliTOFGeometry::XPad(); 
+  Float_t dZ=AliTOFGeometry::ZPad(); 
+
+  Float_t sensRadius = fRecoParam->GetSensRadius();
+  Float_t stepSize   = fRecoParam->GetStepSize();
+  Float_t scaleFact   = fRecoParam->GetWindowScaleFact();
+  Float_t dyMax=fRecoParam->GetWindowSizeMaxY(); 
+  Float_t dzMax=fRecoParam->GetWindowSizeMaxZ();
+  Float_t dCut=fRecoParam->GetDistanceCut();
+  Double_t maxChi2=fRecoParam->GetMaxChi2TRD();
+  Bool_t timeWalkCorr    = fRecoParam->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
 
 
-  Int_t nSteps=(Int_t)(fTOFHeigth/0.1);
+  // Get the number of propagation steps
+
+  Int_t nSteps=(Int_t)(detDepth/stepSize);
 
-  AliTOFcalib *calib = new AliTOFcalib(fGeom);
   //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 iseed=0; iseed<fNseedsTOF; iseed++) {
 
@@ -306,6 +413,7 @@ void AliTOFtracker::MatchTracks( Bool_t mLastStep){
 
     Int_t         index[10000];
     Float_t        dist[10000];
+    Float_t       distZ[10000];
     Float_t       cxpos[10000];
     Float_t       crecL[10000];
     TGeoHMatrix   global[1000];
@@ -317,13 +425,12 @@ void AliTOFtracker::MatchTracks( Bool_t mLastStep){
     Double_t cov[15]; 
     trackTOFin->GetExternalCovariance(cov);
 
-    Float_t scalefact=3.;    
     Double_t dphi=
-      scalefact*
-      ((5*TMath::Sqrt(cov[0]) + 0.5*fDy + 2.5*TMath::Abs(par[2]))/fR); 
+      scaleFact*
+      ((5*TMath::Sqrt(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(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();
@@ -332,8 +439,8 @@ void AliTOFtracker::MatchTracks( Bool_t mLastStep){
 
     //upper limit on window's size.
 
-    if(dz> fDzMax) dz=fDzMax;
-    if(dphi*fR>fDyMax) dphi=fDyMax/fR;
+    if(dz> dzMax) dz=dzMax;
+    if(dphi*sensRadius> dyMax) dphi=dyMax/sensRadius;
 
 
     Int_t nc=0;
@@ -345,48 +452,41 @@ void AliTOFtracker::MatchTracks( Bool_t mLastStep){
       AliTOFcluster *c=fClusters[k];
       if (c->GetZ() > z+dz) break;
       if (c->IsUsed()) continue;
-      //AliInfo(Form(" fClusters[k]->GetZ() (%f) z-dz (%f)   %4i ", fClusters[k]->GetZ(), z-dz, k));
+
+      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;
 
-      {
-      Double_t maxChi2=150.; // "calibratin constant". Needs to be tuned.
       Double_t yc=(c->GetPhi() - trackTOFin->GetAlpha())*c->GetR();
       Double_t p[2]={yc, c->GetZ()};
-      Double_t cov[3]={fDy*fDy/12., 0., fDz*fDz/12.};
-      if (trackTOFin->AliExternalTrackParam::GetPredictedChi2(p,cov) > 150.) 
-         continue;
-      }
+      Double_t cov2[3]= {dY*dY/12., 0., dZ*dZ/12.};
+      if (trackTOFin->AliExternalTrackParam::GetPredictedChi2(p,cov2) > maxChi2)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;      
+      clind[nc] = k;      
       Char_t path[100];
       Int_t ind[5];
-      ind[0]=clind[0][nc];
-      ind[1]=clind[1][nc];
-      ind[2]=clind[2][nc];
-      ind[3]=clind[3][nc];
-      ind[4]=clind[4][nc];
+      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++;
     }
 
-    //if (nc) AliInfo(Form("seed for TOF %4i and number of clusters in the track window %4i (cluster index %4i)     %4i",i,nc, clind[5][0], fN));
-
     //start fine propagation 
 
     Int_t nStepsDone = 0;
     for( Int_t istep=0; istep<nSteps; istep++){ 
 
-      Float_t xs=fGeom->RinTOF()+istep*0.1;
+      Float_t xs=AliTOFGeometry::RinTOF()+istep*0.1;
       Double_t ymax=xs*TMath::Tan(0.5*AliTOFGeometry::GetAlpha());
 
       Bool_t skip=kFALSE;
@@ -397,7 +497,7 @@ void AliTOFtracker::MatchTracks( Bool_t mLastStep){
          break;
        }
       } else if (ysect <-ymax) {
-       if (!trackTOFin->Rotate(-AliTOFGeometry::GetAlpha())) {
+       if (!trackTOFin->Rotate(AliTOFGeometry::GetAlpha())) {
          break;
        }
       }
@@ -420,9 +520,10 @@ void AliTOFtracker::MatchTracks( Bool_t mLastStep){
 
 
     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];
@@ -431,29 +532,30 @@ void AliTOFtracker::MatchTracks( Bool_t mLastStep){
 
       //now see whether the track matches any of the TOF clusters            
 
+      Float_t dist3d[3];
+      accept=kFALSE;
       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,global[i],ctrackPos)<fdCut);
-       if(!mLastStep)accept = (fGeom->IsInsideThePad(cind,global[i],ctrackPos));
+        isInside=fGeom->IsInsideThePad(global[i],ctrackPos,dist3d);
+
+        if( mLastStep){
+          Float_t xLoc=dist3d[0];
+          Float_t rLoc=TMath::Sqrt(dist3d[1]*dist3d[1]+dist3d[2]*dist3d[2]);
+         accept = (TMath::Abs(xLoc)<padDepth*0.5 && rLoc<dCut);
+       }
+       else{
+         accept = isInside;
+       }
        if(accept){
-         if(!mLastStep)isInside=kTRUE;
-         dist[nfound]=fGeom->DistanceToPad(cind,global[i],ctrackPos);
+         dist[nfound]=TMath::Sqrt(dist3d[0]*dist3d[0]+dist3d[1]*dist3d[1]+dist3d[2]*dist3d[2]);
+         distZ[nfound]=dist3d[2];
          crecL[nfound]=trackPos[3][istep];
-         index[nfound]=clind[5][i]; // store cluster id            
-         cxpos[nfound]=fGeom->RinTOF()+istep*0.1; //store prop.radius
+         index[nfound]=clind[i]; // store cluster id       
+         cxpos[nfound]=AliTOFGeometry::RinTOF()+istep*0.1; //store prop.radius
          nfound++;
-         if(isInside)break;
+         if(accept &&!mLastStep)break;
        }//end if accept
       } //end for on the clusters
-
-
-      if(isInside)break;
+      if(accept &&!mLastStep)break;
     } //end for on the steps     
 
 
@@ -468,21 +570,32 @@ void AliTOFtracker::MatchTracks( Bool_t mLastStep){
 
     // 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.;
+    Float_t  mindistZ=0.;
     for (Int_t iclus= 0; iclus<nfound;iclus++){
       if (dist[iclus]< mindist){
        mindist = dist[iclus];
+       mindistZ = distZ[iclus];
        xpos = cxpos[iclus];
         idclus =index[iclus]; 
-        recL=crecL[iclus]+fDx*0.5;
+        recL=crecL[iclus]+corrLen*0.5;
       }
     }
 
+
     AliTOFcluster *c=fClusters[idclus];
-    c->Use(); //AliInfo(Form("I am using the cluster"));
+
+    AliDebug(2, Form("%7i     %7i     %10i     %10i  %10i  %10i      %7i",
+                    iseed,
+                    fnmatch-1,
+                    TMath::Abs(trackTOFin->GetLabel()),
+                    c->GetLabel(0), c->GetLabel(1), c->GetLabel(2),
+                    idclus)); // AdC
+
+    c->Use(); 
 
     // Track length correction for matching Step 2 
 
@@ -504,37 +617,53 @@ void AliTOFtracker::MatchTracks( Bool_t mLastStep){
        ) {
       fngoodmatch++;
 
-      //AliInfo(Form(" track label good %5i",trackTOFin->GetLabel()));
+       AliDebug(2,Form(" track label good %5i",trackTOFin->GetLabel()));
 
     }
     else{
       fnbadmatch++;
 
-      //AliInfo(Form(" track label  bad %5i",trackTOFin->GetLabel()));
+      AliDebug(2,Form(" track label  bad %5i",trackTOFin->GetLabel()));
 
     }
 
     delete trackTOFin;
 
     //  Store quantities to be used in the TOF Calibration
-    Float_t tToT=c->GetToT(); // in ps
+    Float_t tToT=AliTOFGeometry::ToTBinWidth()*c->GetToT()*1E-3; // in ns
     t->SetTOFsignalToT(tToT);
+    Float_t rawTime=AliTOFGeometry::TdcBinWidth()*c->GetTDCRAW()+32; // RAW time,in ps
+    t->SetTOFsignalRaw(rawTime);
+    t->SetTOFsignalDz(mindistZ);
+    AliDebug(2,Form(" Setting TOF raw time: %f, z distance: %f time: %f = ",rawTime,mindistZ));    
     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 = calib->GetIndex(ind);
+    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 %i = ",c->GetTDC()));    
     Double_t tof=AliTOFGeometry::TdcBinWidth()*c->GetTDC()+32; // in ps
-    t->SetTOFsignal(tof);
-    //t->SetTOFcluster(c->GetIndex()); // pointing to the digits tree
+    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
-    Double_t time[10]; t->GetIntegratedTimes(time);
+
+    //Tracking info
+    Double_t time[AliPID::kSPECIES]; t->GetIntegratedTimes(time);
     Double_t mom=t->GetP();
-    for(Int_t j=0;j<=AliPID::kSPECIES;j++){
+    for(Int_t j=0;j<AliPID::kSPECIES;j++){
       Double_t mass=AliPID::ParticleMass(j);
       time[j]+=(recL-trackPos[3][0])/3e-2*TMath::Sqrt(mom*mom+mass*mass)/mom;
     }
@@ -544,12 +673,33 @@ void AliTOFtracker::MatchTracks( Bool_t mLastStep){
     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);
+    fHRecSigYVsP->Fill(mom,TMath::Sqrt(cov[0]));
+    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 calib;
+  delete [] clind;
 }
 //_________________________________________________________________________
 Int_t AliTOFtracker::LoadClusters(TTree *cTree) {
@@ -557,27 +707,73 @@ Int_t AliTOFtracker::LoadClusters(TTree *cTree) {
   //This function loads the TOF clusters
   //--------------------------------------------------------------------
 
+  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 clusters !");
     return 1;
   }
 
-  TClonesArray dummy("AliTOFcluster",10000), *clusters=&dummy;
+  static TClonesArray dummy("AliTOFcluster",10000);
+  dummy.Clear();
+  TClonesArray *clusters=&dummy;
   branch->SetAddress(&clusters);
 
   cTree->GetEvent(0);
   Int_t nc=clusters->GetEntriesFast();
+  fHDigNClus->Fill(nc);
+
   AliInfo(Form("Number of clusters: %d",nc));
 
   for (Int_t i=0; i<nc; i++) {
     AliTOFcluster *c=(AliTOFcluster*)clusters->UncheckedAt(i);
     fClusters[i]=new AliTOFcluster(*c); fN++;
-    //AliInfo(Form("%4i %4i  %f %f %f  %f %f   %2i %1i %2i %1i %2i",i, fClusters[i]->GetIndex(),fClusters[i]->GetZ(),fClusters[i]->GetR(),fClusters[i]->GetPhi(), fClusters[i]->GetTDC(),fClusters[i]->GetADC(),fClusters[i]->GetDetInd(0),fClusters[i]->GetDetInd(1),fClusters[i]->GetDetInd(2),fClusters[i]->GetDetInd(3),fClusters[i]->GetDetInd(4)));
-    //AliInfo(Form("%i %f",i, fClusters[i]->GetZ()));
+
+  // 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);
+
   }
 
-  //AliInfo(Form("Number of clusters: %d",fN));
 
   return 0;
 }
@@ -621,10 +817,10 @@ Bool_t AliTOFtracker::GetTrackPoint(Int_t index, AliTrackPoint& p) const
   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 = fGeom->GetAngles(cl->GetDetInd(1),cl->GetDetInd(2))*TMath::DegToRad();
+  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 = fGeom->XPad()*fGeom->XPad()/12.;
-  Float_t sigmaz2 = fGeom->ZPad()*fGeom->ZPad()/12.;
+  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;
@@ -635,11 +831,11 @@ Bool_t AliTOFtracker::GetTrackPoint(Int_t index, AliTrackPoint& p) const
   p.SetXYZ(xyz[0],xyz[1],xyz[2],cov);
 
   // Detector numbering scheme
-  Int_t nSector = fGeom->NSectors();
-  Int_t nPlate  = fGeom->NPlates();
-  Int_t nStripA = fGeom->NStripA();
-  Int_t nStripB = fGeom->NStripB();
-  Int_t nStripC = fGeom->NStripC();
+  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)
@@ -674,7 +870,138 @@ Bool_t AliTOFtracker::GetTrackPoint(Int_t index, AliTrackPoint& p) const
   Int_t idet = (2*(nStripC+nStripB)+nStripA)*isector +
                stripOffset +
                istrip;
-  UShort_t volid = AliAlignObj::LayerToVolUID(AliAlignObj::kTOF,idet);
+  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) {
+
+  //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;
+}
+//_________________________________________________________________________
+Float_t AliTOFtracker::GetTimeZerofromT0(AliESDEvent *event) const {
+
+  //Returns TimeZero as measured by T0 detector
+
+  return event->GetT0();
+}
+//_________________________________________________________________________
+Float_t AliTOFtracker::GetTimeZerofromTOF(AliESDEvent * /*event*/) const {
+
+  //dummy, for the moment. T0 algorithm using tracks on TOF
+  {
+    //place T0 algo here...
+  }
+  return 0.;
+}
+//_________________________________________________________________________
+
+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]);
+
+}