diff --git a/DQMOffline/Lumi/plugins/ZCounting.cc b/DQMOffline/Lumi/plugins/ZCounting.cc index b77d3d373db2b..00963672c5907 100644 --- a/DQMOffline/Lumi/plugins/ZCounting.cc +++ b/DQMOffline/Lumi/plugins/ZCounting.cc @@ -49,8 +49,7 @@ ZCounting::ZCounting(const edm::ParameterSet& iConfig) IDTypestr_(iConfig.getUntrackedParameter("IDType")), IsoTypestr_(iConfig.getUntrackedParameter("IsoType")), - IsoCut_(iConfig.getUntrackedParameter("IsoCut")) -{ + IsoCut_(iConfig.getUntrackedParameter("IsoCut")) { edm::LogInfo("ZCounting") << "Constructor ZCounting::ZCounting " << std::endl; // Trigger settings @@ -61,7 +60,7 @@ ZCounting::ZCounting(const edm::ParameterSet& iConfig) edm::LogVerbatim("ZCounting") << "ZCounting::ZCounting set trigger names"; const std::vector patterns_ = iConfig.getParameter>("MuonTriggerNames"); - for (const std::string pattern_ : patterns_) { + for (const std::string& pattern_ : patterns_) { triggers->addTriggerRecord(pattern_); } @@ -274,7 +273,7 @@ void ZCounting::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) return; } - const reco::Vertex* pv = 0; + const reco::Vertex* pv = nullptr; int nvtx = 0; for (auto const& itVtx : *hVertexProduct) { diff --git a/DQMOffline/Lumi/plugins/ZCounting.h b/DQMOffline/Lumi/plugins/ZCounting.h index 4e87416efd5e3..2dff7a5f3fcf6 100644 --- a/DQMOffline/Lumi/plugins/ZCounting.h +++ b/DQMOffline/Lumi/plugins/ZCounting.h @@ -38,7 +38,7 @@ class ZCounting : public DQMEDAnalyzer { private: //other functions - bool passMuonID(const reco::Muon& muon, const reco::Vertex *vtx); + bool passMuonID(const reco::Muon& muon, const reco::Vertex* vtx); bool passMuonIso(const reco::Muon& muon); bool isCustomTightMuon(const reco::Muon& muon); @@ -80,14 +80,14 @@ class ZCounting : public DQMEDAnalyzer { const std::string IDTypestr_; const std::string IsoTypestr_; const double IsoCut_; - + // muon ID and ISO parameters MuonIDTypes IDType_{NoneID}; MuonIsoTypes IsoType_{NoneIso}; // trigger objects HLTConfigProvider hltConfigProvider_; - TriggerTools *triggers; + TriggerTools* triggers; // constants const double DRMAX = 0.1; // max dR matching between muon and hlt object @@ -114,7 +114,6 @@ class ZCounting : public DQMEDAnalyzer { MonitorElement* h_mass_Glo_fail_BB; MonitorElement* h_mass_Glo_fail_BE; MonitorElement* h_mass_Glo_fail_EE; - }; #endif diff --git a/DQMOffline/Lumi/plugins/ZCountingElectrons.cc b/DQMOffline/Lumi/plugins/ZCountingElectrons.cc index 516268129087d..73a8672160c02 100644 --- a/DQMOffline/Lumi/plugins/ZCountingElectrons.cc +++ b/DQMOffline/Lumi/plugins/ZCountingElectrons.cc @@ -17,11 +17,14 @@ // ZCountingElectrons::ZCountingElectrons(const edm::ParameterSet& iConfig) : triggerResultsInputTag_(iConfig.getParameter("TriggerResults")), - fPVName_token(consumes(iConfig.getUntrackedParameter("edmPVName", "offlinePrimaryVertices"))), + fPVName_token(consumes( + iConfig.getUntrackedParameter("edmPVName", "offlinePrimaryVertices"))), // Electron-specific Parameters - fGsfElectronName_token(consumes>(iConfig.getUntrackedParameter("edmGsfEleName", "gedGsfElectrons"))), - fSCName_token(consumes>(iConfig.getUntrackedParameter("edmSCName", "particleFlowEGamma"))), + fGsfElectronName_token(consumes>( + iConfig.getUntrackedParameter("edmGsfEleName", "gedGsfElectrons"))), + fSCName_token(consumes>( + iConfig.getUntrackedParameter("edmSCName", "particleFlowEGamma"))), // Electron-specific Tags fRhoToken(consumes(iConfig.getParameter("rhoname"))), @@ -40,7 +43,7 @@ ZCountingElectrons::ZCountingElectrons(const edm::ParameterSet& iConfig) LumiBin_(iConfig.getUntrackedParameter("LumiBin")), LumiMin_(iConfig.getUntrackedParameter("LumiMin")), - LumiMax_(iConfig.getUntrackedParameter("LumiMax")), + LumiMax_(iConfig.getUntrackedParameter("LumiMax")), PVBin_(iConfig.getUntrackedParameter("PVBin")), PVMin_(iConfig.getUntrackedParameter("PVMin")), @@ -62,20 +65,20 @@ ZCountingElectrons::ZCountingElectrons(const edm::ParameterSet& iConfig) triggers->setDRMAX(DRMAX); edm::LogVerbatim("ZCounting") << "ZCounting::ZCounting set trigger names"; - const std::vector patterns_ = - iConfig.getParameter>("ElectronTriggerNames"); - for (const std::string pattern_ : patterns_) { + const std::vector patterns_ = iConfig.getParameter>("ElectronTriggerNames"); + for (const std::string& pattern_ : patterns_) { triggers->addTriggerRecord(pattern_); } - EleID_.setID(ELE_ID_WP); } // // -------------------------------------- Destructor -------------------------------------------- // -ZCountingElectrons::~ZCountingElectrons() { edm::LogInfo("ZCountingElectrons") << "Destructor ZCountingElectrons::~ZCountingElectrons " << std::endl; } +ZCountingElectrons::~ZCountingElectrons() { + edm::LogInfo("ZCountingElectrons") << "Destructor ZCountingElectrons::~ZCountingElectrons " << std::endl; +} // // -------------------------------------- beginRun -------------------------------------------- @@ -89,15 +92,15 @@ void ZCountingElectrons::dqmBeginRun(edm::Run const& iRun, edm::EventSetup const bool hltChanged_ = true; if (hltConfigProvider_.init(iRun, iSetup, triggerResultsInputTag_.process(), hltChanged_)) { - edm::LogVerbatim("ZCountingElectrons") << "ZCountingElectrons::dqmBeginRun [TriggerObjMatchValueMapsProducer::beginRun] " - "HLTConfigProvider initialized [processName() = \"" - << hltConfigProvider_.processName() << "\", tableName() = \"" - << hltConfigProvider_.tableName() << "\", size() = " << hltConfigProvider_.size() - << "]"; + edm::LogVerbatim("ZCountingElectrons") + << "ZCountingElectrons::dqmBeginRun [TriggerObjMatchValueMapsProducer::beginRun] " + "HLTConfigProvider initialized [processName() = \"" + << hltConfigProvider_.processName() << "\", tableName() = \"" << hltConfigProvider_.tableName() + << "\", size() = " << hltConfigProvider_.size() << "]"; } else { - edm::LogError("ZCountingElectrons") << "ZCountingElectrons::dqmBeginRun Initialization of HLTConfigProvider failed for Run=" - << iRun.id() << " (process=\"" << triggerResultsInputTag_.process() - << "\") -> plugin will not produce outputs for this Run"; + edm::LogError("ZCountingElectrons") + << "ZCountingElectrons::dqmBeginRun Initialization of HLTConfigProvider failed for Run=" << iRun.id() + << " (process=\"" << triggerResultsInputTag_.process() << "\") -> plugin will not produce outputs for this Run"; return; } @@ -118,26 +121,83 @@ void ZCountingElectrons::bookHistograms(DQMStore::IBooker& ibooker_, edm::Run co h_npv->setAxisTitle("number of primary vertices", 2); // Electron histograms - h_ee_mass_id_pass_central = ibooker_.book2D("h_ee_mass_id_pass_central", "h_ee_mass_id_pass_central", LumiBin_, LumiMin_, LumiMax_, MassBin_, MassMin_, MassMax_); - h_ee_mass_id_fail_central = ibooker_.book2D("h_ee_mass_id_fail_central", "h_ee_mass_id_fail_central", LumiBin_, LumiMin_, LumiMax_, MassBin_, MassMin_, MassMax_); - h_ee_mass_id_pass_forward = ibooker_.book2D("h_ee_mass_id_pass_forward", "h_ee_mass_id_pass_forward", LumiBin_, LumiMin_, LumiMax_, MassBin_, MassMin_, MassMax_); - h_ee_mass_id_fail_forward = ibooker_.book2D("h_ee_mass_id_fail_forward", "h_ee_mass_id_fail_forward", LumiBin_, LumiMin_, LumiMax_, MassBin_, MassMin_, MassMax_); - - h_ee_mass_HLT_pass_central = ibooker_.book2D("h_ee_mass_HLT_pass_central", "h_ee_mass_HLT_pass_central", LumiBin_, LumiMin_, LumiMax_, MassBin_, MassMin_, MassMax_); - h_ee_mass_HLT_fail_central = ibooker_.book2D("h_ee_mass_HLT_fail_central", "h_ee_mass_HLT_fail_central", LumiBin_, LumiMin_, LumiMax_, MassBin_, MassMin_, MassMax_); - h_ee_mass_HLT_pass_forward = ibooker_.book2D("h_ee_mass_HLT_pass_forward", "h_ee_mass_HLT_pass_forward", LumiBin_, LumiMin_, LumiMax_, MassBin_, MassMin_, MassMax_); - h_ee_mass_HLT_fail_forward = ibooker_.book2D("h_ee_mass_HLT_fail_forward", "h_ee_mass_HLT_fail_forward", LumiBin_, LumiMin_, LumiMax_, MassBin_, MassMin_, MassMax_); - - h_ee_yield_Z_ebeb = ibooker_.book1D("h_ee_yield_Z_ebeb", "h_ee_yield_Z_ebeb", LumiBin_, LumiMin_, LumiMax_); - h_ee_yield_Z_ebee = ibooker_.book1D("h_ee_yield_Z_ebee", "h_ee_yield_Z_ebee", LumiBin_, LumiMin_, LumiMax_); - h_ee_yield_Z_eeee = ibooker_.book1D("h_ee_yield_Z_eeee", "h_ee_yield_Z_eeee", LumiBin_, LumiMin_, LumiMax_); + h_ee_mass_id_pass_central = ibooker_.book2D("h_ee_mass_id_pass_central", + "h_ee_mass_id_pass_central", + LumiBin_, + LumiMin_, + LumiMax_, + MassBin_, + MassMin_, + MassMax_); + h_ee_mass_id_fail_central = ibooker_.book2D("h_ee_mass_id_fail_central", + "h_ee_mass_id_fail_central", + LumiBin_, + LumiMin_, + LumiMax_, + MassBin_, + MassMin_, + MassMax_); + h_ee_mass_id_pass_forward = ibooker_.book2D("h_ee_mass_id_pass_forward", + "h_ee_mass_id_pass_forward", + LumiBin_, + LumiMin_, + LumiMax_, + MassBin_, + MassMin_, + MassMax_); + h_ee_mass_id_fail_forward = ibooker_.book2D("h_ee_mass_id_fail_forward", + "h_ee_mass_id_fail_forward", + LumiBin_, + LumiMin_, + LumiMax_, + MassBin_, + MassMin_, + MassMax_); + + h_ee_mass_HLT_pass_central = ibooker_.book2D("h_ee_mass_HLT_pass_central", + "h_ee_mass_HLT_pass_central", + LumiBin_, + LumiMin_, + LumiMax_, + MassBin_, + MassMin_, + MassMax_); + h_ee_mass_HLT_fail_central = ibooker_.book2D("h_ee_mass_HLT_fail_central", + "h_ee_mass_HLT_fail_central", + LumiBin_, + LumiMin_, + LumiMax_, + MassBin_, + MassMin_, + MassMax_); + h_ee_mass_HLT_pass_forward = ibooker_.book2D("h_ee_mass_HLT_pass_forward", + "h_ee_mass_HLT_pass_forward", + LumiBin_, + LumiMin_, + LumiMax_, + MassBin_, + MassMin_, + MassMax_); + h_ee_mass_HLT_fail_forward = ibooker_.book2D("h_ee_mass_HLT_fail_forward", + "h_ee_mass_HLT_fail_forward", + LumiBin_, + LumiMin_, + LumiMax_, + MassBin_, + MassMin_, + MassMax_); + + h_ee_yield_Z_ebeb = ibooker_.book1D("h_ee_yield_Z_ebeb", "h_ee_yield_Z_ebeb", LumiBin_, LumiMin_, LumiMax_); + h_ee_yield_Z_ebee = ibooker_.book1D("h_ee_yield_Z_ebee", "h_ee_yield_Z_ebee", LumiBin_, LumiMin_, LumiMax_); + h_ee_yield_Z_eeee = ibooker_.book1D("h_ee_yield_Z_eeee", "h_ee_yield_Z_eeee", LumiBin_, LumiMin_, LumiMax_); } // // -------------------------------------- Analyze -------------------------------------------- // //-------------------------------------------------------------------------------------------------- -void ZCountingElectrons::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) { // Fill event tree on the fly +void ZCountingElectrons::analyze(const edm::Event& iEvent, + const edm::EventSetup& iSetup) { // Fill event tree on the fly edm::LogInfo("ZCountingElectrons") << "ZCountingElectrons::analyze" << std::endl; //------------------------------- diff --git a/DQMOffline/Lumi/plugins/ZCountingElectrons.h b/DQMOffline/Lumi/plugins/ZCountingElectrons.h index bd56a1817bb6f..1b466d8e251c4 100644 --- a/DQMOffline/Lumi/plugins/ZCountingElectrons.h +++ b/DQMOffline/Lumi/plugins/ZCountingElectrons.h @@ -32,7 +32,6 @@ class ZCountingElectrons : public DQMEDAnalyzer { void analyze(edm::Event const& e, edm::EventSetup const& eSetup) override; private: - // Electron-specific functions bool ele_probe_selection(double pt, double abseta); bool ele_tag_selection(double pt, double abseta); @@ -74,9 +73,9 @@ class ZCountingElectrons : public DQMEDAnalyzer { // trigger objects HLTConfigProvider hltConfigProvider_; - TriggerTools *triggers; + TriggerTools* triggers; - //constants + //constants const double DRMAX = 0.1; // max dR matching between muon and hlt object const float ELECTRON_MASS = 0.000511; const float ELE_ETA_CRACK_LOW = 1.4442; diff --git a/DQMOffline/Lumi/src/TriggerTools.cc b/DQMOffline/Lumi/src/TriggerTools.cc index 0397f8bd1d9cc..b26d60941f5d6 100644 --- a/DQMOffline/Lumi/src/TriggerTools.cc +++ b/DQMOffline/Lumi/src/TriggerTools.cc @@ -79,7 +79,8 @@ void TriggerTools::initHLTObjects(const HLTConfigProvider& hltConfigProvider_) { } if (iRec.hltPathIndex == (unsigned int)-1) { - edm::LogWarning("TriggerTools") << "TriggerTools::initHLTObjects hltPathIndex has not been found for: " << iRec.hltPattern << std::endl; + edm::LogWarning("TriggerTools") << "TriggerTools::initHLTObjects hltPathIndex has not been found for: " + << iRec.hltPattern << std::endl; continue; } } @@ -122,7 +123,7 @@ bool TriggerTools::pass() const { check if the event passed any of the initialized triggers */ - return triggerBits!=0; + return triggerBits != 0; } //--------------------------------------------------------------------------------------------------