X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TOF%2FAliTOFSDigitizer.cxx;h=9f8a6607a287dcfe231f4ff5aecf43d3d3200821;hb=b671cde111ea27cfcc84c2768d76414018c75c38;hp=d86265ce7bd51941f494dc0807c9cfb328929ef7;hpb=e939a978a98d29901b86bdb02cdcaf5157e717de;p=u%2Fmrichter%2FAliRoot.git

diff --git a/TOF/AliTOFSDigitizer.cxx b/TOF/AliTOFSDigitizer.cxx
index d86265ce7bd..9f8a6607a28 100644
--- a/TOF/AliTOFSDigitizer.cxx
+++ b/TOF/AliTOFSDigitizer.cxx
@@ -27,11 +27,13 @@
 //__________________________________________________________//
 
 #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"
@@ -47,6 +49,7 @@
 #include "AliTOFSDigit.h"
 #include "AliTOF.h"
 
+extern TROOT *gROOT;
 
 ClassImp(AliTOFSDigitizer)
 
@@ -59,7 +62,6 @@ AliTOFSDigitizer::AliTOFSDigitizer():
   fHeadersFile(""),
   fRunLoader(0x0),
   fTOFLoader(0x0),
-  fTOFGeometry(new AliTOFGeometry()),
   fSelectedSector(-1), 
   fSelectedPlate(-1),
   fTimeResolution(0),
@@ -105,7 +107,6 @@ AliTOFSDigitizer::AliTOFSDigitizer(const AliTOFSDigitizer &source):
   fHeadersFile(""),
   fRunLoader(0x0),
   fTOFLoader(0x0),
-  fTOFGeometry(0x0),
   fSelectedSector(-1), 
   fSelectedPlate(-1),
   fTimeResolution(0),
@@ -140,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;
 
 }
@@ -162,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),
@@ -217,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();
@@ -229,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;
@@ -266,8 +268,6 @@ AliTOFSDigitizer::~AliTOFSDigitizer()
   // dtor
   fTOFLoader->CleanSDigitizer();
 
-  delete fTOFGeometry;
-
 }
 
 //____________________________________________________________________________ 
@@ -399,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();
@@ -425,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;
@@ -433,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();