From ec5360411ed7bdd7f85af571b977dd12cb222a02 Mon Sep 17 00:00:00 2001 From: Ben Jones Date: Mon, 8 Jun 2020 10:23:01 -0500 Subject: [PATCH] added esConsumes to modules in L1Trigger/CSCTrackFinder --- .../plugins/CSCTFTrackProducer.cc | 18 ++++++------------ .../plugins/CSCTFTrackProducer.h | 8 ++++++++ .../CSCTrackFinder/plugins/CSCTFanalyzer.cc | 5 ++--- .../CSCTrackFinder/plugins/CSCTFanalyzer.h | 3 +++ 4 files changed, 19 insertions(+), 15 deletions(-) diff --git a/L1Trigger/CSCTrackFinder/plugins/CSCTFTrackProducer.cc b/L1Trigger/CSCTrackFinder/plugins/CSCTFTrackProducer.cc index 397b454744bfb..24b43a839ab66 100644 --- a/L1Trigger/CSCTrackFinder/plugins/CSCTFTrackProducer.cc +++ b/L1Trigger/CSCTrackFinder/plugins/CSCTFTrackProducer.cc @@ -6,19 +6,12 @@ #include "DataFormats/L1CSCTrackFinder/interface/CSCTriggerContainer.h" #include "DataFormats/L1CSCTrackFinder/interface/TrackStub.h" #include "DataFormats/L1DTTrackFinder/interface/L1MuDTChambPhContainer.h" - -#include "Geometry/CSCGeometry/interface/CSCGeometry.h" -#include "Geometry/Records/interface/MuonGeometryRecord.h" - #include "DataFormats/Common/interface/Handle.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/EventSetup.h" #include "FWCore/Framework/interface/ESHandle.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" CSCTFTrackProducer::CSCTFTrackProducer(const edm::ParameterSet& pset) : my_dtrc{}, @@ -30,6 +23,9 @@ CSCTFTrackProducer::CSCTFTrackProducer(const edm::ParameterSet& pset) dt_producer{consumes(pset.getUntrackedParameter("DTproducer"))}, directProd{ consumes >(pset.getUntrackedParameter("DtDirectProd"))}, + m_scalesToken(esConsumes()), + m_ptScaleToken(esConsumes()), + m_pDDToken(esConsumes()), sp_pset{pset.getParameter("SectorProcessor")} { m_scalesCacheID = 0ULL; m_ptScaleCacheID = 0ULL; @@ -49,10 +45,9 @@ void CSCTFTrackProducer::produce(edm::Event& e, const edm::EventSetup& c) { // EventSetup cacheIdentifier to tell when this has happened. if (c.get().cacheIdentifier() != m_scalesCacheID || c.get().cacheIdentifier() != m_ptScaleCacheID) { - edm::ESHandle scales; - c.get().get(scales); + edm::ESHandle scales = c.getHandle(m_scalesToken); - edm::ESHandle ptScale; + edm::ESHandle ptScale = c.getHandle(m_ptScaleToken); c.get().get(ptScale); my_builder = std::make_unique(sp_pset, TMB07, scales.product(), ptScale.product()); @@ -63,8 +58,7 @@ void CSCTFTrackProducer::produce(edm::Event& e, const edm::EventSetup& c) { } // set geometry pointer - edm::ESHandle pDD; - c.get().get(pDD); + edm::ESHandle pDD = c.getHandle(m_pDDToken); edm::Handle LCTs; std::unique_ptr track_product(new L1CSCTrackCollection); diff --git a/L1Trigger/CSCTrackFinder/plugins/CSCTFTrackProducer.h b/L1Trigger/CSCTrackFinder/plugins/CSCTFTrackProducer.h index a1ed09e187c7b..b399dcbb960d8 100644 --- a/L1Trigger/CSCTrackFinder/plugins/CSCTFTrackProducer.h +++ b/L1Trigger/CSCTrackFinder/plugins/CSCTFTrackProducer.h @@ -7,10 +7,15 @@ #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/Utilities/interface/InputTag.h" #include "FWCore/Utilities/interface/EDGetToken.h" +#include "FWCore/Utilities/interface/ESGetToken.h" #include "FWCore/Framework/interface/EventSetup.h" #include "L1Trigger/CSCTrackFinder/src/CSCTFDTReceiver.h" #include "L1Trigger/CSCTrackFinder/src/CSCTFTrackBuilder.h" #include "DataFormats/CSCDigi/interface/CSCCorrelatedLCTDigiCollection.h" +#include "CondFormats/DataRecord/interface/L1MuTriggerScalesRcd.h" +#include "CondFormats/DataRecord/interface/L1MuTriggerPtScaleRcd.h" +#include "Geometry/CSCGeometry/interface/CSCGeometry.h" +#include "Geometry/Records/interface/MuonGeometryRecord.h" class CSCTFTrackBuilder; class L1MuDTChambPhContainer; @@ -33,6 +38,9 @@ class CSCTFTrackProducer : public edm::one::EDProducer input_module; const edm::EDGetTokenT dt_producer; const edm::EDGetTokenT > directProd; + const edm::ESGetToken m_scalesToken; + const edm::ESGetToken m_ptScaleToken; + const edm::ESGetToken m_pDDToken; const edm::ParameterSet sp_pset; unsigned long long m_scalesCacheID; unsigned long long m_ptScaleCacheID; diff --git a/L1Trigger/CSCTrackFinder/plugins/CSCTFanalyzer.cc b/L1Trigger/CSCTrackFinder/plugins/CSCTFanalyzer.cc index cae7d80e1f98a..efc193a1a124b 100644 --- a/L1Trigger/CSCTrackFinder/plugins/CSCTFanalyzer.cc +++ b/L1Trigger/CSCTrackFinder/plugins/CSCTFanalyzer.cc @@ -2,7 +2,6 @@ #include "DataFormats/CSCDigi/interface/CSCCorrelatedLCTDigiCollection.h" #include "DataFormats/L1CSCTrackFinder/interface/L1CSCTrackCollection.h" #include "DataFormats/L1CSCTrackFinder/interface/TrackStub.h" -#include "CondFormats/DataRecord/interface/L1MuTriggerScalesRcd.h" #include #include @@ -12,6 +11,7 @@ CSCTFanalyzer::CSCTFanalyzer(edm::ParameterSet const& pset) : edm::EDAnalyzer() emulTrackProducer = pset.getUntrackedParameter("emulTrackProducer", edm::InputTag("csctfTrackDigis")); lctProducer = pset.getUntrackedParameter("lctProducer", edm::InputTag("csctfDigis")); mbProducer = pset.getUntrackedParameter("mbProducer", edm::InputTag("csctfDigis")); + scalesToken = esConsumes(); file = new TFile("qwe.root", "RECREATE"); tree = new TTree("dy", "QWE"); tree->Branch("nDataMuons", &nDataMuons, "nDataMuons/I"); @@ -74,8 +74,7 @@ void CSCTFanalyzer::endJob(void) { void CSCTFanalyzer::analyze(edm::Event const& e, edm::EventSetup const& es) { if (!ts) { - edm::ESHandle scales; - es.get().get(scales); + edm::ESHandle scales = es.getHandle(scalesToken); ts = scales.product(); } diff --git a/L1Trigger/CSCTrackFinder/plugins/CSCTFanalyzer.h b/L1Trigger/CSCTrackFinder/plugins/CSCTFanalyzer.h index 4fd0c3f2cc0fd..7a53e01fa1439 100644 --- a/L1Trigger/CSCTrackFinder/plugins/CSCTFanalyzer.h +++ b/L1Trigger/CSCTrackFinder/plugins/CSCTFanalyzer.h @@ -7,8 +7,10 @@ #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/Framework/interface/EventSetup.h" #include "FWCore/Framework/interface/ESHandle.h" +#include "FWCore/Utilities/interface/ESGetToken.h" #include "FWCore/Utilities/interface/InputTag.h" #include "CondFormats/L1TObjects/interface/L1MuTriggerScales.h" +#include "CondFormats/DataRecord/interface/L1MuTriggerScalesRcd.h" #include "TTree.h" #include "TFile.h" @@ -16,6 +18,7 @@ class CSCTFanalyzer : public edm::EDAnalyzer { private: edm::InputTag lctProducer, mbProducer, dataTrackProducer, emulTrackProducer; + edm::ESGetToken scalesToken; TTree* tree; TFile* file; int nDataMuons, nEmulMuons, verbose;