From a8de468e943175744ca991de1f74920209377e9b Mon Sep 17 00:00:00 2001 From: Ben Jones Date: Fri, 26 Jun 2020 14:08:03 -0500 Subject: [PATCH 1/3] added esConsumes to modules in L1Trigger/L1TCalorimeter --- .../plugins/L1TCaloStage1LutWriter.cc | 7 ++-- .../plugins/L1TPhysicalEtAdder.cc | 17 +++----- .../plugins/L1TPhysicalEtAdder.h | 8 ++++ .../plugins/L1TStage1Layer2Producer.cc | 40 ++++++++++++------- .../plugins/L1TStage2Layer1Producer.cc | 22 +++++++--- .../plugins/L1TStage2Layer2Producer.cc | 15 ++++--- 6 files changed, 70 insertions(+), 39 deletions(-) diff --git a/L1Trigger/L1TCalorimeter/plugins/L1TCaloStage1LutWriter.cc b/L1Trigger/L1TCalorimeter/plugins/L1TCaloStage1LutWriter.cc index 861f064d8b2ac..99fb065d7d912 100644 --- a/L1Trigger/L1TCalorimeter/plugins/L1TCaloStage1LutWriter.cc +++ b/L1Trigger/L1TCalorimeter/plugins/L1TCaloStage1LutWriter.cc @@ -7,6 +7,7 @@ #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/MakerMacros.h" #include "FWCore/Framework/interface/ESHandle.h" +#include "FWCore/Utilities/interface/ESGetToken.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "CondFormats/L1TObjects/interface/CaloParams.h" @@ -44,7 +45,7 @@ namespace l1t { std::string m_conditionsLabel; Stage1TauIsolationLUT* isoTauLut; - + edm::ESGetToken m_paramsToken; bool m_writeIsoTauLut; // output file names std::string m_isoTauLutName; @@ -59,6 +60,7 @@ namespace l1t { m_writeIsoTauLut = iConfig.getUntrackedParameter("writeIsoTauLut", false); m_isoTauLutName = iConfig.getUntrackedParameter("isoTauLutName", "isoTauLut.txt"); m_conditionsLabel = iConfig.getParameter("conditionsLabel"); + m_paramsToken = esConsumes(edm::ESInputTag("",m_conditionsLabel)); m_params = new CaloParamsHelper; isoTauLut = new Stage1TauIsolationLUT(m_params); @@ -68,8 +70,7 @@ namespace l1t { // ------------ method called for each event ------------ void L1TCaloStage1LutWriter::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) { - edm::ESHandle paramsHandle; - iSetup.get().get(m_conditionsLabel, paramsHandle); + edm::ESHandle paramsHandle = iSetup.getHandle(m_paramsToken); m_params = new (m_params) CaloParamsHelper(*paramsHandle.product()); if (!m_params) { std::cout << "Could not retrieve params from Event Setup" << std::endl; diff --git a/L1Trigger/L1TCalorimeter/plugins/L1TPhysicalEtAdder.cc b/L1Trigger/L1TCalorimeter/plugins/L1TPhysicalEtAdder.cc index e531e69dd034e..bda11701a2c98 100644 --- a/L1Trigger/L1TCalorimeter/plugins/L1TPhysicalEtAdder.cc +++ b/L1Trigger/L1TCalorimeter/plugins/L1TPhysicalEtAdder.cc @@ -1,11 +1,6 @@ #include "L1Trigger/L1TCalorimeter/plugins/L1TPhysicalEtAdder.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "CondFormats/L1TObjects/interface/L1CaloEtScale.h" -#include "CondFormats/DataRecord/interface/L1JetEtScaleRcd.h" -#include "CondFormats/DataRecord/interface/L1HtMissScaleRcd.h" -#include "CondFormats/DataRecord/interface/L1EmEtScaleRcd.h" - #include "DataFormats/L1CaloTrigger/interface/L1CaloEmCand.h" #include "DataFormats/L1CaloTrigger/interface/L1CaloRegion.h" #include "DataFormats/L1CaloTrigger/interface/L1CaloCollections.h" @@ -97,6 +92,9 @@ L1TPhysicalEtAdder::L1TPhysicalEtAdder(const edm::ParameterSet& ps) { EtSumToken_ = consumes(ps.getParameter("InputCollection")); HfSumsToken_ = consumes(ps.getParameter("InputHFSumsCollection")); HfCountsToken_ = consumes(ps.getParameter("InputHFCountsCollection")); + emScaleToken_ = esConsumes(); + jetScaleToken_ = esConsumes(); + htMissScaleToken_ = esConsumes(); } L1TPhysicalEtAdder::~L1TPhysicalEtAdder() {} @@ -132,14 +130,11 @@ void L1TPhysicalEtAdder::produce(edm::StreamID, edm::Event& iEvent, const edm::E iEvent.getByToken(HfCountsToken_, old_hfcounts); //get the proper scales for conversion to physical et - edm::ESHandle emScale; - iSetup.get().get(emScale); + edm::ESHandle emScale = iSetup.getHandle(emScaleToken_); - edm::ESHandle jetScale; - iSetup.get().get(jetScale); + edm::ESHandle jetScale = iSetup.getHandle(jetScaleToken_); - edm::ESHandle htMissScale; - iSetup.get().get(htMissScale); + edm::ESHandle htMissScale = iSetup.getHandle(htMissScaleToken_); int firstBX = old_egammas->getFirstBX(); int lastBX = old_egammas->getLastBX(); diff --git a/L1Trigger/L1TCalorimeter/plugins/L1TPhysicalEtAdder.h b/L1Trigger/L1TCalorimeter/plugins/L1TPhysicalEtAdder.h index 62adeaf5696b6..d860066a4dec7 100644 --- a/L1Trigger/L1TCalorimeter/plugins/L1TPhysicalEtAdder.h +++ b/L1Trigger/L1TCalorimeter/plugins/L1TPhysicalEtAdder.h @@ -22,12 +22,17 @@ #include "FWCore/Utilities/interface/EDGetToken.h" #include "FWCore/Utilities/interface/InputTag.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" +#include "FWCore/Utilities/interface/ESGetToken.h" #include "DataFormats/L1Trigger/interface/EGamma.h" #include "DataFormats/L1Trigger/interface/Tau.h" #include "DataFormats/L1Trigger/interface/Jet.h" #include "DataFormats/L1Trigger/interface/EtSum.h" #include "DataFormats/L1Trigger/interface/CaloSpare.h" +#include "CondFormats/L1TObjects/interface/L1CaloEtScale.h" +#include "CondFormats/DataRecord/interface/L1JetEtScaleRcd.h" +#include "CondFormats/DataRecord/interface/L1HtMissScaleRcd.h" +#include "CondFormats/DataRecord/interface/L1EmEtScaleRcd.h" // // class declaration @@ -53,6 +58,9 @@ class L1TPhysicalEtAdder : public edm::global::EDProducer<> { edm::EDGetToken EtSumToken_; edm::EDGetToken HfSumsToken_; edm::EDGetToken HfCountsToken_; + edm::ESGetToken emScaleToken_; + edm::ESGetToken jetScaleToken_; + edm::ESGetToken htMissScaleToken_; }; #endif diff --git a/L1Trigger/L1TCalorimeter/plugins/L1TStage1Layer2Producer.cc b/L1Trigger/L1TCalorimeter/plugins/L1TStage1Layer2Producer.cc index c7dda306aff91..c5c06318b6f5f 100644 --- a/L1Trigger/L1TCalorimeter/plugins/L1TStage1Layer2Producer.cc +++ b/L1Trigger/L1TCalorimeter/plugins/L1TStage1Layer2Producer.cc @@ -21,6 +21,7 @@ #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/Utilities/interface/EDGetToken.h" #include "FWCore/Utilities/interface/InputTag.h" +#include "FWCore/Utilities/interface/ESGetToken.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "CondFormats/L1TObjects/interface/L1CaloEtScale.h" @@ -91,6 +92,12 @@ class L1TStage1Layer2Producer : public stream::EDProducer<> { // to be extended with other "consumes" stuff EDGetTokenT> regionToken; EDGetTokenT> candsToken; + edm::ESGetToken paramsToken; + edm::ESGetToken configToken; + edm::ESGetToken emScaleToken; + edm::ESGetToken jetScaleToken; + edm::ESGetToken htMissScaleToken; + edm::ESGetToken hfRingScaleToken; }; // @@ -116,6 +123,19 @@ L1TStage1Layer2Producer::L1TStage1Layer2Producer(const ParameterSet& iConfig) { m_params = new CaloParamsHelper; + paramsToken = + esConsumes(edm::ESInputTag("", m_conditionsLabel)); + configToken = + esConsumes(edm::ESInputTag("", m_conditionsLabel)); + emScaleToken = + esConsumes(edm::ESInputTag("", m_conditionsLabel)); + jetScaleToken = + esConsumes(edm::ESInputTag("", m_conditionsLabel)); + htMissScaleToken = + esConsumes(edm::ESInputTag("", m_conditionsLabel)); + hfRingScaleToken = + esConsumes(edm::ESInputTag("", m_conditionsLabel)); + // set cache id to zero, will be set at first beginRun: m_paramsCacheId = 0; m_configCacheId = 0; @@ -248,9 +268,7 @@ void L1TStage1Layer2Producer::beginRun(Run const& iR, EventSetup const& iE) { if (id != m_paramsCacheId) { m_paramsCacheId = id; - edm::ESHandle paramsHandle; - - iE.get().get(m_conditionsLabel, paramsHandle); + edm::ESHandle paramsHandle = iE.getHandle(paramsToken); // replace our local copy of the parameters with a new one using placement new m_params->~CaloParamsHelper(); @@ -267,9 +285,7 @@ void L1TStage1Layer2Producer::beginRun(Run const& iR, EventSetup const& iE) { if (id != m_configCacheId) { m_configCacheId = id; - edm::ESHandle configHandle; - - iE.get().get(m_conditionsLabel, configHandle); + edm::ESHandle configHandle = iE.getHandle(configToken); if (!configHandle.product()) { edm::LogError("l1t|caloStage1") << "Could not retrieve config from Event Setup" << std::endl; @@ -283,21 +299,17 @@ void L1TStage1Layer2Producer::beginRun(Run const& iR, EventSetup const& iE) { LogDebug("l1t|stage 1 jets") << "L1TStage1Layer2Producer::beginRun function called...\n"; //get the proper scales for conversion to physical et AND gt scales - edm::ESHandle emScale; - iE.get().get(m_conditionsLabel, emScale); + edm::ESHandle emScale = iE.getHandle(emScaleToken); m_params->setEmScale(*emScale); - edm::ESHandle jetScale; - iE.get().get(m_conditionsLabel, jetScale); + edm::ESHandle jetScale = iE.getHandle(jetScaleToken); m_params->setJetScale(*jetScale); - edm::ESHandle HtMissScale; - iE.get().get(m_conditionsLabel, HtMissScale); + edm::ESHandle HtMissScale = iE.getHandle(jetScaleToken); m_params->setHtMissScale(*HtMissScale); //not sure if I need this one - edm::ESHandle HfRingScale; - iE.get().get(m_conditionsLabel, HfRingScale); + edm::ESHandle HfRingScale = iE.getHandle(hfRingScaleToken); m_params->setHfRingScale(*HfRingScale); //unsigned long long id = iE.get().cacheIdentifier(); diff --git a/L1Trigger/L1TCalorimeter/plugins/L1TStage2Layer1Producer.cc b/L1Trigger/L1TCalorimeter/plugins/L1TStage2Layer1Producer.cc index 4e1a5fe356e3c..9fef810538734 100644 --- a/L1Trigger/L1TCalorimeter/plugins/L1TStage2Layer1Producer.cc +++ b/L1Trigger/L1TCalorimeter/plugins/L1TStage2Layer1Producer.cc @@ -30,6 +30,7 @@ #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/Utilities/interface/EDGetToken.h" #include "FWCore/Utilities/interface/InputTag.h" +#include "FWCore/Utilities/interface/ESGetToken.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "L1Trigger/L1TCalorimeter/interface/Stage2Layer1FirmwareFactory.h" @@ -86,6 +87,10 @@ class L1TStage2Layer1Producer : public edm::EDProducer { std::vector ecalToken_; // this is a crazy way to store multi-BX info std::vector hcalToken_; // should be replaced with a BXVector< > or similar + edm::ESGetToken ecalScaleToken_; + edm::ESGetToken hcalScaleToken_; + edm::ESGetToken decoderToken_; + edm::ESGetToken paramsToken_; // parameters unsigned long long paramsCacheId_; unsigned fwv_; @@ -113,7 +118,13 @@ L1TStage2Layer1Producer::L1TStage2Layer1Producer(const edm::ParameterSet& ps) ecalToken_[ibx] = consumes(ps.getParameter("ecalToken")); hcalToken_[ibx] = consumes(ps.getParameter("hcalToken")); } - + if (rctConditions_) { + ecalScaleToken_ = esConsumes(); + hcalScaleToken_ = esConsumes(); + } else { + decoderToken_ = esConsumes(); + } + paramsToken_ = esConsumes(); // placeholder for the parameters params_ = new CaloParamsHelper; @@ -135,10 +146,10 @@ void L1TStage2Layer1Producer::produce(edm::Event& iEvent, const edm::EventSetup& edm::ESHandle decoder; if (rctConditions_) { - iSetup.get().get(ecalScale); - iSetup.get().get(hcalScale); + ecalScale = iSetup.getHandle(ecalScaleToken_); + hcalScale = iSetup.getHandle(hcalScaleToken_); } else { - iSetup.get().get(decoder); + decoder = iSetup.getHandle(decoderToken_); } LogDebug("L1TDebug") << "First BX=" << bxFirst_ << ", last BX=" << bxLast_ << ", LSB(E)=" << params_->towerLsbE() @@ -321,8 +332,7 @@ void L1TStage2Layer1Producer::beginRun(edm::Run const& iRun, edm::EventSetup con if (id != paramsCacheId_) { paramsCacheId_ = id; - edm::ESHandle paramsHandle; - iSetup.get().get(paramsHandle); + edm::ESHandle paramsHandle = iSetup.getHandle(paramsToken_); // replace our local copy of the parameters with a new one using placement new params_->~CaloParamsHelper(); diff --git a/L1Trigger/L1TCalorimeter/plugins/L1TStage2Layer2Producer.cc b/L1Trigger/L1TCalorimeter/plugins/L1TStage2Layer2Producer.cc index 4c4850017ad2a..2d49330b96462 100644 --- a/L1Trigger/L1TCalorimeter/plugins/L1TStage2Layer2Producer.cc +++ b/L1Trigger/L1TCalorimeter/plugins/L1TStage2Layer2Producer.cc @@ -31,6 +31,7 @@ #include "FWCore/Utilities/interface/EDGetToken.h" #include "FWCore/Utilities/interface/EDPutToken.h" #include "FWCore/Utilities/interface/InputTag.h" +#include "FWCore/Utilities/interface/ESGetToken.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "L1Trigger/L1TCalorimeter/interface/Stage2Layer2FirmwareFactory.h" @@ -70,8 +71,10 @@ class L1TStage2Layer2Producer : public edm::stream::EDProducer<> { // ----------member data --------------------------- - // input token + // input tokens edm::EDGetTokenT m_towerToken; + edm::ESGetToken m_candidateToken; + edm::ESGetToken m_o2oProtoToken; // put tokens edm::EDPutTokenT m_towerMPToken; @@ -112,6 +115,7 @@ L1TStage2Layer2Producer::L1TStage2Layer2Producer(const edm::ParameterSet& ps) { // register what you consume and keep token for later access: m_towerToken = consumes(ps.getParameter("towerToken")); + m_candidateToken = esConsumes(); // placeholder for the parameters m_params = new CaloParamsHelper; @@ -121,6 +125,9 @@ L1TStage2Layer2Producer::L1TStage2Layer2Producer(const edm::ParameterSet& ps) { // get static config flag m_useStaticConfig = ps.getParameter("useStaticConfig"); + if (!m_useStaticConfig) { + m_o2oProtoToken = esConsumes(); + } //initialize m_paramsCacheId = 0; @@ -253,14 +260,12 @@ void L1TStage2Layer2Producer::beginRun(edm::Run const& iRun, edm::EventSetup con m_paramsCacheId = id; // fetch payload corresponding to the current run from the CondDB - edm::ESHandle candidateHandle; - iSetup.get().get(candidateHandle); + edm::ESHandle candidateHandle = iSetup.getHandle(m_candidateToken); std::unique_ptr candidate(new l1t::CaloParams(*candidateHandle.product())); if (!m_useStaticConfig) { // fetch the latest greatest prototype (equivalent of static payload) - edm::ESHandle o2oProtoHandle; - iSetup.get().get(o2oProtoHandle); + edm::ESHandle o2oProtoHandle = iSetup.getHandle(m_o2oProtoToken); std::unique_ptr prototype(new l1t::CaloParams(*o2oProtoHandle.product())); // prepare to set the emulator's configuration From d6f849dd33060a0e835cfd960ef8d41bb9daafd9 Mon Sep 17 00:00:00 2001 From: Ben Jones Date: Fri, 26 Jun 2020 14:12:21 -0500 Subject: [PATCH 2/3] removed unnessecary Includes of ESHandle.h --- L1Trigger/L1TCalorimeter/plugins/L1TCaloParamsWriter.cc | 1 - L1Trigger/L1TCalorimeter/plugins/L1TCaloRCTToUpgradeConverter.cc | 1 - .../L1TCalorimeter/plugins/L1TCaloStage2ParamsESProducer.cc | 1 - L1Trigger/L1TCalorimeter/plugins/L1TCaloUpgradeToGCTConverter.cc | 1 - L1Trigger/L1TCalorimeter/plugins/L1TCaloUpgradeToGCTConverter.h | 1 - 5 files changed, 5 deletions(-) diff --git a/L1Trigger/L1TCalorimeter/plugins/L1TCaloParamsWriter.cc b/L1Trigger/L1TCalorimeter/plugins/L1TCaloParamsWriter.cc index a1f9bd54813f5..06e9062807105 100644 --- a/L1Trigger/L1TCalorimeter/plugins/L1TCaloParamsWriter.cc +++ b/L1Trigger/L1TCalorimeter/plugins/L1TCaloParamsWriter.cc @@ -5,7 +5,6 @@ #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/Framework/interface/EventSetup.h" -#include "FWCore/Framework/interface/ESHandle.h" #include "CondFormats/DataRecord/interface/L1TCaloParamsRcd.h" #include "CondFormats/L1TObjects/interface/CaloParams.h" diff --git a/L1Trigger/L1TCalorimeter/plugins/L1TCaloRCTToUpgradeConverter.cc b/L1Trigger/L1TCalorimeter/plugins/L1TCaloRCTToUpgradeConverter.cc index dc44665eaec01..805b791a41301 100644 --- a/L1Trigger/L1TCalorimeter/plugins/L1TCaloRCTToUpgradeConverter.cc +++ b/L1Trigger/L1TCalorimeter/plugins/L1TCaloRCTToUpgradeConverter.cc @@ -18,7 +18,6 @@ #include "FWCore/Framework/interface/EventSetup.h" #include "FWCore/Framework/interface/Frameworkfwd.h" #include "FWCore/Framework/interface/global/EDProducer.h" -#include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/MakerMacros.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" diff --git a/L1Trigger/L1TCalorimeter/plugins/L1TCaloStage2ParamsESProducer.cc b/L1Trigger/L1TCalorimeter/plugins/L1TCaloStage2ParamsESProducer.cc index d8e2c8cefc3f6..5fa8a4a8daeff 100644 --- a/L1Trigger/L1TCalorimeter/plugins/L1TCaloStage2ParamsESProducer.cc +++ b/L1Trigger/L1TCalorimeter/plugins/L1TCaloStage2ParamsESProducer.cc @@ -20,7 +20,6 @@ // user include files #include "FWCore/Framework/interface/ModuleFactory.h" #include "FWCore/Framework/interface/ESProducer.h" -#include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Framework/interface/ESProducts.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" diff --git a/L1Trigger/L1TCalorimeter/plugins/L1TCaloUpgradeToGCTConverter.cc b/L1Trigger/L1TCalorimeter/plugins/L1TCaloUpgradeToGCTConverter.cc index 67a18a563d2b9..9ca14ddbde3e2 100644 --- a/L1Trigger/L1TCalorimeter/plugins/L1TCaloUpgradeToGCTConverter.cc +++ b/L1Trigger/L1TCalorimeter/plugins/L1TCaloUpgradeToGCTConverter.cc @@ -16,7 +16,6 @@ #include "CondFormats/L1TObjects/interface/L1CaloEtScale.h" #include "CondFormats/DataRecord/interface/L1JetEtScaleRcd.h" #include "CondFormats/DataRecord/interface/L1EmEtScaleRcd.h" -#include "FWCore/Framework/interface/ESHandle.h" using namespace std; using namespace edm; diff --git a/L1Trigger/L1TCalorimeter/plugins/L1TCaloUpgradeToGCTConverter.h b/L1Trigger/L1TCalorimeter/plugins/L1TCaloUpgradeToGCTConverter.h index fa6007c171cc9..ddce8d7f9d7df 100644 --- a/L1Trigger/L1TCalorimeter/plugins/L1TCaloUpgradeToGCTConverter.h +++ b/L1Trigger/L1TCalorimeter/plugins/L1TCaloUpgradeToGCTConverter.h @@ -18,7 +18,6 @@ #include "FWCore/Framework/interface/EventSetup.h" #include "FWCore/Framework/interface/Frameworkfwd.h" #include "FWCore/Framework/interface/global/EDProducer.h" -#include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/MakerMacros.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" From 461607a98cc9e50511c36b0070306825ebe87bb8 Mon Sep 17 00:00:00 2001 From: Ben Jones Date: Fri, 26 Jun 2020 14:16:49 -0500 Subject: [PATCH 3/3] fix clang format --- L1Trigger/L1TCalorimeter/plugins/L1TCaloStage1LutWriter.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/L1Trigger/L1TCalorimeter/plugins/L1TCaloStage1LutWriter.cc b/L1Trigger/L1TCalorimeter/plugins/L1TCaloStage1LutWriter.cc index 99fb065d7d912..638369a187d71 100644 --- a/L1Trigger/L1TCalorimeter/plugins/L1TCaloStage1LutWriter.cc +++ b/L1Trigger/L1TCalorimeter/plugins/L1TCaloStage1LutWriter.cc @@ -60,7 +60,7 @@ namespace l1t { m_writeIsoTauLut = iConfig.getUntrackedParameter("writeIsoTauLut", false); m_isoTauLutName = iConfig.getUntrackedParameter("isoTauLutName", "isoTauLut.txt"); m_conditionsLabel = iConfig.getParameter("conditionsLabel"); - m_paramsToken = esConsumes(edm::ESInputTag("",m_conditionsLabel)); + m_paramsToken = esConsumes(edm::ESInputTag("", m_conditionsLabel)); m_params = new CaloParamsHelper; isoTauLut = new Stage1TauIsolationLUT(m_params);