]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - TOF/AliTOFClusterFinder.cxx
some coverity fixes
[u/mrichter/AliRoot.git] / TOF / AliTOFClusterFinder.cxx
index 0ed00ca81eb8a0c80ce323bc9c6ceafbeb310859..3cd99b50ecde72cc9da4957d0726919bb053e308 100644 (file)
  **************************************************************************/
 
 /* 
-$Log$
+$Log: AliTOFClusterFinder.cxx,v $
+Revision 1.31  2007/11/24 14:53:19  zampolli
+Status flag implemented as UChar_t
+
+Revision 1.30  2007/10/04 13:08:52  arcelli
+updates to comply with AliTOFGeometryV5 becoming AliTOFGeometry
+
+Revision 1.29  2007/10/03 10:42:33  arcelli
+updates to handle new AliTOFcluster, inheriting form AliCluster3D
+
+Revision 1.28  2007/05/31 16:06:05  arcelli
+move instance of AliRawStream outside loop on DDL
+
+Revision 1.27  2007/05/02 16:31:49  arcelli
+Add methods to handle single event reconstruction.  retrieval of Calib
+info moved to AliTOFReconstructor ctor, and passed via a pointer to
+AliTOFcalib
+
+Revision 1.26  2007/04/30 19:02:24  arcelli
+hopefully the last refinements for correct type conversion in calibration
+
+Revision 1.25  2007/04/30 15:22:17  arcelli
+Change TOF digit Time, Tot etc to int type
+
+Revision 1.24  2007/04/27 11:19:31  arcelli
+updates for the new decoder
+
+Revision 1.23  2007/04/23 16:51:39  decaro
+Digits-to-raw_data conversion: correction for a more real description
+(A.De Caro, R.Preghenella)
+
+Revision 1.22  2007/04/19 17:26:32  arcelli
+Fix a bug (add some debug printout
+
+Revision 1.21  2007/04/18 17:28:12  arcelli
+Set the ToT bin width to the one actually used...
+
 Revision 1.20  2007/03/09 09:57:23  arcelli
  Remove a forgotten include of Riostrem
 
@@ -25,7 +61,8 @@ Revision 1.18  2007/03/06 16:31:20  arcelli
 Add Uncorrected TOF Time signal
 
 Revision 1.17  2007/02/28 18:09:11  arcelli
-Add protection against failed retrieval of the CDB cal object, now Reconstruction exits with AliFatal
+Add protection against failed retrieval of the CDB cal object,
+now Reconstruction exits with AliFatal
 
 Revision 1.16  2007/02/20 15:57:00  decaro
 Raw data update: to read the TOF raw data defined in UNPACKED mode
@@ -66,92 +103,126 @@ Revision 0.01  2005/07/25 A. De Caro
 //                                                            //
 ////////////////////////////////////////////////////////////////
 
+#include "Riostream.h"
 
 #include "TClonesArray.h"
-//#include "TFile.h"
+#include "TStopwatch.h"
 #include "TTree.h"
+//#include <TGeoManager.h>
+#include <TGeoMatrix.h>
+//#include <TGeoPhysicalNode.h>
 
 #include "AliDAQ.h"
 #include "AliLoader.h"
 #include "AliLog.h"
 #include "AliRawReader.h"
 #include "AliRunLoader.h"
+//#include "AliAlignObj.h"
+#include <AliGeomManager.h>
 
-#include "AliTOFCal.h"
 #include "AliTOFcalib.h"
-#include "AliTOFChannel.h"
+#include "AliTOFChannelOnlineArray.h"
+#include "AliTOFChannelOnlineStatusArray.h"
+#include "AliTOFChannelOffline.h"
 #include "AliTOFClusterFinder.h"
 #include "AliTOFcluster.h"
 #include "AliTOFdigit.h"
 #include "AliTOFGeometry.h"
-#include "AliTOFGeometryV5.h"
 #include "AliTOFrawData.h"
-#include "AliTOFRawStream.h"
-#include "Riostream.h"
+
+#include "AliTOFDeltaBCOffset.h"
+#include "AliTOFCTPLatency.h"
+#include "AliTOFRunParams.h"
 
 //extern TFile *gFile;
 
+using std::cout;
+using std::endl;
+using std::ofstream;
+using std::ios;
 ClassImp(AliTOFClusterFinder)
 
-AliTOFClusterFinder::AliTOFClusterFinder():
+AliTOFClusterFinder::AliTOFClusterFinder(AliTOFcalib *calib):
+  TTask("AliTOFClusterFinder",""),
   fRunLoader(0),
   fTOFLoader(0),
   fTreeD(0),
   fTreeR(0),
-  fTOFGeometry(new AliTOFGeometryV5()),
   fDigits(new TClonesArray("AliTOFdigit", 4000)),
   fRecPoints(new TClonesArray("AliTOFcluster", 4000)),
   fNumberOfTofClusters(0),
-  fVerbose(0)
+  fNumberOfTofTrgPads(0),
+  fVerbose(0),
+  fDecoderVersion(0),
+  fTOFcalib(calib),
+  fTOFRawStream(AliTOFRawStream())
 {
 //
 // Constructor
 //
 
-  AliInfo("V5 TOF Geometry is taken as the default");
+  for (Int_t ii=0; ii<kTofMaxCluster; ii++) fTofClusters[ii]=0x0;
+
+  TString validity = (TString)fTOFcalib->GetOfflineValidity();
+  if (validity.CompareTo("valid")==0) {
+    AliInfo(Form(" validity = %s - Using offline calibration parameters",validity.Data()));
+  } else {
+    AliInfo(Form(" validity = %s - Using online calibration parameters",validity.Data()));
+  }
 
 }
+
 //______________________________________________________________________________
 
-AliTOFClusterFinder::AliTOFClusterFinder(AliRunLoader* runLoader):
+AliTOFClusterFinder::AliTOFClusterFinder(AliRunLoader* runLoader, AliTOFcalib *calib):
+  TTask("AliTOFClusterFinder",""),
   fRunLoader(runLoader),
   fTOFLoader(runLoader->GetLoader("TOFLoader")),
   fTreeD(0),
   fTreeR(0),
-  fTOFGeometry(new AliTOFGeometryV5()),
   fDigits(new TClonesArray("AliTOFdigit", 4000)),
   fRecPoints(new TClonesArray("AliTOFcluster", 4000)),
   fNumberOfTofClusters(0),
-  fVerbose(0)
+  fNumberOfTofTrgPads(0),
+  fVerbose(0),
+  fDecoderVersion(0),
+  fTOFcalib(calib),
+  fTOFRawStream(AliTOFRawStream())
 {
 //
 // Constructor
 //
 
-//  runLoader->CdGAFile();
-//  TFile *in=(TFile*)gFile;
-//  in->cd();
-//  fTOFGeometry = (AliTOFGeometry*)in->Get("TOFgeometry");
+  for (Int_t ii=0; ii<kTofMaxCluster; ii++) fTofClusters[ii]=0x0;
+
+  TString validity = (TString)fTOFcalib->GetOfflineValidity();
+  if (validity.CompareTo("valid")==0) {
+    AliInfo(Form(" validity = %s - Using offline calibration parameters",validity.Data()));
+  } else {
+    AliInfo(Form(" validity = %s - Using online calibration parameters",validity.Data()));
+  }
 
 }
 
 //------------------------------------------------------------------------
-AliTOFClusterFinder::AliTOFClusterFinder(const AliTOFClusterFinder &source)
-  :TObject(),
+AliTOFClusterFinder::AliTOFClusterFinder(const AliTOFClusterFinder &source) :
+  TTask(source),
   fRunLoader(0),
   fTOFLoader(0),
   fTreeD(0),
   fTreeR(0),
-  fTOFGeometry(new AliTOFGeometryV5()),
-  fDigits(new TClonesArray("AliTOFdigit", 4000)),
-  fRecPoints(new TClonesArray("AliTOFcluster", 4000)),
+  fDigits(source.fDigits),
+  fRecPoints(source.fRecPoints),
   fNumberOfTofClusters(0),
-  fVerbose(0)
+  fNumberOfTofTrgPads(0),
+  fVerbose(0),
+  fDecoderVersion(source.fDecoderVersion),
+  fTOFcalib(source.fTOFcalib),
+  fTOFRawStream(source.fTOFRawStream)
 {
   // copy constructor
-  this->fDigits=source.fDigits;
-  this->fRecPoints=source.fRecPoints;
-  this->fTOFGeometry=source.fTOFGeometry;
+
+  for (Int_t ii=0; ii<kTofMaxCluster; ii++) fTofClusters[ii]=source.fTofClusters[ii];
 
 }
 
@@ -159,10 +230,19 @@ AliTOFClusterFinder::AliTOFClusterFinder(const AliTOFClusterFinder &source)
 AliTOFClusterFinder& AliTOFClusterFinder::operator=(const AliTOFClusterFinder &source)
 {
   // ass. op.
-  this->fDigits=source.fDigits;
-  this->fRecPoints=source.fRecPoints;
-  this->fTOFGeometry=source.fTOFGeometry;
-  this->fVerbose=source.fVerbose;
+
+  if (this == &source)
+    return *this;
+
+  TTask::operator=(source);  
+  fDigits=source.fDigits;
+  fRecPoints=source.fRecPoints;
+  fVerbose=source.fVerbose;
+  fDecoderVersion=source.fDecoderVersion;
+  fTOFcalib=source.fTOFcalib;
+  fTOFRawStream=source.fTOFRawStream;
+  for (Int_t ii=0; ii<kTofMaxCluster; ii++) fTofClusters[ii]=source.fTofClusters[ii];
+
   return *this;
 
 }
@@ -188,7 +268,16 @@ AliTOFClusterFinder::~AliTOFClusterFinder()
       fRecPoints=0;
     }
 
-  delete fTOFGeometry;
+  //if (fTofClusters || fNumberOfTofClusters) {
+  if (fNumberOfTofClusters) {
+    for (Int_t ii=0; ii<kTofMaxCluster; ii++) {
+      if (fTofClusters[ii]) fTofClusters[ii]->Delete();
+      delete fTofClusters[ii];
+    }
+    fNumberOfTofClusters=0;
+   }
+
+   fNumberOfTofTrgPads=0;
 
 }
 //______________________________________________________________________________
@@ -199,22 +288,22 @@ void AliTOFClusterFinder::Digits2RecPoints(Int_t iEvent)
   // Converts digits to recpoints for TOF
   //
 
+  TStopwatch stopwatch;
+  stopwatch.Start();
+
+  Int_t inholes = 0;
+
   fRunLoader->GetEvent(iEvent);
 
   fTreeD = fTOFLoader->TreeD();
-  if (fTreeD == 0x0)
-    {
-      AliFatal("AliTOFClusterFinder: Can not get TreeD");
-    }
-
-  TBranch *branch = fTreeD->GetBranch("TOF");
-  if (!branch) { 
-    AliError("can't get the branch with the TOF digits !");
+  if (fTreeD == 0x0) {
+    AliFatal("AliTOFClusterFinder: Can not get TreeD");
     return;
   }
 
-  TClonesArray *digits = new TClonesArray("AliTOFdigit",10000);
-  branch->SetAddress(&digits);
+  fDigits->Clear();
+  fTreeD->GetBranch("TOF")->SetAutoDelete(kFALSE);
+  fTreeD->SetBranchAddress("TOF",&fDigits);
 
   ResetRecpoint();
 
@@ -229,53 +318,151 @@ void AliTOFClusterFinder::Digits2RecPoints(Int_t iEvent)
   fTreeR->Branch("TOF", &fRecPoints, bufsize);
 
   fTreeD->GetEvent(0);
-  Int_t nDigits = digits->GetEntriesFast();
+  Int_t nDigits = fDigits->GetEntriesFast();
   AliDebug(2,Form("Number of TOF digits: %d",nDigits));
 
-  Int_t ii, jj;
-  Int_t dig[5];
-  Float_t g[3];
-  Double_t h[5];
-  Float_t tToT;
-  Double_t tTdcND;
+  Int_t ii;
+  Int_t dig[5]={-1,-1,-1,-1,-1}; //cluster detector indeces
+  Int_t parTOF[7]={0,0,0,0,0,0,0}; //The TOF signal parameters
+  Bool_t status=kTRUE; // assume all sim channels ok in the beginning...
   for (ii=0; ii<nDigits; ii++) {
-    AliTOFdigit *d = (AliTOFdigit*)digits->UncheckedAt(ii);
+    AliTOFdigit *d = (AliTOFdigit*)fDigits->UncheckedAt(ii);
     dig[0]=d->GetSector();
     dig[1]=d->GetPlate();
     dig[2]=d->GetStrip();
     dig[3]=d->GetPadz();
     dig[4]=d->GetPadx();
 
-    //AliInfo(Form(" %2i  %1i  %2i  %1i  %2i ",dig[0],dig[1],dig[2],dig[3],dig[4]));
+    /* check valid index */
+    if (dig[0]==-1||dig[1]==-1||dig[2]==-1||dig[3]==-1||dig[4]==-1) continue;
 
-    for (jj=0; jj<3; jj++) g[jj] = 0.;
-    fTOFGeometry->GetPos(dig,g);
-
-    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();
-    tToT = d->GetToT();
-    tTdcND = d->GetTdcND();
+    // Do not reconstruct anything in the holes
+    if (dig[0]==13 || dig[0]==14 || dig[0]==15 ) { // sectors with holes
+      if (dig[1]==2) { // plate with holes
+       inholes++;
+       continue;
+      }
+    }
 
-    AliTOFcluster *tofCluster = new AliTOFcluster(h,d->GetTracks(),dig,ii,tToT, tTdcND);
-    tofCluster->SetTDCRAW(d->GetTdc());
+    AliDebug(2,Form(" %2d  %1d  %2d  %1d  %2d ",dig[0],dig[1],dig[2],dig[3],dig[4]));
+
+    parTOF[0] = d->GetTdc(); //the TDC signal
+    parTOF[1] = d->GetToT(); //the ToT signal
+    parTOF[2] = d->GetAdc(); // the adc charge
+    parTOF[3] = d->GetTdcND(); // non decalibrated sim time
+    parTOF[4] = d->GetTdc(); // raw time, == Tdc time for the moment
+    parTOF[5] = 0; // deltaBC
+    parTOF[6] = 0; // L0-L1 latency
+    Double_t posClus[3];
+    Double_t covClus[6];
+    UShort_t volIdClus=GetClusterVolIndex(dig);
+    GetClusterPars(dig, posClus,covClus);
+    AliTOFcluster *tofCluster = new AliTOFcluster(volIdClus,posClus[0],posClus[1],posClus[2],covClus[0],covClus[1],covClus[2],covClus[3],covClus[4],covClus[5],d->GetTracks(),dig,parTOF,status,ii);
     InsertCluster(tofCluster);
 
   }
 
-  AliInfo(Form("Number of found clusters: %i", fNumberOfTofClusters));
+  AliDebug(1,Form("Number of found clusters: %d for event: %d", fNumberOfTofClusters, iEvent));
 
   CalibrateRecPoint();
   FillRecPoint();
 
   fTreeR->Fill();
-  ResetRecpoint();
+//  ResetRecpoint();
 
   fTOFLoader = fRunLoader->GetLoader("TOFLoader");  
   fTOFLoader->WriteRecPoints("OVERWRITE");
 
+  AliDebug(1,Form("Execution time to read TOF digits and to write TOF clusters : R:%.4fs C:%.4fs",
+                 stopwatch.RealTime(),stopwatch.CpuTime()));
+  if (inholes) AliWarning(Form("Clusters in the TOF holes: %d",inholes));
+
+}
+
+//______________________________________________________________________________
+
+void AliTOFClusterFinder::Digits2RecPoints(TTree* digitsTree, TTree* clusterTree)
+{
+  //
+  // Converts digits to recpoints for TOF
+  //
+
+  TStopwatch stopwatch;
+  stopwatch.Start();
+
+  Int_t inholes = 0;
+
+  if (digitsTree == 0x0) {
+    AliFatal("AliTOFClusterFinder: Can not get TreeD");
+    return;
+  }
+
+  fDigits->Clear();
+  digitsTree->GetBranch("TOF")->SetAutoDelete(kFALSE);
+  digitsTree->SetBranchAddress("TOF",&fDigits);
+
+  ResetRecpoint();
+  Int_t bufsize = 32000;
+  clusterTree->Branch("TOF", &fRecPoints, bufsize);
+
+  digitsTree->GetEvent(0);
+  Int_t nDigits = fDigits->GetEntriesFast();
+  AliDebug(2,Form("Number of TOF digits: %d",nDigits));
+
+  Int_t ii;
+  Int_t dig[5]={-1,-1,-1,-1,-1}; //cluster detector indeces
+  Int_t parTOF[7]={0,0,0,0,0,0,0}; //The TOF signal parameters
+  Bool_t status=kTRUE; // assume all sim channels ok in the beginning...
+  for (ii=0; ii<nDigits; ii++) {
+    AliTOFdigit *d = (AliTOFdigit*)fDigits->UncheckedAt(ii);
+    dig[0]=d->GetSector();
+    dig[1]=d->GetPlate();
+    dig[2]=d->GetStrip();
+    dig[3]=d->GetPadz();
+    dig[4]=d->GetPadx();
+
+    /* check valid index */
+    if (dig[0]==-1||dig[1]==-1||dig[2]==-1||dig[3]==-1||dig[4]==-1) continue;
+
+    // Do not reconstruct anything in the holes
+    if (dig[0]==13 || dig[0]==14 || dig[0]==15 ) { // sectors with holes
+      if (dig[1]==2) { // plate with holes
+       inholes++;
+       continue;
+      }
+    }
+
+    //    AliDebug(2,Form(" %2d  %1d  %2d  %1d  %2d ",dig[0],dig[1],dig[2],dig[3],dig[4]));
+
+    parTOF[0] = d->GetTdc(); //the TDC signal
+    parTOF[1] = d->GetToT(); //the ToT signal
+    parTOF[2] = d->GetAdc(); // the adc charge
+    parTOF[3] = d->GetTdcND(); // non decalibrated sim time
+    parTOF[4] = d->GetTdc(); // raw time, == Tdc time for the moment
+    parTOF[5] = 0; // deltaBC
+    parTOF[6] = 0; // L0-L1 latency
+    
+    Double_t posClus[3];
+    Double_t covClus[6];
+    UShort_t volIdClus=GetClusterVolIndex(dig);
+    GetClusterPars(dig,posClus,covClus);
+    AliTOFcluster *tofCluster = new AliTOFcluster(volIdClus,posClus[0],posClus[1],posClus[2],covClus[0],covClus[1],covClus[2],covClus[3],covClus[4],covClus[5],d->GetTracks(),dig,parTOF,status,ii);
+    InsertCluster(tofCluster);
+
+  }
+
+  AliDebug(1,Form("Number of found clusters: %d", fNumberOfTofClusters));
+
+  CalibrateRecPoint();
+  FillRecPoint();
+
+  clusterTree->Fill();
+//  ResetRecpoint();
+
+  AliDebug(1,Form("Execution time to read TOF digits and to write TOF clusters : R:%.4fs C:%.4fs",
+                 stopwatch.RealTime(),stopwatch.CpuTime()));
+  if (inholes) AliWarning(Form("Clusters in the TOF holes: %d",inholes));
+
 }
 //______________________________________________________________________________
 
@@ -286,7 +473,11 @@ void AliTOFClusterFinder::Digits2RecPoints(AliRawReader *rawReader,
   // Converts RAW data to recpoints for TOF
   //
 
-  //const Int_t kDDL = fTOFGeometry->NDDL()*fTOFGeometry->NSectors();
+  TStopwatch stopwatch;
+  stopwatch.Start();
+
+  Int_t inholes = 0;
+
   const Int_t kDDL = AliDAQ::NumberOfDdls("TOF");
 
   ResetRecpoint();
@@ -295,33 +486,49 @@ void AliTOFClusterFinder::Digits2RecPoints(AliRawReader *rawReader,
   clustersTree->Branch("TOF", &fRecPoints, bufsize);
 
   TClonesArray * clonesRawData;
-
-  Int_t ii = 0;
   Int_t dummy = -1;
 
-  Int_t detectorIndex[5];
-  Float_t position[3];
-  Double_t cylindricalPosition[5];
-  Float_t tToT;
-  Double_t tTdcND;
+  Int_t detectorIndex[5]={-1,-1,-1,-1,-1};
+  Int_t parTOF[7]={-1,-1,-1,-1,-1,-1,-1};
 
   ofstream ftxt;
   if (fVerbose==2) ftxt.open("TOFdigitsRead.txt",ios::app);
 
+  fTOFRawStream.Clear();
+  fTOFRawStream.SetRawReader(rawReader);
+
+  if (fDecoderVersion == 1) {
+    AliInfo("Using New Decoder");
+  }
+  else if (fDecoderVersion == 2) {
+    AliInfo("Using Enhanced Decoder");
+  }
+  else {
+    AliInfo("Using Old Decoder");
+  }
+
   Int_t indexDDL = 0;
   for (indexDDL = 0; indexDDL < kDDL; indexDDL++) {
 
     rawReader->Reset();
-    AliTOFRawStream tofInput(rawReader);
-    tofInput.LoadRawData(indexDDL);
-
-    clonesRawData = (TClonesArray*)tofInput.GetRawData();
+    if (fDecoderVersion == 1) {
+      fTOFRawStream.LoadRawDataBuffers(indexDDL,fVerbose);
+    }
+    else if (fDecoderVersion == 2) {
+      fTOFRawStream.LoadRawDataBuffersV2(indexDDL,fVerbose);
+    }
+    else  {
+      fTOFRawStream.LoadRawData(indexDDL);
+    }
+    
+    clonesRawData = (TClonesArray*)fTOFRawStream.GetRawData();
 
     for (Int_t iRawData = 0; iRawData<clonesRawData->GetEntriesFast(); iRawData++) {
 
       AliTOFrawData *tofRawDatum = (AliTOFrawData*)clonesRawData->UncheckedAt(iRawData);
 
-      if (tofRawDatum->GetTOT()==-1 || tofRawDatum->GetTOF()==-1) continue;
+      //if (tofRawDatum->GetTOT()==-1 || tofRawDatum->GetTOF()==-1) continue;
+      if (tofRawDatum->GetTOF()==-1) continue;
 
       if (fVerbose==2) {
        if (indexDDL<10) ftxt << "  " << indexDDL;
@@ -334,8 +541,13 @@ void AliTOFClusterFinder::Digits2RecPoints(AliRawReader *rawReader,
        ftxt << "  " << tofRawDatum->GetTDCchannel();
       }
 
-      tofInput.EquipmentId2VolumeId(indexDDL, tofRawDatum->GetTRM(), tofRawDatum->GetTRMchain(),
-                                   tofRawDatum->GetTDC(), tofRawDatum->GetTDCchannel(), detectorIndex);
+      if ( tofRawDatum->GetTRM()==3 &&
+         (tofRawDatum->GetTDC()> 11 && tofRawDatum->GetTDC()< 15) ) FillTOFtriggerMap(indexDDL, tofRawDatum);
+
+      for (Int_t aa=0; aa<5; aa++) detectorIndex[aa] = -1;
+
+      fTOFRawStream.EquipmentId2VolumeId(indexDDL, tofRawDatum->GetTRM(), tofRawDatum->GetTRMchain(),
+                                        tofRawDatum->GetTDC(), tofRawDatum->GetTDCchannel(), detectorIndex);
       dummy = detectorIndex[3];
       detectorIndex[3] = detectorIndex[4];
       detectorIndex[4] = dummy;
@@ -351,95 +563,63 @@ void AliTOFClusterFinder::Digits2RecPoints(AliRawReader *rawReader,
        else              ftxt << " " << detectorIndex[4];
       }
 
-      for (ii=0; ii<3; ii++) position[ii] =  0.;
-      fTOFGeometry->GetPos(detectorIndex, position);
-
-      cylindricalPosition[0] = TMath::Sqrt(position[0]*position[0] + position[1]*position[1]);
-      cylindricalPosition[1] = TMath::ATan2(position[1], position[0]);
-      cylindricalPosition[2] = position[2];
-      cylindricalPosition[3] = tofRawDatum->GetTOF();
-      cylindricalPosition[4] = tofRawDatum->GetTOT();
-      tToT = tofRawDatum->GetTOT();
-      tTdcND = -1.;
-      AliTOFcluster *tofCluster = new AliTOFcluster(cylindricalPosition, detectorIndex);
-      tofCluster->SetToT(tToT);
-      tofCluster->SetTDCND(tTdcND);
-      tofCluster->SetTDCRAW(tofRawDatum->GetTOF());
+    /* check valid index */
+    if (detectorIndex[0]==-1||detectorIndex[1]==-1||detectorIndex[2]==-1||detectorIndex[3]==-1||detectorIndex[4]==-1) continue;
+
+      // Do not reconstruct anything in the holes
+      if (detectorIndex[0]==13 || detectorIndex[0]==14 || detectorIndex[0]==15 ) { // sectors with holes
+       if (detectorIndex[1]==2) { // plate with holes
+         inholes++;
+         continue;
+       }
+      }
+
+      parTOF[0] = tofRawDatum->GetTOF(); //TDC
+      parTOF[1] = tofRawDatum->GetTOT(); // TOT
+      parTOF[2] = tofRawDatum->GetTOT(); //ADC==TOF
+      parTOF[3] = 0;//raw data: no track of undecalib sim time
+      parTOF[4] = tofRawDatum->GetTOF(); // RAW time
+      parTOF[5] = tofRawDatum->GetDeltaBC(); // deltaBC
+      parTOF[6] = tofRawDatum->GetL0L1Latency(); // L0-L1 latency
+      Double_t posClus[3];
+      Double_t covClus[6];
+      UShort_t volIdClus=GetClusterVolIndex(detectorIndex);
+      Int_t lab[3]={-1,-1,-1};
+      Bool_t status=kTRUE;
+      GetClusterPars(detectorIndex,posClus,covClus);
+      AliTOFcluster *tofCluster = new AliTOFcluster(volIdClus,posClus[0],posClus[1],posClus[2],covClus[0],covClus[1],covClus[2],covClus[3],covClus[4],covClus[5],lab,detectorIndex,parTOF,status,-1);
       InsertCluster(tofCluster);
 
       if (fVerbose==2) {
-       if (cylindricalPosition[4]<10)                        ftxt << "        " << cylindricalPosition[4];
-       else if (cylindricalPosition[4]>=10 && cylindricalPosition[4]<100) ftxt << "       " << cylindricalPosition[4];
-       else                                     ftxt << "      " << cylindricalPosition[4];
-       if (cylindricalPosition[3]<10)                             ftxt << "      " << cylindricalPosition[3] << endl;
-       else if (cylindricalPosition[3]>=10 && cylindricalPosition[3]<100)   ftxt << "     " << cylindricalPosition[3] << endl;
-       else if (cylindricalPosition[3]>=100 && cylindricalPosition[3]<1000) ftxt << "    " << cylindricalPosition[3] << endl;
-       else                                             ftxt << "   " << cylindricalPosition[3] << endl;
+       if (parTOF[1]<10)ftxt << "        " << parTOF[1];
+       else if (parTOF[1]>=10 && parTOF[1]<100) ftxt << "      " << parTOF[1];
+       else ftxt << "      " << parTOF[1];
+       if (parTOF[0]<10) ftxt << "      " << parTOF[0] << endl;
+       else if (parTOF[0]>=10 && parTOF[0]<100)   ftxt << "    " << parTOF[0] << endl;
+       else if (parTOF[0]>=100 && parTOF[0]<1000) ftxt << "    " << parTOF[0] << endl;
+       else ftxt << "   " << parTOF[0] << endl;
       }
 
     } // closed loop on TOF raw data per current DDL file
 
-    clonesRawData->Clear();
+    clonesRawData->Clear("C");
 
   } // closed loop on DDL index
 
-  /*
-  Int_t indexDDL = 0;
-  for (indexDDL = 0; indexDDL < kDDL; indexDDL++) {
-
-    rawReader->Reset();
-    AliTOFRawStream tofInput(rawReader);
-    rawReader->Select("TOF", indexDDL, indexDDL);
-
-    while(tofInput.Next()) {
-
-      for (ii=0; ii<5; ii++) detectorIndex[ii] = -1;
-
-      detectorIndex[0] = tofInput.GetSector();
-      detectorIndex[1] = tofInput.GetPlate();
-      detectorIndex[2] = tofInput.GetStrip();
-      detectorIndex[3] = tofInput.GetPadZ();
-      detectorIndex[4] = tofInput.GetPadX();
-      
-      //AliInfo(Form("  %2i  %1i  %2i  %1i  %2i ",detectorIndex[0],detectorIndex[1],detectorIndex[2],detectorIndex[3],detectorIndex[4]));
-
-      if (detectorIndex[0]==-1 ||
-         detectorIndex[1]==-1 ||
-         detectorIndex[2]==-1 ||
-         detectorIndex[3]==-1 ||
-         detectorIndex[4]==-1) continue;
-
-      for (ii=0; ii<3; ii++) position[ii] =  0.;
-
-      fTOFGeometry->GetPos(detectorIndex, position);
-
-      cylindricalPosition[0] = TMath::Sqrt(position[0]*position[0] + position[1]*position[1]);
-      cylindricalPosition[1] = TMath::ATan2(position[1], position[0]);
-      cylindricalPosition[2] = position[2];
-      cylindricalPosition[3] = tofInput.GetTofBin();
-      cylindricalPosition[4] = tofInput.GetToTbin();
-      tToT = tofInput.GetToTbin();
-      tTdcND = -1.;
-      AliTOFcluster *tofCluster = new AliTOFcluster(cylindricalPosition, detectorIndex);
-      tofCluster->SetToT(tToT);
-      tofCluster->SetTDCND(tTdcND);
-      InsertCluster(tofCluster);
-
-    } // while loop
-
-  } // loop on DDL files
-  */
-
   if (fVerbose==2) ftxt.close();
 
-  AliInfo(Form("Number of found clusters: %i", fNumberOfTofClusters));
+  AliDebug(1,Form("Number of found clusters: %d", fNumberOfTofClusters));
 
-  CalibrateRecPoint();
+  CalibrateRecPoint(rawReader->GetTimestamp());
   FillRecPoint();
 
   clustersTree->Fill();
 
-  ResetRecpoint();
+//  ResetRecpoint();
+
+  AliDebug(1, Form("Execution time to read TOF raw data and to write TOF clusters : R:%.4fs C:%.4fs",
+                  stopwatch.RealTime(),stopwatch.CpuTime()));
+  if (inholes) AliWarning(Form("Clusters in the TOF holes: %d",inholes));
 
 }
 //______________________________________________________________________________
@@ -450,12 +630,16 @@ void AliTOFClusterFinder::Digits2RecPoints(Int_t iEvent, AliRawReader *rawReader
   // Converts RAW data to recpoints for TOF
   //
 
-  //const Int_t kDDL = fTOFGeometry->NDDL()*fTOFGeometry->NSectors();
+  TStopwatch stopwatch;
+  stopwatch.Start();
+
+  Int_t inholes = 0;
+
   const Int_t kDDL = AliDAQ::NumberOfDdls("TOF");
 
   fRunLoader->GetEvent(iEvent);
 
-  AliDebug(2,Form(" Event number %2i ", iEvent));
+  AliDebug(2,Form(" Event number %2d ", iEvent));
 
   fTreeR = fTOFLoader->TreeR();
 
@@ -469,32 +653,48 @@ void AliTOFClusterFinder::Digits2RecPoints(Int_t iEvent, AliRawReader *rawReader
 
   TClonesArray * clonesRawData;
 
-  Int_t ii = 0;
   Int_t dummy = -1;
 
   Int_t detectorIndex[5] = {-1, -1, -1, -1, -1};
-  Float_t position[3];
-  Double_t cylindricalPosition[5];
-  Float_t tToT;
-  Double_t tTdcND;
-
+  Int_t parTOF[7];
   ofstream ftxt;
   if (fVerbose==2) ftxt.open("TOFdigitsRead.txt",ios::app);
 
+  fTOFRawStream.Clear();
+  fTOFRawStream.SetRawReader(rawReader);
+
+  if (fDecoderVersion == 1) {
+    AliInfo("Using New Decoder");
+  }
+  else if (fDecoderVersion == 2) {
+    AliInfo("Using Enhanced Decoder");
+  }
+  else {
+    AliInfo("Using Old Decoder");
+  }
+
   Int_t indexDDL = 0;
   for (indexDDL = 0; indexDDL < kDDL; indexDDL++) {
 
     rawReader->Reset();
-    AliTOFRawStream tofInput(rawReader);
-    tofInput.LoadRawData(indexDDL);
+    if (fDecoderVersion == 1) {
+      fTOFRawStream.LoadRawDataBuffers(indexDDL,fVerbose);
+    }
+    else if (fDecoderVersion == 2) {
+      fTOFRawStream.LoadRawDataBuffersV2(indexDDL,fVerbose);
+    }
+    else {
+      fTOFRawStream.LoadRawData(indexDDL);
+    }
 
-    clonesRawData = (TClonesArray*)tofInput.GetRawData();
+    clonesRawData = (TClonesArray*)fTOFRawStream.GetRawData();
 
     for (Int_t iRawData = 0; iRawData<clonesRawData->GetEntriesFast(); iRawData++) {
 
       AliTOFrawData *tofRawDatum = (AliTOFrawData*)clonesRawData->UncheckedAt(iRawData);
 
-      if (tofRawDatum->GetTOT()==-1 || tofRawDatum->GetTOF()==-1) continue;
+      //if (tofRawDatum->GetTOT()==-1 || tofRawDatum->GetTOF()==-1) continue;
+      if (tofRawDatum->GetTOF()==-1) continue;
 
       if (fVerbose==2) {
        if (indexDDL<10) ftxt << "  " << indexDDL;
@@ -507,8 +707,8 @@ void AliTOFClusterFinder::Digits2RecPoints(Int_t iEvent, AliRawReader *rawReader
        ftxt << "  " << tofRawDatum->GetTDCchannel();
       }
 
-      tofInput.EquipmentId2VolumeId(indexDDL, tofRawDatum->GetTRM(), tofRawDatum->GetTRMchain(),
-                                   tofRawDatum->GetTDC(), tofRawDatum->GetTDCchannel(), detectorIndex);
+      fTOFRawStream.EquipmentId2VolumeId(indexDDL, tofRawDatum->GetTRM(), tofRawDatum->GetTRMchain(),
+                                        tofRawDatum->GetTDC(), tofRawDatum->GetTDCchannel(), detectorIndex);
       dummy = detectorIndex[3];
       detectorIndex[3] = detectorIndex[4];
       detectorIndex[4] = dummy;
@@ -524,51 +724,66 @@ void AliTOFClusterFinder::Digits2RecPoints(Int_t iEvent, AliRawReader *rawReader
        else              ftxt << " " << detectorIndex[4];
       }
 
-      for (ii=0; ii<3; ii++) position[ii] =  0.;
-      fTOFGeometry->GetPos(detectorIndex, position);
-
-      cylindricalPosition[0] = TMath::Sqrt(position[0]*position[0] + position[1]*position[1]);
-      cylindricalPosition[1] = TMath::ATan2(position[1], position[0]);
-      cylindricalPosition[2] = position[2];
-      cylindricalPosition[3] = tofRawDatum->GetTOF();
-      cylindricalPosition[4] = tofRawDatum->GetTOT();
-      tToT = tofRawDatum->GetTOT();
-      tTdcND = -1.;
-      AliTOFcluster *tofCluster = new AliTOFcluster(cylindricalPosition, detectorIndex);
-      tofCluster->SetToT(tToT);
-      tofCluster->SetTDCND(tTdcND);
-      tofCluster->SetTDCRAW(tofRawDatum->GetTOF());
+    /* check valid index */
+    if (detectorIndex[0]==-1||detectorIndex[1]==-1||detectorIndex[2]==-1||detectorIndex[3]==-1||detectorIndex[4]==-1) continue;
+
+      // Do not reconstruct anything in the holes
+      if (detectorIndex[0]==13 || detectorIndex[0]==14 || detectorIndex[0]==15 ) { // sectors with holes
+       if (detectorIndex[1]==2) { // plate with holes
+         inholes++;
+         continue;
+       }
+      }
+
+      parTOF[0] = tofRawDatum->GetTOF(); // TDC
+      parTOF[1] = tofRawDatum->GetTOT(); // TOT
+      parTOF[2] = tofRawDatum->GetTOT(); // raw data have ADC=TOT
+      parTOF[3] = 0; //raw data: no track of the undecalib sim time
+      parTOF[4] = tofRawDatum->GetTOF(); // Raw time == TDC
+      parTOF[5] = tofRawDatum->GetDeltaBC(); // deltaBC
+      parTOF[6] = tofRawDatum->GetL0L1Latency(); // L0-L1 latency
+      Double_t posClus[3];
+      Double_t covClus[6];
+      UShort_t volIdClus=GetClusterVolIndex(detectorIndex);
+      Int_t lab[3]={-1,-1,-1};
+      Bool_t status=kTRUE;
+      GetClusterPars(detectorIndex,posClus,covClus);
+      AliTOFcluster *tofCluster = new AliTOFcluster(volIdClus,posClus[0],posClus[1],posClus[2],covClus[0],covClus[1],covClus[2],covClus[3],covClus[4],covClus[5],lab,detectorIndex,parTOF,status,-1);
       InsertCluster(tofCluster);
 
       if (fVerbose==2) {
-       if (cylindricalPosition[4]<10)                        ftxt << "        " << cylindricalPosition[4];
-       else if (cylindricalPosition[4]>=10 && cylindricalPosition[4]<100) ftxt << "       " << cylindricalPosition[4];
-       else                                     ftxt << "      " << cylindricalPosition[4];
-       if (cylindricalPosition[3]<10)                             ftxt << "      " << cylindricalPosition[3] << endl;
-       else if (cylindricalPosition[3]>=10 && cylindricalPosition[3]<100)   ftxt << "     " << cylindricalPosition[3] << endl;
-       else if (cylindricalPosition[3]>=100 && cylindricalPosition[3]<1000) ftxt << "    " << cylindricalPosition[3] << endl;
-       else                                             ftxt << "   " << cylindricalPosition[3] << endl;
+       if (parTOF[1]<10)ftxt << "        " << parTOF[1];
+       else if (parTOF[1]>=10 && parTOF[1]<100) ftxt << "      " << parTOF[1];
+       else ftxt << "      " << parTOF[1];
+       if (parTOF[0]<10) ftxt << "      " << parTOF[0] << endl;
+       else if (parTOF[0]>=10 && parTOF[0]<100)   ftxt << "    " << parTOF[0] << endl;
+       else if (parTOF[0]>=100 && parTOF[0]<1000) ftxt << "    " << parTOF[0] << endl;
+       else ftxt << "   " << parTOF[0] << endl;
       }
 
     } // closed loop on TOF raw data per current DDL file
 
-    clonesRawData->Clear();
+    clonesRawData->Clear("C");
 
   } // closed loop on DDL index
 
   if (fVerbose==2) ftxt.close();
 
-  AliInfo(Form("Number of found clusters: %i", fNumberOfTofClusters));
+  AliDebug(1,Form("Number of found clusters: %d for event: %d", fNumberOfTofClusters, iEvent));
 
-  CalibrateRecPoint();
+  CalibrateRecPoint(rawReader->GetTimestamp());
   FillRecPoint();
 
   fTreeR->Fill();
-  ResetRecpoint();
+//  ResetRecpoint();
 
   fTOFLoader = fRunLoader->GetLoader("TOFLoader");
   fTOFLoader->WriteRecPoints("OVERWRITE");
   
+  AliDebug(1, Form("Execution time to read TOF raw data and to write TOF clusters : R:%.4fs C:%.4fs",
+              stopwatch.RealTime(),stopwatch.CpuTime()));
+  if (inholes) AliWarning(Form("Clusters in the TOF holes: %d",inholes));
+
 }
 //______________________________________________________________________________
 
@@ -580,8 +795,10 @@ void AliTOFClusterFinder::Raw2Digits(Int_t iEvent, AliRawReader *rawReader)
   //             (temporary solution)
   //
 
-  //const Int_t kDDL = fTOFGeometry->NDDL()*fTOFGeometry->NSectors();
-  const Int_t kDDL = fTOFGeometry->NDDL()*fTOFGeometry->NSectors();
+  TStopwatch stopwatch;
+  stopwatch.Start();
+
+  const Int_t kDDL = AliTOFGeometry::NDDL()*AliTOFGeometry::NSectors();
 
   fRunLoader->GetEvent(iEvent);
 
@@ -593,57 +810,82 @@ void AliTOFClusterFinder::Raw2Digits(Int_t iEvent, AliRawReader *rawReader)
     fTOFLoader->MakeTree("D");
     fTreeD = fTOFLoader->TreeD();
     }
+  else {
+    AliFatal("Can not get TreeD");
+    return;
+  }
 
-  TClonesArray *tofDigits = new TClonesArray("AliTOFdigit",10000);
   Int_t bufsize = 32000;
-  fTreeD->Branch("TOF", &tofDigits, bufsize);
+  fDigits->Clear();
+  fTreeD->Branch("TOF", &fDigits, bufsize);
 
   fRunLoader->GetEvent(iEvent);
 
-  AliDebug(2,Form(" Event number %2i ", iEvent));
+  AliDebug(2,Form(" Event number %2d ", iEvent));
 
   TClonesArray * clonesRawData;
 
   Int_t dummy = -1;
 
   Int_t detectorIndex[5];
-  Float_t digit[4];
+  Int_t digit[4];
+
+  fTOFRawStream.Clear();
+  fTOFRawStream.SetRawReader(rawReader);
+
+  if (fDecoderVersion == 1) {
+    AliInfo("Using New Decoder");
+  }
+  else if (fDecoderVersion == 2) {
+    AliInfo("Using Enhanced Decoder");
+  }
+  else {
+    AliInfo("Using Old Decoder");
+  }
 
   Int_t indexDDL = 0;
   for (indexDDL = 0; indexDDL < kDDL; indexDDL++) {
 
     rawReader->Reset();
-    AliTOFRawStream tofInput(rawReader);
-    tofInput.LoadRawData(indexDDL);
+    if (fDecoderVersion == 1) {
+      fTOFRawStream.LoadRawDataBuffers(indexDDL,fVerbose);
+    }
+    else if (fDecoderVersion == 2) {
+      fTOFRawStream.LoadRawDataBuffersV2(indexDDL,fVerbose);
+    }
+    else {
+      fTOFRawStream.LoadRawData(indexDDL);
+    }
 
-    clonesRawData = (TClonesArray*)tofInput.GetRawData();
+    clonesRawData = (TClonesArray*)fTOFRawStream.GetRawData();
 
     for (Int_t iRawData = 0; iRawData<clonesRawData->GetEntriesFast(); iRawData++) {
 
       AliTOFrawData *tofRawDatum = (AliTOFrawData*)clonesRawData->UncheckedAt(iRawData);
 
-      if (!tofRawDatum->GetTOT() || !tofRawDatum->GetTOF()) continue;
+      //if (!tofRawDatum->GetTOT() || !tofRawDatum->GetTOF()) continue;
+      if (tofRawDatum->GetTOF()==-1) continue;
 
-      tofInput.EquipmentId2VolumeId(indexDDL, tofRawDatum->GetTRM(), tofRawDatum->GetTRMchain(),
-                                   tofRawDatum->GetTDC(), tofRawDatum->GetTDCchannel(), detectorIndex);
+      fTOFRawStream.EquipmentId2VolumeId(indexDDL, tofRawDatum->GetTRM(), tofRawDatum->GetTRMchain(),
+                                        tofRawDatum->GetTDC(), tofRawDatum->GetTDCchannel(), detectorIndex);
       dummy = detectorIndex[3];
       detectorIndex[3] = detectorIndex[4];
       detectorIndex[4] = dummy;
 
-      digit[0] = (Float_t)tofInput.GetTofBin();
-      digit[1] = (Float_t)tofInput.GetToTbin();
-      digit[2] = (Float_t)tofInput.GetToTbin();
-      digit[3] = -1.;
+      digit[0] = fTOFRawStream.GetTofBin();
+      digit[1] = fTOFRawStream.GetToTbin();
+      digit[2] = fTOFRawStream.GetToTbin();
+      digit[3] = 0;
 
       Int_t tracknum[3]={-1,-1,-1};
 
-      TClonesArray &aDigits = *tofDigits;
-      Int_t last=tofDigits->GetEntriesFast();
+      TClonesArray &aDigits = *fDigits;
+      Int_t last=fDigits->GetEntriesFast();
       new (aDigits[last]) AliTOFdigit(tracknum, detectorIndex, digit);
 
     } // while loop
 
-    clonesRawData->Clear();
+    clonesRawData->Clear("C");
 
   } // DDL Loop
 
@@ -651,7 +893,106 @@ void AliTOFClusterFinder::Raw2Digits(Int_t iEvent, AliRawReader *rawReader)
 
   fTOFLoader = fRunLoader->GetLoader("TOFLoader");
   fTOFLoader->WriteDigits("OVERWRITE");
-  
+
+  AliDebug(1, Form("Execution time to read TOF raw data and to write TOF clusters : R:%.2fs C:%.2fs",
+                  stopwatch.RealTime(),stopwatch.CpuTime()));
+
+}
+
+//______________________________________________________________________________
+
+void AliTOFClusterFinder::Raw2Digits(AliRawReader *rawReader, TTree* digitsTree)
+{
+  //
+  // Converts RAW data to MC digits for TOF for the current event
+  //
+  //
+
+  TStopwatch stopwatch;
+  stopwatch.Start();
+
+  const Int_t kDDL = AliTOFGeometry::NDDL()*AliTOFGeometry::NSectors();
+
+  if (!digitsTree)
+    {
+    AliError("No input digits Tree");
+    return;
+    }
+
+  Int_t bufsize = 32000;
+  digitsTree->Branch("TOF", &fDigits, bufsize);
+
+  TClonesArray * clonesRawData;
+  Int_t dummy = -1;
+
+  Int_t detectorIndex[5];
+  Int_t digit[4];
+
+  fTOFRawStream.Clear();
+  fTOFRawStream.SetRawReader(rawReader);
+
+  if (fDecoderVersion == 1) {
+    AliInfo("Using New Decoder");
+  }
+  else if (fDecoderVersion == 2) {
+    AliInfo("Using Enhanced Decoder");
+  }
+  else {
+    AliInfo("Using Old Decoder");
+  }
+
+  Int_t indexDDL = 0;
+  for (indexDDL = 0; indexDDL < kDDL; indexDDL++) {
+
+    rawReader->Reset();
+    if (fDecoderVersion == 1) {
+      fTOFRawStream.LoadRawDataBuffers(indexDDL,fVerbose);
+    }
+    else if (fDecoderVersion == 2) {
+      fTOFRawStream.LoadRawDataBuffersV2(indexDDL,fVerbose);
+    }
+    else {
+      fTOFRawStream.LoadRawData(indexDDL);
+    }
+
+    clonesRawData = (TClonesArray*)fTOFRawStream.GetRawData();
+
+    for (Int_t iRawData = 0; iRawData<clonesRawData->GetEntriesFast(); iRawData++) {
+
+      AliTOFrawData *tofRawDatum = (AliTOFrawData*)clonesRawData->UncheckedAt(iRawData);
+
+      //if (!tofRawDatum->GetTOT() || !tofRawDatum->GetTOF()) continue;
+      if (tofRawDatum->GetTOF()==-1) continue;
+
+      fTOFRawStream.EquipmentId2VolumeId(indexDDL, tofRawDatum->GetTRM(), tofRawDatum->GetTRMchain(),
+                                        tofRawDatum->GetTDC(), tofRawDatum->GetTDCchannel(), detectorIndex);
+      dummy = detectorIndex[3];
+      detectorIndex[3] = detectorIndex[4];
+      detectorIndex[4] = dummy;
+
+      digit[0] = fTOFRawStream.GetTofBin();
+      digit[1] = fTOFRawStream.GetToTbin();
+      digit[2] = fTOFRawStream.GetToTbin();
+      digit[3] = 0;
+
+      Int_t tracknum[3]={-1,-1,-1};
+
+      TClonesArray &aDigits = *fDigits;
+      Int_t last=fDigits->GetEntriesFast();
+      new (aDigits[last]) AliTOFdigit(tracknum, detectorIndex, digit);
+
+    } // while loop
+
+    clonesRawData->Clear("C");
+
+  } // DDL Loop
+
+  digitsTree->Fill();
+
+  AliDebug(1, Form("Got %d digits: ", fDigits->GetEntries()));
+  AliDebug(1, Form("Execution time to read TOF raw data and fill TOF digit tree : R:%.2fs C:%.2fs",
+                  stopwatch.RealTime(),stopwatch.CpuTime()));
+
 }
 //______________________________________________________________________________
 
@@ -681,7 +1022,7 @@ Int_t AliTOFClusterFinder::InsertCluster(AliTOFcluster *tofCluster) {
 
 Int_t AliTOFClusterFinder::FindClusterIndex(Double_t z) const {
   //--------------------------------------------------------------------
-  // This function returns the index of the nearest cluster 
+  // This function returns the index of the nearest cluster in z
   //--------------------------------------------------------------------
   if (fNumberOfTofClusters==0) return 0;
   if (z <= fTofClusters[0]->GetZ()) return 0;
@@ -708,40 +1049,59 @@ void AliTOFClusterFinder::FillRecPoint()
   Int_t ii, jj;
 
   Int_t detectorIndex[5];
-  Double_t cylindricalPosition[5];
+  Int_t parTOF[7];
   Int_t trackLabels[3];
   Int_t digitIndex = -1;
-  Float_t tToT=0.;
-  Double_t tTdcND=0.;
-  Double_t tTdcRAW=0.;
-  Bool_t cStatus = kTRUE;
+  Bool_t status=kTRUE;
 
   TClonesArray &lRecPoints = *fRecPoints;
   
   for (ii=0; ii<fNumberOfTofClusters; ii++) {
-
-    digitIndex = fTofClusters[ii]->GetIndex();
-    for(jj=0; jj<5; jj++) detectorIndex[jj] = fTofClusters[ii]->GetDetInd(jj);
-    for(jj=0; jj<3; jj++) trackLabels[jj] = fTofClusters[ii]->GetLabel(jj);
-    cylindricalPosition[0] = fTofClusters[ii]->GetR();
-    cylindricalPosition[1] = fTofClusters[ii]->GetPhi();
-    cylindricalPosition[2] = fTofClusters[ii]->GetZ();
-    cylindricalPosition[3] = fTofClusters[ii]->GetTDC();
-    cylindricalPosition[4] = fTofClusters[ii]->GetADC();
-    tToT = fTofClusters[ii]->GetToT();
-    tTdcND = fTofClusters[ii]->GetTDCND();
-    cStatus=fTofClusters[ii]->GetStatus();
-    tTdcRAW=fTofClusters[ii]->GetTDCRAW();
-    new(lRecPoints[ii]) AliTOFcluster(cylindricalPosition, trackLabels, detectorIndex, digitIndex, tToT, tTdcND, tTdcRAW,cStatus);
-
-    //AliInfo(Form("%3i  %3i  %f %f %f %f %f  %2i %2i %2i %1i %2i",ii,digitIndex, cylindricalPosition[2],cylindricalPosition[0],cylindricalPosition[1],cylindricalPosition[3],cylindricalPosition[4],detectorIndex[0],detectorIndex[1],detectorIndex[2],detectorIndex[3],detectorIndex[4]));
-
+    AliTOFcluster* clOr = fTofClusters[ii];
+    fTofClusters[ii] = 0;
+    digitIndex = clOr->GetIndex();
+    for(jj=0; jj<5; jj++) detectorIndex[jj] = clOr->GetDetInd(jj);
+    for(jj=0; jj<3; jj++) trackLabels[jj] = clOr->GetLabel(jj);
+    parTOF[0] = clOr->GetTDC(); // TDC
+    parTOF[1] = clOr->GetToT(); // TOT
+    parTOF[2] = clOr->GetADC(); // ADC=TOT
+    parTOF[3] = clOr->GetTDCND(); // TDCND
+    parTOF[4] = clOr->GetTDCRAW();//RAW
+    parTOF[5] = clOr->GetDeltaBC();//deltaBC
+    parTOF[6] = clOr->GetL0L1Latency();//L0-L1 latency
+    status=clOr->GetStatus();
+    Double_t posClus[3];
+    Double_t covClus[6];
+    UShort_t volIdClus=GetClusterVolIndex(detectorIndex);
+    GetClusterPars(detectorIndex,posClus,covClus);
+    new(lRecPoints[ii]) AliTOFcluster(volIdClus,posClus[0],posClus[1],posClus[2],covClus[0],covClus[1],covClus[2],covClus[3],covClus[4],covClus[5],trackLabels,detectorIndex, parTOF,status,digitIndex);
+
+    AliDebug(2, Form(" %4d  %4d  %f %f %f  %f %f %f %f %f %f  %3d %3d %3d  %2d %1d %2d %1d %2d  %4d %3d %3d %4d %4d  %1d  %4d", 
+                    ii, volIdClus, posClus[0], posClus[1], posClus[2],
+                    clOr->GetSigmaX2(),
+                    clOr->GetSigmaXY(),
+                    clOr->GetSigmaXZ(),
+                    clOr->GetSigmaY2(),
+                    clOr->GetSigmaYZ(),
+                    clOr->GetSigmaZ2(),
+                    trackLabels[0], trackLabels[1], trackLabels[2],
+                    detectorIndex[0], detectorIndex[1], detectorIndex[2], detectorIndex[3], detectorIndex[4],
+                    parTOF[0], parTOF[1], parTOF[2], parTOF[3], parTOF[4],
+                    status, digitIndex));
+
+    delete clOr;
   } // loop on clusters
 
 }
 
 //_________________________________________________________________________
-void AliTOFClusterFinder::CalibrateRecPoint()
+
+/*
+ * OLD CALIBRATE REC POINTS FUNCTION
+ */
+
+#if 0
+void AliTOFClusterFinder::CalibrateRecPoint(UInt_t timestamp)
 {
   //
   // Copy the global array of AliTOFcluster, i.e. fTofClusters (sorted
@@ -753,46 +1113,180 @@ void AliTOFClusterFinder::CalibrateRecPoint()
 
   Int_t detectorIndex[5];
   Int_t digitIndex = -1;
-  Float_t tToT;
-  Float_t tdcCorr;
-  AliInfo(" Calibrating TOF Clusters: ")
-  AliTOFcalib *calib = new AliTOFcalib(fTOFGeometry);
-  // calib->ReadParFromCDB("TOF/Calib",0); // original
-  // Use AliCDBManager's run number
- if(!calib->ReadParFromCDB("TOF/Calib",-1)) {AliFatal("Exiting, no CDB object found!!!");exit(0);}  
+  Double_t tToT;
+  Double_t timeCorr;
+  Int_t   tdcCorr;
+  Float_t tdcLatencyWindow;
+  AliDebug(1," Calibrating TOF Clusters");
+
+  AliTOFChannelOnlineArray *calDelay = fTOFcalib->GetTOFOnlineDelay();  
+  AliTOFChannelOnlineStatusArray *calStatus = fTOFcalib->GetTOFOnlineStatus();  
+  TObjArray *calTOFArrayOffline = fTOFcalib->GetTOFCalArrayOffline();
   
-  AliTOFCal *calTOFArray = calib->GetTOFCalArray();  
+  AliTOFDeltaBCOffset *deltaBCOffsetObj = fTOFcalib->GetDeltaBCOffset();
+  Int_t deltaBCOffset = deltaBCOffsetObj->GetDeltaBCOffset();
+  AliTOFCTPLatency *ctpLatencyObj = fTOFcalib->GetCTPLatency();
+  Float_t ctpLatency = ctpLatencyObj->GetCTPLatency();
+  AliTOFRunParams *runParamsObj = fTOFcalib->GetRunParams();
+  Float_t t0 = runParamsObj->EvalT0(timestamp);
+
+  TString validity = (TString)fTOFcalib->GetOfflineValidity();
+  Int_t calibration = -1;
+  if (validity.CompareTo("valid")==0) {
+    //AliInfo(Form(" validity = %s - Using offline calibration parameters",validity.Data()));
+    calibration = 1;
+  } else {
+    //AliInfo(Form(" validity = %s - Using online calibration parameters",validity.Data()));
+    calibration = 0 ;
+  }
 
   for (ii=0; ii<fNumberOfTofClusters; ii++) {
     digitIndex = fTofClusters[ii]->GetIndex();
     for(jj=0; jj<5; jj++) detectorIndex[jj] = fTofClusters[ii]->GetDetInd(jj);
 
-    Int_t index = calib->GetIndex(detectorIndex);
+    Int_t index = AliTOFGeometry::GetIndex(detectorIndex);
      
-    AliTOFChannel * calChannel = calTOFArray->GetChannel(index);
-
-    // Get channel status 
-    Bool_t status=calChannel->GetStatus();
-    if(status)fTofClusters[ii]->SetStatus(!status); //odd convention, to avoid conflict with calibration objects currently in the db (temporary solution).
-
+    UChar_t statusPulser=calStatus->GetPulserStatus(index);
+    UChar_t statusNoise=calStatus->GetNoiseStatus(index);
+    UChar_t statusHW=calStatus->GetHWStatus(index);
+    UChar_t status=calStatus->GetStatus(index);
+    tdcLatencyWindow = calStatus->GetLatencyWindow(index) * 1.e3; /* ns -> ps */
+    
+    //check the status, also unknown is fine!!!!!!!
+
+    AliDebug(2, Form(" Status for channel %d = %d",index, (Int_t)status));
+    if((statusPulser & AliTOFChannelOnlineStatusArray::kTOFPulserBad)==(AliTOFChannelOnlineStatusArray::kTOFPulserBad)||(statusNoise & AliTOFChannelOnlineStatusArray::kTOFNoiseBad)==(AliTOFChannelOnlineStatusArray::kTOFNoiseBad)||(statusHW & AliTOFChannelOnlineStatusArray::kTOFHWBad)==(AliTOFChannelOnlineStatusArray::kTOFHWBad)){
+      AliDebug(2, Form(" Bad Status for channel %d",index));
+      fTofClusters[ii]->SetStatus(kFALSE); //odd convention, to avoid conflict with calibration objects currently in the db (temporary solution).
+    }
+    else {
+      AliDebug(2, Form(" Good Status for channel %d",index));
+    }
     // Get Rough channel online equalization 
-    Float_t roughDelay=calChannel->GetDelay();
-
+    Double_t roughDelay=(Double_t)calDelay->GetDelay(index);  // in ns
+    AliDebug(2,Form(" channel delay (ns) = %f", roughDelay));
     // Get Refined channel offline calibration parameters
-    Float_t par[6];
-    for (Int_t j = 0; j<6; j++){
-      par[j]=calChannel->GetSlewPar(j);
+    if (calibration ==1){
+      AliTOFChannelOffline * calChannelOffline = (AliTOFChannelOffline*)calTOFArrayOffline->At(index);
+      Double_t par[6];
+      for (Int_t j = 0; j<6; j++){
+       par[j]=(Double_t)calChannelOffline->GetSlewPar(j);
+     } 
+      AliDebug(2,Form(" Calib Pars = %f, %f, %f, %f, %f, %f ",par[0],par[1],par[2],par[3],par[4],par[5]));
+      AliDebug(2,Form(" The ToT and Time, uncorr (counts) = %d , %d", fTofClusters[ii]->GetToT(),fTofClusters[ii]->GetTDC()));
+      tToT = (Double_t)(fTofClusters[ii]->GetToT()*AliTOFGeometry::ToTBinWidth());
+      tToT*=1.E-3; //ToT in ns
+
+      /* check TOT limits and set new TOT in case */
+      if (tToT < AliTOFGeometry::SlewTOTMin()) tToT = AliTOFGeometry::SlewTOTMin();
+      if (tToT > AliTOFGeometry::SlewTOTMax()) tToT = AliTOFGeometry::SlewTOTMax();
+
+      AliDebug(2,Form(" The ToT and Time, uncorr (ns)= %e, %e",fTofClusters[ii]->GetTDC()*AliTOFGeometry::TdcBinWidth()*1.E-3,tToT));
+      timeCorr=par[0]+par[1]*tToT+par[2]*tToT*tToT+par[3]*tToT*tToT*tToT+par[4]*tToT*tToT*tToT*tToT+par[5]*tToT*tToT*tToT*tToT*tToT; // the time correction (ns)
+    }
+    else {
+      timeCorr = roughDelay; // correction in ns
     }
-    tToT = fTofClusters[ii]->GetToT()*AliTOFGeometry::ToTBinWidth()*1.E-3;
-    Float_t timeCorr=par[0]+par[1]*tToT+par[2]*tToT*tToT+par[3]*tToT*tToT*tToT+par[4]*tToT*tToT*tToT*tToT+par[5]*tToT*tToT*tToT*tToT*tToT+roughDelay;
-    tdcCorr=(fTofClusters[ii]->GetTDC()*AliTOFGeometry::TdcBinWidth()+32)*1.E-3-timeCorr;
-    tdcCorr=(tdcCorr*1E3-32)/AliTOFGeometry::TdcBinWidth();
+    AliDebug(2,Form(" The ToT and Time, uncorr (ns)= %e, %e",fTofClusters[ii]->GetTDC()*AliTOFGeometry::TdcBinWidth()*1.E-3,fTofClusters[ii]->GetToT()*AliTOFGeometry::ToTBinWidth()));
+    AliDebug(2,Form(" The time correction (ns) = %f", timeCorr));
+    timeCorr=(Double_t)(fTofClusters[ii]->GetTDC())*AliTOFGeometry::TdcBinWidth()*1.E-3-timeCorr;//redefine the time
+    timeCorr*=1.E3;
+    AliDebug(2,Form(" The channel time, corr (ps)= %e",timeCorr ));
+
+    /* here timeCorr should be already corrected for calibration. 
+     * we now go into further corrections keeping in mind that timeCorr
+     * is in ps.
+     *
+     * the following corrections are performed in this way:
+     *
+     *    time = timeRaw - deltaBC + L0L1Latency + CTPLatency - TDCLatencyWindow - T0
+     *
+     */
+
+    AliDebug(2, Form("applying further corrections (DeltaBC): DeltaBC=%d (BC bins), DeltaBCoffset=%d (BC bins)", fTofClusters[ii]->GetDeltaBC(), deltaBCOffset));
+    AliDebug(2, Form("applying further corrections (L0L1Latency): L0L1Latency=%d (BC bins)", fTofClusters[ii]->GetL0L1Latency()));
+    AliDebug(2, Form("applying further corrections (CTPLatency): CTPLatency=%f (ps)", ctpLatency));
+    AliDebug(2, Form("applying further corrections (TDCLatencyWindow): TDCLatencyWindow=%f (ps)", tdcLatencyWindow));
+    AliDebug(2, Form("applying further corrections (T0): T0=%f (ps)", t0));
+
+    /* deltaBC correction (inhibited for the time being) */
+    //    timeCorr -= (fTofClusters[ii]->GetDeltaBC() - deltaBCOffset) * AliTOFGeometry::BunchCrossingBinWidth();
+    /* L0L1-latency correction */
+    timeCorr += fTofClusters[ii]->GetL0L1Latency() * AliTOFGeometry::BunchCrossingBinWidth();
+    /* CTP-latency correction (from OCDB) */
+    timeCorr += ctpLatency;
+    /* TDC latency-window correction (from OCDB) */
+    timeCorr -= tdcLatencyWindow;
+    /* T0 correction (from OCDB) */
+    timeCorr -= t0;
+
+    /*
+     * end of furhter corrections
+     */
+
+    tdcCorr=(Int_t)(timeCorr/AliTOFGeometry::TdcBinWidth()); //the corrected time (tdc counts)
     fTofClusters[ii]->SetTDC(tdcCorr);
 
   } // loop on clusters
 
-  delete calib;
 }
+#endif
+
+//_________________________________________________________________________
+
+void AliTOFClusterFinder::CalibrateRecPoint(UInt_t timestamp)
+{
+  //
+  // Copy the global array of AliTOFcluster, i.e. fTofClusters (sorted
+  // in Z) in the global TClonesArray of AliTOFcluster,
+  // i.e. fRecPoints.
+  //
+
+  Int_t detectorIndex[5];
+  Double_t time, tot, corr;
+  Int_t deltaBC, l0l1, tdcBin;
+  for (Int_t ii = 0; ii < fNumberOfTofClusters; ii++) {
+    for(Int_t jj = 0; jj < 5; jj++) detectorIndex[jj] = fTofClusters[ii]->GetDetInd(jj);
+
+    Int_t index = AliTOFGeometry::GetIndex(detectorIndex);
+
+    /* check channel enabled */
+    if (!fTOFcalib->IsChannelEnabled(index)) fTofClusters[ii]->SetStatus(kFALSE);
+    
+    /* get cluster info */
+    time = fTofClusters[ii]->GetTDC() * AliTOFGeometry::TdcBinWidth(); /* ps */
+    tot = fTofClusters[ii]->GetToT() * AliTOFGeometry::ToTBinWidth() * 1.e-3; /* ns */
+    deltaBC = fTofClusters[ii]->GetDeltaBC();
+    l0l1 = fTofClusters[ii]->GetL0L1Latency();
+
+    /* get correction */
+    corr = fTOFcalib->GetTimeCorrection(index, tot, deltaBC, l0l1, timestamp); /* ps */
+    AliDebug(2, Form("calibrate index %d: time=%f (ps) tot=%f (ns) deltaBC=%d l0l1=%d timestamp=%d corr=%f (ps)", index, time, tot, deltaBC, l0l1, timestamp, corr));
+
+    /* apply time correction */
+    time -= corr;
+
+    /* convert in TDC bins and set cluster */
+    //tdcBin = (Int_t)(time / AliTOFGeometry::TdcBinWidth()); //the corrected time (tdc counts)
+    tdcBin = TMath::Nint(time / AliTOFGeometry::TdcBinWidth()); //the corrected time (tdc counts)
+    fTofClusters[ii]->SetTDC(tdcBin);
+
+    // noferini
+    Float_t pos[3];
+    AliTOFGeometry::GetPosPar(detectorIndex, pos);
+    Float_t length = 0.;
+    for (Int_t ic = 0; ic < 3; ic++) length += pos[ic] * pos[ic];
+    length = TMath::Sqrt(length);
+    Float_t timealligned = tdcBin*24.4 - length * 0.0333564095198152043; // subtract the minimal time in
+
+    if(timealligned > -1000 && timealligned < 24000 && fTOFcalib->IsChannelEnabled(index)){
+      fNumberOfTofTrgPads++;
+    }
+
+  } // loop on clusters
+
+}
+
 //______________________________________________________________________________
 
 void AliTOFClusterFinder::ResetRecpoint()
@@ -802,6 +1296,7 @@ void AliTOFClusterFinder::ResetRecpoint()
   //
 
   fNumberOfTofClusters = 0;
+  fNumberOfTofTrgPads = 0;
   if (fRecPoints) fRecPoints->Clear();
 
 }
@@ -851,4 +1346,181 @@ void AliTOFClusterFinder::UnLoadClusters()
   fTOFLoader->UnloadRecPoints();
 
 }
-//______________________________________________________________________________
+//-------------------------------------------------------------------------
+UShort_t AliTOFClusterFinder::GetClusterVolIndex(const Int_t * const ind) const {
+
+  //First of all get the volume ID to retrieve the l2t transformation...
+  //
+  // Detector numbering scheme
+  Int_t nSector = 18;
+  Int_t nPlate  = 5;
+  Int_t nStripA = 15;
+  Int_t nStripB = 19;
+  Int_t nStripC = 19;
+
+  Int_t isector =ind[0];
+  if (isector >= nSector)
+    AliError(Form("Wrong sector number in TOF (%d) !",isector));
+  Int_t iplate = ind[1];
+  if (iplate >= nPlate)
+    AliError(Form("Wrong plate number in TOF (%d) !",iplate));
+  Int_t istrip = ind[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 index= (2*(nStripC+nStripB)+nStripA)*isector +
+               stripOffset +
+               istrip;
+
+  UShort_t volIndex = AliGeomManager::LayerToVolUID(AliGeomManager::kTOF,index);
+  return volIndex;
+}
+//
+//-------------------------------------------------------------------------
+void AliTOFClusterFinder::GetClusterPars(Int_t *ind, Double_t* pos,Double_t* cov) const {
+
+  //First of all get the volume ID to retrieve the l2t transformation...
+  //
+  UShort_t volIndex = GetClusterVolIndex(ind);
+  //
+  //
+  //we now go in the system of the strip: determine the local coordinates
+  //
+  //
+  // 47---------------------------------------------------0  ^ z
+  // | | | | | | | | | | | | | | | | | | | | | | | | | | | 1 |
+  // -----------------------------------------------------   | y going outwards
+  // | | | | | | | | | | | | | | | | | | | | | | | | | | | 0 |  par[0]=0;
+
+  // -----------------------------------------------------   |
+  // x <-----------------------------------------------------
+
+  /*
+  Float_t localX = (ind[4]-23.5)*AliTOFGeometry::XPad();
+  Float_t localY = 0;
+  Float_t localZ = (ind[3]- 0.5)*AliTOFGeometry::ZPad();
+  */
+  Float_t localX = (ind[4]-AliTOFGeometry::NpadX()/2)*AliTOFGeometry::XPad()+AliTOFGeometry::XPad()/2.;
+  Float_t localY = 0;
+  Float_t localZ = (ind[3]-AliTOFGeometry::NpadZ()/2)*AliTOFGeometry::ZPad()+AliTOFGeometry::ZPad()/2.;
+  //move to the tracking ref system
+
+  Double_t lpos[3];
+  lpos[0] = localX;
+  lpos[1] = localY;
+  lpos[2] = localZ; 
+
+  const TGeoHMatrix *l2t= AliGeomManager::GetTracking2LocalMatrix(volIndex);
+  // Get The position in the track ref system
+  Double_t tpos[3];
+  l2t->MasterToLocal(lpos,tpos);
+  pos[0] = tpos[0];
+  pos[1] = tpos[1];
+  pos[2] = tpos[2];
+
+  //Get The cluster covariance in the track ref system
+  Double_t lcov[9];
+
+  //cluster covariance in the local system:
+  // sx2   0   0
+  // 0     0   0
+  // 0     0   sz2
+
+  lcov[0] = AliTOFGeometry::XPad()*AliTOFGeometry::XPad()/12.;
+  lcov[1] = 0;
+  lcov[2] = 0;
+  lcov[3] = 0;
+  lcov[4] = 0;
+  lcov[5] = 0;
+  lcov[6] = 0;
+  lcov[7] = 0;
+  lcov[8] = AliTOFGeometry::ZPad()*AliTOFGeometry::ZPad()/12.;
+
+  //cluster covariance in the tracking system:
+  TGeoHMatrix m;
+  m.SetRotation(lcov);
+  m.Multiply(l2t);
+  m.MultiplyLeft(&l2t->Inverse());
+  Double_t *tcov = m.GetRotationMatrix();
+  cov[0] = tcov[0]; cov[1] = tcov[1]; cov[2] = tcov[2];
+  cov[3] = tcov[4]; cov[4] = tcov[5];
+  cov[5] = tcov[8];
+
+  return;
+
+}
+//-------------------------------------------------------------------------
+void AliTOFClusterFinder::FillTOFtriggerMap(Int_t iDDL, AliTOFrawData *tofRawDatum)
+{
+
+  /* get cluster info */
+  //Int_t trm = tofRawDatum->GetTRM();
+  // Int_t tdc = tofRawDatum->GetTDC();
+//   Int_t tdc_ch = tofRawDatum->GetTDCchannel();
+  Int_t chain = tofRawDatum->GetTRMchain();
+  Int_t l0l1 = tofRawDatum->GetL0L1Latency();
+  Double_t corr = l0l1 * AliTOFGeometry::BunchCrossingBinWidth();
+  AliTOFCTPLatency *ctpLatencyObj = fTOFcalib->GetCTPLatency();
+  Float_t ctpLatency = ctpLatencyObj->GetCTPLatency();
+  corr += ctpLatency;
+
+  Double_t timeTOF=tofRawDatum->GetTOF()*AliTOFGeometry::TdcBinWidth();
+  timeTOF-=corr;
+  //Int_t timeRaw_bc = Int_t(timeTOF/1000/24.4); // per ora non usata
+
+  //Int_t timeRaw_bc = Int_t((tofRawDatum->GetTOF()*AliTOFGeometry::TdcBinWidth())/1000/24.4); // per ora non usata
+
+  /*
+  const  Int_t crate_CTTM[72] = { 0,  1, 37, 36,  2,  3, 39, 38,  4,  5,
+                                 41, 40,  6,  7, 43, 42,  8,  9, 45, 44,
+                                 10, 11, 47, 46, 12, 13, 49, 48, 14, 15,
+                                 51, 50, 16, 17, 53, 52, 18, 19, 55, 54,
+                                 20, 21, 57, 56, 22, 23, 59, 58, 24, 25,
+                                 61, 60, 26, 27, 63, 62, 28, 29, 65, 64,
+                                 30, 31, 67, 66, 32, 33, 69, 68, 34, 35,
+                                 71, 70};
+  */
+
+  Int_t cttmCrate=-1;
+//   Int_t cttmBit = tdc_ch + (tdc-12)*AliTOFGeometry::NCh();
+  switch(iDDL%AliTOFGeometry::NDDL()){
+  case 1:
+    cttmCrate=1;
+    break;
+  case 3:
+    cttmCrate=36;
+    break;
+  default:
+    break;
+  }
+  cttmCrate+=2*(Int_t)(iDDL/AliTOFGeometry::NDDL());
+  if(chain==0) {
+    if (iDDL<36) cttmCrate--;
+    else cttmCrate++;
+  }
+
+
+
+
+}
+