Changes in QA to be able to process separately different triggers (Ruben)

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

diff --git a/FMD/AliFMDQADataMakerRec.cxx b/FMD/AliFMDQADataMakerRec.cxx
index 3f63e8e03068e7bc594e06a665183fef3865e718..6f6ae2c7900fb23a5b1b221c96631314857f47ee 100644 (file)
--- a/FMD/AliFMDQADataMakerRec.cxx
+++ b/FMD/AliFMDQADataMakerRec.cxx
@@ -108,6 +108,7 @@ AliFMDQADataMakerRec::EndOfDetectorCycle(AliQAv1::TASKINDEX_t task,
 {
   // Detector specific actions at end of cycle
   // do the QA checking
+  ResetEventTrigClasses(); // reset triggers list to select all histos
   AliLog::Message(5,"FMD: end of detector cycle",
                  "AliFMDQADataMakerRec","AliFMDQADataMakerRec",
                  "AliFMDQADataMakerRec::EndOfDetectorCycle",
@@ -179,7 +180,7 @@ void AliFMDQADataMakerRec::InitESDs()
   
   TH1* hist = MakeELossHist();
   Add2ESDsList(hist, 0, !expert, image);
-    
+  ClonePerTrigClass(AliQAv1::kESDS); // this should be the last line    
 }
 
 //_____________________________________________________________________
@@ -191,9 +192,9 @@ void AliFMDQADataMakerRec::InitDigits()
   
   TH1* hist = MakeADCHist();
   Add2DigitsList(hist, 0, !expert, image);
+  ClonePerTrigClass(AliQAv1::kDIGITS); // this should be the last line
 }
 
-
 //_____________________________________________________________________ 
 void AliFMDQADataMakerRec::InitRecPoints()
 {
@@ -203,6 +204,7 @@ void AliFMDQADataMakerRec::InitRecPoints()
 
   TH1* hist = MakeELossHist();
   Add2RecPointsList(hist,0, !expert, image);
+  ClonePerTrigClass(AliQAv1::kRECPOINTS); // this should be the last linea
 }
 
 //_____________________________________________________________________ 
@@ -247,6 +249,8 @@ void AliFMDQADataMakerRec::InitRaws()
       }
     }
   }
+  //
+  ClonePerTrigClass(AliQAv1::kRAWS); // this should be the last line
 }
 
 #if 0
@@ -260,7 +264,7 @@ struct FillESDHist : public AliESDFMD::ForOne
     // Float_t mult = fmd->Multiplicity(det,ring,sec,strip);
     if(m == AliESDFMD::kInvalidMult) return true;
     
-    fM->GetESDsData(0)->Fill(m);    
+    fM->FillESDsData(0,m);
     return true;
   }
   AliFMDQADataMakerRec* fM;
@@ -304,12 +308,14 @@ void AliFMDQADataMakerRec::MakeESDs(AliESDEvent * esd)
          Float_t mult = fmd->Multiplicity(det,ring,sec,strip);
          if(mult == AliESDFMD::kInvalidMult) continue;
          
-         GetESDsData(0)->Fill(mult);
+         FillESDsData(0,mult);
        }
       }
     }
   }
 #endif
+  IncEvCountCycleESDs();
+  IncEvCountTotalESDs();
 }
 
 
@@ -325,7 +331,7 @@ void AliFMDQADataMakerRec::MakeDigits()
   for(Int_t i=0;i<fDigitsArray->GetEntriesFast();i++) {
     //Raw ADC counts
     AliFMDDigit* digit = static_cast<AliFMDDigit*>(fDigitsArray->At(i));
-    GetDigitsData(0)->Fill(digit->Counts());
+    FillDigitsData(0,digit->Counts());
   }
 }
 
@@ -338,7 +344,6 @@ void AliFMDQADataMakerRec::MakeDigits(TTree * digitTree)
   // Parameters:
   //    digitTree Tree of digits
   //
-  
   if (fDigitsArray) 
     fDigitsArray->Clear();
   else 
@@ -352,6 +357,9 @@ void AliFMDQADataMakerRec::MakeDigits(TTree * digitTree)
   branch->SetAddress(&fDigitsArray);
   branch->GetEntry(0); 
   MakeDigits();
+  //
+  IncEvCountCycleDigits();
+  IncEvCountTotalDigits();
 }
 
 //_____________________________________________________________________
@@ -388,15 +396,18 @@ void AliFMDQADataMakerRec::MakeRaws(AliRawReader* rawReader)
     Short_t           board = pars->GetAltroMap()->Sector2Board(ring, sec);
     
     Int_t index1 = GetHalfringIndex(det, ring, 0, 1);
+    FillRawsData(index1,digit->Counts());
     Int_t index2 = GetHalfringIndex(det, ring, board/16,0);
-    // AliInfo(Form("FMD%d%c[0x%02x]->%2d,%2d", 
-    //              det, ring, board, index1, index2));
-    GetRawsData(index1)->Fill(digit->Counts());
-    GetRawsData(index2)->Fill(digit->Counts()); 
+    FillRawsData(index2,digit->Counts());
+    
   }
-  GetRawsData(1)->Fill(1, fmdReader.GetNErrors(0));
-  GetRawsData(1)->Fill(2, fmdReader.GetNErrors(1));
-  GetRawsData(1)->Fill(3, fmdReader.GetNErrors(2));
+  //
+  FillRawsData(1,1, fmdReader.GetNErrors(0));
+  FillRawsData(1,2, fmdReader.GetNErrors(1));
+  FillRawsData(1,3, fmdReader.GetNErrors(2));
+  //
+  IncEvCountCycleRaws();
+  IncEvCountTotalRaws();
 }
 
 //_____________________________________________________________________
@@ -419,11 +430,11 @@ void AliFMDQADataMakerRec::MakeRecPoints(TTree* clustersTree)
   TIter next(RecPointsAddress) ; 
   AliFMDRecPoint * rp ; 
   while ((rp = static_cast<AliFMDRecPoint*>(next()))) {
-    
-    GetRecPointsData(0)->Fill(rp->Edep()/pars->GetEdepMip()) ;
-  
+    FillRecPointsData(0,rp->Edep()/pars->GetEdepMip());
   }
-
+  IncEvCountCycleRecPoints();
+  IncEvCountTotalRecPoints();
+  //
 }
 
 //_____________________________________________________________________