]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - TOF/AliTOFtracker.cxx
Fix to provide correct EMCAL mapping info (David)
[u/mrichter/AliRoot.git] / TOF / AliTOFtracker.cxx
index c6cc18c12bf8062d58cdc595231bc4bb7a7e7bc2..13f0e1ccb86f964c8535fdf235621164e2e1ffcc 100644 (file)
 #include <Rtypes.h>
 #include <TROOT.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 "AliTOFGeometryV5.h"
+#include "AliTOFGeometry.h"
 #include "AliTOFtracker.h"
 #include "AliTOFtrack.h"
 
@@ -65,8 +68,8 @@ AliTOFtracker::AliTOFtracker():
   fnbadmatch(0),
   fnunmatch(0),
   fnmatch(0),
-  fTracks(0x0),
-  fSeeds(0x0),
+  fTracks(new TClonesArray("AliTOFtrack")),
+  fSeeds(new TClonesArray("AliESDtrack")),
   fHDigClusMap(0x0),
   fHDigNClus(0x0),
   fHDigClusTime(0x0),
@@ -88,86 +91,9 @@ AliTOFtracker::AliTOFtracker():
   //AliTOFtracker main Ctor
    
    // Gettimg the geometry 
-   fGeom=new AliTOFGeometryV5();
-   // Read the reconstruction parameters from the OCDB
-   AliTOFcalib *calib = new AliTOFcalib(fGeom);
-   fRecoParam = (AliTOFRecoParam*)calib->ReadRecParFromCDB("TOF/Calib",-1);
-   if(fRecoParam->GetApplyPbPbCuts())fRecoParam=fRecoParam->GetPbPbparam();
-   Double_t parPID[2];   
-   parPID[0]=fRecoParam->GetTimeResolution();
-   parPID[1]=fRecoParam->GetTimeNSigma();
-   fPid=new AliTOFpidESD(parPID);
-   InitCheckHists();
-
-}
-//_____________________________________________________________________________
-AliTOFtracker::AliTOFtracker(const AliTOFtracker &t):
-  AliTracker(),
-  fRecoParam(0x0),
-  fGeom(0x0),
-  fPid(0x0),
-  fN(0),
-  fNseeds(0),
-  fNseedsTOF(0),
-  fngoodmatch(0),
-  fnbadmatch(0),
-  fnunmatch(0),
-  fnmatch(0),
-  fTracks(0x0),
-  fSeeds(0x0),
-  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
-
-  fNseeds=t.fNseeds;
-  fNseeds=t.fNseeds;
-  fNseedsTOF=t.fNseedsTOF;
-  fngoodmatch=t.fngoodmatch;
-  fnbadmatch=t.fnbadmatch;
-  fnunmatch=t.fnunmatch;
-  fnmatch=t.fnmatch;
-  fRecoParam=t.fRecoParam;
-  fGeom=t.fGeom;
-  fPid=t.fPid;
-  fSeeds=t.fSeeds;
-  fTracks=t.fTracks;
-  fN=t.fN;
-}
+   fGeom= new AliTOFGeometry();
 
-//_____________________________________________________________________________
-AliTOFtracker& AliTOFtracker::operator=(const AliTOFtracker &t)
-{ 
-  //AliTOFtracker assignment operator
-
-  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->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;
+   InitCheckHists();
 
 }
 //_____________________________________________________________________________
@@ -178,7 +104,9 @@ AliTOFtracker::~AliTOFtracker() {
 
   SaveCheckHists();
 
-  delete fRecoParam; 
+  if(!(AliCDBManager::Instance()->GetCacheFlag())){
+    delete fRecoParam;
+  }
   delete fGeom; 
   delete fPid; 
   delete fHDigClusMap;
@@ -192,13 +120,41 @@ AliTOFtracker::~AliTOFtracker() {
   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
 
@@ -211,7 +167,6 @@ Int_t AliTOFtracker::PropagateBack(AliESD* event) {
 
   Int_t ntrk=event->GetNumberOfTracks();
   fNseeds = ntrk;
-  fSeeds= new TClonesArray("AliESDtrack",ntrk);
   TClonesArray &aESDTrack = *fSeeds;
 
 
@@ -240,16 +195,38 @@ Int_t AliTOFtracker::PropagateBack(AliESD* event) {
   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());
-      t->SetTOFsignalToT(seed->GetTOFsignalToT());
-      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;
+
+    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->SetTOFCalChannel(seed->GetTOFCalChannel());
+       Int_t tlab[3]; seed->GetTOFLabel(tlab);    
+       t->SetTOFLabel(tlab);
+
+       AliTOFtrack *track = new AliTOFtrack(*seed);
+       t->UpdateTrackParams(track,AliESDtrack::kTOFout); // to be checked - AdC
+       delete track;
+       Double_t time[10]; t->GetIntegratedTimes(time);
+       AliDebug(1,Form(" %6d  %f %f %f %f %6d %3d %f  %f %f %f %f %f",
+                       i,
+                       t->GetTOFsignalRaw(),
+                       t->GetTOFsignal(),
+                       t->GetTOFsignalToT(),
+                       t->GetTOFsignalDz(),
+                       t->GetTOFCalChannel(),
+                       t->GetTOFcluster(),
+                       t->GetIntegratedLength(),
+                       time[0], time[1], time[2], time[3], time[4]
+                       )
+                );
+      }
     }
   }
 
@@ -277,58 +254,66 @@ Int_t AliTOFtracker::PropagateBack(AliESD* event) {
   //Make TOF PID
   fPid->MakePID(event,timeZero);
 
-  if (fSeeds) {
-    fSeeds->Delete();
-    delete fSeeds;
-    fSeeds = 0x0;
-  }
-  if (fTracks) {
-    fTracks->Delete();
-    delete fTracks;
-    fTracks = 0x0;
-  }
+  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
-
     AliTOFtrack *track = new AliTOFtrack(*t); // New
-    Double_t x = track->GetX(); //New
-
-    if (((t->GetStatus()&AliESDtrack::kTRDout)!=0 ) && 
-        ( x >= fGeom->RinTOF()) ){
-      track->SetSeedIndex(i);
-      t->UpdateTrackParams(track,AliESDtrack::kTOFout);    
-      new(aTOFTrack[fNseedsTOF]) AliTOFtrack(*track);
-      fNseedsTOF++;
+    Float_t x = (Float_t)track->GetX(); //New
+
+    // TRD 'good' tracks, already propagated at 371 cm
+    if ( ( (t->GetStatus()&AliESDtrack::kTRDout)!=0 ) &&
+        ( 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++;
+      }
       delete track;
     }
 
     // Propagate the rest of TPCbp  
-
     else {
-      if(track->PropagateToInnerTOF()){ 
+      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()));
+
        track->SetSeedIndex(i);
-       t->UpdateTrackParams(track,AliESDtrack::kTOFout);    
+       t->UpdateTrackParams(track,AliESDtrack::kTOFin);
        new(aTOFTrack[fNseedsTOF]) AliTOFtrack(*track);
        fNseedsTOF++;
+       seedsTOF2++;
       }
       delete track;
     }
   }
 
-  AliInfo(Form("Number of TOF seedds %i",fNseedsTOF));
+  AliInfo(Form("Number of TOF seeds %d",fNseedsTOF));
+  AliInfo(Form("Number of TOF seeds Type 1 %d",seedsTOF1));
+  AliInfo(Form("Number of TOF seeds Type 2 %d",seedsTOF2));
 
   // Sort according uncertainties on track position 
   fTracks->Sort();
@@ -342,9 +327,13 @@ void AliTOFtracker::MatchTracks( Bool_t mLastStep){
 
   static Float_t corrLen=0.75;
   static Float_t detDepth=15.3;
+  static Float_t padDepth=0.5;
+
+  const Float_t kSpeedOfLight= 2.99792458e-2; // speed of light [cm/ps]
+  const Float_t kTimeOffset = 32.; // time offset for tracking algorithm [ps]
 
-  Float_t dY=fGeom->XPad(); 
-  Float_t dZ=fGeom->ZPad(); 
+  Float_t dY=AliTOFGeometry::XPad(); 
+  Float_t dZ=AliTOFGeometry::ZPad(); 
 
   Float_t sensRadius = fRecoParam->GetSensRadius();
   Float_t stepSize   = fRecoParam->GetStepSize();
@@ -352,7 +341,7 @@ void AliTOFtracker::MatchTracks( Bool_t mLastStep){
   Float_t dyMax=fRecoParam->GetWindowSizeMaxY(); 
   Float_t dzMax=fRecoParam->GetWindowSizeMaxZ();
   Float_t dCut=fRecoParam->GetDistanceCut();
-  Double_t maxChi2=fRecoParam->GetMaxChi2();
+  Double_t maxChi2=fRecoParam->GetMaxChi2TRD();
   Bool_t timeWalkCorr    = fRecoParam->GetTimeWalkCorr();
   if(!mLastStep){
     AliDebug(1,"++++++++++++++TOF Reconstruction Parameters:++++++++++++ \n");
@@ -372,20 +361,19 @@ void AliTOFtracker::MatchTracks( Bool_t mLastStep){
 
   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];
   
+  //The matching loop
   for (Int_t iseed=0; iseed<fNseedsTOF; iseed++) {
 
     AliTOFtrack *track =(AliTOFtrack*)fTracks->UncheckedAt(iseed);
     AliESDtrack *t =(AliESDtrack*)fSeeds->UncheckedAt(track->GetSeedIndex());
-    if(t->GetTOFsignal()>0. ) continue;
+    //if ( t->GetTOFsignal()>0. ) continue;
+    if ( (t->GetStatus()&AliESDtrack::kTOFout)!=0 ) continue;
     AliTOFtrack *trackTOFin =new AliTOFtrack(*track);
 
     // Some init
@@ -432,7 +420,10 @@ void AliTOFtracker::MatchTracks( Bool_t mLastStep){
       if (c->GetZ() > z+dz) break;
       if (c->IsUsed()) continue;
 
-      if (!c->GetStatus()) continue; // skip bad channels as declared in OCDB
+      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();
@@ -440,22 +431,17 @@ void AliTOFtracker::MatchTracks( Bool_t mLastStep){
 
       Double_t yc=(c->GetPhi() - trackTOFin->GetAlpha())*c->GetR();
       Double_t p[2]={yc, c->GetZ()};
-      Double_t cov[3]= {dY*dY/12., 0., dZ*dZ/12.};
-      if (trackTOFin->AliExternalTrackParam::GetPredictedChi2(p,cov) > 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;      
+      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[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();
@@ -467,18 +453,18 @@ void AliTOFtracker::MatchTracks( Bool_t mLastStep){
     Int_t nStepsDone = 0;
     for( Int_t istep=0; istep<nSteps; istep++){ 
 
-      Float_t xs=fGeom->RinTOF()+istep*0.1;
-      Double_t ymax=xs*TMath::Tan(0.5*fGeom->GetAlpha());
+      Float_t xs=AliTOFGeometry::RinTOF()+istep*0.1;
+      Double_t ymax=xs*TMath::Tan(0.5*AliTOFGeometry::GetAlpha());
 
       Bool_t skip=kFALSE;
       Double_t ysect=trackTOFin->GetYat(xs,skip);
       if (skip) break;
       if (ysect > ymax) {
-       if (!trackTOFin->Rotate(fGeom->GetAlpha())) {
+       if (!trackTOFin->Rotate(AliTOFGeometry::GetAlpha())) {
          break;
        }
       } else if (ysect <-ymax) {
-       if (!trackTOFin->Rotate(fGeom->GetAlpha())) {
+       if (!trackTOFin->Rotate(-AliTOFGeometry::GetAlpha())) {
          break;
        }
       }
@@ -501,42 +487,55 @@ 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];
-      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,global[i],ctrackPos)<dCut);
-       if(!mLastStep)accept = (fGeom->IsInsideThePad(cind,global[i],ctrackPos));
-       if(accept){
-         if(!mLastStep)isInside=kTRUE;
-          Float_t dist3d[3];
-         dist[nfound]=fGeom->DistanceToPad(cind,global[i],ctrackPos,dist3d);
-         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
+      Float_t dist3d[3];
+      accept = kFALSE;
+      for (Int_t i=0; i<nc; i++) {
+        isInside = fGeom->IsInsideThePad(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) {
+
+         dist[nfound] = TMath::Sqrt(dist3d[0]*dist3d[0] +
+                                    dist3d[1]*dist3d[1] +
+                                    dist3d[2]*dist3d[2]);
+         AliDebug(1,Form(" dist3dLoc[0] = %f, dist3dLoc[1] = %f, dist3dLoc[2] = %f ",
+                         dist3d[0],dist3d[1],dist3d[2]));
+         distZ[nfound] = dist3d[2]; // Z distance in the RF of the
+                                    // hit pad closest to the
+                                    // reconstructed track
+
+         AliDebug(1,Form("   dist3dLoc[2] = %f --- distZ[%d] = %f",
+                         dist3d[2],nfound,distZ[nfound]));
+
+         crecL[nfound] = trackPos[3][istep];
+         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;
+      } //end for on the clusters
+      if(accept &&!mLastStep)break;
     } //end for on the steps     
 
 
@@ -551,7 +550,7 @@ 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.;
@@ -559,14 +558,32 @@ void AliTOFtracker::MatchTracks( Bool_t mLastStep){
     for (Int_t iclus= 0; iclus<nfound;iclus++){
       if (dist[iclus]< mindist){
        mindist = dist[iclus];
-       mindistZ = distZ[iclus];
+       mindistZ = distZ[iclus]; // Z distance in the RF of the hit
+                                // pad closest to the reconstructed
+                                // track
        xpos = cxpos[iclus];
         idclus =index[iclus]; 
         recL=crecL[iclus]+corrLen*0.5;
       }
     }
 
+
     AliTOFcluster *c=fClusters[idclus];
+    /*
+    Float_t tiltangle = AliTOFGeometry::GetAngles(c->GetDetInd(1),c->GetDetInd(2))*TMath::DegToRad();
+    Float_t localCheck=-mindistZ;
+    localCheck/=TMath::Cos(tiltangle); // Z (tracking/ALICE RF) component of
+                                      // the distance between the
+                                      // reconstructed track and the
+                                      // TOF closest cluster
+    */
+    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
+
     c->Use(); 
 
     // Track length correction for matching Step 2 
@@ -589,28 +606,32 @@ void AliTOFtracker::MatchTracks( Bool_t mLastStep){
        ) {
       fngoodmatch++;
 
-       AliDebug(2,Form(" track label good %5i",trackTOFin->GetLabel()));
+       AliDebug(2,Form(" track label good %5d",trackTOFin->GetLabel()));
 
     }
     else{
       fnbadmatch++;
 
-      AliDebug(2,Form(" track label  bad %5i",trackTOFin->GetLabel()));
+      AliDebug(2,Form(" track label  bad %5d",trackTOFin->GetLabel()));
 
     }
 
     delete trackTOFin;
 
     //  Store quantities to be used in the TOF Calibration
-    Float_t tToT=fGeom->ToTBinWidth()*c->GetToT()*1E-3; // in ns
+    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);
+
     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
@@ -618,24 +639,39 @@ void AliTOFtracker::MatchTracks( Bool_t mLastStep){
     tlab[0]=c->GetLabel(0);
     tlab[1]=c->GetLabel(1);
     tlab[2]=c->GetLabel(2);
-    
-    Double_t tof=fGeom->TdcBinWidth()*c->GetTDC()+32; // in ps
-    if(timeWalkCorr)tof=CorrectTimeWalk(mindistZ,tof);
-    t->SetTOFsignal(tof);
+    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
-    Double_t time[AliPID::kSPECIES]; t->GetIntegratedTimes(time);
+
+    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();
+    AliDebug(1,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])/3e-2*TMath::Sqrt(mom*mom+mass*mass)/mom;
+      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);    
+
+    // 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);
@@ -647,10 +683,9 @@ void AliTOFtracker::MatchTracks( Bool_t mLastStep){
     // Fill Tree for on-the-fly offline Calibration
 
     if ( !((t->GetStatus() & AliESDtrack::kTIME)==0 )){    
-      Float_t rawtime=fGeom->TdcBinWidth()*c->GetTDCRAW()+32; // RAW time,in ps
       fIch=calindex;
       fToT=tToT;
-      fTime=rawtime;
+      fTime=rawTime;
       fExpTimePi=time[2];
       fExpTimeKa=time[3];
       fExpTimePr=time[4];
@@ -659,8 +694,8 @@ void AliTOFtracker::MatchTracks( Bool_t mLastStep){
     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) {
@@ -668,11 +703,11 @@ Int_t AliTOFtracker::LoadClusters(TTree *cTree) {
   //This function loads the TOF clusters
   //--------------------------------------------------------------------
 
-  Int_t npadX = fGeom->NpadX();
-  Int_t npadZ = fGeom->NpadZ();
-  Int_t nStripA = fGeom->NStripA();
-  Int_t nStripB = fGeom->NStripB();
-  Int_t nStripC = fGeom->NStripC();
+  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) { 
@@ -680,7 +715,9 @@ Int_t AliTOFtracker::LoadClusters(TTree *cTree) {
     return 1;
   }
 
-  TClonesArray dummy("AliTOFcluster",10000), *clusters=&dummy;
+  static TClonesArray dummy("AliTOFcluster",10000);
+  dummy.Clear();
+  TClonesArray *clusters=&dummy;
   branch->SetAddress(&clusters);
 
   cTree->GetEvent(0);
@@ -701,8 +738,8 @@ Int_t AliTOFtracker::LoadClusters(TTree *cTree) {
     Int_t ipadX = c->GetDetInd(4);
     Int_t ipadZ = c->GetDetInd(3);
 
-    Float_t time =(fGeom->TdcBinWidth()*c->GetTDC())*1E-3; // in ns
-    Float_t tot = (fGeom->TdcBinWidth()*c->GetToT())*1E-3;//in ns
+    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) {
@@ -776,10 +813,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;
@@ -790,11 +827,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)
@@ -829,7 +866,7 @@ 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;
 }
@@ -839,6 +876,23 @@ 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");
@@ -860,6 +914,9 @@ void AliTOFtracker::InitCheckHists() {
   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();
+
 }
 
 //_________________________________________________________________________
@@ -868,16 +925,10 @@ void AliTOFtracker::SaveCheckHists() {
   //write histos for Digits/Reco QA and Calibration
 
   TDirectory *dir = gDirectory;
-  TFile *logFile = 0;
   TFile *logFileTOF = 0;
 
   TSeqCollection *list = gROOT->GetListOfFiles();
   int n = list->GetEntries();
-  for(int i=0; i<n; i++) {
-    logFile = (TFile*)list->At(i);
-    if (strstr(logFile->GetName(), "AliESDs.root")) break;
-  }
-
   Bool_t isThere=kFALSE;
   for(int i=0; i<n; i++) {
     logFileTOF = (TFile*)list->At(i);
@@ -887,21 +938,10 @@ void AliTOFtracker::SaveCheckHists() {
     } 
   }
    
-  logFile->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);
-  logFile->Flush();  
-
-  if(!isThere)logFileTOF = new TFile( "TOFQA.root","RECREATE");
+  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);
@@ -923,7 +963,7 @@ Float_t AliTOFtracker::CorrectTimeWalk( Float_t dist, Float_t tof) {
 
   //dummy, for the moment
   Float_t tofcorr=0.;
-  if(dist<fGeom->ZPad()*0.5){
+  if(dist<AliTOFGeometry::ZPad()*0.5){
     tofcorr=tof;
     //place here the actual correction
   }else{
@@ -932,14 +972,14 @@ Float_t AliTOFtracker::CorrectTimeWalk( Float_t dist, Float_t tof) {
   return tofcorr;
 }
 //_________________________________________________________________________
-Float_t AliTOFtracker::GetTimeZerofromT0(AliESD *event) {
+Float_t AliTOFtracker::GetTimeZerofromT0(AliESDEvent *event) const {
 
   //Returns TimeZero as measured by T0 detector
 
   return event->GetT0();
 }
 //_________________________________________________________________________
-Float_t AliTOFtracker::GetTimeZerofromTOF(AliESD *event) {
+Float_t AliTOFtracker::GetTimeZerofromTOF(AliESDEvent * /*event*/) const {
 
   //dummy, for the moment. T0 algorithm using tracks on TOF
   {
@@ -947,3 +987,19 @@ Float_t AliTOFtracker::GetTimeZerofromTOF(AliESD *event) {
   }
   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]);
+
+}
+//_________________________________________________________________________
+