diff --git a/L1Trigger/GlobalMuonTrigger/interface/L1MuGlobalMuonTrigger.h b/L1Trigger/GlobalMuonTrigger/interface/L1MuGlobalMuonTrigger.h index c5dc6124b6931..faf22d708f33c 100644 --- a/L1Trigger/GlobalMuonTrigger/interface/L1MuGlobalMuonTrigger.h +++ b/L1Trigger/GlobalMuonTrigger/interface/L1MuGlobalMuonTrigger.h @@ -28,10 +28,24 @@ #include "FWCore/Framework/interface/Event.h" #include "DataFormats/Common/interface/Handle.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" +#include "FWCore/Utilities/interface/ESGetToken.h" #include "DataFormats/L1GlobalMuonTrigger/interface/L1MuRegionalCand.h" #include "DataFormats/L1GlobalMuonTrigger/interface/L1MuGMTReadoutRecord.h" #include "DataFormats/L1GlobalMuonTrigger/interface/L1MuGMTReadoutCollection.h" +#include "CondFormats/L1TObjects/interface/L1MuGMTScales.h" +#include "CondFormats/DataRecord/interface/L1MuGMTScalesRcd.h" +#include "CondFormats/L1TObjects/interface/L1MuTriggerScales.h" +#include "CondFormats/DataRecord/interface/L1MuTriggerScalesRcd.h" +#include "CondFormats/L1TObjects/interface/L1MuTriggerPtScale.h" +#include "CondFormats/DataRecord/interface/L1MuTriggerPtScaleRcd.h" +#include "CondFormats/L1TObjects/interface/L1MuGMTParameters.h" +#include "CondFormats/DataRecord/interface/L1MuGMTParametersRcd.h" +#include "CondFormats/L1TObjects/interface/L1MuGMTChannelMask.h" +#include "CondFormats/DataRecord/interface/L1MuGMTChannelMaskRcd.h" +#include "CondFormats/L1TObjects/interface/L1CaloGeometry.h" +#include "CondFormats/DataRecord/interface/L1CaloGeometryRecord.h" + class L1MuGMTConfig; class L1MuGMTPSB; class L1MuGMTMatcher; @@ -110,6 +124,13 @@ class L1MuGlobalMuonTrigger : public edm::one::EDProducer m_gmtScalesToken; + edm::ESGetToken m_trigScalesToken; + edm::ESGetToken m_trigPtScaleToken; + edm::ESGetToken m_gmtParamsToken; + edm::ESGetToken m_gmtChanMaskToken; + edm::ESGetToken m_caloGeomToken; }; #endif // L1TriggerGlobalMuonTrigger_L1MuGlobalMuonTrigger_h diff --git a/L1Trigger/GlobalMuonTrigger/src/L1MuGlobalMuonTrigger.cc b/L1Trigger/GlobalMuonTrigger/src/L1MuGlobalMuonTrigger.cc index 2f585ed778f3d..7f24637f476c2 100644 --- a/L1Trigger/GlobalMuonTrigger/src/L1MuGlobalMuonTrigger.cc +++ b/L1Trigger/GlobalMuonTrigger/src/L1MuGlobalMuonTrigger.cc @@ -49,19 +49,6 @@ #include "FWCore/Framework/interface/EventSetup.h" #include "FWCore/Framework/interface/ESHandle.h" -#include "CondFormats/L1TObjects/interface/L1MuGMTScales.h" -#include "CondFormats/DataRecord/interface/L1MuGMTScalesRcd.h" -#include "CondFormats/L1TObjects/interface/L1MuTriggerScales.h" -#include "CondFormats/DataRecord/interface/L1MuTriggerScalesRcd.h" -#include "CondFormats/L1TObjects/interface/L1MuTriggerPtScale.h" -#include "CondFormats/DataRecord/interface/L1MuTriggerPtScaleRcd.h" -#include "CondFormats/L1TObjects/interface/L1MuGMTParameters.h" -#include "CondFormats/DataRecord/interface/L1MuGMTParametersRcd.h" -#include "CondFormats/L1TObjects/interface/L1MuGMTChannelMask.h" -#include "CondFormats/DataRecord/interface/L1MuGMTChannelMaskRcd.h" - -#include "CondFormats/L1TObjects/interface/L1CaloGeometry.h" -#include "CondFormats/DataRecord/interface/L1CaloGeometryRecord.h" //---------------- // Constructors -- @@ -135,6 +122,13 @@ L1MuGlobalMuonTrigger::L1MuGlobalMuonTrigger(const edm::ParameterSet& ps) { if (!m_db) m_db = new L1MuGMTDebugBlock(m_config->getBxMin(), m_config->getBxMax()); usesResource("L1MuGlobalMuonTrigger"); + ///EventSetup Tokens + m_gmtScalesToken = esConsumes(); + m_trigScalesToken = esConsumes(); + m_trigPtScaleToken = esConsumes(); + m_gmtParamsToken = esConsumes(); + m_gmtChanMaskToken = esConsumes(); + m_caloGeomToken = esConsumes(); } //-------------- @@ -181,37 +175,32 @@ void L1MuGlobalMuonTrigger::produce(edm::Event& e, const edm::EventSetup& es) { unsigned long long L1MuGMTScalesCacheID = es.get().cacheIdentifier(); if (L1MuGMTScalesCacheID != m_L1MuGMTScalesCacheID) { - edm::ESHandle gmtscales_h; - es.get().get(gmtscales_h); + edm::ESHandle gmtscales_h = es.getHandle(m_gmtScalesToken); m_config->setGMTScales(gmtscales_h.product()); } unsigned long long L1MuTriggerScalesCacheID = es.get().cacheIdentifier(); if (L1MuTriggerScalesCacheID != m_L1MuTriggerScalesCacheID) { - edm::ESHandle trigscales_h; - es.get().get(trigscales_h); + edm::ESHandle trigscales_h = es.getHandle(m_trigScalesToken); m_config->setTriggerScales(trigscales_h.product()); } unsigned long long L1MuTriggerPtScaleCacheID = es.get().cacheIdentifier(); if (L1MuTriggerPtScaleCacheID != m_L1MuTriggerPtScaleCacheID) { - edm::ESHandle trigptscale_h; - es.get().get(trigptscale_h); + edm::ESHandle trigptscale_h = es.getHandle(m_trigPtScaleToken); m_config->setTriggerPtScale(trigptscale_h.product()); } unsigned long long L1MuGMTParametersCacheID = es.get().cacheIdentifier(); if (L1MuGMTParametersCacheID != m_L1MuGMTParametersCacheID) { - edm::ESHandle gmtparams_h; - es.get().get(gmtparams_h); + edm::ESHandle gmtparams_h = es.getHandle(m_gmtParamsToken); m_config->setGMTParams(gmtparams_h.product()); m_config->setDefaults(); } unsigned long long L1MuGMTChannelMaskCacheID = es.get().cacheIdentifier(); if (L1MuGMTChannelMaskCacheID != m_L1MuGMTChannelMaskCacheID) { - edm::ESHandle gmtchanmask_h; - es.get().get(gmtchanmask_h); + edm::ESHandle gmtchanmask_h = es.getHandle(m_gmtChanMaskToken); m_config->setGMTChanMask(gmtchanmask_h.product()); if (L1MuGMTConfig::Debug(1)) { std::string onoff; @@ -234,8 +223,7 @@ void L1MuGlobalMuonTrigger::produce(edm::Event& e, const edm::EventSetup& es) { unsigned long long L1CaloGeometryCacheID = es.get().cacheIdentifier(); if (L1CaloGeometryCacheID != m_L1CaloGeometryCacheID) { - edm::ESHandle caloGeom_h; - es.get().get(caloGeom_h); + edm::ESHandle caloGeom_h = es.getHandle(m_caloGeomToken); m_config->setCaloGeom(caloGeom_h.product()); }