Add required AliVParticle functionality (Markus)

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

diff --git a/TOF/AliTOFSDigitizer.cxx b/TOF/AliTOFSDigitizer.cxx
index d7a8a987d4f3a33c6208caab273a8a110de4cb05..6ab931c748cea64457922e9af629861e7b22b87e 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,14 +49,6 @@
 #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)
 
@@ -432,7 +427,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 +435,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();