From 76f74c586126102677dc15f15753e1ac7606d936 Mon Sep 17 00:00:00 2001 From: Ben Jones Date: Mon, 6 Jul 2020 09:37:06 -0500 Subject: [PATCH 1/3] added esConsumes to modules in RecoVertex/BeamSpotProducer --- RecoVertex/BeamSpotProducer/interface/BeamSpotFromDB.h | 5 +++++ .../BeamSpotProducer/interface/BeamSpotOnlineProducer.h | 5 +++++ RecoVertex/BeamSpotProducer/interface/BeamSpotProducer.h | 5 +++++ RecoVertex/BeamSpotProducer/plugins/BeamSpotFromDB.cc | 8 +++----- .../BeamSpotProducer/plugins/BeamSpotOnlineProducer.cc | 4 ++-- RecoVertex/BeamSpotProducer/plugins/BeamSpotProducer.cc | 6 ++---- 6 files changed, 22 insertions(+), 11 deletions(-) diff --git a/RecoVertex/BeamSpotProducer/interface/BeamSpotFromDB.h b/RecoVertex/BeamSpotProducer/interface/BeamSpotFromDB.h index 0b3b5243127ed..1b16c78db4b35 100644 --- a/RecoVertex/BeamSpotProducer/interface/BeamSpotFromDB.h +++ b/RecoVertex/BeamSpotProducer/interface/BeamSpotFromDB.h @@ -19,6 +19,10 @@ ________________________________________________________________**/ #include "FWCore/Framework/interface/EDAnalyzer.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" +#include "FWCore/Utilities/interface/ESGetToken.h" + +#include "CondFormats/DataRecord/interface/BeamSpotObjectsRcd.h" +#include "CondFormats/BeamSpotObjects/interface/BeamSpotObjects.h" class BeamSpotFromDB : public edm::EDAnalyzer { public: @@ -29,6 +33,7 @@ class BeamSpotFromDB : public edm::EDAnalyzer { void beginJob() override; void analyze(const edm::Event&, const edm::EventSetup&) override; void endJob() override; + edm::ESGetToken m_beamToken; }; #endif diff --git a/RecoVertex/BeamSpotProducer/interface/BeamSpotOnlineProducer.h b/RecoVertex/BeamSpotProducer/interface/BeamSpotOnlineProducer.h index b9ae73c367d7e..9b9363dfb214a 100644 --- a/RecoVertex/BeamSpotProducer/interface/BeamSpotOnlineProducer.h +++ b/RecoVertex/BeamSpotProducer/interface/BeamSpotOnlineProducer.h @@ -17,6 +17,10 @@ ________________________________________________________________**/ #include "DataFormats/Common/interface/Handle.h" #include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Framework/interface/EventSetup.h" +#include "FWCore/Utilities/interface/ESGetToken.h" + +#include "CondFormats/DataRecord/interface/BeamSpotObjectsRcd.h" +#include "CondFormats/BeamSpotObjects/interface/BeamSpotObjects.h" #include "DataFormats/Scalers/interface/BeamSpotOnline.h" #include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerEvmReadoutRecord.h" @@ -38,6 +42,7 @@ class BeamSpotOnlineProducer : public edm::stream::EDProducer<> { double theMaxR2; const edm::EDGetTokenT scalerToken_; const edm::EDGetTokenT l1GtEvmReadoutRecordToken_; + const edm::ESGetToken beamToken_; const unsigned int theBeamShoutMode; }; diff --git a/RecoVertex/BeamSpotProducer/interface/BeamSpotProducer.h b/RecoVertex/BeamSpotProducer/interface/BeamSpotProducer.h index 4a43caea4b725..84bc0b56af39b 100644 --- a/RecoVertex/BeamSpotProducer/interface/BeamSpotProducer.h +++ b/RecoVertex/BeamSpotProducer/interface/BeamSpotProducer.h @@ -17,6 +17,10 @@ ________________________________________________________________**/ #include "DataFormats/Common/interface/Handle.h" #include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Framework/interface/EventSetup.h" +#include "FWCore/Utilities/interface/ESGetToken.h" + +#include "CondFormats/DataRecord/interface/BeamSpotObjectsRcd.h" +#include "CondFormats/BeamSpotObjects/interface/BeamSpotObjects.h" class BeamSpotProducer : public edm::stream::EDProducer<> { public: @@ -31,6 +35,7 @@ class BeamSpotProducer : public edm::stream::EDProducer<> { void produce(edm::Event& iEvent, const edm::EventSetup& iSetup) override; private: + edm::ESGetToken m_beamToken; }; #endif diff --git a/RecoVertex/BeamSpotProducer/plugins/BeamSpotFromDB.cc b/RecoVertex/BeamSpotProducer/plugins/BeamSpotFromDB.cc index ae09fa3a1e3b8..e042d9abe7de9 100644 --- a/RecoVertex/BeamSpotProducer/plugins/BeamSpotFromDB.cc +++ b/RecoVertex/BeamSpotProducer/plugins/BeamSpotFromDB.cc @@ -23,16 +23,14 @@ ________________________________________________________________**/ #include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Framework/interface/EventSetup.h" #include "FWCore/Framework/interface/IOVSyncValue.h" -#include "CondFormats/DataRecord/interface/BeamSpotObjectsRcd.h" -#include "CondFormats/BeamSpotObjects/interface/BeamSpotObjects.h" -BeamSpotFromDB::BeamSpotFromDB(const edm::ParameterSet& iConfig) {} +BeamSpotFromDB::BeamSpotFromDB(const edm::ParameterSet& iConfig) + :m_beamToken(esConsumes()) {} BeamSpotFromDB::~BeamSpotFromDB() {} void BeamSpotFromDB::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) { - edm::ESHandle beamhandle; - iSetup.get().get(beamhandle); + edm::ESHandle beamhandle = iSetup.getHandle(m_beamToken); const BeamSpotObjects* mybeamspot = beamhandle.product(); std::cout << " for runs: " << iEvent.id().run() << " - " << iEvent.id().run() << std::endl; diff --git a/RecoVertex/BeamSpotProducer/plugins/BeamSpotOnlineProducer.cc b/RecoVertex/BeamSpotProducer/plugins/BeamSpotOnlineProducer.cc index 570de1fb83dea..817442438ca5d 100644 --- a/RecoVertex/BeamSpotProducer/plugins/BeamSpotOnlineProducer.cc +++ b/RecoVertex/BeamSpotProducer/plugins/BeamSpotOnlineProducer.cc @@ -18,6 +18,7 @@ BeamSpotOnlineProducer::BeamSpotOnlineProducer(const ParameterSet& iconf) theSetSigmaZ(iconf.getParameter("setSigmaZ")), scalerToken_(consumes(iconf.getParameter("src"))), l1GtEvmReadoutRecordToken_(consumes(iconf.getParameter("gtEvmLabel"))), + beamToken_(esConsumes()), theBeamShoutMode(iconf.getUntrackedParameter("beamMode", 11)) { theMaxR2 = iconf.getParameter("maxRadius"); theMaxR2 *= theMaxR2; @@ -106,8 +107,7 @@ void BeamSpotOnlineProducer::produce(Event& iEvent, const EventSetup& iSetup) { } if (fallBackToDB) { - edm::ESHandle beamhandle; - iSetup.get().get(beamhandle); + edm::ESHandle beamhandle = iSetup.getHandle(beamToken_); const BeamSpotObjects* spotDB = beamhandle.product(); // translate from BeamSpotObjects to reco::BeamSpot diff --git a/RecoVertex/BeamSpotProducer/plugins/BeamSpotProducer.cc b/RecoVertex/BeamSpotProducer/plugins/BeamSpotProducer.cc index 013a49f3c0a2e..b35cab5dc0043 100644 --- a/RecoVertex/BeamSpotProducer/plugins/BeamSpotProducer.cc +++ b/RecoVertex/BeamSpotProducer/plugins/BeamSpotProducer.cc @@ -7,8 +7,6 @@ #include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Framework/interface/EventSetup.h" #include "FWCore/Framework/interface/IOVSyncValue.h" -#include "CondFormats/DataRecord/interface/BeamSpotObjectsRcd.h" -#include "CondFormats/BeamSpotObjects/interface/BeamSpotObjects.h" #include "DataFormats/Math/interface/Error.h" #include "DataFormats/Math/interface/Point3D.h" @@ -21,6 +19,7 @@ BeamSpotProducer::BeamSpotProducer(const edm::ParameterSet& iConf) { << "\n"; //fVerbose=conf.getUntrackedParameter("verbose", false); + m_beamToken = esConsumes(); produces(); } @@ -46,8 +45,7 @@ void BeamSpotProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup //try { edm::LogInfo("RecoVertex/BeamSpotProducer") << "Reconstructing event number: " << iEvent.id() << "\n"; - edm::ESHandle beamhandle; - iSetup.get().get(beamhandle); + edm::ESHandle beamhandle = iSetup.getHandle(m_beamToken); const BeamSpotObjects* spotDB = beamhandle.product(); // translate from BeamSpotObjects to reco::BeamSpot From a1ecb07ca80df15a0d40b8f04fd6bdb23ae98835 Mon Sep 17 00:00:00 2001 From: Ben Jones Date: Mon, 6 Jul 2020 09:57:16 -0500 Subject: [PATCH 2/3] fixed clang format --- RecoVertex/BeamSpotProducer/plugins/BeamSpotFromDB.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RecoVertex/BeamSpotProducer/plugins/BeamSpotFromDB.cc b/RecoVertex/BeamSpotProducer/plugins/BeamSpotFromDB.cc index e042d9abe7de9..dadfecf9a9d2b 100644 --- a/RecoVertex/BeamSpotProducer/plugins/BeamSpotFromDB.cc +++ b/RecoVertex/BeamSpotProducer/plugins/BeamSpotFromDB.cc @@ -25,7 +25,7 @@ ________________________________________________________________**/ #include "FWCore/Framework/interface/IOVSyncValue.h" BeamSpotFromDB::BeamSpotFromDB(const edm::ParameterSet& iConfig) - :m_beamToken(esConsumes()) {} + : m_beamToken(esConsumes()) {} BeamSpotFromDB::~BeamSpotFromDB() {} From a6fae1e66f0a7af2efe538528889ea13be333420 Mon Sep 17 00:00:00 2001 From: Ben Jones Date: Mon, 6 Jul 2020 13:27:25 -0500 Subject: [PATCH 3/3] removed includes already in h file --- RecoVertex/BeamSpotProducer/plugins/BeamSpotOnlineProducer.cc | 4 ---- 1 file changed, 4 deletions(-) diff --git a/RecoVertex/BeamSpotProducer/plugins/BeamSpotOnlineProducer.cc b/RecoVertex/BeamSpotProducer/plugins/BeamSpotOnlineProducer.cc index 817442438ca5d..2a6a9260fb384 100644 --- a/RecoVertex/BeamSpotProducer/plugins/BeamSpotOnlineProducer.cc +++ b/RecoVertex/BeamSpotProducer/plugins/BeamSpotOnlineProducer.cc @@ -2,12 +2,8 @@ #include "RecoVertex/BeamSpotProducer/interface/BeamSpotOnlineProducer.h" #include "DataFormats/BeamSpot/interface/BeamSpot.h" -#include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Framework/interface/EventSetup.h" #include "FWCore/Framework/interface/IOVSyncValue.h" -#include "CondFormats/DataRecord/interface/BeamSpotObjectsRcd.h" -#include "CondFormats/BeamSpotObjects/interface/BeamSpotObjects.h" - #include "FWCore/Framework/interface/MakerMacros.h" using namespace edm;