From 5eab2efa190b7a1bc30876e40fdb19c5b279ff16 Mon Sep 17 00:00:00 2001 From: Minsuk Kim Date: Thu, 6 Jul 2017 14:39:33 +0200 Subject: [PATCH 1/9] Update SusyMonitoring --- DQMOffline/Trigger/python/SusyMonitoring_Client_cff.py | 3 +++ DQMOffline/Trigger/python/SusyMonitoring_cff.py | 2 ++ 2 files changed, 5 insertions(+) diff --git a/DQMOffline/Trigger/python/SusyMonitoring_Client_cff.py b/DQMOffline/Trigger/python/SusyMonitoring_Client_cff.py index c96dd4dc21ca0..f5fef548238c3 100644 --- a/DQMOffline/Trigger/python/SusyMonitoring_Client_cff.py +++ b/DQMOffline/Trigger/python/SusyMonitoring_Client_cff.py @@ -1,4 +1,7 @@ import FWCore.ParameterSet.Config as cms +from DQMOffline.Trigger.VBFSUSYMonitor_Client_cff import * + susyClient = cms.Sequence( + vbfsusyClient ) diff --git a/DQMOffline/Trigger/python/SusyMonitoring_cff.py b/DQMOffline/Trigger/python/SusyMonitoring_cff.py index e782b83f5d57e..4eb94f14fd151 100644 --- a/DQMOffline/Trigger/python/SusyMonitoring_cff.py +++ b/DQMOffline/Trigger/python/SusyMonitoring_cff.py @@ -1,7 +1,9 @@ import FWCore.ParameterSet.Config as cms from DQMOffline.Trigger.RazorMonitor_cff import * +from DQMOffline.Trigger.VBFSUSYMonitor_cff import * susyMonitorHLT = cms.Sequence( susyHLTRazorMonitoring + *susyHLTVBFMonitoring ) From 71520061093e0d2ed042a6136c949315421c13ca Mon Sep 17 00:00:00 2001 From: Minsuk Kim Date: Thu, 6 Jul 2017 14:42:25 +0200 Subject: [PATCH 2/9] Update ObjMonitor for HTDQM --- DQMOffline/Trigger/python/ObjMonitor_cfi.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/DQMOffline/Trigger/python/ObjMonitor_cfi.py b/DQMOffline/Trigger/python/ObjMonitor_cfi.py index bd3cf6556063d..23b71dc57d432 100644 --- a/DQMOffline/Trigger/python/ObjMonitor_cfi.py +++ b/DQMOffline/Trigger/python/ObjMonitor_cfi.py @@ -36,6 +36,12 @@ xmin = cms.double( 0), xmax = cms.double(3.1416), ) +hltobjmonitoring.doHTHistos = cms.bool(True) +hltobjmonitoring.histoPSet.htPSet = cms.PSet( + nbins = cms.uint32 ( 60 ), + xmin = cms.double( -0.5), + xmax = cms.double(1499.5), +) hltobjmonitoring.met = cms.InputTag("pfMetEI") # pfMet hltobjmonitoring.jets = cms.InputTag("pfJetsEI") # ak4PFJets, ak4PFJetsCHS From cef3e4e314f081f130f98ebc81db0fd8281946e5 Mon Sep 17 00:00:00 2001 From: Minsuk Kim Date: Thu, 6 Jul 2017 14:44:09 +0200 Subject: [PATCH 3/9] Update ObjMonitor for HTDQM --- DQMOffline/Trigger/plugins/ObjMonitor.cc | 13 ++++++++++++- DQMOffline/Trigger/plugins/ObjMonitor.h | 4 ++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/DQMOffline/Trigger/plugins/ObjMonitor.cc b/DQMOffline/Trigger/plugins/ObjMonitor.cc index c8c2987383b0d..07dae9d4b3490 100644 --- a/DQMOffline/Trigger/plugins/ObjMonitor.cc +++ b/DQMOffline/Trigger/plugins/ObjMonitor.cc @@ -23,11 +23,13 @@ ObjMonitor::ObjMonitor( const edm::ParameterSet& iConfig ) : , muoToken_ ( mayConsume (iConfig.getParameter("muons") ) ) , do_met_ (iConfig.getParameter("doMETHistos") ) , do_jet_ (iConfig.getParameter("doJetHistos") ) + , do_ht_ (iConfig.getParameter("doHTHistos") ) , num_genTriggerEventFlag_(std::make_unique(iConfig.getParameter("numGenericTriggerEventPSet"),consumesCollector(), *this)) , den_genTriggerEventFlag_(std::make_unique(iConfig.getParameter("denGenericTriggerEventPSet"),consumesCollector(), *this)) , metSelection_ ( iConfig.getParameter("metSelection") ) , jetSelection_ ( iConfig.getParameter("jetSelection") ) , jetId_ ( iConfig.getParameter("jetId") ) + , htjetSelection_ ( iConfig.getParameter("htjetSelection")) , eleSelection_ ( iConfig.getParameter("eleSelection") ) , muoSelection_ ( iConfig.getParameter("muoSelection") ) , njets_ ( iConfig.getParameter("njets" ) ) @@ -40,6 +42,9 @@ ObjMonitor::ObjMonitor( const edm::ParameterSet& iConfig ) : if (do_jet_){ jetDQM_.initialise(iConfig); } + if (do_ht_ ){ + htDQM_.initialise(iConfig); + } } ObjMonitor::~ObjMonitor() @@ -57,6 +62,7 @@ void ObjMonitor::bookHistograms(DQMStore::IBooker & ibooker, if (do_met_) metDQM_.bookHistograms(ibooker); if (do_jet_) jetDQM_.bookHistograms(ibooker); + if (do_ht_ ) htDQM_.bookHistograms(ibooker); // Initialize the GenericTriggerEventFlag if ( num_genTriggerEventFlag_ && num_genTriggerEventFlag_->on() ) num_genTriggerEventFlag_->initRun( iRun, iSetup ); @@ -80,6 +86,7 @@ void ObjMonitor::analyze(edm::Event const& iEvent, edm::EventSetup const& iSetup edm::Handle jetHandle; iEvent.getByToken( jetToken_, jetHandle ); std::vector jets; + std::vector htjets; if ( int(jetHandle->size()) < njets_ ) return; for ( auto const & j : *jetHandle ) { if ( jetSelection_( j ) ) { @@ -96,6 +103,7 @@ void ObjMonitor::analyze(edm::Event const& iEvent, edm::EventSetup const& iSetup } else jets.push_back(j); } + if ( htjetSelection_( j ) ) htjets.push_back(j); } if ( int(jets.size()) < njets_ ) return; @@ -123,6 +131,7 @@ void ObjMonitor::analyze(edm::Event const& iEvent, edm::EventSetup const& iSetup if (do_met_) metDQM_.fillHistograms(met,phi,ls,passNumCond); if (do_jet_) jetDQM_.fillHistograms(jets,pfmet,ls,passNumCond); + if (do_ht_ ) htDQM_.fillHistograms(htjets,met,ls,passNumCond); } @@ -178,6 +187,7 @@ void ObjMonitor::fillDescriptions(edm::ConfigurationDescriptions & descriptions) desc.add("metSelection", "pt > 0"); desc.add("jetSelection", "pt > 0"); desc.add("jetId", ""); + desc.add("htjetSelection", "pt > 30"); desc.add("eleSelection", "pt > 0"); desc.add("muoSelection", "pt > 0"); desc.add("njets", 0); @@ -206,7 +216,8 @@ void ObjMonitor::fillDescriptions(edm::ConfigurationDescriptions & descriptions) METDQM::fillMetDescription(histoPSet); desc.add("doJetHistos", true); JetDQM::fillJetDescription(histoPSet); - + desc.add("doHTHistos", true); + HTDQM::fillHtDescription(histoPSet); desc.add("histoPSet",histoPSet); diff --git a/DQMOffline/Trigger/plugins/ObjMonitor.h b/DQMOffline/Trigger/plugins/ObjMonitor.h index 2a9e9cd6dbcb3..4262b4435cacb 100644 --- a/DQMOffline/Trigger/plugins/ObjMonitor.h +++ b/DQMOffline/Trigger/plugins/ObjMonitor.h @@ -40,6 +40,7 @@ #include "DQMOffline/Trigger/plugins/TriggerDQMBase.h" #include "DQMOffline/Trigger/plugins/METDQM.h" #include "DQMOffline/Trigger/plugins/JetDQM.h" +#include "DQMOffline/Trigger/plugins/HTDQM.h" @@ -93,6 +94,8 @@ class ObjMonitor : public DQMEDAnalyzer METDQM metDQM_; bool do_jet_; JetDQM jetDQM_; + bool do_ht_; + HTDQM htDQM_; std::unique_ptr num_genTriggerEventFlag_; @@ -101,6 +104,7 @@ class ObjMonitor : public DQMEDAnalyzer StringCutObjectSelector metSelection_; StringCutObjectSelector jetSelection_; std::string jetId_; + StringCutObjectSelector htjetSelection_; StringCutObjectSelector eleSelection_; StringCutObjectSelector muoSelection_; int njets_; From 30066cf06942fd84b076a634364b018b6225e6e7 Mon Sep 17 00:00:00 2001 From: Minsuk Kim Date: Thu, 6 Jul 2017 14:46:03 +0200 Subject: [PATCH 4/9] Add HTDQM --- DQMOffline/Trigger/plugins/HTDQM.cc | 91 +++++++++++++++++++++++++++++ DQMOffline/Trigger/plugins/HTDQM.h | 40 +++++++++++++ 2 files changed, 131 insertions(+) create mode 100644 DQMOffline/Trigger/plugins/HTDQM.cc create mode 100644 DQMOffline/Trigger/plugins/HTDQM.h diff --git a/DQMOffline/Trigger/plugins/HTDQM.cc b/DQMOffline/Trigger/plugins/HTDQM.cc new file mode 100644 index 0000000000000..f08c069a8edc4 --- /dev/null +++ b/DQMOffline/Trigger/plugins/HTDQM.cc @@ -0,0 +1,91 @@ +#include "DQMOffline/Trigger/plugins/HTDQM.h" + +HTDQM::HTDQM(){} + +HTDQM::~HTDQM(){} + +void HTDQM::initialise(const edm::ParameterSet& iConfig ){ + + ht_variable_binning_ = iConfig.getParameter("histoPSet").getParameter >("htBinning"); + met_variable_binning_ = iConfig.getParameter("histoPSet").getParameter >("metBinning2"); + ht_binning_ = getHistoPSet(iConfig.getParameter("histoPSet").getParameter("htPSet")); + ls_binning_ = getHistoLSPSet (iConfig.getParameter("histoPSet").getParameter("htlsPSet")); + + htME_.numerator = nullptr; + htME_.denominator = nullptr; + htME_variableBinning_.numerator = nullptr; + htME_variableBinning_.denominator = nullptr; + htVsMET_.numerator = nullptr; + htVsMET_.denominator = nullptr; + htVsLS_.numerator = nullptr; + htVsLS_.denominator = nullptr; +} + +void HTDQM::bookHistograms(DQMStore::IBooker & ibooker) +{ + + std::string histname, histtitle; + + histname = "ht"; histtitle = "PFHT"; + bookME(ibooker,htME_,histname,histtitle,ht_binning_.nbins,ht_binning_.xmin, ht_binning_.xmax); + setMETitle(htME_,"PF HT [GeV]","events / [GeV]"); + + histname = "ht_variable"; histtitle = "PFHT"; + bookME(ibooker,htME_variableBinning_,histname,histtitle,ht_variable_binning_); + setMETitle(htME_variableBinning_,"PF HT [GeV]","events / [GeV]"); + + histname = "htVsMET"; histtitle = "PFHT vs PFMET"; + bookME(ibooker,htVsMET_,histname,histtitle,met_variable_binning_,ht_variable_binning_); + setMETitle(htVsMET_,"PF MET [GeV]","PF HT [GeV]"); + + histname = "htVsLS"; histtitle = "PFHT vs LS"; + bookME(ibooker,htVsLS_,histname,histtitle,ls_binning_.nbins, ls_binning_.xmin, ls_binning_.xmax,ht_binning_.xmin, ht_binning_.xmax); + setMETitle(htVsLS_,"LS","PF HT [GeV]"); + +} + +void HTDQM::fillHistograms(const std::vector & htjets, + const double & met, + const int & ls, + const bool passCond){ + + // filling histograms (denominator) + double htSum = 0; + for (unsigned ij(0); ij Fill(htSum); + htME_variableBinning_.denominator -> Fill(htSum); + + htVsMET_.denominator -> Fill(met, htSum); + htVsLS_.denominator -> Fill(ls, htSum); + + // applying selection for numerator + if (passCond){ + // filling histograms (num_genTriggerEventFlag_) + htME_.numerator -> Fill(htSum); + htME_variableBinning_.numerator -> Fill(htSum); + htVsMET_.numerator -> Fill(met, htSum); + htVsLS_.numerator -> Fill(ls, htSum); + } + +} + +void HTDQM::fillHtDescription(edm::ParameterSetDescription & histoPSet){ + + edm::ParameterSetDescription htPSet; + fillHistoPSetDescription(htPSet); + histoPSet.add("htPSet", htPSet); + + std::vector bins = {0.,50.,100.,150.,200.,250.,300.,350.,400.,450.,500.,550.,600.,650.,700.,750.,800.,900.,1000.,1200.,1500.,2000.}; + histoPSet.add >("htBinning", bins); + + std::vector metbins = {0.,20.,40.,60.,80.,100.,120.,140.,160.,180.,200.,220.,240.,260.,280.,300.,320.,340.,360.,380.,400.,450.,500.,1000.}; + histoPSet.add >("metBinning2", metbins); + + edm::ParameterSetDescription lsPSet; + fillHistoLSPSetDescription(lsPSet); + histoPSet.add("htlsPSet", lsPSet); + +} diff --git a/DQMOffline/Trigger/plugins/HTDQM.h b/DQMOffline/Trigger/plugins/HTDQM.h new file mode 100644 index 0000000000000..3fb1879159c4c --- /dev/null +++ b/DQMOffline/Trigger/plugins/HTDQM.h @@ -0,0 +1,40 @@ +#ifndef DQMOffline_Trigger_HTDQM_H +#define DQMOffline_Trigger_HTDQM_H + +#include "DQMOffline/Trigger/plugins/TriggerDQMBase.h" +#include "FWCore/ParameterSet/interface/ParameterSetDescription.h" +#include "DQMServices/Core/interface/DQMStore.h" +#include "DataFormats/JetReco/interface/PFJet.h" +#include "DataFormats/METReco/interface/PFMET.h" +#include "FWCore/ParameterSet/interface/ParameterSet.h" + +class HTDQM : public TriggerDQMBase +{ + public: + HTDQM(); + virtual ~HTDQM(); + + void initialise(const edm::ParameterSet& iConfig); + void bookHistograms(DQMStore::IBooker &); + void fillHistograms(const std::vector & htjets, + const double & met, + const int & ls, + const bool passCond); + static void fillHtDescription(edm::ParameterSetDescription & histoPSet); + + +private: + + std::vector ht_variable_binning_; + std::vector met_variable_binning_; + MEbinning ht_binning_; + MEbinning ls_binning_; + + ObjME htME_; + ObjME htME_variableBinning_; + ObjME htVsMET_; + ObjME htVsLS_; + +};//class + +#endif //DQMOffline_Trigger_HTDQM_H From d363bc0a72bb4a777a88fa3d1b42faa64863b985 Mon Sep 17 00:00:00 2001 From: Minsuk Kim Date: Thu, 6 Jul 2017 14:48:45 +0200 Subject: [PATCH 5/9] Add VBFSUSY HLTDQM --- .../python/VBFSUSYMonitor_Client_cff.py | 42 +++++++++++++++++++ .../Trigger/python/VBFSUSYMonitor_cff.py | 19 +++++++++ 2 files changed, 61 insertions(+) create mode 100644 DQMOffline/Trigger/python/VBFSUSYMonitor_Client_cff.py create mode 100644 DQMOffline/Trigger/python/VBFSUSYMonitor_cff.py diff --git a/DQMOffline/Trigger/python/VBFSUSYMonitor_Client_cff.py b/DQMOffline/Trigger/python/VBFSUSYMonitor_Client_cff.py new file mode 100644 index 0000000000000..eec864c77c4a3 --- /dev/null +++ b/DQMOffline/Trigger/python/VBFSUSYMonitor_Client_cff.py @@ -0,0 +1,42 @@ +import FWCore.ParameterSet.Config as cms +from DQMServices.Core.DQMEDHarvester import DQMEDHarvester + +vbfsusyEfficiency = DQMEDHarvester("DQMGenericClient", + subDirs = cms.untracked.vstring("HLT/SUSY/VBF/*"), + verbose = cms.untracked.uint32(0), # Set to 2 for all messages + resolution = cms.vstring(), + efficiency = cms.vstring( + "effic_ht 'HT turnON; PF HT [GeV]; efficiency' ht_numerator ht_denominator", + "effic_ht_variable 'HT turnON; PF HT [GeV]; efficiency' ht_variable_numerator ht_variable_denominator", + "effic_met 'MET turnON; PF MET [GeV]; efficiency' met_numerator met_denominator", + "effic_met_variable 'MET turnON; PF MET [GeV]; efficiency' met_variable_numerator met_variable_denominator", + "effic_metPhi 'MET efficiency vs phi; PF MET phi [rad]; efficiency' metPhi_numerator metPhi_denominator", + "effic_jet1pt 'jet1 pT turnON; PFJet1 pT [GeV]; efficiency' jet1pt_numerator jet1pt_denominator", + "effic_jet2pt 'jet2 pT turnON; PFJet2 pT [GeV]; efficiency' jet2pt_numerator jet2pt_denominator", + "effic_jet1eta 'jet1 #eta turnON; jet1 #eta; efficiency' jet1eta_numerator jet1eta_denominator", + "effic_jet2eta 'jet2 #eta turnON; jet2 #eta; efficiency' jet2eta_numerator jet2eta_denominator", + "effic_cjetpt 'central jet pT turnON; central jet pT [GeV]; efficiency' cjetpt_numerator cjetpt_denominator", + "effic_cjeteta 'central jet #eta turnON; central jet #eta; efficiency' cjeteta_numerator cjeteta_denominator", + "effic_fjetpt 'forward jet pT turnON; forward jet pT [GeV]; efficiency' fjetpt_numerator fjetpt_denominator", + "effic_fjeteta 'forward jet #eta turnON; forward jet #eta; efficiency' fjeteta_numerator fjeteta_denominator", + "effic_mjj 'M_{jj} turnON; DiPFJet mass [GeV]; efficiency' mjj_numerator mjj_denominator", + "effic_detajj '#Delta#eta_{jj} turnON; #Delta#eta_{jj}; efficiency' detajj_numerator detajj_denominator", + "effic_dphijj '#Delta#phi_{jj} turnON; #Delta#phi_{jj}; efficiency' dphijj_numerator dphijj_denominator", + "effic_mindphijmet 'min#Delta#phi(j,MET) turnON; min#Delta#phi(jet,MET); efficiency' mindphijmet_numerator mindphijmet_denominator", + + ), + efficiencyProfile = cms.untracked.vstring( + "effic_ht_vs_MET 'HT efficiency vs MET; MET; PF HT efficiency' htVsMET_numerator htVsMET_denominator" + "effic_ht_vs_LS 'HT efficiency vs LS; LS; PF HT efficiency' htVsLS_numerator htVsLS_denominator" + "effic_met_vs_LS 'MET efficiency vs LS; LS; PF MET efficiency' metVsLS_numerator metVsLS_denominator", + "effic_jet1etaVsLS 'Jet1 #eta efficiency vs LS; LS; jet1 #eta efficiency' jet1etaVsLS_numerator jet1etaVsLS_denominator", +"effic_mjjVsLS 'M_{jj} efficiency vs LS; LS; M_{jj} efficiency' mjjVsLS_numerator mjjVsLS_denominator", +"effic_mindphijmetVsLS 'min#Delta#phi(jet,MET) efficiency vs LS; LS; min#Delta#phi(jet,MET) efficiency' mindphijmetVsLS_numerator mindphijmetVsLS_denominator", + ), + +) + + +vbfsusyClient = cms.Sequence( + vbfsusyEfficiency +) diff --git a/DQMOffline/Trigger/python/VBFSUSYMonitor_cff.py b/DQMOffline/Trigger/python/VBFSUSYMonitor_cff.py new file mode 100644 index 0000000000000..23dd2485ef945 --- /dev/null +++ b/DQMOffline/Trigger/python/VBFSUSYMonitor_cff.py @@ -0,0 +1,19 @@ +import FWCore.ParameterSet.Config as cms + +from DQMOffline.Trigger.ObjMonitor_cfi import hltobjmonitoring + +# HLT_Mu8_TrkIsoVVL_DiPFJet40_DEta3p5_MJJ750_HTT300_PFMETNoMu60_v* and +VBFSUSYmonitoring = hltobjmonitoring.clone() +VBFSUSYmonitoring.FolderName = cms.string('HLT/SUSY/VBF/DiJet/') +VBFSUSYmonitoring.numGenericTriggerEventPSet.hltInputTag = cms.InputTag( "TriggerResults","","HLT" ) +VBFSUSYmonitoring.numGenericTriggerEventPSet.hltPaths = cms.vstring("HLT_Mu8_TrkIsoVVL_DiPFJet40_DEta3p5_MJJ750_HTT300_PFMETNoMu60_v*","HLT_Mu10_TrkIsoVVL_DiPFJet40_DEta3p5_MJJ750_HTT350_PFMETNoMu60_v*") +VBFSUSYmonitoring.jetSelection = cms.string("pt>40 & abs(eta)<5.0") +VBFSUSYmonitoring.jetId = cms.string("loose") +VBFSUSYmonitoring.njets = cms.int32(2) +#VBFSUSYmonitoring.metSelection = cms.string("pt>50") +VBFSUSYmonitoring.htjetSelection = cms.string("pt>30 & abs(eta)<5.0") + +susyHLTVBFMonitoring = cms.Sequence( + VBFSUSYmonitoring +) + From 4634c7e88ff73f6aae19cf1e984c94aea2829490 Mon Sep 17 00:00:00 2001 From: Minsuk Kim Date: Fri, 7 Jul 2017 08:31:16 +0200 Subject: [PATCH 6/9] Update VBFSUSY HLTDQM Client --- DQMOffline/Trigger/python/VBFSUSYMonitor_Client_cff.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/DQMOffline/Trigger/python/VBFSUSYMonitor_Client_cff.py b/DQMOffline/Trigger/python/VBFSUSYMonitor_Client_cff.py index eec864c77c4a3..4e6a24756316c 100644 --- a/DQMOffline/Trigger/python/VBFSUSYMonitor_Client_cff.py +++ b/DQMOffline/Trigger/python/VBFSUSYMonitor_Client_cff.py @@ -6,9 +6,7 @@ verbose = cms.untracked.uint32(0), # Set to 2 for all messages resolution = cms.vstring(), efficiency = cms.vstring( - "effic_ht 'HT turnON; PF HT [GeV]; efficiency' ht_numerator ht_denominator", "effic_ht_variable 'HT turnON; PF HT [GeV]; efficiency' ht_variable_numerator ht_variable_denominator", - "effic_met 'MET turnON; PF MET [GeV]; efficiency' met_numerator met_denominator", "effic_met_variable 'MET turnON; PF MET [GeV]; efficiency' met_variable_numerator met_variable_denominator", "effic_metPhi 'MET efficiency vs phi; PF MET phi [rad]; efficiency' metPhi_numerator metPhi_denominator", "effic_jet1pt 'jet1 pT turnON; PFJet1 pT [GeV]; efficiency' jet1pt_numerator jet1pt_denominator", From b3bf76aa137c8152d719c0049c41e8969ddac5f0 Mon Sep 17 00:00:00 2001 From: Minsuk Kim Date: Fri, 7 Jul 2017 22:59:04 +0900 Subject: [PATCH 7/9] Update HTDQM.h --- DQMOffline/Trigger/plugins/HTDQM.h | 1 - 1 file changed, 1 deletion(-) diff --git a/DQMOffline/Trigger/plugins/HTDQM.h b/DQMOffline/Trigger/plugins/HTDQM.h index 3fb1879159c4c..de934e284f795 100644 --- a/DQMOffline/Trigger/plugins/HTDQM.h +++ b/DQMOffline/Trigger/plugins/HTDQM.h @@ -30,7 +30,6 @@ class HTDQM : public TriggerDQMBase MEbinning ht_binning_; MEbinning ls_binning_; - ObjME htME_; ObjME htME_variableBinning_; ObjME htVsMET_; ObjME htVsLS_; From 7d989f1cb22a397d5ce64847fe9ddea25cb8de3a Mon Sep 17 00:00:00 2001 From: Minsuk Kim Date: Fri, 7 Jul 2017 23:10:10 +0900 Subject: [PATCH 8/9] Update HTDQM.cc removed the duplicated histograms to keep only the ones with variable binning --- DQMOffline/Trigger/plugins/HTDQM.cc | 8 -------- 1 file changed, 8 deletions(-) diff --git a/DQMOffline/Trigger/plugins/HTDQM.cc b/DQMOffline/Trigger/plugins/HTDQM.cc index f08c069a8edc4..d93435e610553 100644 --- a/DQMOffline/Trigger/plugins/HTDQM.cc +++ b/DQMOffline/Trigger/plugins/HTDQM.cc @@ -11,8 +11,6 @@ void HTDQM::initialise(const edm::ParameterSet& iConfig ){ ht_binning_ = getHistoPSet(iConfig.getParameter("histoPSet").getParameter("htPSet")); ls_binning_ = getHistoLSPSet (iConfig.getParameter("histoPSet").getParameter("htlsPSet")); - htME_.numerator = nullptr; - htME_.denominator = nullptr; htME_variableBinning_.numerator = nullptr; htME_variableBinning_.denominator = nullptr; htVsMET_.numerator = nullptr; @@ -26,10 +24,6 @@ void HTDQM::bookHistograms(DQMStore::IBooker & ibooker) std::string histname, histtitle; - histname = "ht"; histtitle = "PFHT"; - bookME(ibooker,htME_,histname,histtitle,ht_binning_.nbins,ht_binning_.xmin, ht_binning_.xmax); - setMETitle(htME_,"PF HT [GeV]","events / [GeV]"); - histname = "ht_variable"; histtitle = "PFHT"; bookME(ibooker,htME_variableBinning_,histname,histtitle,ht_variable_binning_); setMETitle(htME_variableBinning_,"PF HT [GeV]","events / [GeV]"); @@ -55,7 +49,6 @@ void HTDQM::fillHistograms(const std::vector & htjets, htSum += htjets[ij].pt(); } - htME_.denominator -> Fill(htSum); htME_variableBinning_.denominator -> Fill(htSum); htVsMET_.denominator -> Fill(met, htSum); @@ -64,7 +57,6 @@ void HTDQM::fillHistograms(const std::vector & htjets, // applying selection for numerator if (passCond){ // filling histograms (num_genTriggerEventFlag_) - htME_.numerator -> Fill(htSum); htME_variableBinning_.numerator -> Fill(htSum); htVsMET_.numerator -> Fill(met, htSum); htVsLS_.numerator -> Fill(ls, htSum); From 1cfdc4353d50153aed94035f051919007f25219b Mon Sep 17 00:00:00 2001 From: Minsuk Kim Date: Thu, 13 Jul 2017 11:20:35 +0200 Subject: [PATCH 9/9] fix the initialisation in the base class and subsequent DQM classes of MET/Jet/HT --- DQMOffline/Trigger/plugins/HTDQM.cc | 6 ------ DQMOffline/Trigger/plugins/JetDQM.cc | 19 ------------------- DQMOffline/Trigger/plugins/METDQM.cc | 8 -------- DQMOffline/Trigger/plugins/TriggerDQMBase.h | 8 ++------ .../python/VBFSUSYMonitor_Client_cff.py | 4 ++-- 5 files changed, 4 insertions(+), 41 deletions(-) diff --git a/DQMOffline/Trigger/plugins/HTDQM.cc b/DQMOffline/Trigger/plugins/HTDQM.cc index d93435e610553..555a792b91e33 100644 --- a/DQMOffline/Trigger/plugins/HTDQM.cc +++ b/DQMOffline/Trigger/plugins/HTDQM.cc @@ -11,12 +11,6 @@ void HTDQM::initialise(const edm::ParameterSet& iConfig ){ ht_binning_ = getHistoPSet(iConfig.getParameter("histoPSet").getParameter("htPSet")); ls_binning_ = getHistoLSPSet (iConfig.getParameter("histoPSet").getParameter("htlsPSet")); - htME_variableBinning_.numerator = nullptr; - htME_variableBinning_.denominator = nullptr; - htVsMET_.numerator = nullptr; - htVsMET_.denominator = nullptr; - htVsLS_.numerator = nullptr; - htVsLS_.denominator = nullptr; } void HTDQM::bookHistograms(DQMStore::IBooker & ibooker) diff --git a/DQMOffline/Trigger/plugins/JetDQM.cc b/DQMOffline/Trigger/plugins/JetDQM.cc index e510340bbd2a3..24ed6741d367a 100644 --- a/DQMOffline/Trigger/plugins/JetDQM.cc +++ b/DQMOffline/Trigger/plugins/JetDQM.cc @@ -18,25 +18,6 @@ void JetDQM::initialise(const edm::ParameterSet& iConfig){ mindphijmet_binning_ = getHistoPSet(iConfig.getParameter("histoPSet").getParameter("mindphijmetPSet")); ls_binning_ = getHistoLSPSet (iConfig.getParameter("histoPSet").getParameter("jetlsPSet")); - jet1ptME_.clear(); - jet2ptME_.clear(); - jet1etaME_.clear(); - jet2etaME_.clear(); - - cjetetaME_.clear(); - fjetetaME_.clear(); - cjetptME_.clear(); - fjetptME_.clear(); - - mjjME_.clear(); - detajjME_.clear(); - dphijjME_.clear(); - - mindphijmetME_.clear(); - - jet1etaVsLS_.clear(); - mjjVsLS_.clear(); - mindphijmetVsLS_.clear(); } void JetDQM::bookHistograms(DQMStore::IBooker & ibooker) diff --git a/DQMOffline/Trigger/plugins/METDQM.cc b/DQMOffline/Trigger/plugins/METDQM.cc index 7fb8a5b3c7940..3b53bd40bda36 100644 --- a/DQMOffline/Trigger/plugins/METDQM.cc +++ b/DQMOffline/Trigger/plugins/METDQM.cc @@ -11,14 +11,6 @@ void METDQM::initialise(const edm::ParameterSet& iConfig ){ phi_binning_ = getHistoPSet(iConfig.getParameter("histoPSet").getParameter("phiPSet")); ls_binning_ = getHistoLSPSet (iConfig.getParameter("histoPSet").getParameter ("lsPSet") ); - metME_.numerator = nullptr; - metME_.denominator = nullptr; - metME_variableBinning_.numerator = nullptr; - metME_variableBinning_.denominator = nullptr; - metVsLS_.numerator = nullptr; - metVsLS_.denominator = nullptr; - metPhiME_.numerator = nullptr; - metPhiME_.denominator = nullptr; } void METDQM::bookHistograms(DQMStore::IBooker & ibooker) diff --git a/DQMOffline/Trigger/plugins/TriggerDQMBase.h b/DQMOffline/Trigger/plugins/TriggerDQMBase.h index 6c284d64c6f13..2cb2284f067b6 100644 --- a/DQMOffline/Trigger/plugins/TriggerDQMBase.h +++ b/DQMOffline/Trigger/plugins/TriggerDQMBase.h @@ -18,12 +18,8 @@ class TriggerDQMBase }; struct ObjME { - MonitorElement* numerator; - MonitorElement* denominator; - inline void clear(){ - numerator = nullptr; - denominator = nullptr; - }; + MonitorElement* numerator = nullptr; + MonitorElement* denominator = nullptr; }; static void fillHistoPSetDescription(edm::ParameterSetDescription & pset); diff --git a/DQMOffline/Trigger/python/VBFSUSYMonitor_Client_cff.py b/DQMOffline/Trigger/python/VBFSUSYMonitor_Client_cff.py index 4e6a24756316c..aa1bc43d9f3a7 100644 --- a/DQMOffline/Trigger/python/VBFSUSYMonitor_Client_cff.py +++ b/DQMOffline/Trigger/python/VBFSUSYMonitor_Client_cff.py @@ -24,8 +24,8 @@ ), efficiencyProfile = cms.untracked.vstring( - "effic_ht_vs_MET 'HT efficiency vs MET; MET; PF HT efficiency' htVsMET_numerator htVsMET_denominator" - "effic_ht_vs_LS 'HT efficiency vs LS; LS; PF HT efficiency' htVsLS_numerator htVsLS_denominator" + "effic_ht_vs_MET 'HT efficiency vs MET; MET; PF HT efficiency' htVsMET_numerator htVsMET_denominator", + "effic_ht_vs_LS 'HT efficiency vs LS; LS; PF HT efficiency' htVsLS_numerator htVsLS_denominator", "effic_met_vs_LS 'MET efficiency vs LS; LS; PF MET efficiency' metVsLS_numerator metVsLS_denominator", "effic_jet1etaVsLS 'Jet1 #eta efficiency vs LS; LS; jet1 #eta efficiency' jet1etaVsLS_numerator jet1etaVsLS_denominator", "effic_mjjVsLS 'M_{jj} efficiency vs LS; LS; M_{jj} efficiency' mjjVsLS_numerator mjjVsLS_denominator",