]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - TOF/AliTOF.cxx
add un-use functionality to clusters
[u/mrichter/AliRoot.git] / TOF / AliTOF.cxx
index e895a27223eb708b8769d1e6081f95cabd4194ea..94634a99f8f089cb5de1ee04464375b33a1e1da5 100644 (file)
@@ -1,3 +1,19 @@
+/**************************************************************************
+ * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
+ *                                                                        *
+ * Author: The ALICE Off-line Project.                                    *
+ * Contributors are mentioned in the code where appropriate.              *
+ *                                                                        *
+ * Permission to use, copy, modify and distribute this software and its   *
+ * documentation strictly for non-commercial purposes is hereby granted   *
+ * without fee, provided that the above copyright notice appears in all   *
+ * copies and that both the copyright notice and this permission notice   *
+ * appear in the supporting documentation. The authors make no claims     *
+ * about the suitability of this software for any purpose. It is          *
+ * provided "as is" without express or implied warranty.                  *
+ **************************************************************************/
+/* $Id$ */
+
 ///////////////////////////////////////////////////////////////////////////////
 //                                                                           //
 //  Time Of Flight                                                           //
 //  detector. Functions specific to one particular geometry are              //
 //  contained in the derived classes                                         //
 //                                                                           //
-//Begin_Html
-/*
-<img src="gif/AliTOFClass.gif">
-*/
-//End_Html
+//  VERSIONE WITH 5 SYMMETRIC MODULES ALONG Z AXIS                           //
+//  ============================================================             //
+//                                                                           //
+//  VERSION WITH HOLES FOR PHOS AND TRD IN SPACEFRAME WITH HOLES             //
+//                                                                           //
+//  Volume sensibile : FPAD                                                  //
+//                                                                           //
+//                                                                           //
 //                                                                           //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
+// Begin_Html
+/*
+<img src="picts/AliTOFClass.gif">
+*/
+//End_Html
+
+#include <TClonesArray.h>
+#include <TFile.h>
+#include <TFolder.h>
+#include <TROOT.h>
+#include <TTask.h>
+#include <TTree.h>
+#include <TVirtualMC.h>
+#include <TStopwatch.h>
 
-#include "AliTOF.h"
-#include <TNode.h>
-#include <TTUBE.h>
-#include <TBRIK.h>
-#include "AliRun.h"
-#include "AliMC.h"
 #include "AliConst.h"
+#include "AliLoader.h"
+#include "AliLog.h"
+#include "AliMC.h"
+#include "AliRun.h"
+#include "AliDAQ.h"
+#include "AliRawReader.h"
+
+//#include "AliTOFDDLRawData.h"
+#include "AliTOFDigitizer.h"
+#include "AliTOFdigit.h"
+#include "AliTOFhitT0.h"
+#include "AliTOFhit.h"
+#include "AliTOFGeometry.h"
+#include "AliTOFSDigitizer.h"
+#include "AliTOFSDigit.h"
+#include "AliTOF.h"
+#include "AliTOFrawData.h"
+#include "AliTOFRawStream.h"
+
+class AliTOFcluster;
+
+extern TFile *gFile;
+extern TROOT *gROOT;
+extern TVirtualMC *gMC;
+
+extern AliRun *gAlice;
+
 ClassImp(AliTOF)
+
 //_____________________________________________________________________________
-AliTOF::AliTOF()
+AliTOF::AliTOF():
+  fFGeom(0x0),
+  fDTask(0x0),
+  fReTask(0x0),
+  fSDigits(0x0),
+  fNSDigits(0),
+  fReconParticles(0x0),
+  fIdSens(-1),
+  fTZero(kFALSE),
+  fTOFHoles(kTRUE),
+  fTOFGeometry(0x0),
+  fTOFRawWriter(AliTOFDDLRawData())
 {
   //
   // Default constructor
   //
+
+  //by default all sectors switched on
+  for (Int_t ii=0; ii<18; ii++) fTOFSectors[ii]=0;
+
+  fDigits = 0;
   fIshunt   = 0;
+  fName = "TOF";
+
 }
  
 //_____________________________________________________________________________
-AliTOF::AliTOF(const char *name, const char *title)
-       : AliDetector(name,title)
+AliTOF::AliTOF(const char *name, const char *title, Option_t *option)
+       : 
+  AliDetector(name,title),
+  fFGeom(0x0),
+  fDTask(0x0),
+  fReTask(0x0),
+  fSDigits(0x0),
+  fNSDigits(0),
+  fReconParticles(0x0),
+  fIdSens(-1),
+  fTZero(kFALSE),
+  fTOFHoles(kTRUE),
+  fTOFGeometry(0x0),
+  fTOFRawWriter(AliTOFDDLRawData())
 {
   //
   // AliTOF standard constructor
   // 
-  fHits   = new TClonesArray("AliTOFhit",  405);
+  // Here are fixed some important parameters
   //
-  fIshunt     =  0;
+
+  // Initialization of hits, sdigits and digits array
+  // added option for time zero analysis
+  //skowron
+  fTOFGeometry = new AliTOFGeometry();
+
+  //by default all sectors switched on
+  for (Int_t ii=0; ii<18; ii++) fTOFSectors[ii]=0;
+
+  if (strstr(option,"tzero")){
+    fHits   = new TClonesArray("AliTOFhitT0",  1000);
+    fTZero = kTRUE;
+    //    AliWarning("tzero option requires AliTOFv4T0/AliTOFv5T0 as TOF version (check Your Config.C)");
+  }else{
+    fHits   = new TClonesArray("AliTOFhit",  1000);
+    fTZero = kFALSE;
+  }
+  if (gAlice==0) {
+     AliFatal("gAlice==0 !");
+  }
+
+  AliMC *mcApplication = (AliMC*)gAlice->GetMCApp();
+
+  if (mcApplication->GetHitLists())
+     mcApplication->AddHitList(fHits);
+  else AliError("gAlice->GetHitLists()==0");
+
+  fIshunt  = 0;
+  fSDigits = new TClonesArray("AliTOFSDigit", 1000);
+  fDigits  = new TClonesArray("AliTOFdigit",  1000);
+
+  //
+  // Digitization parameters
+  //
+  // (Transfer Functions to be inserted here)
   //
-  SetMarkerColor(7);
-  SetMarkerStyle(2);
-  SetMarkerSize(0.4);
+  //PH  SetMarkerColor(7);
+  //PH  SetMarkerStyle(2);
+  //PH  SetMarkerSize(0.4);
+
+// Strip Parameters
+  //fGapA    =   4.; //cm  Gap beetween tilted strip in A-type plate
+  //fGapB    =   6.; //cm  Gap beetween tilted strip in B-type plate
+
+  // Physical performances
+  //fTimeRes = 100.;//ps
+  //fChrgRes = 100.;//pC
+
+}
+
+//____________________________________________________________________________
+void AliTOF::SetTOFSectors(Int_t *sectors)
+{
+  // Setter for partial/full TOF configuration
+
+  for(Int_t isec=0;isec<18;isec++){
+    fTOFSectors[isec]=sectors[isec];
+  }
+}
+//____________________________________________________________________________
+void AliTOF::GetTOFSectors(Int_t *sectors) const
+{
+  // Getter for partial/full TOF configuration
+
+  for(Int_t isec=0;isec<18;isec++){
+    sectors[isec]=fTOFSectors[isec];
+  }
+}
+
+//_____________________________________________________________________________
+void AliTOF::CreateTOFFolders()
+{
+  // create the ALICE TFolder
+  // create the ALICE TTasks
+  // create the ALICE main TFolder
+  // to be done by AliRun
+
+  TFolder * alice = new TFolder();
+  alice->SetNameTitle("FPAlice", "Alice Folder") ;
+  gROOT->GetListOfBrowsables()->Add(alice) ;
+
+  TFolder * aliceF  = alice->AddFolder("folders", "Alice memory Folder") ;
+  //  make it the owner of the objects that it contains
+  aliceF->SetOwner() ;
+  // geometry folder
+  TFolder * geomF = aliceF->AddFolder("Geometry", "Geometry objects") ;
+  TFolder * aliceT  = alice->AddFolder("tasks", "Alice tasks Folder") ;   
+  //  make it the owner of the objects that it contains
+  aliceT->SetOwner() ;
+
+  TTask * aliceDi = new TTask("(S)Digitizer", "Alice SDigitizer & Digitizer") ;
+  aliceT->Add(aliceDi);
+
+  TTask * aliceRe = new TTask("Reconstructioner", "Alice Reconstructioner") ;
+  aliceT->Add(aliceRe);
+
+  char * tempo = new char[80] ;
+
+  // creates the TOF Digitizer and adds it to alice main (S)Digitizer task
+  sprintf(tempo, "%sDigitizers container",GetName() ) ;
+  fDTask = new TTask(GetName(), tempo);
+  aliceDi->Add(fDTask) ;
+
+  // creates the TOF reconstructioner and adds it to alice main Reconstructioner task
+  sprintf(tempo, "%sReconstructioner container",GetName() ) ;
+  fReTask = new TTask(GetName(), tempo);
+  aliceRe->Add(fReTask) ;
+
+  delete [] tempo ;
+  // creates the TOF geometry  folder
+  geomF->AddFolder("TOF", "Geometry for TOF") ;
+}
+
+//_____________________________________________________________________________
+AliTOF::~AliTOF()
+{
+  // dtor:
+  // it remove also the alice folder 
+  // and task that TOF creates instead of AliRun
+  /* PH Temporarily commented because of problems
+  TFolder * alice = (TFolder*)gROOT->GetListOfBrowsables()->FindObject("FPAlice") ;
+  delete alice;
+  alice = 0;
+  */
+  if (fHits)
+    {
+      fHits->Delete ();
+      delete fHits;
+      fHits = 0;
+    }
+  if (fDigits)
+    {
+      fDigits->Delete ();
+      delete fDigits;
+      fDigits = 0;
+    }
+  if (fSDigits)
+    {
+      fSDigits->Delete();
+      delete fSDigits;
+      fSDigits = 0;
+    }
+
+  if (fReconParticles)
+    {
+      fReconParticles->Delete ();
+      delete fReconParticles;
+      fReconParticles = 0;
+    }
+
 }
 
 //_____________________________________________________________________________
@@ -54,532 +283,501 @@ void AliTOF::AddHit(Int_t track, Int_t *vol, Float_t *hits)
 {
   //
   // Add a TOF hit
+  // new with placement used
   //
   TClonesArray &lhits = *fHits;
-  new(lhits[fNhits++]) AliTOFhit(fIshunt,track,vol,hits);
+  new(lhits[fNhits++]) AliTOFhit(fIshunt, track, vol, hits);
 }
+
 //_____________________________________________________________________________
-void AliTOF::BuildGeometry()
+void AliTOF::AddT0Hit(Int_t track, Int_t *vol, Float_t *hits)
 {
   //
-  // Build TOF ROOT geometry for the ALICE event viewver
-  //
-  TNode *Node, *Top;
-  const int kColorTOF  = 27;
-  //
-  // Find top TNODE
-  Top=gAlice->GetGeometry()->GetNode("alice");
-  //
-  // Define rotation matrixes
-  new TRotMatrix("rot501","rot501",90,-18.94737,90,71.05263,0,0);
-  new TRotMatrix("rot502","rot502",90,-37.89474,90,52.10526,0,0);
-  new TRotMatrix("rot503","rot503",90,-56.84211,90,33.15789,0,0);
-  new TRotMatrix("rot504","rot504",90,-75.78947,90,14.21053,0,0);
-  new TRotMatrix("rot505","rot505",90,-94.73685,90,-4.736847,0,0);
-  new TRotMatrix("rot506","rot506",90,-113.6842,90,-23.68421,0,0);
-  new TRotMatrix("rot507","rot507",90,-132.6316,90,-42.63158,0,0);
-  new TRotMatrix("rot508","rot508",90,-151.5789,90,-61.57895,0,0);
-  new TRotMatrix("rot509","rot509",90,-170.5263,90,-80.52632,0,0);
-  new TRotMatrix("rot510","rot510",90,-189.4737,90,-99.47369,0,0);
-  new TRotMatrix("rot511","rot511",90,-208.4211,90,-118.4211,0,0);
-  new TRotMatrix("rot512","rot512",90,-227.3684,90,-137.3684,0,0);
-  new TRotMatrix("rot513","rot513",90,-246.3158,90,-156.3158,0,0);
-  new TRotMatrix("rot514","rot514",90,-265.2632,90,-175.2632,0,0);
-  new TRotMatrix("rot515","rot515",90,-284.2105,90,-194.2105,0,0);
-  new TRotMatrix("rot516","rot516",90,-303.1579,90,-213.1579,0,0);
-  new TRotMatrix("rot517","rot517",90,-322.1053,90,-232.1053,0,0);
-  new TRotMatrix("rot518","rot518",90,-341.0526,90,-251.0526,0,0);
-  new TRotMatrix("rot519","rot519",90,-360,90,-270,0,0);
-  //
-  // Define TOF basic volume
-  new TBRIK("S_TOF1","TOF box","void",60.,6.,175.);
-  //
-  // Position the different copies
-  Top->cd();
-  Node = new TNode("FTO11","FTO11","S_TOF1",224.8018,288.8254,175,"rot502");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  Node = new TNode("FTO12","FTO12","S_TOF1",306.4029,200.183,175,"rot503");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();  
-  Node = new TNode("FTO13","FTO13","S_TOF1",354.8005,89.84769,175,"rot504");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node);
-  //
-  Top->cd();
-  Node = new TNode("FTO14","FTO14","S_TOF1",364.7499,-30.22407,175,"rot505");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  Node = new TNode("FTO15","FTO15","S_TOF1",335.173,-147.0205,175,"rot506");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();  
-  Node = new TNode("FTO16","FTO16","S_TOF1",-335.1731,-147.0205,175,"rot513");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  Node = new TNode("FTO17","FTO17","S_TOF1",-364.7499,-30.22407,175,"rot514");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  Node = new TNode("FTO18","FTO18","S_TOF1",-354.8005,89.84778,175,"rot515");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  Node = new TNode("FTO19","FTO19","S_TOF1",-306.4029,200.183,175,"rot516");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  Node = new TNode("FTO110","FTO110","S_TOF1",-224.8019,288.8254,175,"rot517");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  Node = new TNode("FTO111","FTO111","S_TOF1",224.8018,288.8254,-175,"rot502");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  Node = new TNode("FTO112","FTO112","S_TOF1",306.4029,200.183,-175,"rot503");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  Node = new TNode("FTO113","FTO113","S_TOF1",354.8005,89.84769,-175,"rot504");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  Node = new TNode("FTO114","FTO114","S_TOF1",364.7499,-30.22407,-175,"rot505");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  Node = new TNode("FTO115","FTO115","S_TOF1",335.173,-147.0205,-175,"rot506");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  Node = new TNode("FTO116","FTO116","S_TOF1",-335.1731,-147.0205,-175,"rot513");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  Node = new TNode("FTO117","FTO117","S_TOF1",-364.7499,-30.22407,-175,"rot514");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  Node = new TNode("FTO118","FTO118","S_TOF1",-354.8005,89.84778,-175,"rot515");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  Node = new TNode("FTO119","FTO119","S_TOF1",-306.4029,200.183,-175,"rot516");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  Node = new TNode("FTO120","FTO120","S_TOF1",-224.8019,288.8254,-175,"rot517");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node);
-  //
-  // Define second TOF volume
-  new TBRIK("S_TOF2","TOF box","void",60.,6.,100.);
-  //
-  // Position the volume
-  Top->cd();
-  Node = new TNode("FTO21","FTO21","S_TOF2",269.275,-247.885,250,"rot507");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  Node = new TNode("FTO22","FTO22","S_TOF2",174.1967,-321.8874,250,"rot508");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  Node = new TNode("FTO23","FTO23","S_TOF2",60.24158,-361.0082,250,"rot509");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  Node = new TNode("FTO24","FTO24","S_TOF2",-60.24168,-361.0082,250,"rot510");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  Node = new TNode("FTO25","FTO25","S_TOF2",-174.1967,-321.8874,250,"rot511");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  Node = new TNode("FTO26","FTO26","S_TOF2",-269.275,-247.885,250,"rot512");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  Node = new TNode("FTO27","FTO27","S_TOF2",269.275,-247.885,-250,"rot507");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  Node = new TNode("FTO28","FTO28","S_TOF2",174.1967,-321.8874,-250,"rot508");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  Node = new TNode("FTO29","FTO29","S_TOF2",60.24158,-361.0082,-250,"rot509");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  Node = new TNode("FTO210","FTO210","S_TOF2",-60.24168,-361.0082,-250,"rot510");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  Node = new TNode("FTO211","FTO211","S_TOF2",-174.1967,-321.8874,-250,"rot511");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  Node = new TNode("FTO212","FTO212","S_TOF2",-269.275,-247.885,-250,"rot512");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  // Define third TOF volume
-  new TBRIK("S_TOF3","TOF box","void",60.,6.,75.);
-  //
-  // Position it
-  Top->cd();
-  Node = new TNode("FTO31","FTO31","S_TOF3",118.84,346.1691,275,"rot501");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  Node = new TNode("FTO32","FTO32","S_TOF3",-118.8399,346.1691,275,"rot518");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  Node = new TNode("FTO33","FTO33","S_TOF3",0.,366.,275.,"rot519");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
+  // Add a TOF hit
+  // new with placement used
   //
-  Top->cd();
-  Node = new TNode("FTO34","FTO34","S_TOF3",118.84,346.1691,-275.,"rot501");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
+  TClonesArray &lhits = *fHits;
+  new(lhits[fNhits++]) AliTOFhitT0(fIshunt, track, vol, hits);
+}
+
+//_____________________________________________________________________________
+void AliTOF::AddDigit(Int_t *tracks, Int_t *vol, Int_t *digits)
+{
   //
-  Top->cd();
-  Node = new TNode("FTO35","FTO35","S_TOF3",-118.8399,346.1691,-275,"rot518");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
+  // Add a TOF digit
+  // new with placement used
   //
-  Top->cd();
-  Node = new TNode("FTO36","FTO36","S_TOF3",0.,366.,-275.,"rot519");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
+  TClonesArray &ldigits = *fDigits;
+  new (ldigits[fNdigits++]) AliTOFdigit(tracks, vol, digits);
+}
+
+//_____________________________________________________________________________
+void AliTOF::AddSDigit(Int_t tracknum, Int_t *vol, Int_t *digits)
+{
+     
+//
+// Add a TOF sdigit
+//
+        
+  TClonesArray &lSDigits = *fSDigits;   
+  new(lSDigits[fNSDigits++]) AliTOFSDigit(tracknum, vol, digits);
+}
+
+//_____________________________________________________________________________
+void AliTOF::SetTreeAddress ()
+{
+  // Set branch address for the Hits and Digits Tree.
+  
+  if (fLoader->TreeH())
+   {
+     if (fHits == 0x0)
+      {
+        if (fTZero) fHits   = new TClonesArray("AliTOFhitT0", 1000);
+        else fHits   = new TClonesArray("AliTOFhit", 1000);
+      }
+   }
+  AliDetector::SetTreeAddress ();
+
+  TBranch *branch;
+
+  if (fLoader->TreeS () )
+    {
+      branch = fLoader->TreeS ()->GetBranch ("TOF");
+      if (branch) {
+        if (fSDigits == 0x0) fSDigits = new TClonesArray("AliTOFSDigit",  1000);
+        branch->SetAddress (&fSDigits);
+      }
+    }
+
+  if (fLoader->TreeR() ) 
+    {
+      branch = fLoader->TreeR()->GetBranch("TOF"); 
+      if (branch) 
+       {
+        if (fReconParticles == 0x0) fReconParticles = new TClonesArray("AliTOFcluster",  1000);
+         branch->SetAddress(&fReconParticles);
+       }
+    }
+
+  /*
+  if (fLoader->TreeR() && fReconParticles) //I do not know where this array is created - skowron
+    {
+      branch = fLoader->TreeR()->GetBranch("TOF"); 
+      if (branch) 
+       {
+         branch->SetAddress(&fReconParticles) ;
+       }
+    }
+  */
 }
 
 //_____________________________________________________________________________
 void AliTOF::CreateGeometry()
 {
   //
-  // Common geometry code for version 2 and version 3 of the TOF
+  // Common geometry code 
   //
   //Begin_Html
   /*
-    <img src="gif/AliTOFv23.gif">
+    <img src="picts/AliTOFv23.gif">
   */
   //End_Html
   //
 
-  AliMC* pMC = AliMC::GetMC();
-  
-  const Double_t kPi=TMath::Pi();
-  const Double_t kDegrad=kPi/180;
-  const Double_t kRaddeg=180/kPi;
-  //
-  Float_t fil_rich;
-  Int_t lmax;
-  Float_t xtof, ytof, fil_step, phos_phi, phos_min, phos_max;
-  Int_t lmax1;
-  Float_t zcor1, zcor2, zcor3;
-  Float_t ztof0, ztof1, ztof2, xcor2, ycor2;
-  Int_t i;
-  Float_t dx, dz, zl, xm, ym, phos_r;
-  Int_t idrotm[101];
-  Float_t phos_x;
-  Float_t rp2, zm0, zm1, zm2;
-  Float_t par[10], fil_min, fil_max;
-  Float_t fil1;
-  //
-  Int_t *idtmed = gAlice->Idtmed();
-  //
-  phos_x = 214.6;
-  phos_r = 467.;
-  //phos_z = 260.;
-  //rich_z = 472.5;
-  xtof = 120.;
-  ytof = 12.;
-  ztof0 = 350.;
-  ztof1 = 200.;
-  ztof2 = 150.;
-  //
-  // frame thick along Z axis
-  dz = 0.;
-  //
-  // frame thick along X axis
-  dx = 0.;
-  //
-  // barrel length along Z axis
-  zl = 720.;
-  //
-  // PHOS openings 
-  fil_rich = 30.;
-  phos_phi = TMath::ATan(phos_x / (phos_r * 2.));
-  phos_min = (kPi - phos_phi * 4.) * kRaddeg;
-  phos_max = (phos_phi * 4. + kPi) * kRaddeg;
-  //
-  // barrel radius in module contact point 
-  par[0] = 355.;
-  par[1] = 385.;
-  par[2] = zl / 2.;
-  pMC->Gsvolu("FBAR", "TUBE", idtmed[500], par, 3);
-  //
-  // --- Set module unseen ---
-  pMC->Gspos("FBAR", 1, "ALIC", 0., 0., 0., 0, "ONLY");
-  pMC->Gsatt("FBAR", "SEEN", 0);
-  //
-  // Number of TOF-block 
-  lmax = 19;
-  //
-  // New size YTOF
-  par[0] = xtof / 2.;
-  par[1] = ytof / 2.;
-  par[2] = ztof0 / 2.;
-  pMC->Gsvolu("FTO1", "BOX ", idtmed[506], par, 3);
-  pMC->Gsatt("FTO1", "SEEN", -2);
-  par[2] = ztof1 / 2.;
-  pMC->Gsvolu("FTO2", "BOX ", idtmed[506], par, 3);
-  pMC->Gsatt("FTO2", "SEEN", -2);
-  par[2] = ztof2 / 2.;
-  pMC->Gsvolu("FTO3", "BOX ", idtmed[506], par, 3);
-  pMC->Gsatt("FTO3", "SEEN", -2);
-  //
-  // Subtraction of TOF module boundaries 
-  xm = xtof - dx * 2.;
-  ym = ytof;
-  zm0 = ztof0 - dz * 2.;
-  zm1 = ztof1 - dz * 2.;
-  zm2 = ztof2 - dz * 2.;
-  //  
-  // TOF module internal definitions
-  //  
-  TOFpc(xm, ym, zm0, zm1, zm2);
-  //
-  //rp1 = 382.;
-  rp2 = 366.;
-  fil_step = 360. / lmax;
-  fil_min = phos_min - fil_step * .5;
-  fil_max = phos_max + fil_step * .5;
-  zcor1 = 175.;
-  zcor2 = ztof0 - ztof1 / 2.;
-  zcor3 = ztof0 - ztof2 / 2.;
-  for (i = 1; i <= lmax; ++i) {
-    fil1 = fil_step * i;
-    //xcor1 = rp1 * TMath::Sin(fil1 * kDegrad) + dx * TMath::Cos(fil1 * kDegrad);
-    //ycor1 = rp1 * TMath::Cos(fil1 * kDegrad) - dx * TMath::Sin(fil1 * kDegrad);
-    xcor2 = rp2 * TMath::Sin(fil1 * kDegrad);
-    ycor2 = rp2 * TMath::Cos(fil1 * kDegrad);
-    lmax1 = i + lmax;
-    AliMatrix(idrotm[i], 90., -fil1, 90., 90. - fil1, 0., 0.);
-    if (fil1 >= fil_min  && fil1 <= fil_max) {
-      pMC->Gspos("FTO2", i, "FBAR", xcor2, ycor2, zcor2, idrotm[i], "ONLY");
-      pMC->Gspos("FTO2", lmax1, "FBAR", xcor2, ycor2, -zcor2, idrotm[i], "ONLY");
-    } else if (fil1 <= fil_rich || fil1 >= 360. - fil_rich) {
-      par[2] = ztof2 / 2.;
-      pMC->Gspos("FTO3", i, "FBAR", xcor2, ycor2, zcor3, idrotm[i], "ONLY");
-      pMC->Gspos("FTO3", lmax1, "FBAR", xcor2, ycor2, -zcor3, idrotm[i], "ONLY");
-    } else {
-      par[2] = ztof0 / 2.;
-      pMC->Gspos("FTO1", i, "FBAR", xcor2, ycor2, zcor1, idrotm[i], "ONLY");
-      pMC->Gspos("FTO1", lmax1, "FBAR", xcor2, ycor2, -zcor1, idrotm[i], "ONLY");
-    }
+  Float_t xTof, yTof;
+
+  if (IsVersion()==8) {
+
+    xTof = 124.5;//fTOFGeometry->StripLength()+2.*(0.3+0.03); // cm,  x-dimension of FTOA volume
+    yTof = fTOFGeometry->Rmax()-fTOFGeometry->Rmin(); // cm,  y-dimension of FTOA volume
+    Float_t zTof = fTOFGeometry->ZlenA();             // cm,  z-dimension of FTOA volume
+    
+    //  TOF module internal definitions
+    TOFpc(xTof, yTof, zTof);
+
+  } else if (IsVersion()==7) {
+
+    xTof = 124.5;//fTOFGeometry->StripLength()+2.*(0.3+0.03); // cm,  x-dimension of FTOA volume
+    yTof = fTOFGeometry->Rmax()-fTOFGeometry->Rmin(); // cm,  y-dimension of FTOA volume
+    Float_t zTof = fTOFGeometry->ZlenA();             // cm,  z-dimension of FTOA volume
+    
+    //  TOF module internal definitions
+    TOFpc(xTof, yTof, zTof, fTOFGeometry->ZlenB());
+
+  } else {
+
+    Float_t wall = 4.;//cm // frame inbetween TOF modules
+
+    // Sizes of TOF module with its support etc..
+    xTof = 2.*(fTOFGeometry->Rmin()*TMath::Tan(10.*kDegrad)-wall/2.-0.5);
+    yTof = fTOFGeometry->Rmax()-fTOFGeometry->Rmin();
+
+    //  TOF module internal definitions 
+    TOFpc(xTof, yTof, fTOFGeometry->ZlenC(), fTOFGeometry->ZlenB(), fTOFGeometry->ZlenA(), fTOFGeometry->MaxhZtof());
   }
+
 }
 
 //_____________________________________________________________________________
-void AliTOF::DrawDetector()
+void AliTOF::DrawModule() const
 {
   //
   // Draw a shaded view of the common part of the TOF geometry
-  // for versions 2 and 3
   //
 
-  AliMC* pMC = AliMC::GetMC();
-  
+  AliInfo(" Drawing of AliTOF"); 
   // Set everything unseen
-  pMC->Gsatt("*", "seen", -1);
+  gMC->Gsatt("*", "seen", -1);
   // 
   // Set ALIC mother transparent
-  pMC->Gsatt("ALIC","SEEN",0);
+  gMC->Gsatt("ALIC","SEEN",0);
   //
   // Set the volumes visible
-  pMC->Gsatt("FBAR","SEEN",0);
-  pMC->Gsatt("FTO1","SEEN",1);
-  pMC->Gsatt("FTO2","SEEN",1);
-  pMC->Gsatt("FTO3","SEEN",1);
-  //
-  pMC->Gdopt("hide", "on");
-  pMC->Gdopt("shad", "on");
-  pMC->Gsatt("*", "fill", 7);
-  pMC->SetClipBox(".");
-  pMC->SetClipBox("*", 0, 1000, -1000, 1000, -1000, 1000);
-  pMC->DefaultRange();
-  pMC->Gdraw("alic", 40, 30, 0, 12, 9.5, .02, .02);
-  pMC->Gdhead(1111, "Time Of Flight");
-  pMC->Gdman(18, 4, "MAN");
-  pMC->Gdopt("hide","off");
+  gMC->Gsatt("FTOA","SEEN",1);
+  gMC->Gsatt("FTOB","SEEN",1);
+  gMC->Gsatt("FTOC","SEEN",1);
+  gMC->Gsatt("FLTA","SEEN",1);
+  gMC->Gsatt("FLTB","SEEN",1);
+  gMC->Gsatt("FLTC","SEEN",1);
+  gMC->Gsatt("FSTR","SEEN",1);
+  //
+  gMC->Gdopt("hide", "on");
+  gMC->Gdopt("shad", "on");
+  gMC->Gsatt("*", "fill", 7);
+  gMC->SetClipBox(".");
+  gMC->SetClipBox("*", 0, 1000, -1000, 1000, -1000, 1000);
+  gMC->DefaultRange();
+  gMC->Gdraw("alic", 40, 30, 0, 12, 9.5, .02, .02);
+  gMC->Gdhead(1111, "Time Of Flight");
+  gMC->Gdman(18, 4, "MAN");
+  gMC->Gdopt("hide","off");
 }
 
-//_____________________________________________________________________________
-void AliTOF::CreateMaterials()
+//___________________________________________
+void AliTOF::ResetHits ()
 {
-  //
-  // Defines TOF materials for all versions
-  // Authors :   Maxim Martemianov, Boris Zagreev (ITEP)   18/09/98 
-  //
-  Int_t   ISXFLD = gAlice->Field()->Integ();
-  Float_t SXMGMX = gAlice->Field()->Max();
-  //
-  Float_t ac[2]   = { 12.,16. };
-  Float_t zc[2]   = { 6.,8. };
-  Float_t wc[2]   = { 1.,2. };
-  Float_t ag10[4] = { 12.,1.,16.,28. };
-  Float_t zg10[4] = { 6.,1.,8.,14. };
-  Float_t wmatg10[4] = { .259,.288,.248,.205 };
-  Float_t adme[5] = { 12.,1.,16.,19.,79. };
-  Float_t zdme[5] = { 6.,1.,8.,9.,35. };
-  Float_t wmatdme[5] = { .4056,.0961,.2562,.1014,.1407 };
-  Float_t aal[2] = { 27.,16. };
-  Float_t zal[2] = { 13.,8. };
-  Float_t wmatal[2] = { 2.,3. };
-  //
-  Int_t nlmatdme;
-  Float_t epsil, stmin, dc, densg10, densal, deemax, stemax;
-  Float_t densdme;
-  Int_t nlmatg10, nlmatal;
-  //
-  // --- Vacuum
-  AliMaterial(0, "Vacuum$", 1e-16, 1e-16, 1e-16, 1e16, 1e16);
-  // --- Air
-  AliMaterial(1, "Air$",14.61,7.3,0.001205,30423.24,67500.);
-  // --- CO2 
-  dc = .001977;
-  AliMixture(7, "CO2$", ac, zc, dc, -2, wc);
-  // --- G10 
-  densg10  = 1.7;
-  nlmatg10 = -4;
-  AliMixture(5, "G10$", ag10, zg10, densg10, nlmatg10, wmatg10);
-  // --- DME 
-  densdme  = .00205;
-  nlmatdme = 5;
-  AliMixture(6, "DME ", adme, zdme, densdme, nlmatdme, wmatdme);
-  // ---- ALUMINA (AL203) 
-  densal  = 2.3;
-  nlmatal = -2;
-  AliMixture(8, "ALUMINA$", aal, zal, densal, nlmatal, wmatal);
-  //       Previous data 
-  //       EPSIL  =  0.1   ! Tracking precision, 
-  //       STEMAX = 0.1      ! Maximum displacement for multiple scattering
-  //       DEEMAX = 0.1    ! Maximum fractional energy loss, DLS 
-  //       STMIN  = 0.1 
-  //       New data from 
-  epsil  = .001;
-  stemax = -1.;
-  deemax = -.3;
-  stmin  = -.8;
-  AliMedium(500, "Vacuum  $", 0, 0, ISXFLD, SXMGMX, 10., stemax, deemax, epsil, stmin);
-  AliMedium(501, "Air $", 0, 0, ISXFLD, SXMGMX, 10., stemax, deemax, epsil, stmin);
-  AliMedium(505, "G10$", 5, 0, ISXFLD, SXMGMX, 10., stemax, deemax, epsil, stmin);
-  AliMedium(506, "DME$", 6, 0, ISXFLD, SXMGMX, 10., stemax, deemax, epsil, stmin);
-  AliMedium(507, "CO2$", 7, 0, ISXFLD, SXMGMX, 10., -.01, -.1, .01, -.01);
-  AliMedium(508, "ALUMINA$", 8, 0, ISXFLD, SXMGMX, 10., stemax, deemax, epsil, stmin);
-  AliMedium(510, "DME$", 6, 1, ISXFLD, SXMGMX, 10., stemax, deemax, epsil, stmin);
+  // Reset number of clusters and the cluster array for this detector
+  AliDetector::ResetHits ();
 }
 
-//_____________________________________________________________________________
-Int_t AliTOF::DistancetoPrimitive(Int_t , Int_t )
+//____________________________________________
+void AliTOF::ResetDigits ()
 {
   //
-  // Returns distance from mouse pointer to detector, default version
+  // Reset number of digits and the digits array for this detector
+  AliDetector::ResetDigits ();
   //
-  return 9999;
-}
+} 
+//____________________________________________
+void AliTOF::ResetSDigits ()
+{
+  //
+  // Reset number of sdigits and the sdigits array for this detector
+  fNSDigits = 0;
+  //fSDigits = 0x0;
+  //
+} 
 //_____________________________________________________________________________
 void AliTOF::Init()
 {
   //
   // Initialise TOF detector after it has been built
   //
-  Int_t i;
-  AliMC *pMC=AliMC::GetMC();
-  //
-  printf("\n");
-  for(i=0;i<35;i++) printf("*");
-  printf(" TOF_INIT ");
-  for(i=0;i<35;i++) printf("*");
-  printf("\n");
-  //
   // Set id of TOF sensitive volume
-  fIdSens=pMC->VolId("FPG2");
-  //
-  for(i=0;i<80;i++) printf("*");
-  printf("\n");
+  if (IsVersion() !=0) fIdSens=gMC->VolId("FPAD");
+
+  /*
+  // Save the geometry
+  TDirectory* saveDir = gDirectory;
+  AliRunLoader::Instance()->CdGAFile();
+  fTOFGeometry->Write("TOFGeometry");
+  saveDir->cd();
+  */
 }
 
+//____________________________________________________________________________
+void AliTOF::MakeBranch(Option_t* option)
+{
+ //
+ // Initializes the Branches of the TOF inside the 
+ // trees written for each event. 
+ // AliDetector::MakeBranch initializes just the 
+ // Branch inside TreeH. Here we add the branches in 
+ // TreeD, TreeS and TreeR.
+ //
+  const char *oH = strstr(option,"H");
+  if (fLoader->TreeH() && oH)
+   {
+     if (fHits == 0x0)
+      {
+        if (fTZero) fHits   = new TClonesArray("AliTOFhitT0", 1000);
+        else fHits   = new TClonesArray("AliTOFhit", 1000);
+      }
+   }
+  
+  AliDetector::MakeBranch(option);
+
+  Int_t buffersize = 4000;
+  Char_t branchname[10];
+  sprintf(branchname,"%s",GetName());
+  
+  const char *oD = strstr(option,"D");
+  const char *oS = strstr(option,"S");
+  const char *oR = strstr(option,"R");
+
+  if (fLoader->TreeD() && oD){
+    if (fDigits == 0x0) fDigits = new TClonesArray("AliTOFdigit",  1000); 
+    MakeBranchInTree(fLoader->TreeD(), branchname, &fDigits,buffersize, 0) ;
+  }
+
+  if (fLoader->TreeS() && oS){
+    if (fSDigits == 0x0) fSDigits = new TClonesArray("AliTOFSDigit",  1000);
+    MakeBranchInTree(fLoader->TreeS(), branchname, &fSDigits,buffersize, 0) ;
+  }
+
+  if (fLoader->TreeR() && oR){
+    if (fReconParticles == 0x0) fReconParticles = new TClonesArray("AliTOFcluster",  1000);
+    MakeBranchInTree(fLoader->TreeR(), branchname, &fReconParticles,buffersize, 0) ;
+  }
+
+  /*
+  if (fReconParticles && fLoader->TreeR() && oR){
+    MakeBranchInTree(fLoader->TreeR(), branchname, &fReconParticles,buffersize, 0) ;
+  }
+  */
+}
+
+//____________________________________________________________________________
+void AliTOF::Makehits(Bool_t hits) 
+{
+// default argument used, see AliTOF.h
+// Enable/Disable the writing of the TOF-hits branch 
+// on TreeH
+// by default :  enabled for TOFv1, v2, v3, v4, v5
+//              disabled for TOFv0
+// 
+   if (hits &&  (IsVersion()!=0))
+      fIdSens = gMC->VolId("FPAD");
+   else
+      AliInfo("Option for writing the TOF-hits branch on TreeH: disabled");
+}
+
+//____________________________________________________________________________
+void AliTOF::FinishEvent()
+{
+// do nothing
+}
+
+//____________________________________________________________________________
+void AliTOF::Hits2SDigits()
+{
+//
+// Use the TOF SDigitizer to make TOF SDigits
+//
+
+//  AliInfo("Start...");
+  
+  AliRunLoader * rl = fLoader->GetRunLoader();
+  AliDebug(2,"Initialized runLoader");
+  AliTOFSDigitizer sd((rl->GetFileName()).Data());
+  AliDebug(2,"Initialized TOF sdigitizer");
+  //ToAliDebug(1, sd.Print(""));
+  //AliInfo("ToAliDebug");
+
+  //sd.Exec("all") ;
+  sd.Exec("partial") ;
+
+  AliDebug(2,"I am sorting from AliTOF class");
+
+}
+
+//____________________________________________________________________________
+void AliTOF::Hits2SDigits(Int_t evNumber1, Int_t evNumber2)
+{
+//
+// Use the TOF SDigitizer to make TOF SDigits
+//
+
+  if ((evNumber2-evNumber1)==1) 
+    AliDebug(1, Form("I am making sdigits for the %dth event", evNumber1));
+  if ((evNumber2-evNumber1)>1)
+    AliDebug(1, Form("I am making sdigits for the events from the %dth to the %dth", evNumber1, evNumber2-1));
  
-ClassImp(AliTOFhit)
-//___________________________________________
-AliTOFhit::AliTOFhit(Int_t shunt, Int_t track, Int_t *vol, Float_t *hits):
-  AliHit(shunt, track)
+  AliRunLoader * rl = fLoader->GetRunLoader();
+  AliTOFSDigitizer sd((rl->GetFileName()).Data(),evNumber1,evNumber2) ;
+  ToAliDebug(1, sd.Print(""));
+
+  sd.Exec("") ;
+
+}
+
+//___________________________________________________________________________
+AliDigitizer* AliTOF::CreateDigitizer(AliRunDigitizer* manager) const
+{
+  AliDebug(2,"I am creating the TOF digitizer");
+  return new AliTOFDigitizer(manager);
+}
+
+//___________________________________________________________________________
+Bool_t AliTOF::CheckOverlap(Int_t* vol, Int_t* digit,Int_t Track)
+{
+//
+// Checks if 2 or more hits belong to the same pad.
+// In this case the data assigned to the digit object
+// are the ones of the first hit in order of Time.
+// 2 hits from the same track on the same pad are collected.
+// Called only by Hits2SDigits.
+// This procedure has to be optimized in the next TOF release.
+//
+
+  Bool_t overlap = kFALSE;
+  Int_t  vol2[5];
+
+  for (Int_t ndig=0; ndig<fSDigits->GetEntries(); ndig++){
+    AliTOFdigit* currentDigit = (AliTOFdigit*)(fSDigits->UncheckedAt(ndig));
+    currentDigit->GetLocation(vol2);
+    Bool_t idem= kTRUE;
+    // check on digit volume
+    for (Int_t i=0;i<=4;i++){
+      if (!idem) break;
+      if (vol[i]!=vol2[i]) idem=kFALSE;}
+
+    if (idem){  // same pad fired
+      Int_t tdc2 = digit[0];
+      Int_t tdc1 = currentDigit->GetTdc();
+
+      // we separate two digits on the same pad if
+      // they are separated in time by at least 25 ns
+      // remember that tdc time is given in ps
+
+      if (TMath::Abs(tdc1-tdc2)<25000){
+       // in case of overlap we take the earliest
+       if (tdc1>tdc2){
+         currentDigit->SetTdc(tdc2); 
+         currentDigit->SetAdc(digit[1]);
+       }
+       else {
+         currentDigit->SetTdc(tdc1);
+         currentDigit->SetAdc(digit[1]);
+       }
+       currentDigit->AddTrack(Track); // add track number in the track array
+       overlap = kTRUE;
+       return overlap;
+      } else 
+       overlap= kFALSE;
+
+    } // close if (idem) -> two digits on the same TOF pad
+
+  } // end loop on existing sdigits
+
+  return overlap;
+}
+//____________________________________________________________________________
+void AliTOF::Digits2Raw()
+{
+//
+// Starting from the TOF digits, writes the Raw Data objects
+//
+
+  TStopwatch stopwatch;
+  stopwatch.Start();
+
+  fLoader->LoadDigits();
+
+  TTree* digits = fLoader->TreeD();
+  if (!digits) {
+    AliError("no digits tree");
+    return;
+  }
+  
+  //AliTOFDDLRawData rawWriter;
+  fTOFRawWriter.Clear();
+  fTOFRawWriter.SetVerbose(0);
+  if (fTOFRawWriter.GetPackedAcquisitionMode()) {
+    if(fTOFRawWriter.GetMatchingWindow()>8192)
+      AliWarning(Form("You are running in packing mode and the matching window is %.2f ns, i.e. greater than 199.8848 ns",
+                     fTOFRawWriter.GetMatchingWindow()*AliTOFGeometry::TdcBinWidth()*1.e-03));
+  }
+  
+  AliDebug(1,"Formatting raw data for TOF");
+  digits->GetEvent(0);
+  fTOFRawWriter.RawDataTOF(digits->GetBranch("TOF"));  
+
+  fLoader->UnloadDigits();
+  
+  AliDebug(1, Form("Execution time to write TOF raw data : R:%.2fs C:%.2fs",
+                  stopwatch.RealTime(),stopwatch.CpuTime()));
+
+}
+
+//____________________________________________________________________________
+void AliTOF::RecreateSDigitsArray() {
+//
+// delete TClonesArray fSDigits and create it again
+//  needed for backward compatability with PPR test production
+//
+  fSDigits->Clear();
+}
+//____________________________________________________________________________
+void AliTOF::CreateSDigitsArray() {
+//
+// create TClonesArray fSDigits
+//  needed for backward compatability with PPR test production
+//
+  fSDigits       = new TClonesArray("AliTOFSDigit",  1000);
+}
+//____________________________________________________________________________
+Bool_t AliTOF::Raw2SDigits(AliRawReader* rawReader)
 {
   //
-  // Store a TOF hit
-  //
-  Int_t i;
-  for (i=0;i<3;i++) fVolume[i] = vol[i];
+  // Converts raw data to sdigits for TOF
   //
-  // Position
-  fX=hits[0];
-  fY=hits[1];
-  fZ=hits[2];
+
+  TStopwatch stopwatch;
+  stopwatch.Start();
+
+  if(!GetLoader()->TreeS()) {MakeTree("S");  MakeBranch("S");}
+  //TClonesArray &aSDigits = *fSDigits;
+
+  AliTOFRawStream tofRawStream = AliTOFRawStream();
+  tofRawStream.Raw2SDigits(rawReader, fSDigits);
+
+  GetLoader()->TreeS()->Fill(); GetLoader()->WriteSDigits("OVERWRITE");//write out sdigits
+  Int_t nSDigits = fSDigits->GetEntries();
+
+  ResetSDigits();
+
+  AliDebug(1, Form("Got %d TOF sdigits", nSDigits));
+  AliDebug(1, Form("Execution time to read TOF raw data and fill TOF sdigit tree : R:%.2fs C:%.2fs",
+                  stopwatch.RealTime(),stopwatch.CpuTime()));
+
+  return kTRUE;
+
+}
+
+//____________________________________________________________________________
+void AliTOF::Raw2Digits(AliRawReader* rawReader)
+{
   //
-  // Momentum
-  fPx=hits[3];
-  fPy=hits[4];
-  fPz=hits[5];
-  fPmom=hits[6];
+  // Converts raw data to digits for TOF
   //
-  // Time Of Flight
-  fTof=hits[7];
+
+  TStopwatch stopwatch;
+  stopwatch.Start();
+
+  if(!GetLoader()->TreeD()) {MakeTree("D");  MakeBranch("D");}
+  //TClonesArray &aDigits = *fDigits;
+
+  AliTOFRawStream tofRawStream = AliTOFRawStream();
+  tofRawStream.Raw2Digits(rawReader, fDigits);
+
+  GetLoader()->TreeD()->Fill(); GetLoader()->WriteDigits("OVERWRITE");//write out digits
+  Int_t nDigits = fDigits->GetEntries();
+
+  ResetDigits();
+
+  AliDebug(1, Form("Got %d TOF digits", nDigits));
+  AliDebug(1, Form("Execution time to read TOF raw data and fill TOF digit tree : R:%.2fs C:%.2fs",
+                  stopwatch.RealTime(),stopwatch.CpuTime()));
+
 }