Merge pull request #30427 from JamminJones/fixL1TriggerL1TGlobal

added esConsumes to modules in L1Trigger/L1TGlobal
cms-sw · Jul 7, 2020 · 0bc053c · 0bc053c
2 parents e2b8f25 + 118653d
commit 0bc053c
Show file tree

Hide file tree

Showing 14 changed files with 42 additions and 35 deletions.
diff --git a/L1Trigger/L1TGlobal/plugins/BXVectorInputProducer.cc b/L1Trigger/L1TGlobal/plugins/BXVectorInputProducer.cc
@@ -19,7 +19,6 @@
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/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/L1TGlobal/plugins/FakeInputProducer.cc b/L1Trigger/L1TGlobal/plugins/FakeInputProducer.cc
@@ -16,7 +16,6 @@
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/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/L1TGlobal/plugins/GtInputDump.cc b/L1Trigger/L1TGlobal/plugins/GtInputDump.cc
@@ -32,7 +32,6 @@
 #include "FWCore/Utilities/interface/InputTag.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 
 #include "DataFormats/L1Trigger/interface/EGamma.h"
 #include "DataFormats/L1Trigger/interface/Muon.h"

diff --git a/L1Trigger/L1TGlobal/plugins/GtRecordDump.cc b/L1Trigger/L1TGlobal/plugins/GtRecordDump.cc
@@ -34,7 +34,6 @@
 #include "FWCore/Utilities/interface/InputTag.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 
 #include "DataFormats/L1Trigger/interface/EGamma.h"
 #include "DataFormats/L1Trigger/interface/Muon.h"

diff --git a/L1Trigger/L1TGlobal/plugins/L1TExtCondLegacyToStage2.cc b/L1Trigger/L1TGlobal/plugins/L1TExtCondLegacyToStage2.cc
@@ -20,6 +20,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/L1TUtmTriggerMenu.h"
@@ -68,6 +69,9 @@ class L1TExtCondLegacyToStage2 : public stream::EDProducer<> {
   // Readout Record token
   edm::EDGetTokenT<L1GlobalTriggerReadoutRecord> gtReadoutRecordToken;
 
+  // EventSetup Token for l1GtMenu
+  edm::ESGetToken<L1TUtmTriggerMenu, L1TUtmTriggerMenuRcd> l1GtMenuToken;
+
   unsigned long long m_l1GtMenuCacheID;
   std::map<std::string, unsigned int> m_extBitMap;
 };
@@ -79,7 +83,8 @@ L1TExtCondLegacyToStage2::L1TExtCondLegacyToStage2(const ParameterSet& iConfig)
     : bxFirst_(iConfig.getParameter<int>("bxFirst")),
       bxLast_(iConfig.getParameter<int>("bxLast")),
       gtReadoutRecordToken(
-          consumes<L1GlobalTriggerReadoutRecord>(iConfig.getParameter<edm::InputTag>("LegacyGtReadoutRecord"))) {
+          consumes<L1GlobalTriggerReadoutRecord>(iConfig.getParameter<edm::InputTag>("LegacyGtReadoutRecord"))),
+      l1GtMenuToken(esConsumes<L1TUtmTriggerMenu, L1TUtmTriggerMenuRcd>()) {
   // register what you produce
   produces<GlobalExtBlkBxCollection>();
 
@@ -101,8 +106,7 @@ void L1TExtCondLegacyToStage2::produce(Event& iEvent, const EventSetup& iSetup)
   unsigned long long l1GtMenuCacheID = iSetup.get<L1TUtmTriggerMenuRcd>().cacheIdentifier();
 
   if (m_l1GtMenuCacheID != l1GtMenuCacheID) {
-    edm::ESHandle<L1TUtmTriggerMenu> l1GtMenu;
-    iSetup.get<L1TUtmTriggerMenuRcd>().get(l1GtMenu);
+    edm::ESHandle<L1TUtmTriggerMenu> l1GtMenu = iSetup.getHandle(l1GtMenuToken);
     const L1TUtmTriggerMenu* utml1GtMenu = l1GtMenu.product();
 
     // Instantiate Parser

diff --git a/L1Trigger/L1TGlobal/plugins/L1TExtCondProducer.cc b/L1Trigger/L1TGlobal/plugins/L1TExtCondProducer.cc
@@ -20,6 +20,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/L1TUtmTriggerMenu.h"
@@ -77,6 +78,7 @@ class L1TExtCondProducer : public stream::EDProducer<> {
   bool makeTriggerRulePrefireVetoBit_;
   edm::EDGetTokenT<TCDSRecord> tcdsRecordToken_;
   edm::InputTag tcdsInputTag_;
+  edm::ESGetToken<L1TUtmTriggerMenu, L1TUtmTriggerMenuRcd> l1GtMenuToken_;
 };
 
 //
@@ -89,7 +91,8 @@ L1TExtCondProducer::L1TExtCondProducer(const ParameterSet& iConfig)
       setBptxPlus_(iConfig.getParameter<bool>("setBptxPlus")),
       setBptxMinus_(iConfig.getParameter<bool>("setBptxMinus")),
       setBptxOR_(iConfig.getParameter<bool>("setBptxOR")),
-      tcdsInputTag_(iConfig.getParameter<edm::InputTag>("tcdsRecordLabel")) {
+      tcdsInputTag_(iConfig.getParameter<edm::InputTag>("tcdsRecordLabel")),
+      l1GtMenuToken_(esConsumes<L1TUtmTriggerMenu, L1TUtmTriggerMenuRcd>()) {
   makeTriggerRulePrefireVetoBit_ = false;
 
   m_triggerRulePrefireVetoBit = 255;
@@ -126,8 +129,7 @@ void L1TExtCondProducer::produce(Event& iEvent, const EventSetup& iSetup) {
   unsigned long long l1GtMenuCacheID = iSetup.get<L1TUtmTriggerMenuRcd>().cacheIdentifier();
 
   if (m_l1GtMenuCacheID != l1GtMenuCacheID) {
-    edm::ESHandle<L1TUtmTriggerMenu> l1GtMenu;
-    iSetup.get<L1TUtmTriggerMenuRcd>().get(l1GtMenu);
+    edm::ESHandle<L1TUtmTriggerMenu> l1GtMenu = iSetup.getHandle(l1GtMenuToken_);
     const L1TUtmTriggerMenu* utml1GtMenu = l1GtMenu.product();
 
     // Instantiate Parser

diff --git a/L1Trigger/L1TGlobal/plugins/L1TGlobalPrescaler.cc b/L1Trigger/L1TGlobal/plugins/L1TGlobalPrescaler.cc
@@ -101,6 +101,7 @@ namespace {
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
 #include "FWCore/Utilities/interface/EDMException.h"
+#include "FWCore/Utilities/interface/ESGetToken.h"
 #include "CondFormats/DataRecord/interface/L1TGlobalPrescalesVetosRcd.h"
 #include "CondFormats/L1TObjects/interface/L1TGlobalPrescalesVetos.h"
 #include "DataFormats/L1TGlobal/interface/GlobalAlgBlk.h"
@@ -168,6 +169,7 @@ class L1TGlobalPrescaler : public edm::one::EDFilter<> {
   std::array<unsigned int, GlobalAlgBlk::maxPhysicsTriggers> m_counters;
   const int m_l1tPrescaleColumn;
   int m_oldIndex;
+  edm::ESGetToken<L1TGlobalPrescalesVetos, L1TGlobalPrescalesVetosRcd> m_l1tGtPrescalesVetosToken;
 };
 
 const constexpr Entry<L1TGlobalPrescaler::Mode> L1TGlobalPrescaler::s_modes[];
@@ -196,6 +198,7 @@ L1TGlobalPrescaler::L1TGlobalPrescaler(edm::ParameterSet const& config)
     case Mode::ApplyPrescaleRatios:
     case Mode::ApplyColumnRatios:
     case Mode::ForceColumnValues:
+      m_l1tGtPrescalesVetosToken = esConsumes<L1TGlobalPrescalesVetos, L1TGlobalPrescalesVetosRcd>();
       break;
 
     // this should never happen
@@ -227,7 +230,7 @@ bool L1TGlobalPrescaler::filter(edm::Event& event, edm::EventSetup const& setup)
   // Mode::ApplyPrescaleRatios
   // apply prescales equal to ratio between the given values and the ones read from the EventSetup
   if (m_mode == Mode::ApplyPrescaleRatios and m_oldIndex != index) {
-    edm::ESHandle<L1TGlobalPrescalesVetos> h;
+    edm::ESHandle<L1TGlobalPrescalesVetos> h = setup.getHandle(m_l1tGtPrescalesVetosToken);
     setup.get<L1TGlobalPrescalesVetosRcd>().get(h);
     auto const& prescaleTable = h->prescale_table_;
     if (index >= (int)prescaleTable.size())
@@ -266,8 +269,7 @@ bool L1TGlobalPrescaler::filter(edm::Event& event, edm::EventSetup const& setup)
   // Mode::ApplyColumnValues and Mode::ForceColumnValues
   // apply the prescale values from the EventSetup corresponding to the given column index
   if ((m_mode == Mode::ApplyColumnValues or m_mode == Mode::ForceColumnValues) and m_oldIndex != m_l1tPrescaleColumn) {
-    edm::ESHandle<L1TGlobalPrescalesVetos> h;
-    setup.get<L1TGlobalPrescalesVetosRcd>().get(h);
+    edm::ESHandle<L1TGlobalPrescalesVetos> h = setup.getHandle(m_l1tGtPrescalesVetosToken);
     auto const& prescaleTable = h->prescale_table_;
     if (m_l1tPrescaleColumn >= (int)prescaleTable.size())
       throw edm::Exception(edm::errors::Configuration)
@@ -289,8 +291,7 @@ bool L1TGlobalPrescaler::filter(edm::Event& event, edm::EventSetup const& setup)
   // Mode::ApplyColumnRatios
   // apply prescales equal to ratio between the values corresponsing to the given column index, and the ones read from the EventSetup
   if (m_mode == Mode::ApplyColumnRatios and m_oldIndex != index) {
-    edm::ESHandle<L1TGlobalPrescalesVetos> h;
-    setup.get<L1TGlobalPrescalesVetosRcd>().get(h);
+    edm::ESHandle<L1TGlobalPrescalesVetos> h = setup.getHandle(m_l1tGtPrescalesVetosToken);
     auto const& prescaleTable = h->prescale_table_;
     if (index >= (int)prescaleTable.size())
       throw edm::Exception(edm::errors::LogicError)

diff --git a/L1Trigger/L1TGlobal/plugins/L1TGlobalPrescalesVetosESProducer.cc b/L1Trigger/L1TGlobal/plugins/L1TGlobalPrescalesVetosESProducer.cc
@@ -26,7 +26,6 @@
 
 #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"
 #include "FWCore/ParameterSet/interface/FileInPath.h"

diff --git a/L1Trigger/L1TGlobal/plugins/L1TGlobalProducer.cc b/L1Trigger/L1TGlobal/plugins/L1TGlobalProducer.cc
@@ -21,14 +21,7 @@
 #include "FWCore/Utilities/interface/InputTag.h"
 #include "DataFormats/Common/interface/RefProd.h"
 
-#include "CondFormats/L1TObjects/interface/L1TUtmTriggerMenu.h"
-#include "CondFormats/DataRecord/interface/L1TUtmTriggerMenuRcd.h"
-#include "CondFormats/L1TObjects/interface/L1TGlobalParameters.h"
-
-#include "CondFormats/DataRecord/interface/L1TGlobalParametersRcd.h"
 #include "L1Trigger/L1TGlobal/interface/GlobalParamsHelper.h"
-#include "CondFormats/L1TObjects/interface/L1TGlobalPrescalesVetos.h"
-#include "CondFormats/DataRecord/interface/L1TGlobalPrescalesVetosRcd.h"
 
 #include "DataFormats/L1TGlobal/interface/GlobalAlgBlk.h"
 #include "DataFormats/L1TGlobal/interface/GlobalExtBlk.h"
@@ -114,6 +107,11 @@ L1TGlobalProducer::L1TGlobalProducer(const edm::ParameterSet& parSet)
   m_sumInputToken = consumes<BXVector<EtSum>>(m_sumInputTag);
   m_muInputToken = consumes<BXVector<Muon>>(m_muInputTag);
   m_extInputToken = consumes<BXVector<GlobalExtBlk>>(m_extInputTag);
+  m_l1GtStableParToken = esConsumes<L1TGlobalParameters, L1TGlobalParametersRcd>();
+  m_l1GtMenuToken = esConsumes<L1TUtmTriggerMenu, L1TUtmTriggerMenuRcd>();
+  if (!(m_algorithmTriggersUnprescaled && m_algorithmTriggersUnmasked)) {
+    m_l1GtPrescaleVetosToken = esConsumes<L1TGlobalPrescalesVetos, L1TGlobalPrescalesVetosRcd>();
+  }
   if (m_getPrescaleColumnFromData)
     m_algoblkInputToken = consumes<BXVector<GlobalAlgBlk>>(m_algoblkInputTag);
 
@@ -239,8 +237,7 @@ void L1TGlobalProducer::produce(edm::Event& iEvent, const edm::EventSetup& evSet
   unsigned long long l1GtParCacheID = evSetup.get<L1TGlobalParametersRcd>().cacheIdentifier();
 
   if (m_l1GtParCacheID != l1GtParCacheID) {
-    edm::ESHandle<L1TGlobalParameters> l1GtStablePar;
-    evSetup.get<L1TGlobalParametersRcd>().get(l1GtStablePar);
+    edm::ESHandle<L1TGlobalParameters> l1GtStablePar = evSetup.getHandle(m_l1GtStableParToken);
     m_l1GtStablePar = l1GtStablePar.product();
     const GlobalParamsHelper* data = GlobalParamsHelper::readFromEventSetup(m_l1GtStablePar);
 
@@ -291,8 +288,7 @@ void L1TGlobalProducer::produce(edm::Event& iEvent, const edm::EventSetup& evSet
   if (m_l1GtMenuCacheID != l1GtMenuCacheID) {
     const GlobalParamsHelper* data = GlobalParamsHelper::readFromEventSetup(m_l1GtStablePar);
 
-    edm::ESHandle<L1TUtmTriggerMenu> l1GtMenu;
-    evSetup.get<L1TUtmTriggerMenuRcd>().get(l1GtMenu);
+    edm::ESHandle<L1TUtmTriggerMenu> l1GtMenu = evSetup.getHandle(m_l1GtMenuToken);
     const L1TUtmTriggerMenu* utml1GtMenu = l1GtMenu.product();
 
     // Instantiate Parser
@@ -369,8 +365,7 @@ void L1TGlobalProducer::produce(edm::Event& iEvent, const edm::EventSetup& evSet
     unsigned long long l1GtPfAlgoCacheID = evSetup.get<L1TGlobalPrescalesVetosRcd>().cacheIdentifier();
 
     if (m_l1GtPfAlgoCacheID != l1GtPfAlgoCacheID) {
-      edm::ESHandle<L1TGlobalPrescalesVetos> l1GtPrescalesVetoes;
-      evSetup.get<L1TGlobalPrescalesVetosRcd>().get(l1GtPrescalesVetoes);
+      edm::ESHandle<L1TGlobalPrescalesVetos> l1GtPrescalesVetoes = evSetup.getHandle(m_l1GtPrescaleVetosToken);
       const L1TGlobalPrescalesVetos* es = l1GtPrescalesVetoes.product();
       m_l1GtPrescalesVetoes = PrescalesVetosHelper::readFromEventSetup(es);
 

diff --git a/L1Trigger/L1TGlobal/plugins/L1TGlobalProducer.h b/L1Trigger/L1TGlobal/plugins/L1TGlobalProducer.h
@@ -15,12 +15,19 @@
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/InputTag.h"
+#include "FWCore/Utilities/interface/ESGetToken.h"
 
 #include "L1Trigger/L1TGlobal/interface/GlobalBoard.h"
 
 #include "CondFormats/L1TObjects/interface/L1TGlobalParameters.h"
 #include "L1Trigger/L1TGlobal/interface/GlobalParamsHelper.h"
 #include "L1Trigger/L1TGlobal/interface/PrescalesVetosHelper.h"
+#include "CondFormats/L1TObjects/interface/L1TUtmTriggerMenu.h"
+#include "CondFormats/DataRecord/interface/L1TUtmTriggerMenuRcd.h"
+#include "CondFormats/L1TObjects/interface/L1TGlobalParameters.h"
+#include "CondFormats/DataRecord/interface/L1TGlobalParametersRcd.h"
+#include "CondFormats/L1TObjects/interface/L1TGlobalPrescalesVetos.h"
+#include "CondFormats/DataRecord/interface/L1TGlobalPrescalesVetosRcd.h"
 
 class L1TGlobalParameters;
 class L1GtParameters;
@@ -173,6 +180,10 @@ class L1TGlobalProducer : public edm::stream::EDProducer<> {
   bool m_getPrescaleColumnFromData;
   edm::InputTag m_algoblkInputTag;
   edm::EDGetToken m_algoblkInputToken;
+
+  edm::ESGetToken<L1TGlobalParameters, L1TGlobalParametersRcd> m_l1GtStableParToken;
+  edm::ESGetToken<L1TUtmTriggerMenu, L1TUtmTriggerMenuRcd> m_l1GtMenuToken;
+  edm::ESGetToken<L1TGlobalPrescalesVetos, L1TGlobalPrescalesVetosRcd> m_l1GtPrescaleVetosToken;
 };
 
 #endif /*L1TGlobalProducer_h*/
diff --git a/L1Trigger/L1TGlobal/plugins/L1TGlobalSummary.cc b/L1Trigger/L1TGlobal/plugins/L1TGlobalSummary.cc
@@ -14,7 +14,6 @@
 #include "FWCore/Utilities/interface/InputTag.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 
 #include "DataFormats/L1TGlobal/interface/GlobalAlgBlk.h"
 #include "DataFormats/L1TGlobal/interface/GlobalExtBlk.h"

diff --git a/L1Trigger/L1TGlobal/plugins/L1TUtmTriggerMenuDumper.cc b/L1Trigger/L1TGlobal/plugins/L1TUtmTriggerMenuDumper.cc
@@ -24,6 +24,7 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Utilities/interface/ESGetToken.h"
 
 #include "CondFormats/L1TObjects/interface/L1TUtmTriggerMenu.h"
 #include "CondFormats/DataRecord/interface/L1TUtmTriggerMenuRcd.h"
@@ -48,9 +49,11 @@ class L1TUtmTriggerMenuDumper : public EDAnalyzer {
   void endRun(Run const&, EventSetup const&) override;
   void beginLuminosityBlock(LuminosityBlock const&, EventSetup const&) override;
   void endLuminosityBlock(LuminosityBlock const&, EventSetup const&) override;
+  edm::ESGetToken<L1TUtmTriggerMenu, L1TUtmTriggerMenuRcd> m_l1TriggerMenuToken;
 };
 
-L1TUtmTriggerMenuDumper::L1TUtmTriggerMenuDumper(const ParameterSet& iConfig) {}
+L1TUtmTriggerMenuDumper::L1TUtmTriggerMenuDumper(const ParameterSet& iConfig)
+    : m_l1TriggerMenuToken(esConsumes<L1TUtmTriggerMenu, L1TUtmTriggerMenuRcd, edm::Transition::BeginRun>()) {}
 
 L1TUtmTriggerMenuDumper::~L1TUtmTriggerMenuDumper() {}
 
@@ -61,8 +64,7 @@ void L1TUtmTriggerMenuDumper::beginJob() { cout << "INFO:  L1TUtmTriggerMenuDump
 void L1TUtmTriggerMenuDumper::endJob() { cout << "INFO:  L1TUtmTriggerMenuDumper module endJob called.\n"; }
 
 void L1TUtmTriggerMenuDumper::beginRun(Run const& run, EventSetup const& iSetup) {
-  edm::ESHandle<L1TUtmTriggerMenu> hmenu;
-  iSetup.get<L1TUtmTriggerMenuRcd>().get(hmenu);
+  edm::ESHandle<L1TUtmTriggerMenu> hmenu = iSetup.getHandle(m_l1TriggerMenuToken);
   const esTriggerMenu* menu = reinterpret_cast<const esTriggerMenu*>(hmenu.product());
 
   const std::map<std::string, esAlgorithm>& algoMap = menu->getAlgorithmMap();

diff --git a/L1Trigger/L1TGlobal/plugins/L1TUtmTriggerMenuESProducer.cc b/L1Trigger/L1TGlobal/plugins/L1TUtmTriggerMenuESProducer.cc
@@ -26,7 +26,6 @@
 
 #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"
 #include "FWCore/ParameterSet/interface/FileInPath.h"

diff --git a/L1Trigger/L1TGlobal/plugins/StableParametersTrivialProducer.cc b/L1Trigger/L1TGlobal/plugins/StableParametersTrivialProducer.cc
@@ -6,7 +6,6 @@
 
 #include "FWCore/Framework/interface/ESProducer.h"
 #include "FWCore/Framework/interface/ModuleFactory.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/MessageLogger/interface/MessageDrop.h"