Merge pull request #30554 from JamminJones/fixRecoVertexBeamSpotProducer

added esConsumes to modules in RecoVertex/BeamSpotProducer
cms-sw · Jul 7, 2020 · 9e907f7 · 9e907f7
2 parents 2d727ac + a6fae1e
commit 9e907f7
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 15 deletions.
diff --git 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<BeamSpotObjects, BeamSpotObjectsRcd> m_beamToken;
 };
 
 #endif
diff --git 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<BeamSpotOnlineCollection> scalerToken_;
   const edm::EDGetTokenT<L1GlobalTriggerEvmReadoutRecord> l1GtEvmReadoutRecordToken_;
+  const edm::ESGetToken<BeamSpotObjects, BeamSpotObjectsRcd> beamToken_;
 
   const unsigned int theBeamShoutMode;
 };

diff --git 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<BeamSpotObjects, BeamSpotObjectsRcd> m_beamToken;
 };
 
 #endif
diff --git 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<BeamSpotObjects, BeamSpotObjectsRcd>()) {}
 
 BeamSpotFromDB::~BeamSpotFromDB() {}
 
 void BeamSpotFromDB::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
-  edm::ESHandle<BeamSpotObjects> beamhandle;
-  iSetup.get<BeamSpotObjectsRcd>().get(beamhandle);
+  edm::ESHandle<BeamSpotObjects> 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
@@ -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;
@@ -18,6 +14,7 @@ BeamSpotOnlineProducer::BeamSpotOnlineProducer(const ParameterSet& iconf)
       theSetSigmaZ(iconf.getParameter<double>("setSigmaZ")),
       scalerToken_(consumes<BeamSpotOnlineCollection>(iconf.getParameter<InputTag>("src"))),
       l1GtEvmReadoutRecordToken_(consumes<L1GlobalTriggerEvmReadoutRecord>(iconf.getParameter<InputTag>("gtEvmLabel"))),
+      beamToken_(esConsumes<BeamSpotObjects, BeamSpotObjectsRcd>()),
       theBeamShoutMode(iconf.getUntrackedParameter<unsigned int>("beamMode", 11)) {
   theMaxR2 = iconf.getParameter<double>("maxRadius");
   theMaxR2 *= theMaxR2;
@@ -106,8 +103,7 @@ void BeamSpotOnlineProducer::produce(Event& iEvent, const EventSetup& iSetup) {
   }
 
   if (fallBackToDB) {
-    edm::ESHandle<BeamSpotObjects> beamhandle;
-    iSetup.get<BeamSpotObjectsRcd>().get(beamhandle);
+    edm::ESHandle<BeamSpotObjects> 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
@@ -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<bool>("verbose", false);
+  m_beamToken = esConsumes<BeamSpotObjects, BeamSpotObjectsRcd>();
 
   produces<reco::BeamSpot>();
 }
@@ -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<BeamSpotObjects> beamhandle;
-  iSetup.get<BeamSpotObjectsRcd>().get(beamhandle);
+  edm::ESHandle<BeamSpotObjects> beamhandle = iSetup.getHandle(m_beamToken);
   const BeamSpotObjects* spotDB = beamhandle.product();
 
   // translate from BeamSpotObjects to reco::BeamSpot