Merge pull request #20439 from mtosi/HLTDQM_fixMemoryIssue1

HLTDQM : fix memory issue (part 1)
cms-sw · Sep 29, 2017 · 829d9e6 · 829d9e6
2 parents e9f1976 + ac5d532
commit 829d9e6
Show file tree

Hide file tree

Showing 62 changed files with 661 additions and 528 deletions.
diff --git a/DQMOffline/Trigger/plugins/BPHMonitor.cc b/DQMOffline/Trigger/plugins/BPHMonitor.cc
@@ -248,7 +248,7 @@ void BPHMonitor::bookHistograms(DQMStore::IBooker     & ibooker,
     histname =trMuPh+"1Phi"; histtitle =trMuPh+"1Phi";
     bookME(ibooker,mu1Phi_,histname,histtitle, phi_binning_);
     setMETitle(mu1Phi_,trMuPh+"_#phi","events / 0.1 rad");
-  
+
     histname =trMuPh+"1Eta"; histtitle = trMuPh+"1_Eta";
     bookME(ibooker,mu1Eta_,histname,histtitle, eta_binning_);
     setMETitle(mu1Eta_,trMuPh+"_#eta","events/ ");

diff --git a/DQMOffline/Trigger/plugins/HTDQM.cc b/DQMOffline/Trigger/plugins/HTDQM.cc
@@ -9,7 +9,7 @@ void HTDQM::initialise(const edm::ParameterSet& iConfig ){
   ht_variable_binning_ = iConfig.getParameter<edm::ParameterSet>("histoPSet").getParameter<std::vector<double> >("htBinning");
   met_variable_binning_ = iConfig.getParameter<edm::ParameterSet>("histoPSet").getParameter<std::vector<double> >("metBinning2");
   ht_binning_ = getHistoPSet(iConfig.getParameter<edm::ParameterSet>("histoPSet").getParameter<edm::ParameterSet>("htPSet"));
-  ls_binning_ = getHistoLSPSet (iConfig.getParameter<edm::ParameterSet>("histoPSet").getParameter<edm::ParameterSet>("htlsPSet"));
+  ls_binning_ = getHistoPSet (iConfig.getParameter<edm::ParameterSet>("histoPSet").getParameter<edm::ParameterSet>("htlsPSet"));
 
 }
 

diff --git a/DQMOffline/Trigger/plugins/HTMonitor.cc b/DQMOffline/Trigger/plugins/HTMonitor.cc
@@ -15,9 +15,9 @@ HTMonitor::HTMonitor( const edm::ParameterSet& iConfig ) :
   , eleToken_             ( mayConsume<reco::GsfElectronCollection>(iConfig.getParameter<edm::InputTag>("electrons") ) )   
   , muoToken_             ( mayConsume<reco::MuonCollection>       (iConfig.getParameter<edm::InputTag>("muons")     ) )   
   , vtxToken_             ( mayConsume<reco::VertexCollection>      (iConfig.getParameter<edm::InputTag>("vertices")      ) )
-  , ht_variable_binning_ ( iConfig.getParameter<edm::ParameterSet>("histoPSet").getParameter<std::vector<double> >("htBinning") )
-  , ht_binning_          ( getHistoPSet   (iConfig.getParameter<edm::ParameterSet>("histoPSet").getParameter<edm::ParameterSet>   ("htPSet")    ) )
-  , ls_binning_           ( getHistoLSPSet (iConfig.getParameter<edm::ParameterSet>("histoPSet").getParameter<edm::ParameterSet>   ("lsPSet")     ) )
+  , ht_variable_binning_  ( iConfig.getParameter<edm::ParameterSet>("histoPSet").getParameter<std::vector<double> >("htBinning") )
+  , ht_binning_           ( getHistoPSet (iConfig.getParameter<edm::ParameterSet>("histoPSet").getParameter<edm::ParameterSet>   ("htPSet")    ) )
+  , ls_binning_           ( getHistoPSet (iConfig.getParameter<edm::ParameterSet>("histoPSet").getParameter<edm::ParameterSet>   ("lsPSet")     ) )
   , num_genTriggerEventFlag_(new GenericTriggerEventFlag(iConfig.getParameter<edm::ParameterSet>("numGenericTriggerEventPSet"),consumesCollector(), *this))
   , den_genTriggerEventFlag_(new GenericTriggerEventFlag(iConfig.getParameter<edm::ParameterSet>("denGenericTriggerEventPSet"),consumesCollector(), *this))
   , metSelection_ ( iConfig.getParameter<std::string>("metSelection") )
@@ -104,7 +104,7 @@ void HTMonitor::bookHistograms(DQMStore::IBooker     & ibooker,
   std::string histname, histtitle;
 
   std::string currentFolder = folderName_ ;
-  ibooker.setCurrentFolder(currentFolder.c_str());
+  ibooker.setCurrentFolder(currentFolder);
 
   histname = "ht_variable"; histtitle = "HT";
   bookME(ibooker,htME_variableBinning_,histname,histtitle,ht_variable_binning_);
@@ -161,7 +161,7 @@ void HTMonitor::analyze(edm::Event const& iEvent, edm::EventSetup const& iSetup)
   float deltaPhi_met_j1 = 10.0;
   float deltaPhi_j1_j2 = 10.0;
 
-  if (jets.size() >= 1) deltaPhi_met_j1 = fabs( deltaPhi( pfmet.phi(),  jets[0].phi() ));
+  if (!jets.empty()) deltaPhi_met_j1 = fabs( deltaPhi( pfmet.phi(),  jets[0].phi() ));
   if (jets.size() >= 2) deltaPhi_j1_j2 = fabs( deltaPhi( jets[0].phi(),  jets[1].phi() ));
 
   edm::Handle<reco::GsfElectronCollection> eleHandle;
@@ -223,7 +223,9 @@ void HTMonitor::fillHistoPSetDescription(edm::ParameterSetDescription & pset)
 
 void HTMonitor::fillHistoLSPSetDescription(edm::ParameterSetDescription & pset)
 {
-  pset.add<unsigned>   ( "nbins", 2500);
+  pset.add<unsigned int>   ( "nbins", 2500);
+  pset.add<double>         ( "xmin",     0.);
+  pset.add<double>         ( "xmax",  2500.);
 }
 
 void HTMonitor::fillDescriptions(edm::ConfigurationDescriptions & descriptions)

diff --git a/DQMOffline/Trigger/plugins/JetDQM.cc b/DQMOffline/Trigger/plugins/JetDQM.cc
@@ -16,7 +16,7 @@ void JetDQM::initialise(const edm::ParameterSet& iConfig){
   detajj_binning_ = getHistoPSet(iConfig.getParameter<edm::ParameterSet>("histoPSet").getParameter<edm::ParameterSet>("detajjPSet"));
   dphijj_binning_ = getHistoPSet(iConfig.getParameter<edm::ParameterSet>("histoPSet").getParameter<edm::ParameterSet>("dphijjPSet"));
   mindphijmet_binning_ = getHistoPSet(iConfig.getParameter<edm::ParameterSet>("histoPSet").getParameter<edm::ParameterSet>("mindphijmetPSet"));
-  ls_binning_ = getHistoLSPSet (iConfig.getParameter<edm::ParameterSet>("histoPSet").getParameter<edm::ParameterSet>("jetlsPSet"));
+  ls_binning_ = getHistoPSet (iConfig.getParameter<edm::ParameterSet>("histoPSet").getParameter<edm::ParameterSet>("jetlsPSet"));
 
 }
 
@@ -93,7 +93,7 @@ void JetDQM::fillHistograms(const std::vector<reco::PFJet> & jets,
 			    const bool passCond){
 
   // filling histograms (denominator)
-  if (jets.size()>0){
+  if (!jets.empty()){
     double eta1 = jets[0].eta();
     jet1ptME_.denominator -> Fill(jets[0].pt());
     jet1etaME_.denominator -> Fill(eta1);
@@ -135,7 +135,7 @@ void JetDQM::fillHistograms(const std::vector<reco::PFJet> & jets,
   // applying selection for numerator
   if (passCond){
     // filling histograms (num_genTriggerEventFlag_)  
-    if (jets.size()>0){
+    if (!jets.empty()){
       double eta1 = jets[0].eta();
       jet1ptME_.numerator -> Fill(jets[0].pt());
       jet1etaME_.numerator -> Fill(eta1);