Revert "Removed the histograms that only contained the counts of the …

…other histograms" This reverts commit 8ef4256.
cms-sw · Nov 7, 2014 · 5c915f0 · 5c915f0
1 parent 7ddfbc6
commit 5c915f0
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 1 deletion.
diff --git a/DQMOffline/EGamma/plugins/PhotonAnalyzer.cc b/DQMOffline/EGamma/plugins/PhotonAnalyzer.cc
@@ -145,10 +145,33 @@ void PhotonAnalyzer::bookHistograms(DQMStore::IBooker & iBooker,
                                     edm::Run const & /* iRun */,
                                     edm::EventSetup const & /* iSetup */)
 {
+  bookHistogramsForHistogramCounts(iBooker);
+
   bookHistogramsEfficiency(iBooker);
   bookHistogramsInvMass(iBooker);
   bookHistogramsPhotons(iBooker);
   bookHistogramsConversions(iBooker);
+
+  fillHistogramsForHistogramCounts(iBooker);
+}
+
+void PhotonAnalyzer::bookHistogramsForHistogramCounts(DQMStore::IBooker & iBooker)
+{
+  iBooker.setCurrentFolder("Egamma/"+fName_+"/");
+  // Int values stored in MEs to keep track of how many histograms are in each folder
+  totalNumberOfHistos_efficiencyFolder =  iBooker.bookInt("numberOfHistogramsInEfficiencyFolder");
+  totalNumberOfHistos_invMassFolder =     iBooker.bookInt("numberOfHistogramsInInvMassFolder");
+  totalNumberOfHistos_photonsFolder =     iBooker.bookInt("numberOfHistogramsInPhotonsFolder");
+  totalNumberOfHistos_conversionsFolder = iBooker.bookInt("numberOfHistogramsInConversionsFolder");
+}
+
+void PhotonAnalyzer::fillHistogramsForHistogramCounts(DQMStore::IBooker & iBooker)
+{
+  iBooker.setCurrentFolder("Egamma/"+fName_+"/");
+  totalNumberOfHistos_efficiencyFolder->Fill(histo_index_efficiency_);
+  totalNumberOfHistos_invMassFolder->Fill(histo_index_invMass_);
+  totalNumberOfHistos_photonsFolder->Fill(histo_index_photons_);
+  totalNumberOfHistos_conversionsFolder->Fill(histo_index_conversions_);
 }
 
 void PhotonAnalyzer::bookHistogramsEfficiency(DQMStore::IBooker & iBooker)

diff --git a/DQMOffline/EGamma/plugins/PhotonAnalyzer.h b/DQMOffline/EGamma/plugins/PhotonAnalyzer.h
@@ -175,7 +175,6 @@ class PhotonAnalyzer : public DQMEDAnalyzer
 
   std::stringstream currentFolder_;
 
-  // These indexes are used to count the different types of booked elements
   int histo_index_photons_;
   int histo_index_conversions_;
   int histo_index_efficiency_;
@@ -262,6 +261,11 @@ class PhotonAnalyzer : public DQMEDAnalyzer
   int reducedR9Bin_;
   int reducedSumBin_;
 
+  MonitorElement* totalNumberOfHistos_efficiencyFolder;
+  MonitorElement* totalNumberOfHistos_invMassFolder;
+  MonitorElement* totalNumberOfHistos_photonsFolder;
+  MonitorElement* totalNumberOfHistos_conversionsFolder;
+
   MonitorElement* h_nRecoVtx_;
 
   MonitorElement* h_phoEta_Loose_;