X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TOF%2FAliTOFT0.cxx;h=890b8fadc339b82b36e868ab734e035e0e0f8fc2;hb=79965b8cf24a2c01fc9a9bfe343b9d462eea78d6;hp=511b2047a465b50feceb06820db6444cea362d5f;hpb=0e46b9aedf22cba61c60921b7b19fb76d89a7a2e;p=u%2Fmrichter%2FAliRoot.git

diff --git a/TOF/AliTOFT0.cxx b/TOF/AliTOFT0.cxx
index 511b2047a46..890b8fadc33 100644
--- a/TOF/AliTOFT0.cxx
+++ b/TOF/AliTOFT0.cxx
@@ -79,18 +79,18 @@
 //
 //_________________________________________________________________________
 
-#include "TCanvas.h"
-#include "TClonesArray.h"
-#include "TFile.h"
-#include "TFolder.h"
-#include "TFrame.h"
-#include "TH1.h"
-#include "TParticle.h"
-#include "TRandom.h"
-#include "TBenchmark.h"
-#include "TSystem.h"
-#include "TTask.h"
-#include "TTree.h"
+#include <TCanvas.h>
+#include <TClonesArray.h>
+#include <TFile.h>
+//#include <TFolder.h>
+#include <TFrame.h>
+#include <TH1.h>
+#include <TParticle.h>
+#include <TBenchmark.h>
+#include <TTask.h>
+#include <TTree.h>
+#include <TRandom.h>
+#include <TROOT.h>
 
 #include "AliMC.h"
 #include "AliRun.h"
@@ -99,36 +99,47 @@
 #include "AliTOFT0.h"
 #include "AliTOF.h"
 
-extern TBenchmark *gBenchmark;
-extern TSystem *gSystem;
-extern TRandom *gRandom;
 extern TROOT *gROOT;
+extern TRandom *gRandom;
+extern TBenchmark *gBenchmark;
 
 extern AliRun *gAlice;
 
-
 ClassImp(AliTOFT0)
 
 //____________________________________________________________________________ 
-  AliTOFT0::AliTOFT0():TTask("AliTOFT0","") 
+AliTOFT0::AliTOFT0():
+  TTask("AliTOFT0",""),
+  fNevents(0),
+  fTimeResolution(0),
+  fLowerMomBound(0),
+  fUpperMomBound(0),
+  fT0File(""),
+  fHeadersFile("")
 {
   // ctor
-  fNevents = 0 ;
 }
            
 //____________________________________________________________________________ 
-  AliTOFT0::AliTOFT0(char* headerFile, Int_t nEvents):TTask("AliTOFT0","") 
+AliTOFT0::AliTOFT0(char* headerFile, Int_t nEvents):
+  TTask("AliTOFT0",""), 
+  fNevents(nEvents),
+  fTimeResolution(1.2e-10),
+  fLowerMomBound(1.5),
+  fUpperMomBound(2.),
+  fT0File(""),
+  fHeadersFile(headerFile)
 {
   //
   //
   //
 
-  fNevents=nEvents ; // Number of events for which calculate the T0, 
+  //fNevents=nEvents ; // Number of events for which calculate the T0, 
                      // default 0: it means all evens in current file
-  fLowerMomBound=1.5; // [GeV/c] default value
-  fUpperMomBound=2. ; // [GeV/c] default value
-  fTimeResolution   = 1.2e-10; // 120 ps by default	
-  fHeadersFile = headerFile ;
+  //fLowerMomBound=1.5; // [GeV/c] default value
+  //fUpperMomBound=2. ; // [GeV/c] default value
+  //fTimeResolution   = 1.2e-10; // 120 ps by default	
+  //fHeadersFile = headerFile ;
 
   TFile * file = (TFile*) gROOT->GetFile(fHeadersFile.Data() ) ;
 
@@ -147,7 +158,14 @@ ClassImp(AliTOFT0)
 }
 
 //____________________________________________________________________________ 
-  AliTOFT0::AliTOFT0(const AliTOFT0 & tzero):TTask("AliTOFT0","")
+AliTOFT0::AliTOFT0(const AliTOFT0 & tzero):
+  TTask("AliTOFT0",""),
+  fNevents(0),
+  fTimeResolution(0),
+  fLowerMomBound(0),
+  fUpperMomBound(0),
+  fT0File(""),
+  fHeadersFile("")
 {
   // copy ctr
 
@@ -250,15 +268,15 @@ void AliTOFT0::Exec(Option_t *option)
   }
 
   if(strstr(option,"all")){
-    AliInfo(Form("Selecting primary tracks with momentum between %d GeV/c and %d GeV/c",  fLowerMomBound, fUpperMomBound));
+    AliInfo(Form("Selecting primary tracks with momentum between %f GeV/c and %f GeV/c",  fLowerMomBound, fUpperMomBound));
     AliInfo("Memorandum: 0 means PION | 1 means KAON | 2 means PROTON")
   }
 
-  if (fNevents == 0) fNevents = (Int_t) gAlice->TreeE()->GetEntries();
+  if (fNevents == 0) fNevents = (Int_t) AliRunLoader::Instance()->TreeE()->GetEntries();
 
   for (Int_t ievent = 0; ievent < fNevents; ievent++) {
     gAlice->GetEvent(ievent);
-    TTree *hitTree = detTOF->TreeH ();
+    TTree *hitTree = detTOF->GetLoader()->TreeH ();
     if (!hitTree)
       return;
     TParticle*    particle;
@@ -278,7 +296,7 @@ void AliTOFT0::Exec(Option_t *option)
     {
       if(nset>=5) break; // check on the number of set analyzed
       
-      gAlice->ResetHits();
+      gAlice->GetMCApp()->ResetHits();
       hitTree->GetEvent(track);
 
       AliMC *mcApplication = (AliMC*)gAlice->GetMCApp();
@@ -428,8 +446,8 @@ void AliTOFT0::Exec(Option_t *option)
 	    if(strstr(option,"all")){
 	      AliInfo(Form("True Assignment %d  %d  %d  %d  %d  %d  %d  %d  %d  %d", truparticle[0], truparticle[1], truparticle[2], truparticle[3], truparticle[4], truparticle[5], truparticle[6], truparticle[7], truparticle[8], truparticle[9]));
 	      AliInfo(Form("Best Assignment %d  %d  %d  %d  %d  %d  %d  %d  %d  %d", assparticle[0], assparticle[1], assparticle[2], assparticle[3], assparticle[4], assparticle[5], assparticle[6], assparticle[7], assparticle[8], assparticle[9]));
-	      AliInfo(Form("Minimum ChiSquare for current set   %d ", chisquare));
-	      AliInfo(Form("Confidence Level (Minimum ChiSquare) %d", confLevel));
+	      AliInfo(Form("Minimum ChiSquare for current set   %f ", chisquare));
+	      AliInfo(Form("Confidence Level (Minimum ChiSquare) %f", confLevel));
 	    }
 	    if (strstr(option,"visual") && itimes && (itimes%kUPDATE) == 0) {
 	      if (itimes == kUPDATE){
@@ -463,10 +481,10 @@ void AliTOFT0::Exec(Option_t *option)
     nmisidentified=(nmisidentified0+nmisidentified1+nmisidentified2+nmisidentified3+nmisidentified4+nmisidentified5+nmisidentified6+nmisidentified7+nmisidentified8+nmisidentified9);
     AliInfo(Form("total number of tracks token into account  %i", 10*5*fNevents));
     Float_t badPercentage=100.*(Float_t)nmisidentified/(10*5*fNevents);
-    AliInfo(Form("total misidentified                       %i (%d %) ", nmisidentified, badPercentage));
+    AliInfo(Form("total misidentified                       %i (%d %%) ", nmisidentified, badPercentage));
     AliInfo(Form("Total Number of set token into account     %i", 5*fNevents));
     Float_t goodSetPercentage=100.*(Float_t)ngood/(5*fNevents);
-    AliInfo(Form("Number of set with no misidentified tracks %i (%d %)", ngood, goodSetPercentage));
+    AliInfo(Form("Number of set with no misidentified tracks %i (%d %%)", ngood, goodSetPercentage));
   }
 
   // free used memory for canvas
@@ -505,7 +523,7 @@ void AliTOFT0::Exec(Option_t *option)
 void AliTOFT0::SetTZeroFile(char * file )
 {
   //
-  //
+  // Set T0 file name
   //
   printf("Destination file : %s \n", file) ;
   fT0File=file;
@@ -516,7 +534,7 @@ void AliTOFT0::SetTZeroFile(char * file )
 void AliTOFT0::Print(Option_t* /*option*/)const
 {
   //
-  //
+  // Print class content
   //
   printf("------------------- %s -------------\n", GetName()) ;
   if(!fT0File.IsNull())