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",