Merge pull request #30469 from JamminJones/fixL1TriggerRPCTechnicalTr…

…igger added esConsumes to modules in L1Trigger/RPCTechnicalTrigger
cms-sw · Jul 7, 2020 · c5da6c3 · c5da6c3
2 parents 9e907f7 + 3e67ff0
commit c5da6c3
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/L1Trigger/RPCTechnicalTrigger/interface/RPCTechnicalTrigger.h b/L1Trigger/RPCTechnicalTrigger/interface/RPCTechnicalTrigger.h
@@ -39,6 +39,7 @@ Description: Implementation of the RPC Technical Trigger Emulator
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
+#include "FWCore/Utilities/interface/ESGetToken.h"
 
 #include "Geometry/RPCGeometry/interface/RPCRoll.h"
 #include "Geometry/RPCGeometry/interface/RPCGeometry.h"
@@ -132,6 +133,10 @@ class RPCTechnicalTrigger : public edm::stream::EDProducer<> {
   std::map<int, TTUResults*> convertToMap(const std::vector<std::unique_ptr<TTUResults>>&) const;
 
   bool searchCoincidence(int, int, std::map<int, TTUResults*> const& ttuResultsByQuandrant) const;
+
+  edm::ESGetToken<RPCGeometry, MuonGeometryRecord> m_rpcGeometryToken;
+  edm::ESGetToken<RBCBoardSpecs, RBCBoardSpecsRcd> m_pRBCSpecsToken;
+  edm::ESGetToken<TTUBoardSpecs, TTUBoardSpecsRcd> m_pTTUSpecsToken;
 };
 
 #endif  // RPCTECHNICALTRIGGER_H
diff --git a/L1Trigger/RPCTechnicalTrigger/src/RPCTechnicalTrigger.cc b/L1Trigger/RPCTechnicalTrigger/src/RPCTechnicalTrigger.cc
@@ -43,9 +43,8 @@ RPCTechnicalTrigger::RPCTechnicalTrigger(const edm::ParameterSet& iConfig)
       m_ttNames{iConfig.getParameter<std::vector<std::string>>("BitNames")},
       m_rpcDigiLabel{iConfig.getParameter<edm::InputTag>("RPCDigiLabel")},
       m_rpcDigiToken{consumes<RPCDigiCollection>(m_rpcDigiLabel)},
-      m_useRPCSimLink{iConfig.getUntrackedParameter<int>("UseRPCSimLink", 0)} {
-  //...........................................................................
-
+      m_useRPCSimLink{iConfig.getUntrackedParameter<int>("UseRPCSimLink", 0)},
+      m_rpcGeometryToken(esConsumes<RPCGeometry, MuonGeometryRecord>()) {
   std::string configFile = iConfig.getParameter<std::string>("ConfigFile");
 
   edm::FileInPath f1("L1Trigger/RPCTechnicalTrigger/data/" + configFile);
@@ -80,6 +79,10 @@ RPCTechnicalTrigger::RPCTechnicalTrigger(const edm::ParameterSet& iConfig)
   m_hasConfig = false;
   produces<L1GtTechnicalTriggerRecord>();
   consumes<edm::DetSetVector<RPCDigiSimLink>>(edm::InputTag("simMuonRPCDigis", "RPCDigiSimLink", ""));
+  if (m_useEventSetup >= 1) {
+    m_pRBCSpecsToken = esConsumes<RBCBoardSpecs, RBCBoardSpecsRcd, edm::Transition::BeginRun>();
+    m_pTTUSpecsToken = esConsumes<TTUBoardSpecs, TTUBoardSpecsRcd, edm::Transition::BeginRun>();
+  }
 }
 
 RPCTechnicalTrigger::~RPCTechnicalTrigger() {}
@@ -95,8 +98,7 @@ void RPCTechnicalTrigger::produce(edm::Event& iEvent, const edm::EventSetup& iSe
   std::unique_ptr<L1GtTechnicalTriggerRecord> output(new L1GtTechnicalTriggerRecord());
 
   //.   Set up RPC geometry
-  edm::ESHandle<RPCGeometry> rpcGeometry;
-  iSetup.get<MuonGeometryRecord>().get(rpcGeometry);
+  edm::ESHandle<RPCGeometry> rpcGeometry = iSetup.getHandle(m_rpcGeometryToken);
 
   std::unique_ptr<ProcessInputSignal> signal;
   if (m_useRPCSimLink == 0) {
@@ -295,11 +297,10 @@ void RPCTechnicalTrigger::beginRun(edm::Run const& iRun, const edm::EventSetup&
   //..  Get Board Specifications (hardware configuration)
 
   if (m_useEventSetup >= 1) {
-    edm::ESHandle<RBCBoardSpecs> pRBCSpecs;
+    edm::ESHandle<RBCBoardSpecs> pRBCSpecs = evtSetup.getHandle(m_pRBCSpecsToken);
     evtSetup.get<RBCBoardSpecsRcd>().get(pRBCSpecs);
 
-    edm::ESHandle<TTUBoardSpecs> pTTUSpecs;
-    evtSetup.get<TTUBoardSpecsRcd>().get(pTTUSpecs);
+    edm::ESHandle<TTUBoardSpecs> pTTUSpecs = evtSetup.getHandle(m_pTTUSpecsToken);
 
     if (!pRBCSpecs.isValid() || !pTTUSpecs.isValid()) {
       edm::LogError("RPCTechnicalTrigger") << "can't find RBC/TTU BoardSpecsRcd" << '\n';