bugfix: correcting the condition for the check for the local GRP entry added before...

[u/mrichter/AliRoot.git] / FMD / AliFMDQADataMakerRec.cxx

diff --git a/FMD/AliFMDQADataMakerRec.cxx b/FMD/AliFMDQADataMakerRec.cxx
index f95d040b44b51496af8879496285cd047fa67acc..a4bdf41a6b2224472851bd26126e8f178bc80990 100644 (file)
--- a/FMD/AliFMDQADataMakerRec.cxx
+++ b/FMD/AliFMDQADataMakerRec.cxx
@@ -115,6 +115,18 @@ void AliFMDQADataMakerRec::InitESDs()
     
 }
 
+//_____________________________________________________________________
+void AliFMDQADataMakerRec::InitDigits()
+{
+  // create Digits histograms in Digits subdir
+  const Bool_t expert   = kTRUE ; 
+  const Bool_t image    = kTRUE ; 
+  
+  TH1I* hADCCounts = new TH1I("hADCCounts","Dist of ADC counts;ADC counts;Counts",1024,0,1024);
+  Add2DigitsList(hADCCounts, 0, !expert, image);
+}
+
+
 //_____________________________________________________________________ 
 void AliFMDQADataMakerRec::InitRecPoints()
 {
@@ -125,7 +137,7 @@ void AliFMDQADataMakerRec::InitRecPoints()
   TH1F* hEnergyOfRecpoints = new TH1F("hEnergyOfRecpoints",
                                      "Energy Distribution",100,0,3);
   hEnergyOfRecpoints->SetXTitle("Edep/Emip");
-  hEnergyOfRecpoints->SetYTitle("");
+  hEnergyOfRecpoints->SetYTitle("Counts");
   Add2RecPointsList(hEnergyOfRecpoints,0, !expert, image);
 }
 
@@ -143,7 +155,7 @@ void AliFMDQADataMakerRec::InitRaws()
     for(Int_t iring = firstring;iring<=1;iring++) {
       Char_t ring = (iring == 1 ? 'I' : 'O');
       hADCCounts      = new TH1I(Form("hADCCounts_FMD%d%c",
-                                     det, ring), "ADC counts",
+                                     det, ring), "ADC counts;Amplitude [ADC counts];Counts",
                                 1024,0,1023);
       
       Int_t index1 = GetHalfringIndex(det, ring, 0,1);
@@ -157,7 +169,7 @@ void AliFMDQADataMakerRec::InitRaws()
        
        
        hADCCounts      = new TH1I(Form("hADCCounts_FMD%d%c_board%d",
-                                       det, ring, board), "ADC counts",
+                                       det, ring, board), "ADC counts;Amplitude [ADC counts];Counts",
                                   1024,0,1023);
        hADCCounts->SetXTitle("ADC counts");
        hADCCounts->SetYTitle("");
@@ -179,6 +191,10 @@ void AliFMDQADataMakerRec::MakeESDs(AliESDEvent * esd)
   AliESDFMD* fmd = esd->GetFMDData();
   if (!fmd) return;
   
+  // Check id histograms already created for this Event Specie
+  if ( ! GetESDsData(0) )
+    InitESDs() ;
+
   for(UShort_t det=1;det<=3;det++) {
     for (UShort_t ir = 0; ir < 2; ir++) {
       Char_t   ring = (ir == 0 ? 'I' : 'O');
@@ -196,7 +212,7 @@ void AliFMDQADataMakerRec::MakeESDs(AliESDEvent * esd)
   }
 }
 
-/*
+
 //_____________________________________________________________________
 void AliFMDQADataMakerRec::MakeDigits(TClonesArray * digits)
 {
@@ -205,6 +221,11 @@ void AliFMDQADataMakerRec::MakeDigits(TClonesArray * digits)
     AliError("FMD Digit object not found!!") ;
     return;
   }
+  
+  // Check id histograms already created for this Event Specie
+  if ( ! GetDigitsData(0) )
+    InitDigits() ;
+
   for(Int_t i=0;i<digits->GetEntriesFast();i++) {
     //Raw ADC counts
     AliFMDDigit* digit = static_cast<AliFMDDigit*>(digits->At(i));
@@ -227,11 +248,15 @@ void AliFMDQADataMakerRec::MakeDigits(TTree * digitTree)
   branch->GetEntry(0); 
   MakeDigits(digitsAddress);
 }
-*/
+
 //_____________________________________________________________________
 void AliFMDQADataMakerRec::MakeRaws(AliRawReader* rawReader)
 {
  
+  // Check id histograms already created for this Event Specie
+  if ( ! GetRawsData(0) )
+    InitRaws() ;
+
   AliFMDRawReader fmdReader(rawReader,0);
   TClonesArray* digitsAddress = &fDigitsArray;
   
@@ -261,6 +286,11 @@ void AliFMDQADataMakerRec::MakeRaws(AliRawReader* rawReader)
 void AliFMDQADataMakerRec::MakeRecPoints(TTree* clustersTree)
 {
   // makes data from RecPoints
+  
+  // Check id histograms already created for this Event Specie
+  if ( ! GetRecPointsData(0) )
+    InitRecPoints() ;
+
   AliFMDParameters* pars = AliFMDParameters::Instance();
   fRecPointsArray.Clear();
   TBranch *fmdbranch = clustersTree->GetBranch("FMD");