X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TOF%2FAliTOFQADataMakerSim.cxx;h=bd7896ad771d2890646a5e82a998e0e623f7be9b;hb=b671cde111ea27cfcc84c2768d76414018c75c38;hp=faf92b698c4c747dab95a6cf44a768fd619b8fa4;hpb=04236e6706a5b16e11ccf14c139bb4a995291429;p=u%2Fmrichter%2FAliRoot.git

diff --git a/TOF/AliTOFQADataMakerSim.cxx b/TOF/AliTOFQADataMakerSim.cxx
index faf92b698c4..bd7896ad771 100644
--- a/TOF/AliTOFQADataMakerSim.cxx
+++ b/TOF/AliTOFQADataMakerSim.cxx
@@ -22,19 +22,20 @@
 ///////////////////////////////////////////////////////////////////////
 
 #include <TClonesArray.h>
-#include <TFile.h> 
-#include <TH1I.h> 
+//#include <TFile.h> 
+//#include <TH1I.h> 
 #include <TH1F.h> 
 #include <TH2F.h> 
 #include <TTree.h>
 #include <TMath.h>
 
+#include "AliLog.h"
+
 #include "AliTOFdigit.h"
 #include "AliTOFSDigit.h"
 #include "AliTOFhitT0.h"
 #include "AliTOFQADataMakerSim.h"
 #include "AliQAChecker.h"
-#include "AliLog.h"
 #include "AliTOFGeometry.h"
 
 
@@ -77,21 +78,24 @@ void AliTOFQADataMakerSim::InitHits()
   //
   // create Hits histograms in Hits subdir
   //
+
+  Bool_t expert = kFALSE;
+
   TH1F * h0 = new TH1F("hTOFHits",    "Number of TOF Hits ",301, -1.02, 5.) ; 
   h0->Sumw2() ;
-  Add2HitsList(h0, 0) ;
+  Add2HitsList(h0, 0, expert) ;
 
   TH1F * h1  = new TH1F("hTOFHitsTime", "Hits Time Spectrum in TOF (ns)", 2000, 0., 200) ; 
   h1->Sumw2() ;
-  Add2HitsList(h1, 1) ;
+  Add2HitsList(h1, 1, expert) ;
 
   TH1F * h2  = new TH1F("hTOFHitsLength", "Length Spectrum in TOF (cm)", 500, 0., 500) ; 
   h2->Sumw2() ;
-  Add2HitsList(h2, 2) ;
+  Add2HitsList(h2, 2, expert) ;
 
   TH2F * h3  = new TH2F("hTOFHitsClusMap","Hits vs TOF eta-phi",183, -0.5, 182.5,865,-0.5,864.5) ; 
   h3->Sumw2() ;
-  Add2HitsList(h3, 3) ;
+  Add2HitsList(h3, 3, expert) ;
 }
 
 //____________________________________________________________________________ 
@@ -100,20 +104,23 @@ void AliTOFQADataMakerSim::InitDigits()
   //
   // create Digits histograms in Digits subdir
   //
+
+  Bool_t expert = kFALSE;
+
   TH1F * h0 = new TH1F("hTOFDigits",    "Number of TOF Digits ",301, -1.02, 5.) ;   h0->Sumw2() ;
-  Add2DigitsList(h0, 0) ;
+  Add2DigitsList(h0, 0, expert) ;
 
   TH1F * h1  = new TH1F("hTOFDigitsTime", "Digits Time Spectrum in TOF (ns)", 2000, 0., 200) ; 
   h1->Sumw2() ;
-  Add2DigitsList(h1, 1) ;
+  Add2DigitsList(h1, 1, expert) ;
 
   TH1F * h2  = new TH1F("hTOFDigitsToT", "Digits ToT Spectrum in TOF (ns)", 500, 0., 50) ; 
   h2->Sumw2() ;
-  Add2DigitsList(h2, 2) ;
+  Add2DigitsList(h2, 2, expert) ;
 
   TH2F * h3  = new TH2F("hTOFDigitsClusMap","Digits vs TOF eta-phi",183, -0.5, 182.5,865,-0.5,864.5) ; 
   h3->Sumw2() ;
-  Add2DigitsList(h3, 3) ;
+  Add2DigitsList(h3, 3, expert) ;
 
 }
 
@@ -123,16 +130,19 @@ void AliTOFQADataMakerSim::InitSDigits()
   //
   // create SDigits histograms in SDigits subdir
   //
+
+  Bool_t expert = kFALSE;
+
   TH1F * h0 = new TH1F("hTOFSDigits",    "Number of TOF SDigits ",301, -1.02, 5.) ;   h0->Sumw2() ;
-  Add2SDigitsList(h0, 0) ;
+  Add2SDigitsList(h0, 0, expert) ;
 
   TH1F * h1  = new TH1F("hTOFSDigitsTime", "SDigits Time Spectrum in TOF (ns)", 2000, 0., 200) ; 
   h1->Sumw2() ;
-  Add2SDigitsList(h1, 1) ;
+  Add2SDigitsList(h1, 1, expert) ;
 
   TH2F * h2  = new TH2F("hTOFSDigitsClusMap","SDigits vs TOF eta-phi",183, -0.5, 182.5,865,-0.5,864.5) ; 
   h2->Sumw2() ;
-  Add2SDigitsList(h2, 2) ;
+  Add2SDigitsList(h2, 2, expert) ;
 
 }
 
@@ -189,8 +199,12 @@ void AliTOFQADataMakerSim::MakeHits(TTree * hitTree)
     return;
   }
 
-  TClonesArray * hits = new TClonesArray("AliTOFhitT0", 1000);
-  TClonesArray * dummy = new TClonesArray("AliTOFhitT0", 1000);
+  static TClonesArray statichits("AliTOFhitT0", 1000);
+  statichits.Clear();
+  TClonesArray *hits = &statichits;
+  static TClonesArray staticdummy("AliTOFhitT0", 1000);
+  staticdummy.Clear();
+  TClonesArray *dummy = &staticdummy;
   branch->SetAddress(&dummy);
   Int_t index = 0 ;  
   for (Int_t ientry = 0 ; ientry < branch->GetEntries() ; ientry++) {
@@ -202,8 +216,6 @@ void AliTOFQADataMakerSim::MakeHits(TTree * hitTree)
     } 
   } 	
 
-  dummy->Delete();
-  delete dummy;
   MakeHits(hits) ; 
 
 }
@@ -326,7 +338,7 @@ void AliTOFQADataMakerSim::StartOfDetectorCycle()
 }
 
 //____________________________________________________________________________ 
-void AliTOFQADataMakerSim::EndOfDetectorCycle(AliQA::TASKINDEX task, TObjArray * list)
+void AliTOFQADataMakerSim::EndOfDetectorCycle(AliQA::TASKINDEX_t task, TObjArray ** list)
 {
   //Detector specific actions at end of cycle
   // do the QA checking