From ea84b43e0c83358693cd0f53a75f466c9136b53c Mon Sep 17 00:00:00 2001 From: Tamas Date: Tue, 7 Dec 2021 01:33:19 +0100 Subject: [PATCH 1/3] es get() migration of L1CondDBPayloadWriter and L1CondDBPayloadWriterExt --- .../plugins/L1CondDBPayloadWriter.cc | 6 +-- .../plugins/L1CondDBPayloadWriterExt.cc | 52 ++++++++++++++++--- 2 files changed, 47 insertions(+), 11 deletions(-) diff --git a/CondTools/L1Trigger/plugins/L1CondDBPayloadWriter.cc b/CondTools/L1Trigger/plugins/L1CondDBPayloadWriter.cc index b83618cd9ba3e..7586c67697982 100644 --- a/CondTools/L1Trigger/plugins/L1CondDBPayloadWriter.cc +++ b/CondTools/L1Trigger/plugins/L1CondDBPayloadWriter.cc @@ -45,10 +45,8 @@ L1CondDBPayloadWriter::L1CondDBPayloadWriter(const edm::ParameterSet& iConfig) m_writeConfigData(iConfig.getParameter("writeConfigData")), m_overwriteKeys(iConfig.getParameter("overwriteKeys")), m_logTransactions(iConfig.getParameter("logTransactions")), - m_newL1TriggerKeyList(iConfig.getParameter("newL1TriggerKeyList")) { - //now do what ever initialization is needed - l1TriggerKeyToken_ = esConsumes(); -} + m_newL1TriggerKeyList(iConfig.getParameter("newL1TriggerKeyList")), + l1TriggerKeyToken_(esConsumes()) {} L1CondDBPayloadWriter::~L1CondDBPayloadWriter() { // do anything here that needs to be done at desctruction time diff --git a/CondTools/L1TriggerExt/plugins/L1CondDBPayloadWriterExt.cc b/CondTools/L1TriggerExt/plugins/L1CondDBPayloadWriterExt.cc index 1449d7cc80ea1..bad02d46aef30 100644 --- a/CondTools/L1TriggerExt/plugins/L1CondDBPayloadWriterExt.cc +++ b/CondTools/L1TriggerExt/plugins/L1CondDBPayloadWriterExt.cc @@ -1,21 +1,59 @@ #include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "CondTools/L1TriggerExt/plugins/L1CondDBPayloadWriterExt.h" - #include "CondFormats/L1TObjects/interface/L1TriggerKeyExt.h" #include "CondFormats/DataRecord/interface/L1TriggerKeyExtRcd.h" #include "CondFormats/L1TObjects/interface/L1TriggerKeyListExt.h" #include "CondFormats/DataRecord/interface/L1TriggerKeyListExtRcd.h" +#include + +#include "FWCore/Framework/interface/Frameworkfwd.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" +#include "FWCore/Framework/interface/Event.h" +#include "FWCore/Framework/interface/MakerMacros.h" +#include "FWCore/ParameterSet/interface/ParameterSet.h" +#include "FWCore/Utilities/interface/ESGetToken.h" +#include "CondTools/L1TriggerExt/interface/DataWriterExt.h" + +class L1CondDBPayloadWriterExt : public edm::one::EDAnalyzer<> { +public: + explicit L1CondDBPayloadWriterExt(const edm::ParameterSet&); + ~L1CondDBPayloadWriterExt() override; + +private: + void beginJob() override; + void analyze(const edm::Event&, const edm::EventSetup&) override; + void endJob() override; + + // ----------member data --------------------------- + l1t::DataWriterExt m_writer; + // std::string m_tag ; // tag is known by PoolDBOutputService + + // set to false to write config data without valid TSC key + bool m_writeL1TriggerKeyExt; + + // set to false to write config data only + bool m_writeConfigData; + + // substitute new payload tokens for existing keys in L1TriggerKeyListExt + bool m_overwriteKeys; + + bool m_logTransactions; + + // if true, do not retrieve L1TriggerKeyListExt from EventSetup + bool m_newL1TriggerKeyListExt; + + // Token to access L1TriggerKeyExt data in the event setup + edm::ESGetToken theL1TriggerKeyExtToken_; +}; + L1CondDBPayloadWriterExt::L1CondDBPayloadWriterExt(const edm::ParameterSet& iConfig) : m_writeL1TriggerKeyExt(iConfig.getParameter("writeL1TriggerKeyExt")), m_writeConfigData(iConfig.getParameter("writeConfigData")), m_overwriteKeys(iConfig.getParameter("overwriteKeys")), m_logTransactions(iConfig.getParameter("logTransactions")), - m_newL1TriggerKeyListExt(iConfig.getParameter("newL1TriggerKeyListExt")) { - //now do what ever initialization is needed - key_token = esConsumes(); -} + m_newL1TriggerKeyListExt(iConfig.getParameter("newL1TriggerKeyListExt")), + theL1TriggerKeyExtToken_(esConsumes()) {} L1CondDBPayloadWriterExt::~L1CondDBPayloadWriterExt() { // do anything here that needs to be done at desctruction time @@ -46,7 +84,7 @@ void L1CondDBPayloadWriterExt::analyze(const edm::Event& iEvent, const edm::Even bool triggerKeyOK = true; try { // Get L1TriggerKeyExt - key = iSetup.get().get(key_token); + key = iSetup.getData(theL1TriggerKeyExtToken_); if (!m_overwriteKeys) { triggerKeyOK = oldKeyList.token(key.tscKey()).empty(); } From e9025cb558e1849300f0aa9e4a31ee9547e1b54f Mon Sep 17 00:00:00 2001 From: Tamas Date: Tue, 7 Dec 2021 14:20:55 +0100 Subject: [PATCH 2/3] Remove L1CondDBPayloadWriterExt.h --- .../plugins/L1CondDBPayloadWriterExt.h | 52 ------------------- 1 file changed, 52 deletions(-) delete mode 100644 CondTools/L1TriggerExt/plugins/L1CondDBPayloadWriterExt.h diff --git a/CondTools/L1TriggerExt/plugins/L1CondDBPayloadWriterExt.h b/CondTools/L1TriggerExt/plugins/L1CondDBPayloadWriterExt.h deleted file mode 100644 index 062c7e1aa11d8..0000000000000 --- a/CondTools/L1TriggerExt/plugins/L1CondDBPayloadWriterExt.h +++ /dev/null @@ -1,52 +0,0 @@ -#ifndef CondTools_L1TriggerExt_L1CondDBPayloadWriterExt_h -#define CondTools_L1TriggerExt_L1CondDBPayloadWriterExt_h -#include - -#include "FWCore/Framework/interface/Frameworkfwd.h" -#include "FWCore/Framework/interface/one/EDAnalyzer.h" - -#include "FWCore/Framework/interface/Event.h" -#include "FWCore/Framework/interface/MakerMacros.h" - -#include "FWCore/ParameterSet/interface/ParameterSet.h" - -#include "FWCore/Utilities/interface/ESGetToken.h" - -#include "CondTools/L1TriggerExt/interface/DataWriterExt.h" - -#include "CondFormats/L1TObjects/interface/L1TriggerKeyExt.h" -#include "CondFormats/DataRecord/interface/L1TriggerKeyExtRcd.h" - -class L1CondDBPayloadWriterExt : public edm::one::EDAnalyzer<> { -public: - explicit L1CondDBPayloadWriterExt(const edm::ParameterSet&); - ~L1CondDBPayloadWriterExt() override; - -private: - void beginJob() override; - void analyze(const edm::Event&, const edm::EventSetup&) override; - void endJob() override; - - // ----------member data --------------------------- - l1t::DataWriterExt m_writer; - // std::string m_tag ; // tag is known by PoolDBOutputService - - // token to access object key - edm::ESGetToken key_token; - - // set to false to write config data without valid TSC key - bool m_writeL1TriggerKeyExt; - - // set to false to write config data only - bool m_writeConfigData; - - // substitute new payload tokens for existing keys in L1TriggerKeyListExt - bool m_overwriteKeys; - - bool m_logTransactions; - - // if true, do not retrieve L1TriggerKeyListExt from EventSetup - bool m_newL1TriggerKeyListExt; -}; - -#endif From 0e1479a9a6ca403b96db2b4fc5c760640bb65ab6 Mon Sep 17 00:00:00 2001 From: Tamas Date: Tue, 7 Dec 2021 16:38:04 +0100 Subject: [PATCH 3/3] Remove L1TriggerExt from SealModule --- CondTools/L1TriggerExt/plugins/L1CondDBPayloadWriterExt.cc | 2 +- CondTools/L1TriggerExt/plugins/SealModule.cc | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/CondTools/L1TriggerExt/plugins/L1CondDBPayloadWriterExt.cc b/CondTools/L1TriggerExt/plugins/L1CondDBPayloadWriterExt.cc index bad02d46aef30..2ce081edc7484 100644 --- a/CondTools/L1TriggerExt/plugins/L1CondDBPayloadWriterExt.cc +++ b/CondTools/L1TriggerExt/plugins/L1CondDBPayloadWriterExt.cc @@ -180,4 +180,4 @@ void L1CondDBPayloadWriterExt::beginJob() {} void L1CondDBPayloadWriterExt::endJob() {} //define this as a plug-in -//DEFINE_FWK_MODULE(L1CondDBPayloadWriterExt); +DEFINE_FWK_MODULE(L1CondDBPayloadWriterExt); diff --git a/CondTools/L1TriggerExt/plugins/SealModule.cc b/CondTools/L1TriggerExt/plugins/SealModule.cc index c70f0c4ad507b..998706376abc8 100644 --- a/CondTools/L1TriggerExt/plugins/SealModule.cc +++ b/CondTools/L1TriggerExt/plugins/SealModule.cc @@ -1,5 +1,4 @@ #include "FWCore/Framework/interface/MakerMacros.h" -#include "CondTools/L1TriggerExt/plugins/L1CondDBPayloadWriterExt.h" #include "CondTools/L1TriggerExt/plugins/L1CondDBIOVWriterExt.h" #include "CondTools/L1TriggerExt/plugins/L1TriggerKeyDummyProdExt.h" #include "CondTools/L1TriggerExt/plugins/L1TriggerKeyListDummyProdExt.h" @@ -8,7 +7,6 @@ using namespace l1t; -DEFINE_FWK_MODULE(L1CondDBPayloadWriterExt); DEFINE_FWK_MODULE(L1CondDBIOVWriterExt); DEFINE_FWK_EVENTSETUP_MODULE(L1TriggerKeyDummyProdExt); DEFINE_FWK_EVENTSETUP_MODULE(L1TriggerKeyListDummyProdExt);