Finally got the ResetDetector correct.

This required to insure that histograms are correctly named, in order to be able to distinguish Tracker from Trigger histograms.
Otherwise trigger part was resetting tracker part...

Also updated the shifter tracker occupancy plot to show DDL occupancy instead of buspatch occupancy. It is higher level and thus easier to explain and interpret.

diff --git a/MUON/AliMUONQAIndices.h b/MUON/AliMUONQAIndices.h
index 8952e72421c292ef1219e1000adec4e07c8e2190..30f60a6459f02ce17c0a7b8fd6ef212da92ddf72 100644 (file)
--- a/MUON/AliMUONQAIndices.h
+++ b/MUON/AliMUONQAIndices.h
@@ -27,6 +27,8 @@ namespace AliMUONQAIndices
     kTrackerBusPatchPaddingErrors   = 10, ///< Padding errors during readout of the tracker
     kTrackerNofRawEventSeen         = 11, ///< Number of events seen (and used)
     kTrackerReadoutErrors           = 12,  ///< Integrated number of errors (and events for 1st bin)
+    kTrackerDDLOccupancy            = 13, ///< DDL occupancy in percent
+    kTrackerDDLNofEvents            = 14, ///< nof of events per DDL
     kTriggerScalersTime       = 22, ///< Trigger scalers acquisition time index
     kTriggerScalers           = 23, ///< Trigger scalers histogram per plane index
     kTriggerScalersDisplay    = 31, ///< Trigger scalers display histogram per plane index

diff --git a/MUON/AliMUONTrackerQAChecker.cxx b/MUON/AliMUONTrackerQAChecker.cxx
index 827c65c0616ffa697f82cda7c5ac931343dcb4f1..04964b1054dceab863649d277238d8c56930c550 100644 (file)
--- a/MUON/AliMUONTrackerQAChecker.cxx
+++ b/MUON/AliMUONTrackerQAChecker.cxx
@@ -42,6 +42,8 @@
 #include "TLine.h"
 #include "TMath.h"
 #include "TPaveText.h"
+#include "TGaxis.h"
+#include "TVirtualPad.h"
 
 /// \cond CLASSIMP
 ClassImp(AliMUONTrackerQAChecker)
@@ -252,14 +254,16 @@ AliMUONTrackerQAChecker::CheckRaws(TObjArray ** list, const AliMUONRecoParam* re
 
     TH1* hnevents = AliQAv1::GetData(list,AliMUONQAIndices::kTrackerNofRawEventSeen,AliRecoParam::ConvertIndex(specie));
 
-    if ( !hbp || !hnpads || !hnevents ) 
+    TH1* hddl = AliQAv1::GetData(list,AliMUONQAIndices::kTrackerDDLOccupancy,AliRecoParam::ConvertIndex(specie));
+    
+    if ( !hbp || !hnpads || !hnevents || !hddl ) 
     {
       continue;
     }
-
-    Int_t nevents = TMath::Nint(hnevents->GetBinContent(1));
     
-    rv[specie] = BeautifyTrackerBusPatchOccupancy(*hbp,hbpconfig,*hnpads,nevents,*recoParam);    
+    Int_t nevents = TMath::Nint(hnevents->GetBinContent(1));
+        
+    rv[specie] = BeautifyTrackerBusPatchOccupancy(*hddl,*hbp,hbpconfig,*hnpads,nevents,*recoParam);    
   }
   
   return rv;
@@ -267,7 +271,8 @@ AliMUONTrackerQAChecker::CheckRaws(TObjArray ** list, const AliMUONRecoParam* re
 
 //____________________________________________________________________________ 
 AliMUONVQAChecker::ECheckCode
-AliMUONTrackerQAChecker::BeautifyTrackerBusPatchOccupancy(TH1& hbp, 
+AliMUONTrackerQAChecker::BeautifyTrackerBusPatchOccupancy(TH1& hddl,
+                                                          TH1& hbp, 
                                                           const TH1* hbuspatchconfig, 
                                                           const TH1& hnpads, 
                                                           Int_t nevents,
@@ -390,7 +395,7 @@ AliMUONTrackerQAChecker::BeautifyTrackerBusPatchOccupancy(TH1& hbp,
   
   hbp.SetMaximum(ymax*1.4);
   
-  TPaveText* text = new TPaveText(0.50,0.60,0.99,0.99,"NDC");
+  TPaveText* text = new TPaveText(0.30,0.50,0.99,0.99,"NDC");
   
   text->AddText(Form("MCH RUN %d - %d events",AliCDBManager::Instance()->GetRun(),nevents));
   
@@ -415,7 +420,7 @@ AliMUONTrackerQAChecker::BeautifyTrackerBusPatchOccupancy(TH1& hbp,
     text->AddText(Form("%5.2f %% of missing pads (%d out of %d)",missingPadFraction,nMissingPads,nPads));
     text->AddText(Form("%5.2f %% bus patches above the %5.2f %% limit",aboveLimitFraction,maxToleratedOccupancy));
     text->AddText(Form("%5.2f %% bus patches below the %e %% limit",belowLimitFraction,minToleratedOccupancy));
-    text->AddText(Form("Truncated mean at %2d %% is %7.2f %%",(Int_t)(alpha*100),tmean));
+    text->AddText(Form("Bus patch mean occupancy (truncated at %2d %%) is %7.2f %%",(Int_t)(alpha*100),tmean));
     
     if ( missingPadFraction >= 100.0 ) 
     {
@@ -453,6 +458,35 @@ AliMUONTrackerQAChecker::BeautifyTrackerBusPatchOccupancy(TH1& hbp,
     text->SetFillColor(6); // pink = ERROR
   }
   
+  /// Make as well a version for DDL occupancy, that'll be used by the shifter
+  
+  hddl.GetListOfFunctions()->Add(text->Clone());
+  
+  Bool_t aboveOnePercent(kFALSE);
+  Bool_t aboveTwoPercent(kFALSE);
+  
+  for ( Int_t i = 1; i <= hddl.GetXaxis()->GetNbins(); ++i )
+  {
+    Double_t b = hddl.GetBinContent(i);
+    if ( b > 1.0 ) aboveOnePercent = kTRUE;
+    if ( b > 2.0 ) aboveTwoPercent = kTRUE;
+    
+  }
+  
+  hddl.SetMaximum(2);
+  hddl.SetFillStyle(0);
+  if ( aboveOnePercent ) 
+  {
+    hddl.SetFillStyle(1001);
+    hddl.SetFillColor(kOrange);    
+  }
+  if ( aboveTwoPercent ) 
+  {
+    hddl.SetFillStyle(1001);
+    hddl.SetFillColor(kRed);
+  }
+  hddl.SetLineWidth(3);
+  hddl.SetStats(kFALSE);
+  
   return rv;
 }
-

diff --git a/MUON/AliMUONTrackerQAChecker.h b/MUON/AliMUONTrackerQAChecker.h
index 7743a65f08a33db6aea156d7df9d012e8c845a47..382add8429b806c9458aab0d20c8c813586b9dd5 100644 (file)
--- a/MUON/AliMUONTrackerQAChecker.h
+++ b/MUON/AliMUONTrackerQAChecker.h
@@ -30,7 +30,8 @@ private:
   
   AliMUONVQAChecker::ECheckCode MarkHisto(TH1& histo, AliMUONVQAChecker::ECheckCode value) const;
   
-  AliMUONVQAChecker::ECheckCode BeautifyTrackerBusPatchOccupancy(TH1& hbp, 
+  AliMUONVQAChecker::ECheckCode BeautifyTrackerBusPatchOccupancy(TH1& hddl,
+                                                                 TH1& hbp, 
                                                                  const TH1* hbuspatchconfig, 
                                                                  const TH1& hnpads, 
                                                                  Int_t nevents,

diff --git a/MUON/AliMUONTrackerQADataMakerRec.cxx b/MUON/AliMUONTrackerQADataMakerRec.cxx
index b303e506672850cd025727d9eb50c28107918beb..32a66a1ca6b40572ad553426b2d29d1fe5007f6a 100644 (file)
--- a/MUON/AliMUONTrackerQADataMakerRec.cxx
+++ b/MUON/AliMUONTrackerQADataMakerRec.cxx
@@ -18,7 +18,9 @@
 // --- MUON header files ---
 #include "AliMUONTrackerQADataMakerRec.h"
 
+#include "AliDAQ.h"
 #include "AliQAv1.h"
+#include "AliMpDDL.h"
 #include "AliMUONConstants.h"  
 #include "AliMUONDigitMaker.h"
 #include "AliMUONQAIndices.h"
@@ -382,8 +384,10 @@ void AliMUONTrackerQADataMakerRec::EndOfDetectorCycleRaws(Int_t specie, TObjArra
 
   if ( fTrackerDataMaker ) 
   {
+    /// put the trackerdata in the pipeline
     InsertTrackerData(specie,list,fTrackerDataMaker->Data(),AliMUONQAIndices::kTrackerData);
 
+    /// project the tracerdata into buspatch occupancies (for the experts)
     TH1* hbp = GetRawsData(AliMUONQAIndices::kTrackerBusPatchOccupancy);
     hbp->Reset();
     TIter nextBP(AliMpDDLStore::Instance()->CreateBusPatchIterator());
@@ -398,6 +402,7 @@ void AliMUONTrackerQADataMakerRec::EndOfDetectorCycleRaws(Int_t specie, TObjArra
       hbp->SetBinContent(bin,data->BusPatch(busPatchId,occDim)*100.0); // occupancy, in percent
     }
     
+    /// log the readout errors (for the shifter)
     TH1* hnevents = GetRawsData(AliMUONQAIndices::kTrackerNofRawEventSeen);
     hnevents->Reset();
     hnevents->Fill(0.0,fTrackerDataMaker->Data()->NumberOfEvents(-1));
@@ -408,6 +413,45 @@ void AliMUONTrackerQADataMakerRec::EndOfDetectorCycleRaws(Int_t specie, TObjArra
       FillErrors(*fLogger);      
       fLogger->Clear();
     }
+
+    /// project tracker data into DDL occupancies (for the shifter)
+    TH1* hddl = GetRawsData(AliMUONQAIndices::kTrackerDDLOccupancy);
+    hddl->Reset();
+    TH1* hddlevents = GetRawsData(AliMUONQAIndices::kTrackerDDLNofEvents);
+    hddlevents->Reset();
+    
+    const Int_t nddls = AliDAQ::NumberOfDdls("MUONTRK");
+    const Int_t offset = AliDAQ::DdlIDOffset("MUONTRK");
+    
+    for ( Int_t iddl = 0; iddl < nddls; ++iddl )
+    {
+      AliMpDDL* ddl = AliMpDDLStore::Instance()->GetDDL(iddl);
+      
+      Int_t ddlId = offset + ddl->GetId();
+      Int_t npads = 0;
+      
+      Int_t nevents = data->NumberOfEvents(iddl);
+      
+      hddlevents->Fill(ddlId,nevents);
+      
+      Double_t occ(0.0);
+      
+      for ( Int_t ide = 0; ide < ddl->GetNofDEs(); ++ide )
+      {
+        Int_t de = ddl->GetDEId(ide);
+        
+        npads += TMath::Nint(data->DetectionElement(de,3));
+        
+        occ +=  data->DetectionElement(de,4);
+      }
+      
+      if ( nevents > 0 && npads > 0 )
+      {
+        occ = occ/npads/nevents;
+      }
+
+      hddl->Fill(ddlId,100.0*occ); // occ in percent
+    }
   }
 }
 
@@ -516,7 +560,7 @@ void AliMUONTrackerQADataMakerRec::InitRaws()
 
   TH1* hbpnmanus = new TH1F("hTrackerBusPatchNofManus","Number of manus per bus patch",nbins,xmin,xmax);
 
-  Add2RawsList(hbp,AliMUONQAIndices::kTrackerBusPatchOccupancy, !expert, image, !saveCorr);
+  Add2RawsList(hbp,AliMUONQAIndices::kTrackerBusPatchOccupancy, expert, image, !saveCorr);
   Add2RawsList(hbpnpads,AliMUONQAIndices::kTrackerBusPatchNofPads, expert, !image, !saveCorr);
   Add2RawsList(hbpnmanus,AliMUONQAIndices::kTrackerBusPatchNofManus, expert, !image, !saveCorr);
 
@@ -606,6 +650,18 @@ void AliMUONTrackerQADataMakerRec::InitRaws()
       hbpconfig->Fill(bp->GetId());
     }
   }
+  
+  nbins = AliDAQ::NumberOfDdls("MUONTRK");
+  const Int_t offset = AliDAQ::DdlIDOffset("MUONTRK");
+  
+  xmin = offset - 0.5;
+  xmax  = offset + nbins - 0.5;
+  
+  Add2RawsList(new TH1F("hTrackerDDLOccupancy",";DDLId;DDL Occupancy in %",nbins,xmin,xmax),
+               AliMUONQAIndices::kTrackerDDLOccupancy,!expert,image,!saveCorr);
+  Add2RawsList(new TH1F("hTrackerDDLNofEvents","Number of events seen by DDL;DDLId",nbins,xmin,xmax),
+               AliMUONQAIndices::kTrackerDDLNofEvents,expert,!image,!saveCorr);
+  
 }
 
 //__________________________________________________________________
@@ -1175,9 +1231,9 @@ AliMUONTrackerQADataMakerRec::ResetDetectorRaws(TObjArray* list)
       
       if ( hn.Contains("Tracker") )
       {
-        if ( hn != "hTrackerBusPatchNofPads" && 
-            hn != "hTrackerBusPatchNofManus" &&
-            hn != "hTrackerBusPatchConfig" )
+        if ( !hn.Contains("hTrackerBusPatchNofPads") && 
+            !hn.Contains("hTrackerBusPatchNofManus") &&
+            !hn.Contains("hTrackerBusPatchConfig" ) )
         {
           AliDebug(1,Form("Resetting %s",hn.Data()));
           h->Reset();                  

diff --git a/MUON/AliMUONTriggerQADataMakerRec.cxx b/MUON/AliMUONTriggerQADataMakerRec.cxx
index b18ba46c6ff65649bb9ba7baa962f7e60938b08d..d6abe0c37806728f18a3cc14f275961497093987 100644 (file)
--- a/MUON/AliMUONTriggerQADataMakerRec.cxx
+++ b/MUON/AliMUONTriggerQADataMakerRec.cxx
@@ -235,93 +235,93 @@ void AliMUONTriggerQADataMakerRec::InitRaws()
 
   TString errorAxisTitle = "Number of errors";
 
-  histo1D = new TH1F("ErrorLocalXPos", "ErrorLocalXPos",nbLocalBoard,0.5,(Float_t)nbLocalBoard+0.5);
+  histo1D = new TH1F("hTriggerErrorLocalXPos", "ErrorLocalXPos",nbLocalBoard,0.5,(Float_t)nbLocalBoard+0.5);
   histo1D->GetXaxis()->SetTitle(boardName.Data());
   histo1D->GetYaxis()->SetTitle(errorAxisTitle.Data());
   Add2RawsList(histo1D, AliMUONQAIndices::kTriggerErrorLocalXPos, expert, !image, !saveCorr);
 
-  histo1D = new TH1F("ErrorLocalYPos", "ErrorLocalYPos",nbLocalBoard,0.5,(Float_t)nbLocalBoard+0.5);
+  histo1D = new TH1F("hTriggerErrorLocalYPos", "ErrorLocalYPos",nbLocalBoard,0.5,(Float_t)nbLocalBoard+0.5);
   histo1D->GetXaxis()->SetTitle(boardName.Data());
   histo1D->GetYaxis()->SetTitle(errorAxisTitle.Data());
   Add2RawsList(histo1D, AliMUONQAIndices::kTriggerErrorLocalYPos, expert, !image, !saveCorr);
 
-  histo1D = new TH1F("ErrorLocalDev", "ErrorLocalDev",nbLocalBoard,0.5,(Float_t)nbLocalBoard+0.5);
+  histo1D = new TH1F("hTriggerErrorLocalDev", "ErrorLocalDev",nbLocalBoard,0.5,(Float_t)nbLocalBoard+0.5);
   histo1D->GetXaxis()->SetTitle(boardName.Data());
   histo1D->GetYaxis()->SetTitle(errorAxisTitle.Data());
   Add2RawsList(histo1D, AliMUONQAIndices::kTriggerErrorLocalDev, expert, !image, !saveCorr);
 
-  histo1D = new TH1F("ErrorLocalTriggerDec", "ErrorLocalTriggerDec",nbLocalBoard,0.5,(Float_t)nbLocalBoard+0.5);
+  histo1D = new TH1F("hTriggerErrorLocalTriggerDec", "ErrorLocalTriggerDec",nbLocalBoard,0.5,(Float_t)nbLocalBoard+0.5);
   histo1D->GetXaxis()->SetTitle(boardName.Data());
   histo1D->GetYaxis()->SetTitle(errorAxisTitle.Data());
   Add2RawsList(histo1D, AliMUONQAIndices::kTriggerErrorLocalTriggerDec, expert, !image, !saveCorr);
 
-  histo1D = new TH1F("ErrorLocalLPtLSB", "ErrorLocalLPtLSB",nbLocalBoard,0.5,(Float_t)nbLocalBoard+0.5);
+  histo1D = new TH1F("hTriggerErrorLocalLPtLSB", "ErrorLocalLPtLSB",nbLocalBoard,0.5,(Float_t)nbLocalBoard+0.5);
   histo1D->GetXaxis()->SetTitle(boardName.Data());
   histo1D->GetYaxis()->SetTitle(errorAxisTitle.Data());
   Add2RawsList(histo1D, AliMUONQAIndices::kTriggerErrorLocalLPtLSB, expert, !image, !saveCorr);
 
-  histo1D = new TH1F("ErrorLocalLPtMSB", "ErrorLocalLPtMSB",nbLocalBoard,0.5,(Float_t)nbLocalBoard+0.5);
+  histo1D = new TH1F("hTriggerErrorLocalLPtMSB", "ErrorLocalLPtMSB",nbLocalBoard,0.5,(Float_t)nbLocalBoard+0.5);
   histo1D->GetXaxis()->SetTitle(boardName.Data());
   histo1D->GetYaxis()->SetTitle(errorAxisTitle.Data());
   Add2RawsList(histo1D, AliMUONQAIndices::kTriggerErrorLocalLPtMSB, expert, !image, !saveCorr);
 
-  histo1D = new TH1F("ErrorLocalHPtLSB", "ErrorLocalHPtLSB",nbLocalBoard,0.5,(Float_t)nbLocalBoard+0.5);
+  histo1D = new TH1F("hTriggerErrorLocalHPtLSB", "ErrorLocalHPtLSB",nbLocalBoard,0.5,(Float_t)nbLocalBoard+0.5);
   histo1D->GetXaxis()->SetTitle(boardName.Data());
   histo1D->GetYaxis()->SetTitle(errorAxisTitle.Data());
   Add2RawsList(histo1D, AliMUONQAIndices::kTriggerErrorLocalHPtLSB, expert, !image, !saveCorr);
 
-  histo1D = new TH1F("ErrorLocalHPtMSB", "ErrorLocalHPtMSB",nbLocalBoard,0.5,(Float_t)nbLocalBoard+0.5);
+  histo1D = new TH1F("hTriggerErrorLocalHPtMSB", "ErrorLocalHPtMSB",nbLocalBoard,0.5,(Float_t)nbLocalBoard+0.5);
   histo1D->GetXaxis()->SetTitle(boardName.Data());
   histo1D->GetYaxis()->SetTitle(errorAxisTitle.Data());
   Add2RawsList(histo1D, AliMUONQAIndices::kTriggerErrorLocalHPtMSB, expert, !image, !saveCorr);
 
-  histo1D = new TH1F("ErrorLocalTrigY", "ErrorLocalTrigY",nbLocalBoard,0.5,(Float_t)nbLocalBoard+0.5);
+  histo1D = new TH1F("hTriggerErrorLocalTrigY", "ErrorLocalTrigY",nbLocalBoard,0.5,(Float_t)nbLocalBoard+0.5);
   histo1D->GetXaxis()->SetTitle(boardName.Data());
   histo1D->GetYaxis()->SetTitle(errorAxisTitle.Data());
   Add2RawsList(histo1D, AliMUONQAIndices::kTriggerErrorLocalTrigY, expert, !image, !saveCorr);
 
-  histo1D = new TH1F("Ratio4434Local", "Ratio4434Local",nbLocalBoard,0.5,(Float_t)nbLocalBoard+0.5);
+  histo1D = new TH1F("hTriggerRatio4434Local", "Ratio4434Local",nbLocalBoard,0.5,(Float_t)nbLocalBoard+0.5);
   histo1D->GetXaxis()->SetTitle(boardName.Data());
   histo1D->GetYaxis()->SetTitle("ratio 44/34");
   Add2RawsList(histo1D, AliMUONQAIndices::kTriggerLocalRatio4434, expert, !image, !saveCorr);                                               
-  histo1D = new TH1F("Ratio4434AllEvents", "Ratio4434AllEvents",1,0,1);
+  histo1D = new TH1F("hTriggerRatio4434AllEvents", "Ratio4434AllEvents",1,0,1);
   histo1D->GetXaxis()->SetTitle("Event number");
   histo1D->GetYaxis()->SetTitle("ratio 44/34");
   histo1D->SetLineColor(4);                           
   Add2RawsList(histo1D, AliMUONQAIndices::kTriggerRatio4434AllEvents, expert, !image, !saveCorr);                                               
-  histo1D = new TH1F("Ratio4434SinceLastUpdate", "Ratio4434SinceLastUpdate",1,0,1);
+  histo1D = new TH1F("hTriggerRatio4434SinceLastUpdate", "Ratio4434SinceLastUpdate",1,0,1);
   histo1D->GetXaxis()->SetTitle("Event number");
   histo1D->GetYaxis()->SetTitle("ratio 44/34");                           
   Add2RawsList(histo1D, AliMUONQAIndices::kTriggerRatio4434SinceLastUpdate, expert, !image, !saveCorr);
 
-  histo1D = new TH1F("ErrorLocal2RegionalLPtLSB", "ErrorLocal2RegionalLPtLSB",nbLocalBoard,0.5,(Float_t)nbLocalBoard+0.5);
+  histo1D = new TH1F("hTriggerErrorLocal2RegionalLPtLSB", "ErrorLocal2RegionalLPtLSB",nbLocalBoard,0.5,(Float_t)nbLocalBoard+0.5);
   histo1D->GetXaxis()->SetTitle(boardName.Data());
   histo1D->GetYaxis()->SetTitle(errorAxisTitle.Data());
   Add2RawsList(histo1D, AliMUONQAIndices::kTriggerErrorLocal2RegionalLPtLSB, expert, !image, !saveCorr);
 
-  histo1D = new TH1F("ErrorLocal2RegionalLPtMSB", "ErrorLocal2RegionalLPtMSB",nbLocalBoard,0.5,(Float_t)nbLocalBoard+0.5);
+  histo1D = new TH1F("hTriggerErrorLocal2RegionalLPtMSB", "ErrorLocal2RegionalLPtMSB",nbLocalBoard,0.5,(Float_t)nbLocalBoard+0.5);
   histo1D->GetXaxis()->SetTitle(boardName.Data());
   histo1D->GetYaxis()->SetTitle(errorAxisTitle.Data());
   Add2RawsList(histo1D, AliMUONQAIndices::kTriggerErrorLocal2RegionalLPtMSB, expert, !image, !saveCorr);
 
-  histo1D = new TH1F("ErrorLocal2RegionalHPtLSB", "ErrorLocal2RegionalHPtLSB",nbLocalBoard,0.5,(Float_t)nbLocalBoard+0.5);
+  histo1D = new TH1F("hTriggerErrorLocal2RegionalHPtLSB", "ErrorLocal2RegionalHPtLSB",nbLocalBoard,0.5,(Float_t)nbLocalBoard+0.5);
   histo1D->GetXaxis()->SetTitle(boardName.Data());
   histo1D->GetYaxis()->SetTitle(errorAxisTitle.Data());
   Add2RawsList(histo1D, AliMUONQAIndices::kTriggerErrorLocal2RegionalHPtLSB, expert, !image, !saveCorr);
 
-  histo1D = new TH1F("ErrorLocal2RegionalHPtMSB", "ErrorLocal2RegionalHPtMSB",nbLocalBoard,0.5,(Float_t)nbLocalBoard+0.5);
+  histo1D = new TH1F("hTriggerErrorLocal2RegionalHPtMSB", "ErrorLocal2RegionalHPtMSB",nbLocalBoard,0.5,(Float_t)nbLocalBoard+0.5);
   histo1D->GetXaxis()->SetTitle(boardName.Data());
   histo1D->GetYaxis()->SetTitle(errorAxisTitle.Data());
   Add2RawsList(histo1D, AliMUONQAIndices::kTriggerErrorLocal2RegionalHPtMSB, expert, !image, !saveCorr);
 
-  histo1D = new TH1F("ErrorOutGlobalFromInGlobal", "ErrorOutGlobalFromInGlobal",6,-0.5,6-0.5);
+  histo1D = new TH1F("hTriggerErrorOutGlobalFromInGlobal", "ErrorOutGlobalFromInGlobal",6,-0.5,6-0.5);
   histo1D->GetYaxis()->SetTitle(errorAxisTitle.Data());
   for (int ibin=0;ibin<6;ibin++){
     histo1D->GetXaxis()->SetBinLabel(ibin+1,globalXaxisName[ibin]);
   }
   Add2RawsList(histo1D, AliMUONQAIndices::kTriggerErrorOutGlobalFromInGlobal, expert, !image, !saveCorr);
 
-  histo1D = new TH1F("ErrorOutGlobalFromInLocal", "ErrorOutGlobalFromInLocal",6,-0.5,6-0.5);
+  histo1D = new TH1F("hTriggerErrorOutGlobalFromInLocal", "ErrorOutGlobalFromInLocal",6,-0.5,6-0.5);
   histo1D->GetYaxis()->SetTitle(errorAxisTitle.Data());
   for (int ibin=0;ibin<6;ibin++){
     histo1D->GetXaxis()->SetBinLabel(ibin+1,globalXaxisName[ibin]);
@@ -343,22 +343,22 @@ void AliMUONTriggerQADataMakerRec::InitRaws()
   Add2RawsList(histoAlgoErr,     AliMUONQAIndices::kTriggerErrorSummary,      expert, !image, !saveCorr);
   Add2RawsList(histoAlgoErrNorm, AliMUONQAIndices::kTriggerErrorSummaryNorm, !expert,  image, !saveCorr);  
 
-  histo1D = new TH1F("hTriggeredBoards", "Triggered boards", nbLocalBoard, 0.5, (Float_t)nbLocalBoard + 0.5);
+  histo1D = new TH1F("hTriggerTriggeredBoards", "Triggered boards", nbLocalBoard, 0.5, (Float_t)nbLocalBoard + 0.5);
   Add2RawsList(histo1D, AliMUONQAIndices::kTriggeredBoards, expert, !image, !saveCorr);
 
-  histo2D = (TH2F*)triggerDisplay.GetEmptyDisplayHisto("hFiredBoardsDisplay", AliMUONTriggerDisplay::kDisplayBoards,
+  histo2D = (TH2F*)triggerDisplay.GetEmptyDisplayHisto("hTriggerFiredBoardsDisplay", AliMUONTriggerDisplay::kDisplayBoards,
                                                       0, 0, "Local board triggers / event");
   histo2D->SetOption("COLZ");
   Add2RawsList(histo2D, AliMUONQAIndices::kTriggerBoardsDisplay, expert, !image, !saveCorr);
 
-  TH1F* histoYCopyErr = new TH1F("ErrorLocalYCopy", "Number of YCopy errors",nbLocalBoard,0.5,(Float_t)nbLocalBoard+0.5);
+  TH1F* histoYCopyErr = new TH1F("hTriggerErrorLocalYCopy", "Number of YCopy errors",nbLocalBoard,0.5,(Float_t)nbLocalBoard+0.5);
   histoYCopyErr->GetXaxis()->SetTitle(boardName.Data());
   histoYCopyErr->GetYaxis()->SetTitle(errorAxisTitle.Data());
   // Copy of previous histo for scaling purposes
-  TH1F* histoYCopyErrTest = (TH1F*)histoYCopyErr->Clone("ErrorLocalYCopyTest");
+  TH1F* histoYCopyErrTest = (TH1F*)histoYCopyErr->Clone("hTriggerErrorLocalYCopyTest");
   histoYCopyErrTest->SetTitle("Number of YCopy tested");
   // Copy of previous histo for scaling purposes
-  TH1F* histoYCopyErrNorm = (TH1F*)histoYCopyErr->Clone("ErrorLocalYCopyNorm");
+  TH1F* histoYCopyErrNorm = (TH1F*)histoYCopyErr->Clone("hTriggerErrorLocalYCopyNorm");
   histoYCopyErrNorm->SetTitle("% of YCopy errors");
   // Adding both histos after cloning to avoid problems with the expert bit
   Add2RawsList(histoYCopyErr,     AliMUONQAIndices::kTriggerErrorLocalYCopy,     expert, !image, !saveCorr);
@@ -398,15 +398,15 @@ void AliMUONTriggerQADataMakerRec::InitRaws()
   Add2RawsList(histoGlobalMult,     AliMUONQAIndices::kTriggerGlobalOutput,     expert, !image, !saveCorr);
   Add2RawsList(histoGlobalMultNorm, AliMUONQAIndices::kTriggerGlobalOutputNorm, expert, !image, !saveCorr);
 
-  histo1D = new TH1F("hRawNAnalyzedEvents", "Number of analyzed events per specie", 1, 0.5, 1.5);
+  histo1D = new TH1F("hTriggerRawNAnalyzedEvents", "Number of analyzed events per specie", 1, 0.5, 1.5);
   Int_t esindex = AliRecoParam::AConvert(CurrentEventSpecie());
   histo1D->GetXaxis()->SetBinLabel(1, AliRecoParam::GetEventSpecieName(esindex));
   histo1D->GetYaxis()->SetTitle("Number of analyzed events");
   Add2RawsList(histo1D, AliMUONQAIndices::kTriggerRawNAnalyzedEvents, expert, !image, !saveCorr);
 
-  fNumberOf34Dec = new TH1F("hNumberOf34Dec", "hNumberOf34Dec",nbLocalBoard,0.5,(Float_t)nbLocalBoard+0.5);
+  fNumberOf34Dec = new TH1F("hTriggerNumberOf34Dec", "hNumberOf34Dec",nbLocalBoard,0.5,(Float_t)nbLocalBoard+0.5);
   fNumberOf34Dec->SetDirectory(0); // Detach histo from file to avoid double delete
-  fNumberOf44Dec = new TH1F("hNumberOf44Dec", "hNumberOf44Dec",nbLocalBoard,0.5,(Float_t)nbLocalBoard+0.5);
+  fNumberOf44Dec = new TH1F("hTriggerNumberOf44Dec", "hNumberOf44Dec",nbLocalBoard,0.5,(Float_t)nbLocalBoard+0.5);
   fNumberOf44Dec->SetDirectory(0); // Detach histo from file to avoid double delete
 }
 
@@ -417,7 +417,7 @@ void AliMUONTriggerQADataMakerRec::InitDigits()
   const Bool_t expert   = kTRUE ; 
   const Bool_t image    = kTRUE ; 
   
-  TH1I* h0 = new TH1I("hDigitsDetElem", "Detection element distribution in Digits;Detection element Id;Counts",  400, 1100, 1500); 
+  TH1I* h0 = new TH1I("hTriggerDigitsDetElem", "Detection element distribution in Digits;Detection element Id;Counts",  400, 1100, 1500); 
   Add2DigitsList(h0, 0, !expert, image);
 } 
 
@@ -432,7 +432,7 @@ void AliMUONTriggerQADataMakerRec::InitRecPoints()
 
   TH1F* histo1D = 0x0;
 
-  histo1D = new TH1F("hNAnalyzedEvents", "Number of analyzed events per specie", 1, 0.5, 1.5);
+  histo1D = new TH1F("hTriggerNAnalyzedEvents", "Number of analyzed events per specie", 1, 0.5, 1.5);
   Int_t esindex = AliRecoParam::AConvert(CurrentEventSpecie());
   histo1D->GetXaxis()->SetBinLabel(1, AliRecoParam::GetEventSpecieName(esindex));
   histo1D->GetYaxis()->SetTitle("Number of analyzed events");
@@ -940,7 +940,7 @@ AliMUONTriggerQADataMakerRec::FillTriggerDCSHistos()
       Int_t ich = iChamber - AliMpConstants::NofTrackingChambers();
 
       histoIndex = AliMUONQAIndices::kTriggerRPChv + ich;
-      histoName = Form("hRPCHVChamber%i", 11+ich);
+      histoName = Form("hTriggerRPCHVChamber%i", 11+ich);
       histoTitle = Form("Chamber %i: RPC HV (kV)", 11+ich);
 
       currHisto = (TH2F*)GetRecPointsData(histoIndex);

diff --git a/MUON/AliMUONVQADataMakerRec.cxx b/MUON/AliMUONVQADataMakerRec.cxx
index 7441d5b99b94bef764ef1afd21a0d8a5066252a9..1746612bfc5e42ad0f8de49ea5a091ec80775b6e 100644 (file)
--- a/MUON/AliMUONVQADataMakerRec.cxx
+++ b/MUON/AliMUONVQADataMakerRec.cxx
@@ -145,7 +145,6 @@ AliMUONVQADataMakerRec::ResetDetector(TObjArray* list)
     TH1* h = dynamic_cast<TH1*>(o);
     if ( h ) 
     {
-      h->Reset();
       TString hcn(h->ClassName());
       if ( hcn.Contains(pattern) ) 
       {