reducing macro to minimum AliReconstruction functionality, disable QA and TriggerESD...

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

diff --git a/TOF/AliTOFSDigitizer.cxx b/TOF/AliTOFSDigitizer.cxx
index 6ab931c748cea64457922e9af629861e7b22b87e..910b55d0aa5b7c9bc8480fd170727768aab6918c 100644 (file)
--- a/TOF/AliTOFSDigitizer.cxx
+++ b/TOF/AliTOFSDigitizer.cxx
@@ -49,6 +49,7 @@
 #include "AliTOFSDigit.h"
 #include "AliTOF.h"
 
+extern TROOT *gROOT;
 
 ClassImp(AliTOFSDigitizer)
 
@@ -61,7 +62,6 @@ AliTOFSDigitizer::AliTOFSDigitizer():
   fHeadersFile(""),
   fRunLoader(0x0),
   fTOFLoader(0x0),
-  fTOFGeometry(new AliTOFGeometry()),
   fSelectedSector(-1), 
   fSelectedPlate(-1),
   fTimeResolution(0),
@@ -107,7 +107,6 @@ AliTOFSDigitizer::AliTOFSDigitizer(const AliTOFSDigitizer &source):
   fHeadersFile(""),
   fRunLoader(0x0),
   fTOFLoader(0x0),
-  fTOFGeometry(0x0),
   fSelectedSector(-1), 
   fSelectedPlate(-1),
   fTimeResolution(0),
@@ -142,15 +141,14 @@ AliTOFSDigitizer::AliTOFSDigitizer(const AliTOFSDigitizer &source):
   fAdcRms(0)
 {
   // copy constructor
-  this->fTOFGeometry=source.fTOFGeometry;
+  //this->fTOFGeometry=source.fTOFGeometry;
 
 }
 
 //____________________________________________________________________________ 
-AliTOFSDigitizer& AliTOFSDigitizer::operator=(const AliTOFSDigitizer &source)
+AliTOFSDigitizer& AliTOFSDigitizer::operator=(const AliTOFSDigitizer &/*source*/)
 {
   // ass. op.
-  this->fTOFGeometry=source.fTOFGeometry;
   return *this;
 
 }
@@ -164,7 +162,6 @@ AliTOFSDigitizer::AliTOFSDigitizer(const char* HeaderFile, Int_t evNumber1, Int_
   fHeadersFile(HeaderFile), // input filename (with hits)
   fRunLoader(0x0),
   fTOFLoader(0x0),
-  fTOFGeometry(0x0),
   fSelectedSector(-1), // by default we sdigitize all sectors
   fSelectedPlate(-1),  // by default we sdigitize all plates in all sectors
   fTimeResolution(0),
@@ -219,10 +216,13 @@ AliTOFSDigitizer::AliTOFSDigitizer(const char* HeaderFile, Int_t evNumber1, Int_
       return;
     }
 
+  /*
   fRunLoader->CdGAFile();
   TDirectory *savedir=gDirectory;
   TFile *in=(TFile*)gFile;
 
+   
+// when fTOFGeometry was needed
   if (!in->IsOpen()) {
     AliWarning("Geometry file is not open default TOF geometry will be used");
     fTOFGeometry = new AliTOFGeometry();
@@ -231,9 +231,9 @@ AliTOFSDigitizer::AliTOFSDigitizer(const char* HeaderFile, Int_t evNumber1, Int_
     in->cd();
     fTOFGeometry = (AliTOFGeometry*)in->Get("TOFgeometry");
   }
-
+  
   savedir->cd();
-
+  */
   if (fRunLoader->TreeE() == 0x0) fRunLoader->LoadHeader();
   
   if (evNumber1>=0) fEvent1 = evNumber1;
@@ -268,8 +268,6 @@ AliTOFSDigitizer::~AliTOFSDigitizer()
   // dtor
   fTOFLoader->CleanSDigitizer();
 
-  delete fTOFGeometry;
-
 }
 
 //____________________________________________________________________________ 
@@ -401,7 +399,8 @@ void AliTOFSDigitizer::Exec(Option_t *verboseOption) {
     TClonesArray *tofHitArray = tof->Hits();
 
     // create hit map
-    AliTOFHitMap *hitMap = new AliTOFHitMap(tof->SDigits(), fTOFGeometry);
+    //    AliTOFHitMap *hitMap = new AliTOFHitMap(tof->SDigits(), fTOFGeometry);
+    AliTOFHitMap *hitMap = new AliTOFHitMap(tof->SDigits());
 
     TBranch * tofHitsBranch = hitTree->GetBranch("TOF");