Additional protection (Yves)

[u/mrichter/AliRoot.git] / PHOS / AliPHOSQADataMaker.cxx

diff --git a/PHOS/AliPHOSQADataMaker.cxx b/PHOS/AliPHOSQADataMaker.cxx
index 522bf37675f748bc1bf3c57f5249a450b41b6536..640eb1d68991139d4af0c5163be0be2d75da6cd7 100644 (file)
--- a/PHOS/AliPHOSQADataMaker.cxx
+++ b/PHOS/AliPHOSQADataMaker.cxx
@@ -44,6 +44,8 @@
 #include "AliPHOSRecParticle.h" 
 #include "AliPHOSTrackSegment.h" 
 #include "AliPHOSRawDecoder.h"
+#include "AliPHOSReconstructor.h"
+#include "AliPHOSRecoParam.h"
 
 ClassImp(AliPHOSQADataMaker)
            
@@ -73,7 +75,7 @@ AliPHOSQADataMaker& AliPHOSQADataMaker::operator = (const AliPHOSQADataMaker& qa
 }
  
 //____________________________________________________________________________ 
-void AliPHOSQADataMaker::EndOfDetectorCycle(AliQA::TASKINDEX task, TList * list)
+void AliPHOSQADataMaker::EndOfDetectorCycle(AliQA::TASKINDEX task, TObjArray * list)
 {
   //Detector specific actions at end of cycle
   // do the QA checking
@@ -84,6 +86,7 @@ void AliPHOSQADataMaker::EndOfDetectorCycle(AliQA::TASKINDEX task, TList * list)
 void AliPHOSQADataMaker::InitESDs()
 {
   //create ESDs histograms in ESDs subdir
+       
   TH1F * h0 = new TH1F("hPhosESDs",    "ESDs energy distribution in PHOS",       100, 0., 100.) ;  
   h0->Sumw2() ; 
   Add2ESDsList(h0, 0) ;
@@ -113,7 +116,7 @@ void AliPHOSQADataMaker::InitDigits()
   Add2DigitsList(h0, 0) ;
   TH1I * h1 = new TH1I("hPhosDigitsMul", "Digits multiplicity distribution in PHOS", 500, 0, 1000) ; 
   h1->Sumw2() ;
-  Add2DigitsList(h1, 0) ;
+  Add2DigitsList(h1, 1) ;
 }
 
 //____________________________________________________________________________ 
@@ -210,13 +213,14 @@ void AliPHOSQADataMaker::InitSDigits()
 void AliPHOSQADataMaker::MakeESDs(AliESDEvent * esd)
 {
   // make QA data from ESDs
-  
-  Int_t maxClu = esd->GetNumberOfPHOSClusters() ; 
-  Int_t index = 0, count = 0 ; 
-  for ( index = 0 ; index < maxClu; index++ ) {
-    AliESDCaloCluster * clu = esd->GetCaloCluster(index) ;
-    GetESDsData(0)->Fill(clu->E()) ;
-    count++ ; 
+
+  Int_t count = 0 ; 
+  for ( Int_t index = 0; index < esd->GetNumberOfCaloClusters() ; index++ ) {
+       AliESDCaloCluster * clu = esd->GetCaloCluster(index) ;
+       if ( clu->IsPHOS() ) {
+               GetESDsData(0)->Fill(clu->E()) ;
+               count++ ;
+       } 
   }
   GetESDsData(1)->Fill(count) ;
 }
@@ -311,9 +315,7 @@ void AliPHOSQADataMaker::MakeRaws(AliRawReader* rawReader)
   const Int_t modMax = 5 ; 
   rawReader->Reset() ; 
   AliPHOSRawDecoder decoder(rawReader);
-  decoder.SetOldRCUFormat(kTRUE);
-  decoder.SubtractPedestals(kTRUE);
-
+  decoder.SubtractPedestals(AliPHOSReconstructor::GetRecoParam()->EMCSubtractPedestals());
   Int_t count = 0 ; 
   while (decoder.NextDigit()) {
    Int_t module  = decoder.GetModule() ;