Shadowing of variabled corrected.

[u/mrichter/AliRoot.git] / TRD / AliTRDQADataMakerSim.cxx

diff --git a/TRD/AliTRDQADataMakerSim.cxx b/TRD/AliTRDQADataMakerSim.cxx
index 927a37730aae491728e72815812f040c990a7bf7..b8d03ae1c96e7539443daf6ae3f9e69a631482c4 100644 (file)
--- a/TRD/AliTRDQADataMakerSim.cxx
+++ b/TRD/AliTRDQADataMakerSim.cxx
@@ -46,6 +46,7 @@
 #include "AliTRDdigitsManager.h"
 #include "AliTRDgeometry.h"
 #include "AliTRDdataArrayS.h"
+#include "AliTRDdataArrayF.h"
 //#include "AliTRDrawStreamTB.h"
 
 #include "AliQAChecker.h"
@@ -87,7 +88,7 @@ AliTRDQADataMakerSim& AliTRDQADataMakerSim::operator=(const AliTRDQADataMakerSim
 }
 
 //____________________________________________________________________________ 
-void AliTRDQADataMakerSim::EndOfDetectorCycle(AliQA::TASKINDEX task, TObjArray * list)
+void AliTRDQADataMakerSim::EndOfDetectorCycle(AliQA::TASKINDEX_t task, TObjArray * list)
 {
   //
   // Detector specific actions at end of cycle
@@ -136,7 +137,7 @@ void AliTRDQADataMakerSim::InitDigits()
 
   hist[0] = new TH1D("qaTRD_digits_det", ";Detector Id of the digit", 540, -0.5, 539.5);
   hist[1] = new TH1D("qaTRD_digits_time", ";Time bin", 40, -0.5, 39.5);
-  hist[2] = new TH1D("qaTRD_digits_amp", ";Amplitude", 100, 0, 100.);
+  hist[2] = new TH1D("qaTRD_digits_amp", ";Amplitude", 100, -5.5, 94.5);
 
   for(Int_t i=0; i<kNhist; i++) {
     hist[i]->Sumw2();
@@ -218,6 +219,8 @@ void AliTRDQADataMakerSim::MakeHits(TTree * hitTree)
   tmp->Delete();
   delete tmp;
   MakeHits(hits);
+  hits->Delete();
+  delete hits;
 
 }
 
@@ -230,7 +233,11 @@ void AliTRDQADataMakerSim::MakeDigits(TClonesArray * digits)
 
   TIter next(digits) ; 
   AliTRDdigit * digit ; 
+  
+  // Info("Make digits", "From the arrya");
+  
   while ( (digit = dynamic_cast<AliTRDdigit *>(next())) ) {
+    if (digit->GetAmp() < 1) continue;
     GetDigitsData(0)->Fill(digit->GetDetector());
     GetDigitsData(1)->Fill(digit->GetTime());
     GetDigitsData(2)->Fill(digit->GetAmp());
@@ -245,10 +252,16 @@ void AliTRDQADataMakerSim::MakeDigits(TTree * digits)
   // Makes data from digits tree
   //
 
+  // Info("Make digits", "From a tree");
+
   AliTRDdigitsManager *digitsManager = new AliTRDdigitsManager();
   digitsManager->CreateArrays();
   digitsManager->ReadDigits(digits);
 
+  TH1D *histDet = (TH1D*)GetDigitsData(0);
+  TH1D *histTime = (TH1D*)GetDigitsData(1);
+  TH1D *histSignal = (TH1D*)GetDigitsData(2);
+
   for (Int_t i = 0; i < AliTRDgeometry::kNdet; i++) {
 
     AliTRDdataArrayS *digitsIn = (AliTRDdataArrayS *) digitsManager->GetDigits(i);      
@@ -270,9 +283,10 @@ void AliTRDQADataMakerSim::MakeDigits(TTree * digits)
        for(Int_t time = 0; time < nTbins; time++) {
 
          Float_t signal = digitsIn->GetDataUnchecked(row,col,time);
-         GetDigitsData(0)->Fill(i);
-         GetDigitsData(1)->Fill(time);
-         GetDigitsData(2)->Fill(signal);
+         if (signal < 1) continue;
+         histDet->Fill(i);
+         histTime->Fill(time);
+         histSignal->Fill(signal);
        }
 
     //delete digitsIn;
@@ -307,12 +321,18 @@ void AliTRDQADataMakerSim::MakeSDigits(TTree * digits)
   //
 
   AliTRDdigitsManager *digitsManager = new AliTRDdigitsManager();
+  digitsManager->SetSDigits(kTRUE);
   digitsManager->CreateArrays();
   digitsManager->ReadDigits(digits);
 
+  TH1D *histDet = (TH1D*)GetSDigitsData(0);
+  TH1D *histTime = (TH1D*)GetSDigitsData(1);
+  TH1D *histSignal = (TH1D*)GetSDigitsData(2);
+
   for (Int_t i = 0; i < AliTRDgeometry::kNdet; i++) {
 
-    AliTRDdataArrayS *digitsIn = (AliTRDdataArrayS *) digitsManager->GetDigits(i);      
+    //AliTRDdataArrayS *digitsIn = (AliTRDdataArrayS *) digitsManager->GetDigits(i);      
+    AliTRDdataArrayF *digitsIn = (AliTRDdataArrayF *) digitsManager->GetDigits(i);      
 
     // This is to take care of switched off super modules
     if (digitsIn->GetNtime() == 0) continue;
@@ -331,10 +351,10 @@ void AliTRDQADataMakerSim::MakeSDigits(TTree * digits)
        for(Int_t time = 0; time < nTbins; time++) {
 
          Float_t signal = digitsIn->GetDataUnchecked(row,col,time);
-         if (signal <= 0) continue;
-         GetSDigitsData(0)->Fill(i);
-         GetSDigitsData(1)->Fill(time);
-         GetSDigitsData(2)->Fill(signal);
+         if (signal < 1) continue;
+         histDet->Fill(i);
+         histTime->Fill(time);
+         histSignal->Fill(signal);
        }
 
     // delete digitsIn;