X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=T0%2FAliT0QADataMakerSim.cxx;h=d6eb86cb1a6a077c007e77ae2bc9c9efcaa297de;hb=710d11ac0eea521f49a19e1dbe42fb4f2fb853b2;hp=35a3b236b01a8c0767d2ce66b4b698ba8288e60e;hpb=f628b9d2ed342e530b5b75331a7867a563156ddd;p=u%2Fmrichter%2FAliRoot.git

diff --git a/T0/AliT0QADataMakerSim.cxx b/T0/AliT0QADataMakerSim.cxx
index 35a3b236b01..d6eb86cb1a6 100644
--- a/T0/AliT0QADataMakerSim.cxx
+++ b/T0/AliT0QADataMakerSim.cxx
@@ -40,7 +40,7 @@
 #include "AliQAChecker.h"
 #include "AliT0RawReader.h"
 
-#include "iostream.h"
+#include <Riostream.h>
 
 ClassImp(AliT0QADataMakerSim)
            
@@ -98,8 +98,10 @@ void AliT0QADataMakerSim::InitHits()
   TString timename;
   
   TH2F *fhHitsTimeA = new TH2F("hHitsTimeA", "Hits Efficiency;#PMT; Time [ns];", 13, 12, 25, 100,12,15 );
-  Add2HitsList(fhHitsTimeA,0, !expert, image);
+  fhHitsTimeA->SetOption("COLZ");
+ Add2HitsList(fhHitsTimeA,0, !expert, image);
   TH2F *fhHitsTimeC = new TH2F("hHitsTimeC", "Hits Efficiency;#PMT; Time [ns];", 13, 0, 13, 100,2,5 );
+  fhHitsTimeC->SetOption("COLZ");
   Add2HitsList(fhHitsTimeC,1, !expert, image);
 }
 
@@ -111,10 +113,13 @@ void AliT0QADataMakerSim::InitDigits()
   const Bool_t image    = kTRUE ; 
   
   TH2F * fhDigCFD = new TH2F("fhDigCFD", " CFD digits; #PMT; CFD time [#channel]",25,-0.5,24.5,100,0,1000);
+  fhDigCFD->SetOption("COLZ");
   Add2DigitsList( fhDigCFD,0);
   TH2F *fhDigLEDamp = new TH2F("fhDigLEDamp", " LED-CFD digits; #PMT; amplitude  LED-CFD [#channel]",25,-0.5,24.5,100,100,1000);
+  fhDigLEDamp->SetOption("COLZ");
   Add2DigitsList( fhDigLEDamp,1, !expert, image);
   TH2F * fhDigQTC = new TH2F("fhDigQTC", " QTC digits; #PMT; amplitude QTC [#channel]",25,-0.5,24.5,200,500,10000);
+  fhDigQTC->SetOption("COLZ");
   Add2DigitsList( fhDigQTC,2, !expert, image);
   
   
@@ -126,7 +131,10 @@ void AliT0QADataMakerSim::InitDigits()
 void AliT0QADataMakerSim::MakeHits(TTree *hitTree)
 {
   //fills QA histos for Hits
-  TClonesArray * hits = new TClonesArray("AliT0hit", 1000);
+  if (fHitsArray) 
+    fHitsArray->Clear() ; 
+  else 
+    fHitsArray = new TClonesArray("AliT0hit", 1000);
   
   TBranch * branch = hitTree->GetBranch("T0") ;
   if ( ! branch ) {
@@ -134,7 +142,7 @@ void AliT0QADataMakerSim::MakeHits(TTree *hitTree)
   } else {
 
    if (branch) {
-      branch->SetAddress(&hits);
+      branch->SetAddress(&fHitsArray);
     }else{
       AliError("Branch T0 hit not found");
       exit(111);
@@ -143,12 +151,13 @@ void AliT0QADataMakerSim::MakeHits(TTree *hitTree)
     
     if (ntracks<=0) return;
     // Start loop on tracks in the hits containers
+
     for (Int_t track=0; track<ntracks;track++) {
       branch->GetEntry(track);
-      Int_t nhits = hits->GetEntriesFast();
+      Int_t nhits = fHitsArray->GetEntriesFast();
       for (Int_t ihit=0;ihit<nhits;ihit++) 
 	{
-	  AliT0hit  * startHit   = (AliT0hit*) hits->UncheckedAt(ihit);
+	  AliT0hit  * startHit   = (AliT0hit*) fHitsArray->UncheckedAt(ihit);
 	  if (!startHit) {
  	    AliError("The unchecked hit doesn't exist");
 	    continue;
@@ -181,6 +190,7 @@ void AliT0QADataMakerSim::MakeDigits( TTree *digitsTree)
     AliError(Form("EXEC Branch T0 digits not found"));
      return;
   }
+
   digitsTree->GetEvent(0);
   digitsTree->GetEntry(0);
   brDigits->GetEntry(0);