TOF geometry updating (addition of AliTOFGeometry)

[u/mrichter/AliRoot.git] / TOF / AliTOF.cxx

diff --git a/TOF/AliTOF.cxx b/TOF/AliTOF.cxx
index 666d28ee05c18522275f0112f4ed20ab15ec4c7a..6913f5ec471ae6bb7e8acb2c213b9f24849bfbe8 100644 (file)
--- a/TOF/AliTOF.cxx
+++ b/TOF/AliTOF.cxx
@@ -70,6 +70,7 @@
 #include "AliTOFhit.h"
 #include "AliTOFhitT0.h"
 #include "AliMC.h"
+#include "AliTOFDigitizer.h"
  
 ClassImp(AliTOF)
  
@@ -90,6 +91,7 @@ AliTOF::AliTOF()
   fName="TOF";
   fMerger = 0x0;
   fTZero = kFALSE;
+  fTOFGeometry = 0;
 }
  
 //_____________________________________________________________________________
@@ -109,6 +111,7 @@ AliTOF::AliTOF(const char *name, const char *title, Option_t *option)
   fReTask= 0x0;
   fReconParticles= 0x0;
   fMerger = 0x0;
+  fTOFGeometry = 0;
 
   if (strstr(option,"tzero")){
     fHits   = new TClonesArray("AliTOFhitT0",  1000);
@@ -594,6 +597,15 @@ void AliTOF::ResetDigits ()
   AliDetector::ResetDigits ();
   //
 } 
+//____________________________________________
+void AliTOF::ResetSDigits ()
+{
+  //
+  // Reset number of sdigits and the sdigits array for this detector
+  fNSDigits = 0;
+  //fSDigits = 0x0;
+  //
+} 
 //_____________________________________________________________________________
 void AliTOF::Init()
 {
@@ -709,29 +721,50 @@ AliTOFMerger*  AliTOF::Merger()
     return fMerger;
 }
 
-
 //---------------------------------------------------------------------
-
 void AliTOF::Hits2SDigits()
 {
 //
 // Use the TOF SDigitizer to make TOF SDigits
 //
-//
-  //#ifdef DEBUG
-  cout<<"ALiTOF::Hits2SDigits> start...\n";
-  //#endif
+
+  cout<<"AliTOF::Hits2SDigits> start...\n";
   
-  //char * fileSDigits = 0 ;
-  char * fileHeader = 0;
-  AliTOFSDigitizer * sd = new AliTOFSDigitizer(fileHeader) ;
+  const char * fileHeader = fLoader->GetRunLoader()->GetFileName().Data();
+  AliTOFSDigitizer * sd = new AliTOFSDigitizer(fileHeader);
+  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) 
+      cout << "<AliTOF::Hits2SDigits>: I am making sdigits for the " << evNumber1 << "th event \n";
+  else if ((evNumber2-evNumber1)>1)
+      cout << "<AliTOF::Hits2SDigits>: I am making sdigits for the events from the " 
+           << evNumber1 << "th to the " << evNumber2-1 << "th \n";
+ 
+  const char * fileHeader = fLoader->GetRunLoader()->GetFileName().Data();
+  AliTOFSDigitizer * sd = new AliTOFSDigitizer(fileHeader,evNumber1,evNumber2) ;
   sd->Print("");
 
-  delete sd ;
-  
+  sd->Exec("") ;
+
 }
+
+//___________________________________________________________________________
+AliDigitizer* AliTOF::CreateDigitizer(AliRunDigitizer* manager) const
+{
+  return new AliTOFDigitizer(manager);
+}
+
 //___________________________________________________________________________
 Bool_t AliTOF::CheckOverlap(Int_t* vol, Float_t* digit,Int_t Track)
 {