bug fixed

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

diff --git a/TOF/AliTOFSDigitizer.cxx b/TOF/AliTOFSDigitizer.cxx
index d7a8a987d4f3a33c6208caab273a8a110de4cb05..9f8a6607a287dcfe231f4ff5aecf43d3d3200821 100644 (file)
--- a/TOF/AliTOFSDigitizer.cxx
+++ b/TOF/AliTOFSDigitizer.cxx
@@ -26,11 +26,14 @@
 //   Use case: see AliTOFhits2sdigits.C macro in the CVS    //
 //__________________________________________________________//
 
-#include "TBenchmark.h"
-#include "TF1.h"
-#include "TFile.h"
-#include "TParticle.h"
-#include "TTree.h"
+#include <TBenchmark.h>
+#include <TClonesArray.h>
+#include <TF1.h>
+#include <TFile.h>
+#include <TParticle.h>
+#include <TTree.h>
+#include <TRandom.h>
+#include <TROOT.h>
 
 #include "AliLoader.h"
 #include "AliLog.h"
@@ -46,15 +49,8 @@
 #include "AliTOFSDigit.h"
 #include "AliTOF.h"
 
-extern TBenchmark *gBenchmark;
-extern TDirectory *gDirectory;
-extern TFile *gFile;
-extern TRandom *gRandom;
 extern TROOT *gROOT;
 
-extern AliRun *gAlice;
-
-
 ClassImp(AliTOFSDigitizer)
 
 //____________________________________________________________________________ 
@@ -66,7 +62,6 @@ AliTOFSDigitizer::AliTOFSDigitizer():
   fHeadersFile(""),
   fRunLoader(0x0),
   fTOFLoader(0x0),
-  fTOFGeometry(new AliTOFGeometry()),
   fSelectedSector(-1), 
   fSelectedPlate(-1),
   fTimeResolution(0),
@@ -112,7 +107,6 @@ AliTOFSDigitizer::AliTOFSDigitizer(const AliTOFSDigitizer &source):
   fHeadersFile(""),
   fRunLoader(0x0),
   fTOFLoader(0x0),
-  fTOFGeometry(0x0),
   fSelectedSector(-1), 
   fSelectedPlate(-1),
   fTimeResolution(0),
@@ -147,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;
 
 }
@@ -169,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),
@@ -224,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();
@@ -236,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;
@@ -273,8 +268,6 @@ AliTOFSDigitizer::~AliTOFSDigitizer()
   // dtor
   fTOFLoader->CleanSDigitizer();
 
-  delete fTOFGeometry;
-
 }
 
 //____________________________________________________________________________ 
@@ -406,14 +399,15 @@ 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");
 
     Int_t ntracks = static_cast<Int_t>(hitTree->GetEntries());
     for (Int_t track = 0; track < ntracks; track++)
     {
-      gAlice->ResetHits();
+      gAlice->GetMCApp()->ResetHits();
       tofHitsBranch->GetEvent(track);
 
       AliMC *mcApplication = (AliMC*)gAlice->GetMCApp();
@@ -432,7 +426,7 @@ void AliTOFSDigitizer::Exec(Option_t *verboseOption) {
 
       for (Int_t hit = 0; hit < nhits; hit++) {
        Int_t    vol[5];       // location for a digit
-       Float_t  digit[2];     // TOF digit variables
+       Int_t  digit[2];     // TOF digit variables
        Int_t tracknum;
        Float_t dxPad;
        Float_t dzPad;
@@ -440,7 +434,7 @@ void AliTOFSDigitizer::Exec(Option_t *verboseOption) {
 
        // fp: really sorry for this, it is a temporary trick to have
        // track length too
-       if(version!=6 && version!=7){
+       if (version<6) { //(version!=6 && version!=7)
          AliTOFhit *tofHit = (AliTOFhit *) tofHitArray->UncheckedAt(hit);
          tracknum = tofHit->GetTrack();
          vol[0] = tofHit->GetSector();