]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - TOF/AliTOF.cxx
New AliTRDcluster constructor
[u/mrichter/AliRoot.git] / TOF / AliTOF.cxx
index 97f8081bfa58b6f5f9c7806c20c301146d10e24a..c87e976c992ea3380ed20336deb0d50d18f61780 100644 (file)
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/*
-$Log$
-Revision 1.9  1999/10/15 15:35:19  fca
-New version for frame1099 with and without holes
-
-Revision 1.9  1999/09/29 09:24:33  fca
-Introduction of the Copyright and cvs Log
+/* $Id$ */
 
-*/
 ///////////////////////////////////////////////////////////////////////////////
 //                                                                           //
-//  Time Of Flight                               FCA                         //
+//  Time Of Flight                                                           //
 //  This class contains the basic functions for the Time Of Flight           //
 //  detector. Functions specific to one particular geometry are              //
 //  contained in the derived classes                                         //
-//
-//  VERSIONE WITH 5 SYMMETRIC MODULES ALONG Z AXIS
-//  ==============================================
-//  
-//  VERSION WITH HOLES FOR PHOS AND TRD IN SPACEFRAME WITH HOLES
-//
-//  Volume sensibile : FPAD
-//
-//
-//
+//                                                                           //
+//  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 "AliTOF.h"
-#include <TNode.h>
-#include <TTUBE.h>
-#include <TBRIK.h>
-#include "AliRun.h"
+#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 "AliConst.h"
+#include "AliLoader.h"
+#include "AliLog.h"
+#include "AliMC.h"
+#include "AliRun.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"
+
+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),
+  fTOFGeometry(0x0)
 {
   //
   // Default constructor
   //
+  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),
+  fTOFGeometry(0x0)
 {
   //
   // AliTOF standard constructor
   // 
-  fHits   = new TClonesArray("AliTOFhit",  405);
+  // Here are fixed some important parameters
+  //
+
+  // Initialization of hits, sdigits and digits array
+  // added option for time zero analysis
+  //skowron
+  fTOFGeometry = new AliTOFGeometry();
+
+  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
   //
-  fIshunt     =  0;
+  // (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];
+  }
+}
+//_____________________________________________________________________________
+AliTOF::AliTOF(const AliTOF &source)
+  :AliDetector(),
+  fFGeom(0x0),
+  fDTask(0x0),
+  fReTask(0x0),
+  fSDigits(0x0),
+  fNSDigits(0),
+  fReconParticles(0x0),
+  fIdSens(-1),
+  fTZero(kFALSE),
+  fTOFGeometry(0x0)
+{
+  // copy constructor
+
+  this->fReconParticles=source.fReconParticles;
+  this->fSDigits=source.fSDigits;
+  this->fTOFGeometry=source.fTOFGeometry;
+
+}
+
+//_____________________________________________________________________________
+AliTOF& AliTOF::operator=(const AliTOF &source)
+{
+  // ass. op.
+
+  this->fReconParticles=source.fReconParticles;
+  this->fSDigits=source.fSDigits;
+  this->fTOFGeometry=source.fTOFGeometry;
+  return *this;
+
+}
+
+//_____________________________________________________________________________
+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;
+    }
+
 }
 
 //_____________________________________________________________________________
@@ -87,497 +301,92 @@ 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");
+  // Add a TOF hit
+  // new with placement used
   //
-  // Define rotation matrixes
-  new TRotMatrix("rot501","rot501",90,-20,90,90-20,0,0);
-  new TRotMatrix("rot502","rot502",90,-40,90,90-40,0,0);
-  new TRotMatrix("rot503","rot503",90,-60,90,90-60,0,0);
-  new TRotMatrix("rot504","rot504",90,-80,90,90-80,0,0);
-  new TRotMatrix("rot505","rot505",90,-100,90,90-100,0,0);
-  new TRotMatrix("rot506","rot506",90,-120,90,90-120,0,0);
-  new TRotMatrix("rot507","rot507",90,-140,90,90-140,0,0);
-  new TRotMatrix("rot508","rot508",90,-160,90,90-160,0,0);
-  new TRotMatrix("rot509","rot509",90,-180,90,90-180,0,0);
-  new TRotMatrix("rot510","rot510",90,-200,90,90-200,0,0);
-  new TRotMatrix("rot511","rot511",90,-220,90,90-220,0,0);
-  new TRotMatrix("rot512","rot512",90,-240,90,90-240,0,0);
-  new TRotMatrix("rot513","rot513",90,-260,90,90-260,0,0);
-  new TRotMatrix("rot514","rot514",90,-280,90,90-280,0,0);
-  new TRotMatrix("rot515","rot515",90,-300,90,90-300,0,0);
-  new TRotMatrix("rot516","rot516",90,-320,90,90-320,0,0);
-  new TRotMatrix("rot517","rot517",90,-340,90,90-340,0,0);
-  new TRotMatrix("rot518","rot518",90,-360,90,90-360,0,0);
+  TClonesArray &lhits = *fHits;
+  new(lhits[fNhits++]) AliTOFhitT0(fIshunt, track, vol, hits);
+}
+
+//_____________________________________________________________________________
+void AliTOF::AddDigit(Int_t *tracks, Int_t *vol, Int_t *digits)
+{
   //
-  // Position the different copies
-  const Float_t rtof=(399+370)/2;
-  const Int_t ntof=18;
-  const Float_t kPi = TMath::Pi();
-  const Float_t angle=2*kPi/ntof;
-  Float_t ang;
+  // Add a TOF digit
+  // new with placement used
   //
-  // Define TOF basic volume
-  
-  Float_t zlen1 = 152.5;
-  Float_t zlen2 = 147.0;
-  Float_t zlen3 = 117.0;
+  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.
   
-  new TBRIK("S_TOF1","TOF box","void",130/2,29/2,zlen1/2);
-  //
-  // Position it
-  //
-  Top->cd();
-  ang=3.5*angle;
-  Node = new TNode("FTO001","FTO001","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),299.15,"rot501");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  Node = new TNode("FTO101","FTO101","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-299.15,"rot501");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  ang=2.5*angle;
-  Node = new TNode("FTO002","FTO002","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),299.15,"rot502");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  Node = new TNode("FTO102","FTO102","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-299.15,"rot502");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  ang=1.5*angle;
-  Node = new TNode("FTO003","FTO003","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),299.15,"rot503");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  Node = new TNode("FTO103","FTO103","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-299.15,"rot503");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();  
-  ang=0.5*angle;
-  Node = new TNode("FTO004","FTO004","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),299.15,"rot504");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node);
-  //
-  Top->cd();
-  Node = new TNode("FTO104","FTO104","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-299.15,"rot504");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  ang=-0.5*angle;
-  Node = new TNode("FTO005","FTO005","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),299.15,"rot505");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  Node = new TNode("FTO105","FTO105","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-299.15,"rot505");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  ang=-1.5*angle;
-  Node = new TNode("FTO006","FTO006","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),299.15,"rot506");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  Node = new TNode("FTO106","FTO106","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-299.15,"rot506");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  ang=-2.5*angle;
-  Node = new TNode("FTO007","FTO006","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),299.15,"rot507");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  Node = new TNode("FTO107","FTO106","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-299.15,"rot507");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  ang=-3.5*angle;
-  Node = new TNode("FTO008","FTO006","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),299.15,"rot508");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  Node = new TNode("FTO108","FTO106","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-299.15,"rot508");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  ang=-4.5*angle;
-  Node = new TNode("FTO009","FTO006","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),299.15,"rot509");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  Node = new TNode("FTO109","FTO106","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-299.15,"rot509");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  ang=-5.5*angle;
-  Node = new TNode("FTO010","FTO006","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),299.15,"rot510");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  Node = new TNode("FTO110","FTO106","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-299.15,"rot510");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  ang=-6.5*angle;
-  Node = new TNode("FTO011","FTO006","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),299.15,"rot511");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  Node = new TNode("FTO111","FTO106","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-299.15,"rot511");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();  
-  ang=-7.5*angle;
-  Node = new TNode("FTO012","FTO012","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),299.15,"rot512");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  Node = new TNode("FTO112","FTO112","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-299.15,"rot512");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  ang=-8.5*angle;
-  Node = new TNode("FTO013","FTO013","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),299.15,"rot513");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  Node = new TNode("FTO113","FTO113","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-299.15,"rot513");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  ang=kPI-0.5*angle;
-  Node = new TNode("FTO014","FTO04","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),299.15,"rot514");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  Node = new TNode("FTO114","FTO114","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-299.15,"rot514");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  ang=kPI-1.5*angle;
-  Node = new TNode("FTO015","FTO015","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),299.15,"rot515");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  Node = new TNode("FTO115","FTO115","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-299.15,"rot515");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  ang=kPI-2.5*angle;
-  Node = new TNode("FTO016","FTO016","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),299.15,"rot516");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  Node = new TNode("FTO116","FTO116","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-299.15,"rot516");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  ang=kPi-3.5*angle;
-  Node = new TNode("FTO017","FTO017","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),299.15,"rot517");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  Node = new TNode("FTO117","FTO117","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-299.15,"rot517");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  ang=kPi/2;
-  Node = new TNode("FTO018","FTO018","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),299.15,"rot518");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  Node = new TNode("FTO118","FTO118","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-299.15,"rot518");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  //
-  // Define second TOF volume
-  new TBRIK("S_TOF2","TOF box","void",130/2,29/2,zlen2/2);
-  //
-  // Position the volume
-  //
-  Top->cd();
-  ang=2.5*angle;
-  Node = new TNode("FTO202","FTO202","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),146.45,"rot502");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  Node = new TNode("FTO402","FTO402","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-146.45,"rot502");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  ang=1.5*angle;
-  Node = new TNode("FTO203","FTO203","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),146.45,"rot503");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  Node = new TNode("FTO403","FTO403","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-146.45,"rot503");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  ang=0.5*angle;
-  Node = new TNode("FTO204","FTO204","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),146.45,"rot504");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  Node = new TNode("FTO404","FTO404","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-146.45,"rot504");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  ang=-0.5*angle;
-  Node = new TNode("FTO205","FTO205","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),146.45,"rot505");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  Node = new TNode("FTO405","FTO405","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-146.45,"rot505");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  ang=-1.5*angle;
-  Node = new TNode("FTO206","FTO206","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),146.45,"rot506");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  Node = new TNode("FTO406","FTO406","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-146.45,"rot506");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  ang=-2.5*angle;
-  Node = new TNode("FTO207","FTO207","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),146.45,"rot507");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  Node = new TNode("FTO407","FTO407","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-146.45,"rot507");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  //
-  Top->cd();
-  ang=-3.5*angle;
-  Node = new TNode("FTO208","FTO208","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),146.45,"rot508");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  Node = new TNode("FTO408","FTO408","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-146.45,"rot508");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  ang=-kPi/2;
-  Node = new TNode("FTO209","FTO209","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),146.45,"rot509");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  Node = new TNode("FTO409","FTO409","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-146.45,"rot509");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  ang=-kPi/2-angle;
-  Node = new TNode("FTO210","FTO210","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),146.45,"rot510");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  Node = new TNode("FTO410","FTO410","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-146.45,"rot510");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  ang=-kPi/2-2*angle;
-  Node = new TNode("FTO211","FTO211","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),146.45,"rot511");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  Node = new TNode("FTO411","FTO411","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-146.45,"rot511");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  ang=-kPi/2-3*angle;
-  Node = new TNode("FTO212","FTO212","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),146.45,"rot512");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  Node = new TNode("FTO412","FTO412","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-146.45,"rot512");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  //
-  Top->cd();
-  ang=-kPi/2-4*angle;
-  Node = new TNode("FTO213","FTO213","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),146.45,"rot513");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  Node = new TNode("FTO413","FTO413","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-146.45,"rot513");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  ang=kPi-0.5*angle;
-  Node = new TNode("FTO214","FTO214","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),146.45,"rot514");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  Node = new TNode("FTO414","FTO414","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-146.45,"rot514");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  ang=kPi-1.5*angle;
-  Node = new TNode("FTO215","FTO215","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),146.45,"rot515");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  Node = new TNode("FTO415","FTO415","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-146.45,"rot515");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  ang=kPi-2.5*angle;
-  Node = new TNode("FTO216","FTO216","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),146.45,"rot516");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  Node = new TNode("FTO416","FTO416","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-146.45,"rot516");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
+  if (fLoader->TreeH())
+   {
+     if (fHits == 0x0)
+      {
+        if (fTZero) fHits   = new TClonesArray("AliTOFhitT0", 1000);
+        else fHits   = new TClonesArray("AliTOFhit", 1000);
+      }
+   }
+  AliDetector::SetTreeAddress ();
 
-  // Define third TOF volume
-  new TBRIK("S_TOF3","TOF box","void",130/2.,29/2,zlen3/2.);
-  //
-  // Position it
-  //
-  Top->cd();
-  ang=2.5*angle;
-  Node = new TNode("FTO302","FTO302","S_TOF3",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),0.,"rot502");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  ang=1.5*angle;
-  Node = new TNode("FTO303","FTO303","S_TOF3",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),0.,"rot503");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  ang=0.5*angle;
-  Node = new TNode("FTO304","FTO304","S_TOF3",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),0.,"rot504");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  ang=-0.5*angle;
-  Node = new TNode("FTO305","FTO305","S_TOF3",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),0.,"rot505");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  ang=-1.5*angle;
-  Node = new TNode("FTO306","FTO306","S_TOF3",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),0.,"rot506");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  //
-  Top->cd();
-  ang=kPi+1.5*angle;
-  Node = new TNode("FTO312","FTO312","S_TOF3",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),0.,"rot512");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  ang=kPi+0.5*angle;
-  Node = new TNode("FTO313","FTO313","S_TOF3",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),0.,"rot513");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  ang=kPi-0.5*angle;
-  Node = new TNode("FTO314","FTO314","S_TOF3",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),0.,"rot514");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  ang=kPi-1.5*angle;
-  Node = new TNode("FTO315","FTO315","S_TOF3",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),0.,"rot515");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
-  //
-  Top->cd();
-  ang=kPi-2.5*angle;
-  Node = new TNode("FTO316","FTO316","S_TOF3",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),0.,"rot516");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
+  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) ;
+       }
+    }
+  */
 }
 
 //_____________________________________________________________________________
@@ -593,43 +402,48 @@ void AliTOF::CreateGeometry()
   //End_Html
   //
 
-  const Double_t kPi=TMath::Pi();
-  const Double_t kDegrad=kPi/180;
-  //
-  Float_t xtof, ytof;
-  Float_t ztof0;
-  Float_t rmin, rmax, dwall;
-
-  // barrel iner radius 
-  rmin = 370.;//cm
-  // barrel outer radius 
-  rmax = rmin+29;
-  
-  // frame inbetween TOF modules
-  dwall = 4.;//cm
-  // Sizes of TOF module with its support etc..
-  xtof = 2.*(rmin*TMath::Tan(10*kDegrad)-dwall/2-.5);
-  ytof = rmax-rmin;
-  ztof0 = 375.5;//cm
+  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) {
 
-// TOF size  (CO2)
+    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());
 
-  Float_t zlen1 = 159.5;//cm
-  Float_t zlen2 = 154.0;//cm
-  Float_t zlen3 = 124.0;//cm
+  } 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());
+  }
 
-//  TOF module internal definitions 
-  TOFpc(xtof, ytof, zlen1, zlen2, zlen3, ztof0);
 }
 
 //_____________________________________________________________________________
-void AliTOF::DrawModule()
+void AliTOF::DrawModule() const
 {
   //
   // Draw a shaded view of the common part of the TOF geometry
   //
 
-   cout << " Drawing of AliTOF"<< endl
+  AliInfo(" Drawing of AliTOF")
   // Set everything unseen
   gMC->Gsatt("*", "seen", -1);
   // 
@@ -637,16 +451,13 @@ void AliTOF::DrawModule()
   gMC->Gsatt("ALIC","SEEN",0);
   //
   // Set the volumes visible
-  gMC->Gsatt("FBAR","SEEN",0);
-  gMC->Gsatt("FTO1","SEEN",1);
-  gMC->Gsatt("FTO2","SEEN",1);
-  gMC->Gsatt("FTO3","SEEN",1);
-  gMC->Gsatt("FBT1","SEEN",1);
-  gMC->Gsatt("FBT2","SEEN",1);
-  gMC->Gsatt("FBT3","SEEN",1);
-  gMC->Gsatt("FLT1","SEEN",1);
-  gMC->Gsatt("FLT2","SEEN",1);
-  gMC->Gsatt("FLT3","SEEN",1);
+  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");
@@ -661,162 +472,285 @@ void AliTOF::DrawModule()
 }
 
 //_____________________________________________________________________________
-void AliTOF::CreateMaterials()
+Int_t AliTOF::DistancetoPrimitive(Int_t , Int_t )
 {
   //
-  // 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();
-  //
-  //--- Quartz (SiO2) 
-  Float_t   aq[2] = { 28.0855,15.9994 };
-  Float_t   zq[2] = { 14.,8. };
-  Float_t   wq[2] = { 1.,2. };
-  Float_t   dq = 2.20;
-  Int_t nq = -2;
-  // --- Freon
-  Float_t afre[2]  = { 12.011,18.9984032 };
-  Float_t zfre[2]  = { 6.,9. };
-  Float_t wfre[2]  = { 5.,12. };
-  Float_t densfre  = 1.5;
-  Int_t nfre = -2;
-  // --- CO2 
-  Float_t ac[2]   = { 12.,16. };
-  Float_t zc[2]   = { 6.,8. };
-  Float_t wc[2]   = { 1.,2. };
-  Float_t dc = .001977;
-  Int_t nc = -2;
-   // For mylar (C5H4O2) 
-  Float_t amy[3] = { 12., 1., 16. };
-  Float_t zmy[3] = {  6., 1.,  8. };
-  Float_t wmy[3] = {  5., 4.,  2. };
-  Float_t dmy    = 1.39;
-  Int_t nmy = -3;
- // For polyethilene (CH2) for honeycomb!!!!
-  Float_t ape[2] = { 12., 1. };
-  Float_t zpe[2] = {  6., 1. };
-  Float_t wpe[2] = {  1., 2. };
-  Float_t dpe    = 0.935*0.479; //To have 1%X0 for 1cm as for honeycomb
-  Int_t npe = -2;
-  // --- G10 
-  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 densg10  = 1.7;
-  Int_t nlmatg10 = -4;
-  // --- DME 
-  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 densdme  = .00205;
-  Int_t nlmatdme = 5;
-  // ---- ALUMINA (AL203) 
-  Float_t aal[2] = { 27.,16. };
-  Float_t zal[2] = { 13.,8. };
-  Float_t wmatal[2] = { 2.,3. };
-  Float_t densal  = 2.3;
-  Int_t nlmatal = -2;
-  // -- Water
-  Float_t awa[2] = {  1., 16. };
-  Float_t zwa[2] = {  1.,  8. };
-  Float_t wwa[2] = {  2.,  1. };
-  Float_t dwa    = 1.0;
-  Int_t nwa = -2;
+  // Returns distance from mouse pointer to detector, default version
   //
-  //AliMaterial(0, "Vacuum$", 1e-16, 1e-16, 1e-16, 1e16, 1e16);
-  AliMaterial(1, "Air$",14.61,7.3,0.001205,30423.24,67500.);
-  AliMaterial(2, "Cu $",  63.54, 29.0, 8.96, 1.43, 14.8);
-  AliMaterial(3, "C  $",  12.01,  6.0, 2.265,18.8, 74.4);
-  AliMixture(4, "Polyethilene$", ape, zpe, dpe, npe, wpe);
-  AliMixture(5, "G10$", ag10, zg10, densg10, nlmatg10, wmatg10);
-  AliMixture(6, "DME ", adme, zdme, densdme, nlmatdme, wmatdme);
-  AliMixture(7, "CO2$", ac, zc, dc, nc, wc);
-  AliMixture(8, "ALUMINA$", aal, zal, densal, nlmatal, wmatal);
-  AliMaterial(9, "Al $", 26.98, 13., 2.7, 8.9, 37.2);
-  AliMaterial(10, "C-TRD$", 12.01, 6., 2.265*18.8/69.282*15./100, 18.8, 74.4); // for 15%
-  AliMixture(11, "Mylar$",  amy, zmy, dmy, nmy, wmy);
-  AliMixture(12, "Freon$",  afre, zfre, densfre, nfre, wfre);
-  AliMixture(13, "Quartz$", aq, zq, dq, nq, wq);
-  AliMixture(14, "Water$",  awa, zwa, dwa, nwa, wwa);
-
-  Float_t epsil, stmin, deemax, stemax;
-  //       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(1, "Air$", 1, 0, ISXFLD, SXMGMX, 10., stemax, deemax, epsil, stmin);
-  AliMedium(2, "Cu $", 2, 0, ISXFLD, SXMGMX, 10., stemax, deemax, epsil, stmin);
-  AliMedium(3, "C  $", 3, 0, ISXFLD, SXMGMX, 10., stemax, deemax, epsil, stmin);
-  AliMedium(4, "Pol$", 4, 0, ISXFLD, SXMGMX, 10., stemax, deemax, epsil, stmin);
-  AliMedium(5, "G10$", 5, 0, ISXFLD, SXMGMX, 10., stemax, deemax, epsil, stmin);
-  AliMedium(6, "DME$", 6, 0, ISXFLD, SXMGMX, 10., stemax, deemax, epsil, stmin);
-  AliMedium(7, "CO2$", 7, 0, ISXFLD, SXMGMX, 10., -.01, -.1, .01, -.01);
-  AliMedium(8, "ALUMINA$", 8, 0, ISXFLD, SXMGMX, 10., stemax, deemax, epsil, stmin);
-  AliMedium(9, "Al Frame$", 9, 0, ISXFLD, SXMGMX, 10, stemax, deemax, epsil, stmin);
-  AliMedium(10, "DME-S$", 6, 1, ISXFLD, SXMGMX, 10., stemax, deemax, epsil, stmin);
-  AliMedium(11, "C-TRD$", 10, 0, ISXFLD, SXMGMX, 10., stemax, deemax, epsil, stmin);
-  AliMedium(12, "Myl$", 11, 0, ISXFLD, SXMGMX, 10., stemax, deemax, epsil, stmin);
-  AliMedium(13, "Fre$", 12, 0, ISXFLD, SXMGMX, 10., stemax, deemax, epsil, stmin);
-  AliMedium(14, "Fre-S$", 12, 1, ISXFLD, SXMGMX, 10., stemax, deemax, epsil, stmin);
-  AliMedium(15, "Glass$", 13, 0, ISXFLD, SXMGMX, 10., stemax, deemax, epsil, stmin);
-  AliMedium(16, "Water$", 14, 0, ISXFLD, SXMGMX, 10., stemax, deemax, epsil, stmin);
+  return 9999;
 }
 
-//_____________________________________________________________________________
-Int_t AliTOF::DistancetoPrimitive(Int_t , Int_t )
+//___________________________________________
+void AliTOF::ResetHits ()
+{
+  // Reset number of clusters and the cluster array for this detector
+  AliDetector::ResetHits ();
+}
+
+//____________________________________________
+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
   //
-  //
   // Set id of TOF sensitive volume
   if (IsVersion() !=0) fIdSens=gMC->VolId("FPAD");
-  //
+
+  /*
+  // Save the geometry
+  TDirectory* saveDir = gDirectory;
+  gAlice->GetRunLoader()->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();
+  AliTOFSDigitizer sd((rl->GetFileName()).Data());
+  ToAliDebug(1, sd.Print(""));
+
+  sd.Exec("") ;
+
+}
+
+//____________________________________________________________________________
+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
 {
-  //
-  // Store a TOF hit
-  //
-  Int_t i;
-  for (i=0;i<3;i++) fVolume[i] = vol[i];
-  //
-  // Position
-  fX=hits[0];
-  fY=hits[1];
-  fZ=hits[2];
-  //
-  // Momentum
-  fPx=hits[3];
-  fPy=hits[4];
-  fPz=hits[5];
-  fPmom=hits[6];
-  //
-  // Time Of Flight
-  fTof=hits[7];
+  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;
+  }
+  
+  fRunLoader->CdGAFile();
+  TFile *in=(TFile*)gFile;
+  in->cd();
+  AliTOFGeometry *geometry  = (AliTOFGeometry*)in->Get("TOFgeometry");
+
+  AliTOFDDLRawData rawWriter(geometry);
+  //AliTOFDDLRawData rawWriter;
+  rawWriter.SetVerbose(0);
+  //rawWriter.SetFakeOrphaneProduction(kTRUE);
+  //rawWriter.SetPackedAcquisitionMode(kFALSE);
+  if (rawWriter.GetPackedAcquisitionMode()) {
+    if(rawWriter.GetMatchingWindow()>8192)
+      AliWarning(Form("You are running in packing mode and the matching window is %.2f ns, i.e. greater than 199.8848 ns",
+                     rawWriter.GetMatchingWindow()*AliTOFGeometry::TdcBinWidth()*1.e-03));
+  }
+  
+  AliDebug(1,"Formatting raw data for TOF");
+  digits->GetEvent(0);
+  rawWriter.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
+//
+  delete fSDigits;
+  fSDigits       = new TClonesArray("AliTOFSDigit",  1000);
+}
+//____________________________________________________________________________
+void AliTOF::CreateSDigitsArray() {
+//
+// create TClonesArray fSDigits
+//  needed for backward compatability with PPR test production
+//
+  fSDigits       = new TClonesArray("AliTOFSDigit",  1000);
+}