From b2a79a3199ce6dc0f7b07a2f5f630675d900f59e Mon Sep 17 00:00:00 2001 From: Marino Missiroli Date: Sat, 20 Mar 2021 23:48:02 +0100 Subject: [PATCH 1/9] esConsumes migration of HLTrigger/Egamma --- .../plugins/HLTEgammaL1MatchFilterPairs.cc | 15 ------ .../plugins/HLTEgammaL1MatchFilterRegional.cc | 16 ------ .../HLTEgammaL1TMatchFilterRegional.cc | 18 ------- HLTrigger/Egamma/plugins/HLTPMMassFilter.cc | 16 +++--- HLTrigger/Egamma/plugins/HLTPMMassFilter.h | 51 ++++++------------- 5 files changed, 21 insertions(+), 95 deletions(-) diff --git a/HLTrigger/Egamma/plugins/HLTEgammaL1MatchFilterPairs.cc b/HLTrigger/Egamma/plugins/HLTEgammaL1MatchFilterPairs.cc index f0f3d0d0cdada..cb0f04e04e031 100644 --- a/HLTrigger/Egamma/plugins/HLTEgammaL1MatchFilterPairs.cc +++ b/HLTrigger/Egamma/plugins/HLTEgammaL1MatchFilterPairs.cc @@ -4,23 +4,12 @@ * \author Monica Vazquez Acosta (CERN) * */ - #include "HLTEgammaL1MatchFilterPairs.h" - -//#include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutSetupFwd.h" - #include "DataFormats/Common/interface/Handle.h" - #include "DataFormats/HLTReco/interface/TriggerFilterObjectWithRefs.h" - #include "FWCore/MessageLogger/interface/MessageLogger.h" - -#include "CondFormats/L1TObjects/interface/L1CaloGeometry.h" -#include "CondFormats/DataRecord/interface/L1CaloGeometryRecord.h" - #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" #include "FWCore/ParameterSet/interface/ParameterSetDescription.h" -#include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Framework/interface/EventSetup.h" #include @@ -143,10 +132,6 @@ bool HLTEgammaL1MatchFilterPairs::hltFilter(edm::Event& iEvent, } } - // Get the CaloGeometry - edm::ESHandle l1CaloGeom; - iSetup.get().get(l1CaloGeom); - // look at all candidates, check cuts and add to filter object int n(0); diff --git a/HLTrigger/Egamma/plugins/HLTEgammaL1MatchFilterRegional.cc b/HLTrigger/Egamma/plugins/HLTEgammaL1MatchFilterRegional.cc index b15c7c2a7916e..3a347f8db595b 100644 --- a/HLTrigger/Egamma/plugins/HLTEgammaL1MatchFilterRegional.cc +++ b/HLTrigger/Egamma/plugins/HLTEgammaL1MatchFilterRegional.cc @@ -4,26 +4,14 @@ * \author Monica Vazquez Acosta (CERN) * */ - #include "HLTEgammaL1MatchFilterRegional.h" - -//#include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutSetupFwd.h" - #include "DataFormats/Common/interface/Handle.h" - #include "DataFormats/HLTReco/interface/TriggerFilterObjectWithRefs.h" - #include "DataFormats/L1Trigger/interface/L1JetParticle.h" #include "DataFormats/L1Trigger/interface/L1JetParticleFwd.h" - #include "FWCore/MessageLogger/interface/MessageLogger.h" - -#include "CondFormats/L1TObjects/interface/L1CaloGeometry.h" -#include "CondFormats/DataRecord/interface/L1CaloGeometryRecord.h" - #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" #include "FWCore/ParameterSet/interface/ParameterSetDescription.h" -#include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Framework/interface/EventSetup.h" #define TWOPI 6.283185308 @@ -92,10 +80,6 @@ bool HLTEgammaL1MatchFilterRegional::hltFilter(edm::Event& iEvent, edm::Ref ref; - // Get the CaloGeometry - edm::ESHandle l1CaloGeom; - iSetup.get().get(l1CaloGeom); - // look at all candidates, check cuts and add to filter object int n(0); diff --git a/HLTrigger/Egamma/plugins/HLTEgammaL1TMatchFilterRegional.cc b/HLTrigger/Egamma/plugins/HLTEgammaL1TMatchFilterRegional.cc index f6873b1eb509e..a32787e5f2fe1 100644 --- a/HLTrigger/Egamma/plugins/HLTEgammaL1TMatchFilterRegional.cc +++ b/HLTrigger/Egamma/plugins/HLTEgammaL1TMatchFilterRegional.cc @@ -4,27 +4,13 @@ * \author Monica Vazquez Acosta (CERN) * */ - #include "HLTEgammaL1TMatchFilterRegional.h" - -//#include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutSetupFwd.h" - #include "DataFormats/Common/interface/Handle.h" - #include "DataFormats/HLTReco/interface/TriggerFilterObjectWithRefs.h" - -//#include "DataFormats/L1Trigger/interface/L1JetParticle.h" -//#include "DataFormats/L1Trigger/interface/L1JetParticleFwd.h" #include "DataFormats/L1Trigger/interface/Jet.h" - #include "FWCore/MessageLogger/interface/MessageLogger.h" - -#include "CondFormats/L1TObjects/interface/L1CaloGeometry.h" -#include "CondFormats/DataRecord/interface/L1CaloGeometryRecord.h" - #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" #include "FWCore/ParameterSet/interface/ParameterSetDescription.h" -#include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Framework/interface/EventSetup.h" #define TWOPI 6.283185308 @@ -103,10 +89,6 @@ bool HLTEgammaL1TMatchFilterRegional::hltFilter(edm::Event& iEvent, edm::Ref ref; - // Get the CaloGeometry - edm::ESHandle l1CaloGeom; - iSetup.get().get(l1CaloGeom); - // look at all candidates, check cuts and add to filter object int n(0); diff --git a/HLTrigger/Egamma/plugins/HLTPMMassFilter.cc b/HLTrigger/Egamma/plugins/HLTPMMassFilter.cc index 37c8ad7634e8e..3e6a0fc37e507 100644 --- a/HLTrigger/Egamma/plugins/HLTPMMassFilter.cc +++ b/HLTrigger/Egamma/plugins/HLTPMMassFilter.cc @@ -5,15 +5,12 @@ * Contact: Jeremy.Werner@cern.ch * Date: February 21, 2007 */ - -#include "FWCore/Framework/interface/ESHandle.h" - #include "HLTPMMassFilter.h" // // constructors and destructor // -HLTPMMassFilter::HLTPMMassFilter(const edm::ParameterSet& iConfig) : HLTFilter(iConfig) { +HLTPMMassFilter::HLTPMMassFilter(const edm::ParameterSet& iConfig) : HLTFilter(iConfig), magFieldToken_(esConsumes()) { candTag_ = iConfig.getParameter("candTag"); beamSpot_ = iConfig.getParameter("beamSpot"); l1EGTag_ = iConfig.getParameter("l1EGCand"); @@ -60,8 +57,7 @@ bool HLTPMMassFilter::hltFilter(edm::Event& iEvent, filterproduct.addCollectionTag(l1EGTag_); } - edm::ESHandle theMagField; - iSetup.get().get(theMagField); + auto const& theMagField = iSetup.getData(magFieldToken_); edm::Handle PrevFilterOutput; iEvent.getByToken(candToken_, PrevFilterOutput); @@ -133,10 +129,10 @@ bool HLTPMMassFilter::hltFilter(edm::Event& iEvent, for (auto& i : scs) { refsc = i; const reco::SuperClusterRef sc = refsc->superCluster(); - TLorentzVector pscPos = approxMomAtVtx(theMagField.product(), vertexPos, sc, 1); + TLorentzVector pscPos = approxMomAtVtx(theMagField, vertexPos, sc, 1); pEleCh1.push_back(pscPos); - TLorentzVector pscEle = approxMomAtVtx(theMagField.product(), vertexPos, sc, -1); + TLorentzVector pscEle = approxMomAtVtx(theMagField, vertexPos, sc, -1); pEleCh2.push_back(pscEle); etaOrig.push_back(sc->eta()); } @@ -170,13 +166,13 @@ bool HLTPMMassFilter::hltFilter(edm::Event& iEvent, return accept; } -TLorentzVector HLTPMMassFilter::approxMomAtVtx(const MagneticField* magField, +TLorentzVector HLTPMMassFilter::approxMomAtVtx(const MagneticField& magField, const GlobalPoint& xvert, const reco::SuperClusterRef sc, int charge) const { GlobalPoint xsc(sc->position().x(), sc->position().y(), sc->position().z()); float energy = sc->energy(); - auto theFTS = trackingTools::ftsFromVertexToPoint(*magField, xsc, xvert, energy, charge); + auto theFTS = trackingTools::ftsFromVertexToPoint(magField, xsc, xvert, energy, charge); float theApproxMomMod = theFTS.momentum().x() * theFTS.momentum().x() + theFTS.momentum().y() * theFTS.momentum().y() + theFTS.momentum().z() * theFTS.momentum().z(); TLorentzVector theApproxMom( diff --git a/HLTrigger/Egamma/plugins/HLTPMMassFilter.h b/HLTrigger/Egamma/plugins/HLTPMMassFilter.h index 5980e5d73a353..87e26ce9e7bac 100644 --- a/HLTrigger/Egamma/plugins/HLTPMMassFilter.h +++ b/HLTrigger/Egamma/plugins/HLTPMMassFilter.h @@ -9,48 +9,25 @@ * Date: February 21, 2007 */ -#include "HLTrigger/HLTcore/interface/HLTFilter.h" - -#include "DataFormats/HLTReco/interface/TriggerFilterObjectWithRefs.h" -#include "TrackingTools/TrajectoryState/interface/ftsFromVertexToPoint.h" #include "DataFormats/BeamSpot/interface/BeamSpot.h" -#include "DataFormats/Math/interface/Point3D.h" - -#include "FWCore/Framework/interface/EventSetup.h" - -#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" -#include "MagneticField/Engine/interface/MagneticField.h" - -#include "DataFormats/Common/interface/Handle.h" - -#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" -#include "FWCore/ParameterSet/interface/ParameterSetDescription.h" - -#include "FWCore/MessageLogger/interface/MessageLogger.h" - +#include "DataFormats/EgammaCandidates/interface/Electron.h" +#include "DataFormats/EgammaCandidates/interface/ElectronFwd.h" #include "DataFormats/EgammaReco/interface/SuperCluster.h" #include "DataFormats/EgammaReco/interface/SuperClusterFwd.h" - +#include "DataFormats/HLTReco/interface/TriggerFilterObjectWithRefs.h" +#include "DataFormats/Math/interface/Point3D.h" #include "DataFormats/RecoCandidate/interface/RecoEcalCandidate.h" #include "DataFormats/RecoCandidate/interface/RecoEcalCandidateFwd.h" +#include "FWCore/Framework/interface/EventSetup.h" +#include "FWCore/MessageLogger/interface/MessageLogger.h" +#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" +#include "FWCore/ParameterSet/interface/ParameterSetDescription.h" +#include "HLTrigger/HLTcore/interface/HLTFilter.h" +#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" +#include "MagneticField/Engine/interface/MagneticField.h" +#include "TrackingTools/TrajectoryState/interface/ftsFromVertexToPoint.h" -#include "DataFormats/EgammaCandidates/interface/Electron.h" -#include "DataFormats/EgammaCandidates/interface/ElectronFwd.h" - -// TEST -#include "FWCore/ServiceRegistry/interface/Service.h" -#include "CommonTools/UtilAlgos/interface/TFileService.h" - -#include "TFile.h" -#include "TDirectory.h" -#include "TH1F.h" -#include "TH2F.h" #include "TLorentzVector.h" -#include "TVector3.h" - -// -// class declaration -// class HLTPMMassFilter : public HLTFilter { public: @@ -62,7 +39,7 @@ class HLTPMMassFilter : public HLTFilter { static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); private: - TLorentzVector approxMomAtVtx(const MagneticField* magField, + TLorentzVector approxMomAtVtx(const MagneticField& magField, const GlobalPoint& xvert, const reco::SuperClusterRef sc, int charge) const; @@ -79,6 +56,8 @@ class HLTPMMassFilter : public HLTFilter { bool isElectron1_; bool isElectron2_; edm::InputTag l1EGTag_; + + edm::ESGetToken const magFieldToken_; }; #endif //HLTPMMassFilter_h From d29525ab9d4024c7a8dbf856090e33c4f7a2b0d1 Mon Sep 17 00:00:00 2001 From: Marino Missiroli Date: Sun, 21 Mar 2021 09:05:11 +0100 Subject: [PATCH 2/9] esConsumes migration of HLTrigger/HLTanalyzers --- .../HLTanalyzers/plugins/HLTBitAnalyzer.h | 1 - HLTrigger/HLTanalyzers/plugins/HLTGetDigi.cc | 8 +++----- HLTrigger/HLTanalyzers/plugins/HLTGetDigi.h | 2 ++ HLTrigger/HLTanalyzers/plugins/HLTInfo.cc | 4 ++-- HLTrigger/HLTanalyzers/plugins/HLTInfo.h | 18 +++++++++++------- 5 files changed, 18 insertions(+), 15 deletions(-) diff --git a/HLTrigger/HLTanalyzers/plugins/HLTBitAnalyzer.h b/HLTrigger/HLTanalyzers/plugins/HLTBitAnalyzer.h index 7f65296fab83d..d6132f4db1212 100644 --- a/HLTrigger/HLTanalyzers/plugins/HLTBitAnalyzer.h +++ b/HLTrigger/HLTanalyzers/plugins/HLTBitAnalyzer.h @@ -7,7 +7,6 @@ #include "DataFormats/L1TGlobal/interface/GlobalAlgBlk.h" #include "DataFormats/L1TGlobal/interface/GlobalExtBlk.h" #include "FWCore/Framework/interface/EDAnalyzer.h" -#include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/EventSetup.h" #include "FWCore/Framework/interface/Frameworkfwd.h" diff --git a/HLTrigger/HLTanalyzers/plugins/HLTGetDigi.cc b/HLTrigger/HLTanalyzers/plugins/HLTGetDigi.cc index ec1c30caf659e..a49e9acf1dbaf 100644 --- a/HLTrigger/HLTanalyzers/plugins/HLTGetDigi.cc +++ b/HLTrigger/HLTanalyzers/plugins/HLTGetDigi.cc @@ -13,7 +13,6 @@ #include #include "DataFormats/Common/interface/Handle.h" -#include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Framework/interface/EventSetup.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "FWCore/Utilities/interface/InputTag.h" @@ -26,7 +25,7 @@ using namespace std; // // constructors and destructor // -HLTGetDigi::HLTGetDigi(const edm::ParameterSet& ps) { +HLTGetDigi::HLTGetDigi(const edm::ParameterSet& ps) : l1GtParamsToken_(esConsumes()) { EBdigiCollection_ = ps.getParameter("EBdigiCollection"); EEdigiCollection_ = ps.getParameter("EEdigiCollection"); ESdigiCollection_ = ps.getParameter("ESdigiCollection"); @@ -295,9 +294,8 @@ void HLTGetDigi::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup edm::Handle gtMap; edm::Handle gtRR; - edm::ESHandle l1GtPar; - iSetup.get().get(l1GtPar); - int nBx = l1GtPar->gtTotalBxInEvent(); + auto const& l1GtParamsHandle = iSetup.getHandle(l1GtParamsToken_); + auto const nBx = l1GtParamsHandle->gtTotalBxInEvent(); std::unique_ptr newGtEvm(new L1GlobalTriggerEvmReadoutRecord(nBx)); std::unique_ptr newGtMap(new L1GlobalTriggerObjectMapRecord()); diff --git a/HLTrigger/HLTanalyzers/plugins/HLTGetDigi.h b/HLTrigger/HLTanalyzers/plugins/HLTGetDigi.h index 34303d22f6caf..a38adf59ef49c 100644 --- a/HLTrigger/HLTanalyzers/plugins/HLTGetDigi.h +++ b/HLTrigger/HLTanalyzers/plugins/HLTGetDigi.h @@ -67,6 +67,8 @@ class HLTGetDigi : public edm::EDAnalyzer { static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); private: + edm::ESGetToken const l1GtParamsToken_; + edm::InputTag EBdigiCollection_; edm::EDGetTokenT EBdigiToken_; edm::InputTag EEdigiCollection_; diff --git a/HLTrigger/HLTanalyzers/plugins/HLTInfo.cc b/HLTrigger/HLTanalyzers/plugins/HLTInfo.cc index e13aa64d66cac..487d0f46f5066 100644 --- a/HLTrigger/HLTanalyzers/plugins/HLTInfo.cc +++ b/HLTrigger/HLTanalyzers/plugins/HLTInfo.cc @@ -169,8 +169,8 @@ void HLTInfo::analyze(const edm::Handle& hltresults, if (id != cache_id_) { cache_id_ = id; */ - edm::ESHandle menu; - eventSetup.get().get(menu); + auto const& menu = eventSetup.getHandle(l1tUtmTriggerMenuToken_); + //std::map const & algorithmMap_ = &(menu->getAlgorithmMap()); /* // get the bit/name association diff --git a/HLTrigger/HLTanalyzers/plugins/HLTInfo.h b/HLTrigger/HLTanalyzers/plugins/HLTInfo.h index 27a7c850c5d94..7868a0fb05307 100644 --- a/HLTrigger/HLTanalyzers/plugins/HLTInfo.h +++ b/HLTrigger/HLTanalyzers/plugins/HLTInfo.h @@ -1,6 +1,7 @@ #ifndef HLTINFO_H #define HLTINFO_H +#include #include #include @@ -26,7 +27,6 @@ #include "DataFormats/L1TGlobal/interface/GlobalExtBlk.h" #include "DataFormats/METReco/interface/CaloMETCollection.h" #include "FWCore/Common/interface/Provenance.h" -#include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Framework/interface/EventPrincipal.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "HLTrigger/HLTcore/interface/HLTPrescaleProvider.h" @@ -41,13 +41,14 @@ namespace edm { typedef std::vector MyStrings; /** \class HLTInfo - * + * * $Date: November 2006 - * $Revision: + * $Revision: * \author P. Bargassa - Rice U. - * $Date: April 2016 - * $Revision: - * \author G. Karapostoli - ULB + + * $Date: April 2016 + * $Revision: + * \author G. Karapostoli - ULB */ class HLTInfo { public: @@ -72,6 +73,8 @@ class HLTInfo { private: HLTInfo(); + edm::ESGetToken l1tUtmTriggerMenuToken_; + // Tree variables float *hltppt, *hltpeta; int L1EvtCnt, HltEvtCnt, nhltpart; @@ -109,7 +112,8 @@ HLTInfo::HLTInfo(edm::ParameterSet const& pset, edm::ConsumesCollector&& iC, T& template HLTInfo::HLTInfo(edm::ParameterSet const& pset, edm::ConsumesCollector& iC, T& module) : HLTInfo() { - hltPrescaleProvider_.reset(new HLTPrescaleProvider(pset, iC, module)); + l1tUtmTriggerMenuToken_ = iC.esConsumes(); + hltPrescaleProvider_ = std::make_unique(pset, iC, module); } #endif From 5d0a1d75bbdf819aeff69243cd52ec3c13c1541c Mon Sep 17 00:00:00 2001 From: Marino Missiroli Date: Sun, 21 Mar 2021 11:06:11 +0100 Subject: [PATCH 3/9] esConsumes migration of HLTrigger/HLTcore --- .../HLTcore/interface/HLTPrescaleRecorder.h | 3 ++- .../HLTcore/plugins/HLTPrescaleRecorder.cc | 18 ++++-------------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/HLTrigger/HLTcore/interface/HLTPrescaleRecorder.h b/HLTrigger/HLTcore/interface/HLTPrescaleRecorder.h index 078a1a9996796..eb17eefd5c432 100644 --- a/HLTrigger/HLTcore/interface/HLTPrescaleRecorder.h +++ b/HLTrigger/HLTcore/interface/HLTPrescaleRecorder.h @@ -27,6 +27,7 @@ #include "DataFormats/HLTReco/interface/HLTPrescaleTable.h" #include "CondFormats/HLTObjects/interface/HLTPrescaleTableCond.h" +#include "CondFormats/DataRecord/interface/HLTPrescaleTableRcd.h" #include #include @@ -76,6 +77,7 @@ class HLTPrescaleRecorder : public edm::one::EDProducer hltInputToken_; /// Tag of DB entry (HLT Key Name) (src=4) std::string hltDBTag_; + edm::ESGetToken const hltPrescaleTableCondToken_; /// Prescale service edm::service::PrescaleService* ps_; @@ -84,7 +86,6 @@ class HLTPrescaleRecorder : public edm::one::EDProducer hltHandle_; - edm::ESHandle hltESHandle_; /// payload HLT object trigger::HLTPrescaleTable hlt_; diff --git a/HLTrigger/HLTcore/plugins/HLTPrescaleRecorder.cc b/HLTrigger/HLTcore/plugins/HLTPrescaleRecorder.cc index 97d93ff78bc05..2a4b51dde3282 100644 --- a/HLTrigger/HLTcore/plugins/HLTPrescaleRecorder.cc +++ b/HLTrigger/HLTcore/plugins/HLTPrescaleRecorder.cc @@ -8,19 +8,10 @@ */ #include "HLTrigger/HLTcore/interface/HLTPrescaleRecorder.h" - -#include "CondFormats/HLTObjects/interface/HLTPrescaleTableCond.h" -#include "CondFormats/DataRecord/interface/HLTPrescaleTableRcd.h" - #include "DataFormats/Provenance/interface/ProcessHistory.h" - +#include "DataFormats/Provenance/interface/Timestamp.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" - #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" -#include "FWCore/ParameterSet/interface/ParameterSet.h" -#include "FWCore/PrescaleService/interface/PrescaleService.h" - -#include "DataFormats/Provenance/interface/Timestamp.h" #include #include @@ -43,10 +34,10 @@ HLTPrescaleRecorder::HLTPrescaleRecorder(const edm::ParameterSet& ps) hltInputTag_(ps.getParameter("hltInputTag")), hltInputToken_(), hltDBTag_(ps.getParameter("hltDBTag")), + hltPrescaleTableCondToken_(esConsumes(edm::ESInputTag("", hltDBTag_))), ps_(nullptr), db_(nullptr), hltHandle_(), - hltESHandle_(), hlt_() { if (src_ == 1) { // Run @@ -155,9 +146,8 @@ void HLTPrescaleRecorder::beginRun(edm::Run const& iRun, const edm::EventSetup& } } else if (src_ == 4) { /// From CondDB (needs ESProducer module as well) - const HLTPrescaleTableRcd& hltRecord(iSetup.get()); - hltRecord.get(hltDBTag_, hltESHandle_); - hlt_ = hltESHandle_->hltPrescaleTable(); + auto const& hltPrescaleTableCond = iSetup.getData(hltPrescaleTableCondToken_); + hlt_ = hltPrescaleTableCond.hltPrescaleTable(); } return; From 42057d73cb292fd8b739db17233e88720339d373 Mon Sep 17 00:00:00 2001 From: Marino Missiroli Date: Sun, 21 Mar 2021 14:55:09 +0100 Subject: [PATCH 4/9] esConsumes migration of HLTrigger/HLTfilters --- .../HLTfilters/plugins/HLTLevel1GTSeed.cc | 22 +++++++----------- .../HLTfilters/plugins/HLTLevel1GTSeed.h | 23 +++++++++++-------- .../HLTfilters/plugins/HLTLevel1Pattern.cc | 23 +++++++++++-------- .../plugins/TriggerResultsFilterFromDB.cc | 5 ++-- .../plugins/TriggerResultsFilterFromDB.h | 1 + 5 files changed, 39 insertions(+), 35 deletions(-) diff --git a/HLTrigger/HLTfilters/plugins/HLTLevel1GTSeed.cc b/HLTrigger/HLTfilters/plugins/HLTLevel1GTSeed.cc index ad6da68ce339f..54c0ac6ca21c4 100644 --- a/HLTrigger/HLTfilters/plugins/HLTLevel1GTSeed.cc +++ b/HLTrigger/HLTfilters/plugins/HLTLevel1GTSeed.cc @@ -52,13 +52,6 @@ #include "DataFormats/HLTReco/interface/TriggerFilterObjectWithRefs.h" -#include "CondFormats/L1TObjects/interface/L1GtTriggerMenu.h" -#include "CondFormats/DataRecord/interface/L1GtTriggerMenuRcd.h" - -#include "CondFormats/L1TObjects/interface/L1GtTriggerMask.h" -#include "CondFormats/DataRecord/interface/L1GtTriggerMaskAlgoTrigRcd.h" -#include "CondFormats/DataRecord/interface/L1GtTriggerMaskTechTrigRcd.h" - #include "CondFormats/L1TObjects/interface/L1GtCondition.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" @@ -70,7 +63,6 @@ #include "FWCore/Utilities/interface/Exception.h" #include "FWCore/Framework/interface/EventSetup.h" -#include "FWCore/Framework/interface/ESHandle.h" // constructors HLTLevel1GTSeed::HLTLevel1GTSeed(const edm::ParameterSet& parSet) @@ -79,6 +71,11 @@ HLTLevel1GTSeed::HLTLevel1GTSeed(const edm::ParameterSet& parSet) m_l1GtMenu(nullptr), m_l1GtMenuCacheID(0ULL), + // trigger records + m_l1GtTriggerMenuToken(esConsumes()), + m_l1GtTriggerMaskAlgoTrigRcdToken(esConsumes()), + m_l1GtTriggerMaskTechTrigRcdToken(esConsumes()), + // seeding done via L1 trigger object maps, with objects that fired m_l1UseL1TriggerObjectMaps(parSet.getParameter("L1UseL1TriggerObjectMaps")), @@ -256,8 +253,7 @@ bool HLTLevel1GTSeed::hltFilter(edm::Event& iEvent, } // get the trigger mask from the EventSetup - edm::ESHandle l1GtTmAlgo; - evSetup.get().get(l1GtTmAlgo); + auto const& l1GtTmAlgo = evSetup.getHandle(m_l1GtTriggerMaskAlgoTrigRcdToken); // get L1GlobalTriggerReadoutRecord and GT decision edm::Handle gtReadoutRecord; @@ -291,8 +287,7 @@ bool HLTLevel1GTSeed::hltFilter(edm::Event& iEvent, // seeding done via technical trigger bits if (m_l1TechTriggerSeeding) { // get the technical trigger mask from the EventSetup - edm::ESHandle l1GtTmTech; - evSetup.get().get(l1GtTmTech); + auto const& l1GtTmTech = evSetup.getHandle(m_l1GtTriggerMaskTechTrigRcdToken); // get Global Trigger technical trigger word, update the tokenResult members // from m_l1AlgoLogicParser and get the result for the logical expression @@ -317,8 +312,7 @@ bool HLTLevel1GTSeed::hltFilter(edm::Event& iEvent, unsigned long long l1GtMenuCacheID = evSetup.get().cacheIdentifier(); if (m_l1GtMenuCacheID != l1GtMenuCacheID) { - edm::ESHandle l1GtMenu; - evSetup.get().get(l1GtMenu); + auto const& l1GtMenu = evSetup.getHandle(m_l1GtTriggerMenuToken); m_l1GtMenu = l1GtMenu.product(); m_l1GtMenuCacheID = l1GtMenuCacheID; diff --git a/HLTrigger/HLTfilters/plugins/HLTLevel1GTSeed.h b/HLTrigger/HLTfilters/plugins/HLTLevel1GTSeed.h index cb4700f8647d8..4acee0b4121e5 100644 --- a/HLTrigger/HLTfilters/plugins/HLTLevel1GTSeed.h +++ b/HLTrigger/HLTfilters/plugins/HLTLevel1GTSeed.h @@ -22,21 +22,19 @@ #include // user include files - -// base class -#include "HLTrigger/HLTcore/interface/HLTStreamFilter.h" - +#include "FWCore/Utilities/interface/InputTag.h" +#include "CondFormats/DataRecord/interface/L1GtTriggerMenuRcd.h" +#include "CondFormats/DataRecord/interface/L1GtTriggerMaskAlgoTrigRcd.h" +#include "CondFormats/DataRecord/interface/L1GtTriggerMaskTechTrigRcd.h" +#include "CondFormats/L1TObjects/interface/L1GtTriggerMenu.h" +#include "CondFormats/L1TObjects/interface/L1GtTriggerMenuFwd.h" +#include "CondFormats/L1TObjects/interface/L1GtTriggerMask.h" #include "DataFormats/HLTReco/interface/TriggerFilterObjectWithRefs.h" - #include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutSetupFwd.h" -#include "CondFormats/L1TObjects/interface/L1GtTriggerMenuFwd.h" #include "DataFormats/L1GlobalTrigger/interface/L1GtLogicParser.h" - -#include "FWCore/Utilities/interface/InputTag.h" +#include "HLTrigger/HLTcore/interface/HLTStreamFilter.h" // forward declarations -class L1GtTriggerMenu; -class L1GtTriggerMask; class L1GlobalTriggerReadoutRecord; class L1GlobalTriggerObjectMapRecord; namespace edm { @@ -109,6 +107,11 @@ class HLTLevel1GTSeed : public HLTStreamFilter { const L1GtTriggerMenu *m_l1GtMenu; unsigned long long m_l1GtMenuCacheID; + // trigger records + edm::ESGetToken const m_l1GtTriggerMenuToken; + edm::ESGetToken const m_l1GtTriggerMaskAlgoTrigRcdToken; + edm::ESGetToken const m_l1GtTriggerMaskTechTrigRcdToken; + /// logic parser for m_l1SeedsLogicalExpression L1GtLogicParser m_l1AlgoLogicParser; diff --git a/HLTrigger/HLTfilters/plugins/HLTLevel1Pattern.cc b/HLTrigger/HLTfilters/plugins/HLTLevel1Pattern.cc index 8dc181f706c14..694a6a08ccb93 100644 --- a/HLTrigger/HLTfilters/plugins/HLTLevel1Pattern.cc +++ b/HLTrigger/HLTfilters/plugins/HLTLevel1Pattern.cc @@ -24,6 +24,9 @@ #include "CondFormats/DataRecord/interface/L1GtTriggerMenuRcd.h" #include "CondFormats/DataRecord/interface/L1GtTriggerMaskTechTrigRcd.h" #include "CondFormats/DataRecord/interface/L1GtTriggerMaskAlgoTrigRcd.h" +#include "CondFormats/L1TObjects/interface/L1GtTriggerMenu.h" +#include "CondFormats/L1TObjects/interface/L1GtTriggerMenuFwd.h" +#include "CondFormats/L1TObjects/interface/L1GtTriggerMask.h" #include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutRecord.h" // @@ -51,13 +54,16 @@ class HLTLevel1Pattern : public edm::EDFilter { bool m_invert; bool m_throw; + edm::ESGetToken const m_l1GtTriggerMenuToken; + edm::ESGetToken const m_l1GtTriggerMaskAlgoTrigRcdToken; + edm::ESGetToken const m_l1GtTriggerMaskTechTrigRcdToken; + edm::ESWatcher m_watchL1Menu; edm::ESWatcher m_watchPhysicsMask; edm::ESWatcher m_watchTechnicalMask; }; #include "FWCore/Framework/interface/EventSetup.h" -#include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "CondFormats/L1TObjects/interface/L1GtTriggerMenu.h" #include "CondFormats/L1TObjects/interface/L1GtTriggerMask.h" @@ -76,7 +82,10 @@ HLTLevel1Pattern::HLTLevel1Pattern(const edm::ParameterSet& config) m_triggerMasked(false), m_ignoreL1Mask(config.getParameter("ignoreL1Mask")), m_invert(config.getParameter("invert")), - m_throw(config.getParameter("throw")) { + m_throw(config.getParameter("throw")), + m_l1GtTriggerMenuToken(esConsumes()), + m_l1GtTriggerMaskAlgoTrigRcdToken(esConsumes()), + m_l1GtTriggerMaskTechTrigRcdToken(esConsumes()) { m_gtReadoutRecordToken = consumes(m_gtReadoutRecord); std::vector pattern(config.getParameter >("triggerPattern")); if (pattern.size() != m_bunchCrossings.size()) @@ -127,9 +136,7 @@ void HLTLevel1Pattern::fillDescriptions(edm::ConfigurationDescriptions& descript bool HLTLevel1Pattern::filter(edm::Event& event, const edm::EventSetup& setup) { // determine the L1 algo or tech bit to use if (m_watchL1Menu.check(setup)) { - edm::ESHandle h_menu; - setup.get().get(h_menu); - + auto const& h_menu = setup.getHandle(m_l1GtTriggerMenuToken); // look for an Algo L1 bit const AlgorithmMap& algoMap = h_menu->gtAlgorithmAliasMap(); const AlgorithmMap& techMap = h_menu->gtTechnicalTriggerMap(); @@ -156,8 +163,7 @@ bool HLTLevel1Pattern::filter(edm::Event& event, const edm::EventSetup& setup) { // - mask & partition == 0x00 --> fully unmasked // - mask & partition != part. --> unmasked in some partitions, consider as unmasked if (m_watchPhysicsMask.check(setup)) { - edm::ESHandle h_mask; - setup.get().get(h_mask); + auto const& h_mask = setup.getHandle(m_l1GtTriggerMaskAlgoTrigRcdToken); m_triggerMasked = ((h_mask->gtTriggerMask()[m_triggerNumber] & m_daqPartitions) == m_daqPartitions); } } else { @@ -166,8 +172,7 @@ bool HLTLevel1Pattern::filter(edm::Event& event, const edm::EventSetup& setup) { // - mask & partition == 0x00 --> fully unmasked // - mask & partition != part. --> unmasked in some partitions, consider as unmasked if (m_watchTechnicalMask.check(setup)) { - edm::ESHandle h_mask; - setup.get().get(h_mask); + auto const& h_mask = setup.getHandle(m_l1GtTriggerMaskTechTrigRcdToken); m_triggerMasked = ((h_mask->gtTriggerMask()[m_triggerNumber] & m_daqPartitions) == m_daqPartitions); } } diff --git a/HLTrigger/HLTfilters/plugins/TriggerResultsFilterFromDB.cc b/HLTrigger/HLTfilters/plugins/TriggerResultsFilterFromDB.cc index 40aa1f2527191..fd6471a614f12 100644 --- a/HLTrigger/HLTfilters/plugins/TriggerResultsFilterFromDB.cc +++ b/HLTrigger/HLTfilters/plugins/TriggerResultsFilterFromDB.cc @@ -32,6 +32,7 @@ TriggerResultsFilterFromDB::TriggerResultsFilterFromDB(const edm::ParameterSet& config) : m_eventSetupPathsKey(config.getParameter("eventSetupPathsKey")), m_eventSetupWatcher(), + m_alcaRecoTriggerBitsRcdToken(esConsumes()), m_expression(nullptr), m_eventCache(config, consumesCollector()) {} @@ -87,8 +88,8 @@ void TriggerResultsFilterFromDB::parse(const std::string& expression) { // read the triggerConditions from the database void TriggerResultsFilterFromDB::pathsFromSetup(const edm::Event& event, const edm::EventSetup& setup) { // Get map of strings to concatenated list of names of HLT paths from EventSetup: - edm::ESHandle triggerBits; - setup.get().get(triggerBits); + auto const& triggerBits = setup.getHandle(m_alcaRecoTriggerBitsRcdToken); + typedef std::map TriggerMap; const TriggerMap& triggerMap = triggerBits->m_alcarecoToTrig; diff --git a/HLTrigger/HLTfilters/plugins/TriggerResultsFilterFromDB.h b/HLTrigger/HLTfilters/plugins/TriggerResultsFilterFromDB.h index de02d451b782e..3ee1439bdd85c 100644 --- a/HLTrigger/HLTfilters/plugins/TriggerResultsFilterFromDB.h +++ b/HLTrigger/HLTfilters/plugins/TriggerResultsFilterFromDB.h @@ -53,6 +53,7 @@ class TriggerResultsFilterFromDB : public edm::stream::EDFilter<> { /// read the triggerConditions from the database std::string m_eventSetupPathsKey; edm::ESWatcher m_eventSetupWatcher; + edm::ESGetToken const m_alcaRecoTriggerBitsRcdToken; /// evaluator for the trigger condition triggerExpression::Evaluator *m_expression; From efdc5763fa0d4c567d1de67fb1fc830df300bde8 Mon Sep 17 00:00:00 2001 From: Marino Missiroli Date: Sun, 21 Mar 2021 15:12:40 +0100 Subject: [PATCH 5/9] esConsumes migration of HLTrigger/JSONMonitoring --- .../plugins/L1TriggerJSONMonitoring.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/HLTrigger/JSONMonitoring/plugins/L1TriggerJSONMonitoring.cc b/HLTrigger/JSONMonitoring/plugins/L1TriggerJSONMonitoring.cc index be9f44ab32263..a52f6286e0177 100644 --- a/HLTrigger/JSONMonitoring/plugins/L1TriggerJSONMonitoring.cc +++ b/HLTrigger/JSONMonitoring/plugins/L1TriggerJSONMonitoring.cc @@ -20,7 +20,6 @@ #include "EventFilter/Utilities/interface/FastMonitoringService.h" #include "EventFilter/Utilities/interface/JSONSerializer.h" #include "EventFilter/Utilities/interface/JsonMonitorable.h" -#include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/EventSetup.h" #include "FWCore/Framework/interface/LuminosityBlock.h" @@ -150,8 +149,9 @@ class L1TriggerJSONMonitoring : public edm::global::EDAnalyzer< static void writeIniFile(L1TriggerJSONMonitoringData::run const&, unsigned int, std::vector const&); // configuration - const edm::InputTag level1Results_; // InputTag for L1 trigge results - const edm::EDGetTokenT level1ResultsToken_; // Token for L1 trigge results + const edm::InputTag level1Results_; // InputTag for L1 trigger results + const edm::EDGetTokenT level1ResultsToken_; // Token for L1 trigger results + const edm::ESGetToken l1tUtmTriggerMenuRcdToken_; }; // instantiate static data members @@ -160,7 +160,8 @@ constexpr const std::array L1TriggerJSONMonitoring::tcdsTrigger // constructor L1TriggerJSONMonitoring::L1TriggerJSONMonitoring(edm::ParameterSet const& config) : level1Results_(config.getParameter("L1Results")), - level1ResultsToken_(consumes(level1Results_)) {} + level1ResultsToken_(consumes(level1Results_)), + l1tUtmTriggerMenuRcdToken_(esConsumes()) {} // validate the configuration and optionally fill the default values void L1TriggerJSONMonitoring::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { @@ -193,8 +194,7 @@ std::shared_ptr L1TriggerJSONMonitoring::globa // read the L1 trigger names from the EventSetup std::vector triggerNames(GlobalAlgBlk::maxPhysicsTriggers, ""s); - edm::ESHandle menuHandle; - setup.get().get(menuHandle); + auto const& menuHandle = setup.getHandle(l1tUtmTriggerMenuRcdToken_); if (menuHandle.isValid()) { for (auto const& algo : menuHandle->getAlgorithmMap()) triggerNames[algo.second.getIndex()] = algo.first; From d0d653d5c34f6866f1ec0c46644b2491334e9c16 Mon Sep 17 00:00:00 2001 From: Marino Missiroli Date: Sun, 21 Mar 2021 15:49:22 +0100 Subject: [PATCH 6/9] esConsumes migration of HLTrigger/JetMET --- .../interface/HLTHcalTowerNoiseCleaner.h | 6 ++-- .../HLTHcalTowerNoiseCleanerWithrechit.h | 6 ++-- HLTrigger/JetMET/plugins/PixelJetPuId.cc | 8 +++-- .../JetMET/src/HLTHcalTowerNoiseCleaner.cc | 33 +++++-------------- .../src/HLTHcalTowerNoiseCleanerWithrechit.cc | 32 +++++------------- 5 files changed, 29 insertions(+), 56 deletions(-) diff --git a/HLTrigger/JetMET/interface/HLTHcalTowerNoiseCleaner.h b/HLTrigger/JetMET/interface/HLTHcalTowerNoiseCleaner.h index 18ab6d4a6eb44..279e213d92781 100644 --- a/HLTrigger/JetMET/interface/HLTHcalTowerNoiseCleaner.h +++ b/HLTrigger/JetMET/interface/HLTHcalTowerNoiseCleaner.h @@ -10,11 +10,12 @@ #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/EventSetup.h" -#include "RecoMET/METAlgorithms/interface/HcalNoiseAlgo.h" - #include "DataFormats/CaloTowers/interface/CaloTower.h" #include "DataFormats/CaloTowers/interface/CaloTowerCollection.h" #include "DataFormats/METReco/interface/HcalNoiseRBX.h" +#include "Geometry/CaloTopology/interface/CaloTowerTopology.h" +#include "Geometry/Records/interface/HcalRecNumberingRecord.h" +#include "RecoMET/METAlgorithms/interface/HcalNoiseAlgo.h" namespace edm { class ConfigurationDescriptions; @@ -28,6 +29,7 @@ class HLTHcalTowerNoiseCleaner : public edm::stream::EDProducer<> { void produce(edm::Event&, const edm::EventSetup&) override; private: + edm::ESGetToken const hcalRecNumberingRecordToken_; edm::EDGetTokenT m_theHcalNoiseToken; edm::EDGetTokenT m_theCaloTowerCollectionToken; // parameters diff --git a/HLTrigger/JetMET/interface/HLTHcalTowerNoiseCleanerWithrechit.h b/HLTrigger/JetMET/interface/HLTHcalTowerNoiseCleanerWithrechit.h index a270f47653b88..5d8e5e388b9b1 100644 --- a/HLTrigger/JetMET/interface/HLTHcalTowerNoiseCleanerWithrechit.h +++ b/HLTrigger/JetMET/interface/HLTHcalTowerNoiseCleanerWithrechit.h @@ -10,11 +10,12 @@ #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/EventSetup.h" -#include "RecoMET/METAlgorithms/interface/HcalNoiseAlgo.h" - #include "DataFormats/CaloTowers/interface/CaloTower.h" #include "DataFormats/CaloTowers/interface/CaloTowerCollection.h" #include "DataFormats/METReco/interface/HcalNoiseRBX.h" +#include "Geometry/CaloTopology/interface/CaloTowerTopology.h" +#include "Geometry/Records/interface/HcalRecNumberingRecord.h" +#include "RecoMET/METAlgorithms/interface/HcalNoiseAlgo.h" namespace edm { class ConfigurationDescriptions; @@ -28,6 +29,7 @@ class HLTHcalTowerNoiseCleanerWithrechit : public edm::stream::EDProducer<> { void produce(edm::Event&, const edm::EventSetup&) override; private: + edm::ESGetToken const hcalRecNumberingRecordToken_; edm::EDGetTokenT m_theHcalNoiseToken; edm::EDGetTokenT m_theCaloTowerCollectionToken; // parameters diff --git a/HLTrigger/JetMET/plugins/PixelJetPuId.cc b/HLTrigger/JetMET/plugins/PixelJetPuId.cc index b3509570d70f4..252213bde5bae 100644 --- a/HLTrigger/JetMET/plugins/PixelJetPuId.cc +++ b/HLTrigger/JetMET/plugins/PixelJetPuId.cc @@ -63,6 +63,8 @@ class PixelJetPuId : public edm::global::EDProducer<> { void produce(edm::StreamID sid, edm::Event&, const edm::EventSetup&) const override; // ----------member data --------------------------- + edm::ESGetToken const transientTrackRecordToken_; + edm::InputTag m_primaryVertex; edm::InputTag m_tracks; edm::InputTag m_jets; @@ -86,7 +88,8 @@ class PixelJetPuId : public edm::global::EDProducer<> { // // constructors and destructor // -PixelJetPuId::PixelJetPuId(const edm::ParameterSet& iConfig) { +PixelJetPuId::PixelJetPuId(const edm::ParameterSet& iConfig) + : transientTrackRecordToken_(esConsumes(edm::ESInputTag("", "TransientTrackBuilder"))) { //InputTag m_tracks = iConfig.getParameter("tracks"); tracksToken = consumes >(m_tracks); @@ -167,8 +170,7 @@ void PixelJetPuId::produce(edm::StreamID sid, edm::Event& iEvent, const edm::Eve iEvent.getByToken(primaryVertexToken, primaryVertex); //get Transient Track Builder - edm::ESHandle builder; - iSetup.get().get("TransientTrackBuilder", builder); + auto const& builder = iSetup.getHandle(transientTrackRecordToken_); //init JetTagCollection if (!generaljets.product()->empty()) { diff --git a/HLTrigger/JetMET/src/HLTHcalTowerNoiseCleaner.cc b/HLTrigger/JetMET/src/HLTHcalTowerNoiseCleaner.cc index f2a3f5fd1c7df..cc5b3188984cb 100644 --- a/HLTrigger/JetMET/src/HLTHcalTowerNoiseCleaner.cc +++ b/HLTrigger/JetMET/src/HLTHcalTowerNoiseCleaner.cc @@ -15,42 +15,26 @@ // // // +#include -#include "DataFormats/Common/interface/Handle.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/EventSetup.h" - #include "FWCore/ParameterSet/interface/ParameterSet.h" - +#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" +#include "FWCore/ParameterSet/interface/ParameterSetDescription.h" +#include "FWCore/Utilities/interface/InputTag.h" +#include "DataFormats/Common/interface/Handle.h" #include "DataFormats/Candidate/interface/Candidate.h" #include "DataFormats/JetReco/interface/Jet.h" #include "DataFormats/JetReco/interface/CaloJet.h" #include "DataFormats/CaloTowers/interface/CaloTowerDetId.h" #include "DataFormats/CaloTowers/interface/CaloTowerCollection.h" -#include "Geometry/CaloTopology/interface/CaloTowerTopology.h" -#include "Geometry/Records/interface/HcalRecNumberingRecord.h" -#include "DataFormats/Math/interface/LorentzVector.h" -#include "DataFormats/Math/interface/Point3D.h" - -#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" -#include "FWCore/ParameterSet/interface/ParameterSetDescription.h" -#include "FWCore/Utilities/interface/InputTag.h" - -#include -#include -#include -#include -#include -#include - #include "HLTrigger/JetMET/interface/HLTHcalTowerNoiseCleaner.h" -//#include - HLTHcalTowerNoiseCleaner::HLTHcalTowerNoiseCleaner(const edm::ParameterSet& iConfig) - : HcalNoiseRBXCollectionTag_(iConfig.getParameter("HcalNoiseRBXCollection")), + : hcalRecNumberingRecordToken_(esConsumes()), + HcalNoiseRBXCollectionTag_(iConfig.getParameter("HcalNoiseRBXCollection")), TowerCollectionTag_(iConfig.getParameter("CaloTowerCollection")), severity_(iConfig.getParameter("severity")), maxNumRBXs_(iConfig.getParameter("maxNumRBXs")), @@ -155,8 +139,7 @@ void HLTHcalTowerNoiseCleaner::produce(edm::Event& iEvent, const edm::EventSetup } //get the calotower topology - edm::ESHandle caloTowerTopology; - iSetup.get().get(caloTowerTopology); + auto const& caloTowerTopology = iSetup.getHandle(hcalRecNumberingRecordToken_); // get the RBXs produced by RecoMET/METProducers/HcalNoiseInfoProducer edm::Handle rbxs_h; diff --git a/HLTrigger/JetMET/src/HLTHcalTowerNoiseCleanerWithrechit.cc b/HLTrigger/JetMET/src/HLTHcalTowerNoiseCleanerWithrechit.cc index b994f12aed157..e2b9a347b94fd 100644 --- a/HLTrigger/JetMET/src/HLTHcalTowerNoiseCleanerWithrechit.cc +++ b/HLTrigger/JetMET/src/HLTHcalTowerNoiseCleanerWithrechit.cc @@ -15,42 +15,27 @@ // // // +#include -#include "DataFormats/Common/interface/Handle.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/EventSetup.h" - #include "FWCore/ParameterSet/interface/ParameterSet.h" - +#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" +#include "FWCore/ParameterSet/interface/ParameterSetDescription.h" +#include "FWCore/Utilities/interface/InputTag.h" +#include "DataFormats/Common/interface/Handle.h" #include "DataFormats/Candidate/interface/Candidate.h" #include "DataFormats/JetReco/interface/Jet.h" #include "DataFormats/JetReco/interface/CaloJet.h" #include "DataFormats/CaloTowers/interface/CaloTowerDetId.h" #include "DataFormats/CaloTowers/interface/CaloTowerCollection.h" -#include "Geometry/CaloTopology/interface/CaloTowerTopology.h" -#include "Geometry/Records/interface/HcalRecNumberingRecord.h" -#include "DataFormats/Math/interface/LorentzVector.h" -#include "DataFormats/Math/interface/Point3D.h" - -#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" -#include "FWCore/ParameterSet/interface/ParameterSetDescription.h" -#include "FWCore/Utilities/interface/InputTag.h" - -#include -#include -#include -#include -#include -#include - #include "HLTrigger/JetMET/interface/HLTHcalTowerNoiseCleanerWithrechit.h" -//#include - HLTHcalTowerNoiseCleanerWithrechit::HLTHcalTowerNoiseCleanerWithrechit(const edm::ParameterSet& iConfig) - : HcalNoiseRBXCollectionTag_(iConfig.getParameter("HcalNoiseRBXCollection")), + : hcalRecNumberingRecordToken_(esConsumes()), + HcalNoiseRBXCollectionTag_(iConfig.getParameter("HcalNoiseRBXCollection")), TowerCollectionTag_(iConfig.getParameter("CaloTowerCollection")), severity_(iConfig.getParameter("severity")), maxNumRBXs_(iConfig.getParameter("maxNumRBXs")), @@ -147,8 +132,7 @@ void HLTHcalTowerNoiseCleanerWithrechit::fillDescriptions(edm::ConfigurationDesc void HLTHcalTowerNoiseCleanerWithrechit::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) { using namespace reco; - edm::ESHandle caloTowerTopology; - iSetup.get().get(caloTowerTopology); + auto const& caloTowerTopology = iSetup.getHandle(hcalRecNumberingRecordToken_); //get the calo MET / MHT edm::Handle tower_h; From 72e7578a4ceb7c71dacd7153eb459f530372e9e9 Mon Sep 17 00:00:00 2001 From: Marino Missiroli Date: Sun, 21 Mar 2021 23:52:20 +0100 Subject: [PATCH 7/9] esConsumes migration of HLTrigger/Muon --- .../Muon/plugins/HLTDiMuonGlbTrkFilter.cc | 19 +++++++------------ .../Muon/plugins/HLTDiMuonGlbTrkFilter.h | 3 +++ .../Muon/plugins/HLTMuonDimuonL3Filter.cc | 5 ++--- .../Muon/plugins/HLTMuonDimuonL3Filter.h | 4 +++- HLTrigger/Muon/plugins/HLTMuonL1Filter.cc | 6 ++---- HLTrigger/Muon/plugins/HLTMuonL1Filter.h | 2 ++ HLTrigger/Muon/plugins/HLTMuonL1TFilter.cc | 8 +------- .../Muon/plugins/HLTMuonTrackMassFilter.cc | 7 ++----- .../Muon/plugins/HLTMuonTrackMassFilter.h | 3 +++ .../Muon/plugins/HLTMuonTrimuonL3Filter.cc | 10 ++++------ .../Muon/plugins/HLTMuonTrimuonL3Filter.h | 3 +++ HLTrigger/Muon/test/HLTMuonRateAnalyzer.cc | 1 - .../test/HLTMuonRateAnalyzerWithWeight.cc | 1 - HLTrigger/Muon/test/HLTMuonTurnOnAnalyzer.cc | 1 - 14 files changed, 32 insertions(+), 41 deletions(-) diff --git a/HLTrigger/Muon/plugins/HLTDiMuonGlbTrkFilter.cc b/HLTrigger/Muon/plugins/HLTDiMuonGlbTrkFilter.cc index f70eb359c5c5e..49db0a676ecfc 100644 --- a/HLTrigger/Muon/plugins/HLTDiMuonGlbTrkFilter.cc +++ b/HLTrigger/Muon/plugins/HLTDiMuonGlbTrkFilter.cc @@ -1,31 +1,26 @@ +#include "HLTDiMuonGlbTrkFilter.h" #include "DataFormats/Common/interface/Handle.h" - #include "DataFormats/HLTReco/interface/TriggerFilterObjectWithRefs.h" #include "DataFormats/HLTReco/interface/TriggerRefsCollections.h" - -#include "FWCore/MessageLogger/interface/MessageLogger.h" - #include "DataFormats/TrackReco/interface/Track.h" #include "DataFormats/RecoCandidate/interface/RecoChargedCandidate.h" #include "DataFormats/RecoCandidate/interface/RecoChargedCandidateFwd.h" #include "DataFormats/MuonReco/interface/MuonFwd.h" -#include "HLTDiMuonGlbTrkFilter.h" #include "DataFormats/BeamSpot/interface/BeamSpot.h" #include "DataFormats/MuonSeed/interface/L3MuonTrajectorySeed.h" #include "DataFormats/MuonSeed/interface/L3MuonTrajectorySeedCollection.h" - +#include "DataFormats/Math/interface/deltaR.h" #include "TrackingTools/PatternTools/interface/ClosestApproachInRPhi.h" #include "TrackingTools/TransientTrack/interface/TransientTrack.h" -#include "MagneticField/Engine/interface/MagneticField.h" -#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" +#include "FWCore/MessageLogger/interface/MessageLogger.h" #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" #include "FWCore/ParameterSet/interface/ParameterSetDescription.h" #include "FWCore/Utilities/interface/InputTag.h" #include "FWCore/Utilities/interface/EDMException.h" +#include "FWCore/Framework/interface/ESHandle.h" -#include "DataFormats/Math/interface/deltaR.h" - -HLTDiMuonGlbTrkFilter::HLTDiMuonGlbTrkFilter(const edm::ParameterSet& iConfig) : HLTFilter(iConfig) { +HLTDiMuonGlbTrkFilter::HLTDiMuonGlbTrkFilter(const edm::ParameterSet& iConfig) + : HLTFilter(iConfig), idealMagneticFieldRecordToken_(esConsumes()) { m_muonsTag = iConfig.getParameter("inputMuonCollection"); m_muonsToken = consumes(m_muonsTag); m_candsTag = iConfig.getParameter("inputCandCollection"); @@ -116,7 +111,7 @@ bool HLTDiMuonGlbTrkFilter::hltFilter(edm::Event& iEvent, // Needed for DCA calculation edm::ESHandle bFieldHandle; if (m_maxDCAMuMu < 100.) - iSetup.get().get(bFieldHandle); + bFieldHandle = iSetup.getHandle(idealMagneticFieldRecordToken_); for (unsigned int i = 0; i < filteredMuons.size() - 1; ++i) for (unsigned int j = i + 1; j < filteredMuons.size(); ++j) { const reco::Muon& mu1(muons->at(filteredMuons.at(i))); diff --git a/HLTrigger/Muon/plugins/HLTDiMuonGlbTrkFilter.h b/HLTrigger/Muon/plugins/HLTDiMuonGlbTrkFilter.h index 6c2e8cda30dee..f68b58f3aee95 100644 --- a/HLTrigger/Muon/plugins/HLTDiMuonGlbTrkFilter.h +++ b/HLTrigger/Muon/plugins/HLTDiMuonGlbTrkFilter.h @@ -5,6 +5,8 @@ #include "DataFormats/RecoCandidate/interface/RecoChargedCandidateFwd.h" #include "DataFormats/MuonReco/interface/MuonFwd.h" #include "DataFormats/MuonReco/interface/MuonSelectors.h" +#include "MagneticField/Engine/interface/MagneticField.h" +#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" namespace edm { class ConfigurationDescriptions; @@ -20,6 +22,7 @@ class HLTDiMuonGlbTrkFilter : public HLTFilter { trigger::TriggerFilterObjectWithRefs& filterproduct) const override; private: + edm::ESGetToken const idealMagneticFieldRecordToken_; // WARNING: two input collection represent should be aligned and represent // the same list of muons, just stored in different containers edm::InputTag m_muonsTag; // input collection of muons diff --git a/HLTrigger/Muon/plugins/HLTMuonDimuonL3Filter.cc b/HLTrigger/Muon/plugins/HLTMuonDimuonL3Filter.cc index ffa94e5b78826..589cc8716d105 100644 --- a/HLTrigger/Muon/plugins/HLTMuonDimuonL3Filter.cc +++ b/HLTrigger/Muon/plugins/HLTMuonDimuonL3Filter.cc @@ -19,7 +19,6 @@ #include "TrackingTools/TransientTrack/interface/TransientTrack.h" #include "FWCore/Utilities/interface/InputTag.h" #include "DataFormats/Math/interface/deltaR.h" -#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" using namespace edm; using namespace std; @@ -50,6 +49,7 @@ namespace { HLTMuonDimuonL3Filter::HLTMuonDimuonL3Filter(const edm::ParameterSet& iConfig) : HLTFilter(iConfig), + idealMagneticFieldRecordToken_(esConsumes()), beamspotTag_(iConfig.getParameter("BeamSpotTag")), beamspotToken_(consumes(beamspotTag_)), candTag_(iConfig.getParameter("CandTag")), @@ -290,8 +290,7 @@ bool HLTMuonDimuonL3Filter::hltFilter(edm::Event& iEvent, } //end of using normal TrajectorySeeds // Needed for DCA calculation - ESHandle bFieldHandle; - iSetup.get().get(bFieldHandle); + auto const& bFieldHandle = iSetup.getHandle(idealMagneticFieldRecordToken_); // look at all mucands, check cuts and add to filter object int n = 0; diff --git a/HLTrigger/Muon/plugins/HLTMuonDimuonL3Filter.h b/HLTrigger/Muon/plugins/HLTMuonDimuonL3Filter.h index 073d1c3f0003e..a84b54119c1b8 100644 --- a/HLTrigger/Muon/plugins/HLTMuonDimuonL3Filter.h +++ b/HLTrigger/Muon/plugins/HLTMuonDimuonL3Filter.h @@ -21,8 +21,9 @@ #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" #include "FWCore/ParameterSet/interface/ParameterSetDescription.h" #include "DataFormats/Common/interface/Handle.h" -#include "MagneticField/Engine/interface/MagneticField.h" #include "FWCore/Framework/interface/ESHandle.h" +#include "MagneticField/Engine/interface/MagneticField.h" +#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" namespace edm { class ConfigurationDescriptions; @@ -44,6 +45,7 @@ class HLTMuonDimuonL3Filter : public HLTFilter { const reco::RecoChargedCandidateRef&, const reco::BeamSpot&, const edm::ESHandle&) const; + const edm::ESGetToken idealMagneticFieldRecordToken_; const edm::InputTag beamspotTag_; const edm::EDGetTokenT beamspotToken_; const edm::InputTag candTag_; // input tag identifying product contains muons diff --git a/HLTrigger/Muon/plugins/HLTMuonL1Filter.cc b/HLTrigger/Muon/plugins/HLTMuonL1Filter.cc index 517079ae68c12..cd7f7be092001 100644 --- a/HLTrigger/Muon/plugins/HLTMuonL1Filter.cc +++ b/HLTrigger/Muon/plugins/HLTMuonL1Filter.cc @@ -17,7 +17,6 @@ #include "DataFormats/L1GlobalMuonTrigger/interface/L1MuGMTCand.h" #include "FWCore/Utilities/interface/EDMException.h" -#include "FWCore/Framework/interface/ESHandle.h" #include "TMath.h" #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" @@ -31,6 +30,7 @@ // HLTMuonL1Filter::HLTMuonL1Filter(const edm::ParameterSet& iConfig) : HLTFilter(iConfig), + l1MuTriggerScalesRcdToken_(esConsumes()), candTag_(iConfig.getParameter("CandTag")), candToken_(consumes(candTag_)), previousCandTag_(iConfig.getParameter("PreviousCandTag")), @@ -130,9 +130,7 @@ bool HLTMuonL1Filter::hltFilter(edm::Event& iEvent, csctfTracks = csctfTracksHandle.product(); // read scales for every event (fast, no need to cache this) - ESHandle scales; - iSetup.get().get(scales); - l1MuTriggerScales = scales.product(); + l1MuTriggerScales = &iSetup.getData(l1MuTriggerScalesRcdToken_); } // get hold of muons that fired the previous level diff --git a/HLTrigger/Muon/plugins/HLTMuonL1Filter.h b/HLTrigger/Muon/plugins/HLTMuonL1Filter.h index 53eb2498d688b..4e279f6c9e153 100644 --- a/HLTrigger/Muon/plugins/HLTMuonL1Filter.h +++ b/HLTrigger/Muon/plugins/HLTMuonL1Filter.h @@ -36,6 +36,8 @@ class HLTMuonL1Filter : public HLTFilter { trigger::TriggerFilterObjectWithRefs& filterproduct) const override; private: + edm::ESGetToken const l1MuTriggerScalesRcdToken_; + /// input tag identifying the product containing muons edm::InputTag candTag_; edm::EDGetTokenT candToken_; diff --git a/HLTrigger/Muon/plugins/HLTMuonL1TFilter.cc b/HLTrigger/Muon/plugins/HLTMuonL1TFilter.cc index b7813b87bb648..7f1ae1066c5d1 100644 --- a/HLTrigger/Muon/plugins/HLTMuonL1TFilter.cc +++ b/HLTrigger/Muon/plugins/HLTMuonL1TFilter.cc @@ -7,21 +7,15 @@ */ #include "HLTMuonL1TFilter.h" - #include "DataFormats/Common/interface/Handle.h" #include "DataFormats/HLTReco/interface/TriggerFilterObjectWithRefs.h" #include "DataFormats/HLTReco/interface/TriggerRefsCollections.h" - #include "FWCore/MessageLogger/interface/MessageLogger.h" - #include "FWCore/Utilities/interface/EDMException.h" - -#include "FWCore/Framework/interface/ESHandle.h" -#include "TMath.h" - #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" #include "FWCore/ParameterSet/interface/ParameterSetDescription.h" #include "FWCore/Utilities/interface/InputTag.h" +#include "TMath.h" #include diff --git a/HLTrigger/Muon/plugins/HLTMuonTrackMassFilter.cc b/HLTrigger/Muon/plugins/HLTMuonTrackMassFilter.cc index 6dc6f0f533fee..13d2ae1349294 100644 --- a/HLTrigger/Muon/plugins/HLTMuonTrackMassFilter.cc +++ b/HLTrigger/Muon/plugins/HLTMuonTrackMassFilter.cc @@ -23,8 +23,6 @@ #include "TrackingTools/PatternTools/interface/ClosestApproachInRPhi.h" #include "TrackingTools/TransientTrack/interface/TransientTrack.h" -#include "MagneticField/Engine/interface/MagneticField.h" -#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" #include "FWCore/ParameterSet/interface/ParameterSetDescription.h" @@ -32,11 +30,11 @@ #include #include -#include #include HLTMuonTrackMassFilter::HLTMuonTrackMassFilter(const edm::ParameterSet& iConfig) : HLTFilter(iConfig), + idealMagneticFieldRecordToken_(esConsumes()), beamspotTag_(iConfig.getParameter("BeamSpotTag")), beamspotToken_(consumes(beamspotTag_)), muonTag_(iConfig.getParameter("CandTag")), @@ -147,8 +145,7 @@ bool HLTMuonTrackMassFilter::hltFilter(edm::Event& iEvent, iEvent.getByToken(beamspotToken_, beamspotHandle); reco::BeamSpot::Point beamspot(beamspotHandle->position()); // Needed for DCA calculation - edm::ESHandle bFieldHandle; - iSetup.get().get(bFieldHandle); + auto const& bFieldHandle = iSetup.getHandle(idealMagneticFieldRecordToken_); // // Muons // diff --git a/HLTrigger/Muon/plugins/HLTMuonTrackMassFilter.h b/HLTrigger/Muon/plugins/HLTMuonTrackMassFilter.h index 6c05e26364638..40830df327523 100644 --- a/HLTrigger/Muon/plugins/HLTMuonTrackMassFilter.h +++ b/HLTrigger/Muon/plugins/HLTMuonTrackMassFilter.h @@ -7,6 +7,8 @@ #include "HLTrigger/HLTcore/interface/HLTFilter.h" #include "DataFormats/RecoCandidate/interface/RecoChargedCandidateFwd.h" #include "DataFormats/BeamSpot/interface/BeamSpot.h" +#include "MagneticField/Engine/interface/MagneticField.h" +#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" #include @@ -30,6 +32,7 @@ class HLTMuonTrackMassFilter : public HLTFilter { const reco::RecoChargedCandidateRef& trackRef) const; private: + edm::ESGetToken const idealMagneticFieldRecordToken_; edm::InputTag beamspotTag_; ///< beamspot used for quality cuts edm::EDGetTokenT beamspotToken_; ///< beamspot used for quality cuts edm::InputTag muonTag_; ///< RecoChargedCandidateCollection (muons) diff --git a/HLTrigger/Muon/plugins/HLTMuonTrimuonL3Filter.cc b/HLTrigger/Muon/plugins/HLTMuonTrimuonL3Filter.cc index 94d71421773ea..508e1c41bc9eb 100644 --- a/HLTrigger/Muon/plugins/HLTMuonTrimuonL3Filter.cc +++ b/HLTrigger/Muon/plugins/HLTMuonTrimuonL3Filter.cc @@ -25,8 +25,6 @@ #include "TrackingTools/PatternTools/interface/ClosestApproachInRPhi.h" #include "TrackingTools/TransientTrack/interface/TransientTrack.h" -#include "MagneticField/Engine/interface/MagneticField.h" -#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" #include "FWCore/ParameterSet/interface/ParameterSetDescription.h" #include "FWCore/Utilities/interface/InputTag.h" @@ -43,6 +41,7 @@ using namespace trigger; // HLTMuonTrimuonL3Filter::HLTMuonTrimuonL3Filter(const edm::ParameterSet& iConfig) : HLTFilter(iConfig), + idealMagneticFieldRecordToken_(esConsumes()), beamspotTag_(iConfig.getParameter("BeamSpotTag")), beamspotToken_(consumes(beamspotTag_)), candTag_(iConfig.getParameter("CandTag")), @@ -186,8 +185,7 @@ bool HLTMuonTrimuonL3Filter::hltFilter(edm::Event& iEvent, beamSpot = *recoBeamSpotHandle; // Needed for DCA calculation - ESHandle bFieldHandle; - iSetup.get().get(bFieldHandle); + auto const& bFieldHandle = iSetup.getHandle(idealMagneticFieldRecordToken_); // needed to compare to L2 vector vl2cands; @@ -283,8 +281,8 @@ bool HLTMuonTrimuonL3Filter::hltFilter(edm::Event& iEvent, // Pt threshold cut double pt2 = cand2->pt(); - // double err2 = tk2->error(0); - // double abspar2 = fabs(tk2->parameter(0)); + // double err2 = tk2->error(0); + // double abspar2 = fabs(tk2->parameter(0)); double ptLx2 = pt2; // Don't convert to 90% efficiency threshold LogDebug("HLTMuonTrimuonL3Filter") << " ... 2nd muon in loop, pt2= " << pt2 << ", ptLx2= " << ptLx2; diff --git a/HLTrigger/Muon/plugins/HLTMuonTrimuonL3Filter.h b/HLTrigger/Muon/plugins/HLTMuonTrimuonL3Filter.h index 225bb24def6e0..3e6e082beead6 100644 --- a/HLTrigger/Muon/plugins/HLTMuonTrimuonL3Filter.h +++ b/HLTrigger/Muon/plugins/HLTMuonTrimuonL3Filter.h @@ -17,6 +17,8 @@ #include "DataFormats/BeamSpot/interface/BeamSpot.h" #include "DataFormats/MuonReco/interface/MuonTrackLinks.h" #include "DataFormats/MuonReco/interface/MuonFwd.h" +#include "MagneticField/Engine/interface/MagneticField.h" +#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" namespace edm { class ConfigurationDescriptions; @@ -34,6 +36,7 @@ class HLTMuonTrimuonL3Filter : public HLTFilter { private: static bool triggeredByLevel2(const reco::TrackRef& track, std::vector& vcands); + edm::ESGetToken const idealMagneticFieldRecordToken_; edm::InputTag beamspotTag_; edm::EDGetTokenT beamspotToken_; edm::InputTag candTag_; // input tag identifying product contains muons diff --git a/HLTrigger/Muon/test/HLTMuonRateAnalyzer.cc b/HLTrigger/Muon/test/HLTMuonRateAnalyzer.cc index 3ec4e5a5d9d20..514a55e17b9c9 100644 --- a/HLTrigger/Muon/test/HLTMuonRateAnalyzer.cc +++ b/HLTrigger/Muon/test/HLTMuonRateAnalyzer.cc @@ -11,7 +11,6 @@ #include "FWCore/Framework/interface/Frameworkfwd.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/EventSetup.h" -#include "FWCore/Framework/interface/ESHandle.h" #include "DataFormats/Common/interface/Handle.h" #include "DataFormats/TrackReco/interface/Track.h" diff --git a/HLTrigger/Muon/test/HLTMuonRateAnalyzerWithWeight.cc b/HLTrigger/Muon/test/HLTMuonRateAnalyzerWithWeight.cc index 1cea8f16049ad..f3bdd2a5064ab 100644 --- a/HLTrigger/Muon/test/HLTMuonRateAnalyzerWithWeight.cc +++ b/HLTrigger/Muon/test/HLTMuonRateAnalyzerWithWeight.cc @@ -11,7 +11,6 @@ #include "FWCore/Framework/interface/Frameworkfwd.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/EventSetup.h" -#include "FWCore/Framework/interface/ESHandle.h" #include "DataFormats/Common/interface/Handle.h" #include "DataFormats/L1Trigger/interface/L1MuonParticle.h" #include "DataFormats/L1Trigger/interface/L1MuonParticleFwd.h" diff --git a/HLTrigger/Muon/test/HLTMuonTurnOnAnalyzer.cc b/HLTrigger/Muon/test/HLTMuonTurnOnAnalyzer.cc index 055cbcb6ab31c..67c9d9d82399a 100644 --- a/HLTrigger/Muon/test/HLTMuonTurnOnAnalyzer.cc +++ b/HLTrigger/Muon/test/HLTMuonTurnOnAnalyzer.cc @@ -11,7 +11,6 @@ #include "FWCore/Framework/interface/Frameworkfwd.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/EventSetup.h" -#include "FWCore/Framework/interface/ESHandle.h" #include "DataFormats/Common/interface/Handle.h" #include "DataFormats/L1Trigger/interface/L1MuonParticle.h" From 94f18a4a185c44783c438ba650ab3cdbe188aa72 Mon Sep 17 00:00:00 2001 From: Marino Missiroli Date: Mon, 22 Mar 2021 21:05:39 +0100 Subject: [PATCH 8/9] esConsumes migration of HLTrigger/btau --- .../plugins/HLTDisplacedmumuVtxProducer.cc | 18 ++++------- .../plugins/HLTDisplacedmumuVtxProducer.h | 4 +++ .../plugins/HLTDisplacedmumumuVtxProducer.cc | 19 ++++-------- .../plugins/HLTDisplacedmumumuVtxProducer.h | 3 ++ .../plugins/HLTDisplacedtktkVtxProducer.cc | 23 +++++--------- .../plugins/HLTDisplacedtktkVtxProducer.h | 3 ++ .../plugins/HLTDisplacedtktktkVtxProducer.cc | 22 +++++--------- .../plugins/HLTDisplacedtktktkVtxProducer.h | 3 ++ HLTrigger/btau/plugins/HLTmmkFilter.cc | 13 ++++---- HLTrigger/btau/plugins/HLTmmkFilter.h | 14 ++++++--- HLTrigger/btau/plugins/HLTmmkkFilter.cc | 30 +++++++------------ HLTrigger/btau/plugins/HLTmmkkFilter.h | 14 ++++++--- .../btau/plugins/HLTmumutkVtxProducer.cc | 19 +++++------- HLTrigger/btau/plugins/HLTmumutkVtxProducer.h | 7 +++++ .../btau/plugins/HLTmumutktkVtxProducer.cc | 23 ++++++-------- .../btau/plugins/HLTmumutktkVtxProducer.h | 12 ++++++-- 16 files changed, 107 insertions(+), 120 deletions(-) diff --git a/HLTrigger/btau/plugins/HLTDisplacedmumuVtxProducer.cc b/HLTrigger/btau/plugins/HLTDisplacedmumuVtxProducer.cc index 0530724aaeab6..0569a594034e3 100644 --- a/HLTrigger/btau/plugins/HLTDisplacedmumuVtxProducer.cc +++ b/HLTrigger/btau/plugins/HLTDisplacedmumuVtxProducer.cc @@ -3,7 +3,6 @@ #include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" - #include "DataFormats/Candidate/interface/CandidateFwd.h" #include "DataFormats/RecoCandidate/interface/RecoCandidate.h" #include "DataFormats/RecoCandidate/interface/RecoChargedCandidate.h" @@ -11,18 +10,13 @@ #include "DataFormats/Candidate/interface/Candidate.h" #include "DataFormats/HLTReco/interface/TriggerFilterObjectWithRefs.h" #include "DataFormats/HLTReco/interface/TriggerRefsCollections.h" - #include "DataFormats/TrackReco/interface/TrackFwd.h" #include "DataFormats/TrackReco/interface/Track.h" -#include "TrackingTools/TransientTrack/interface/TransientTrackBuilder.h" -#include "TrackingTools/Records/interface/TransientTrackRecord.h" - -#include "RecoVertex/KalmanVertexFit/interface/KalmanVertexFitter.h" -#include "RecoVertex/VertexPrimitives/interface/TransientVertex.h" #include "DataFormats/VertexReco/interface/Vertex.h" #include "DataFormats/VertexReco/interface/VertexFwd.h" #include "DataFormats/Common/interface/RefToBase.h" - +#include "RecoVertex/KalmanVertexFit/interface/KalmanVertexFitter.h" +#include "RecoVertex/VertexPrimitives/interface/TransientVertex.h" #include "HLTDisplacedmumuVtxProducer.h" using namespace edm; @@ -33,7 +27,8 @@ using namespace trigger; // constructors and destructor // HLTDisplacedmumuVtxProducer::HLTDisplacedmumuVtxProducer(const edm::ParameterSet& iConfig) - : srcTag_(iConfig.getParameter("Src")), + : transientTrackRecordToken_(esConsumes(edm::ESInputTag("", "TransientTrackBuilder"))), + srcTag_(iConfig.getParameter("Src")), srcToken_(consumes(srcTag_)), previousCandTag_(iConfig.getParameter("PreviousCandTag")), previousCandToken_(consumes(previousCandTag_)), @@ -72,9 +67,8 @@ void HLTDisplacedmumuVtxProducer::produce(edm::StreamID, edm::Event& iEvent, con Handle mucands; iEvent.getByToken(srcToken_, mucands); - //get the transient track builder: - edm::ESHandle theB; - iSetup.get().get("TransientTrackBuilder", theB); + // get the transient track builder + auto const& theB = iSetup.getHandle(transientTrackRecordToken_); std::unique_ptr vertexCollection(new VertexCollection()); diff --git a/HLTrigger/btau/plugins/HLTDisplacedmumuVtxProducer.h b/HLTrigger/btau/plugins/HLTDisplacedmumuVtxProducer.h index 6ff338cd99df6..403f828a20cb9 100644 --- a/HLTrigger/btau/plugins/HLTDisplacedmumuVtxProducer.h +++ b/HLTrigger/btau/plugins/HLTDisplacedmumuVtxProducer.h @@ -21,6 +21,9 @@ #include "DataFormats/TrackReco/interface/TrackFwd.h" #include "DataFormats/HLTReco/interface/TriggerFilterObjectWithRefs.h" #include "DataFormats/HLTReco/interface/TriggerRefsCollections.h" +#include "TrackingTools/TransientTrack/interface/TransientTrackBuilder.h" +#include "TrackingTools/Records/interface/TransientTrackRecord.h" + #include namespace edm { @@ -37,6 +40,7 @@ class HLTDisplacedmumuVtxProducer : public edm::global::EDProducer<> { private: bool checkPreviousCand(const reco::TrackRef& trackref, const std::vector& ref2) const; + const edm::ESGetToken transientTrackRecordToken_; const edm::InputTag srcTag_; const edm::EDGetTokenT srcToken_; const edm::InputTag previousCandTag_; diff --git a/HLTrigger/btau/plugins/HLTDisplacedmumumuVtxProducer.cc b/HLTrigger/btau/plugins/HLTDisplacedmumumuVtxProducer.cc index 931c0ba45e8b8..b56605d3c7992 100644 --- a/HLTrigger/btau/plugins/HLTDisplacedmumumuVtxProducer.cc +++ b/HLTrigger/btau/plugins/HLTDisplacedmumumuVtxProducer.cc @@ -1,9 +1,7 @@ #include -#include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" - #include "DataFormats/Candidate/interface/CandidateFwd.h" #include "DataFormats/RecoCandidate/interface/RecoCandidate.h" #include "DataFormats/RecoCandidate/interface/RecoChargedCandidate.h" @@ -11,18 +9,13 @@ #include "DataFormats/Candidate/interface/Candidate.h" #include "DataFormats/HLTReco/interface/TriggerFilterObjectWithRefs.h" #include "DataFormats/HLTReco/interface/TriggerRefsCollections.h" - #include "DataFormats/TrackReco/interface/TrackFwd.h" #include "DataFormats/TrackReco/interface/Track.h" -#include "TrackingTools/TransientTrack/interface/TransientTrackBuilder.h" -#include "TrackingTools/Records/interface/TransientTrackRecord.h" - -#include "RecoVertex/KalmanVertexFit/interface/KalmanVertexFitter.h" -#include "RecoVertex/VertexPrimitives/interface/TransientVertex.h" #include "DataFormats/VertexReco/interface/Vertex.h" #include "DataFormats/VertexReco/interface/VertexFwd.h" #include "DataFormats/Common/interface/RefToBase.h" - +#include "RecoVertex/KalmanVertexFit/interface/KalmanVertexFitter.h" +#include "RecoVertex/VertexPrimitives/interface/TransientVertex.h" #include "HLTDisplacedmumumuVtxProducer.h" using namespace edm; @@ -33,7 +26,8 @@ using namespace trigger; // constructors and destructor // HLTDisplacedmumumuVtxProducer::HLTDisplacedmumumuVtxProducer(const edm::ParameterSet& iConfig) - : srcTag_(iConfig.getParameter("Src")), + : transientTrackRecordToken_(esConsumes(edm::ESInputTag("", "TransientTrackBuilder"))), + srcTag_(iConfig.getParameter("Src")), srcToken_(consumes(srcTag_)), previousCandTag_(iConfig.getParameter("PreviousCandTag")), previousCandToken_(consumes(previousCandTag_)), @@ -70,9 +64,8 @@ void HLTDisplacedmumumuVtxProducer::produce(edm::StreamID, edm::Event& iEvent, c Handle mucands; iEvent.getByToken(srcToken_, mucands); - //get the transient track builder: - edm::ESHandle theB; - iSetup.get().get("TransientTrackBuilder", theB); + // get the transient track builder + auto const& theB = iSetup.getHandle(transientTrackRecordToken_); std::unique_ptr vertexCollection(new VertexCollection()); diff --git a/HLTrigger/btau/plugins/HLTDisplacedmumumuVtxProducer.h b/HLTrigger/btau/plugins/HLTDisplacedmumumuVtxProducer.h index cc0fab1a9fd12..ca954b62f318d 100644 --- a/HLTrigger/btau/plugins/HLTDisplacedmumumuVtxProducer.h +++ b/HLTrigger/btau/plugins/HLTDisplacedmumumuVtxProducer.h @@ -21,6 +21,8 @@ #include "DataFormats/TrackReco/interface/TrackFwd.h" #include "DataFormats/HLTReco/interface/TriggerFilterObjectWithRefs.h" #include "DataFormats/HLTReco/interface/TriggerRefsCollections.h" +#include "TrackingTools/TransientTrack/interface/TransientTrackBuilder.h" +#include "TrackingTools/Records/interface/TransientTrackRecord.h" #include namespace edm { @@ -37,6 +39,7 @@ class HLTDisplacedmumumuVtxProducer : public edm::global::EDProducer<> { private: bool checkPreviousCand(const reco::TrackRef& trackref, const std::vector& ref2) const; + const edm::ESGetToken transientTrackRecordToken_; const edm::InputTag srcTag_; const edm::EDGetTokenT srcToken_; const edm::InputTag previousCandTag_; diff --git a/HLTrigger/btau/plugins/HLTDisplacedtktkVtxProducer.cc b/HLTrigger/btau/plugins/HLTDisplacedtktkVtxProducer.cc index 858acbb80bc1b..b2a4b13cb72f7 100644 --- a/HLTrigger/btau/plugins/HLTDisplacedtktkVtxProducer.cc +++ b/HLTrigger/btau/plugins/HLTDisplacedtktkVtxProducer.cc @@ -1,9 +1,7 @@ #include -#include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" - #include "DataFormats/Candidate/interface/CandidateFwd.h" #include "DataFormats/RecoCandidate/interface/RecoCandidate.h" #include "DataFormats/RecoCandidate/interface/RecoChargedCandidate.h" @@ -11,18 +9,13 @@ #include "DataFormats/Candidate/interface/Candidate.h" #include "DataFormats/HLTReco/interface/TriggerFilterObjectWithRefs.h" #include "DataFormats/HLTReco/interface/TriggerRefsCollections.h" - #include "DataFormats/TrackReco/interface/TrackFwd.h" #include "DataFormats/TrackReco/interface/Track.h" -#include "TrackingTools/TransientTrack/interface/TransientTrackBuilder.h" -#include "TrackingTools/Records/interface/TransientTrackRecord.h" - -#include "RecoVertex/KalmanVertexFit/interface/KalmanVertexFitter.h" -#include "RecoVertex/VertexPrimitives/interface/TransientVertex.h" #include "DataFormats/VertexReco/interface/Vertex.h" #include "DataFormats/VertexReco/interface/VertexFwd.h" #include "DataFormats/Common/interface/RefToBase.h" - +#include "RecoVertex/KalmanVertexFit/interface/KalmanVertexFitter.h" +#include "RecoVertex/VertexPrimitives/interface/TransientVertex.h" #include "HLTDisplacedtktkVtxProducer.h" using namespace edm; @@ -33,7 +26,8 @@ using namespace trigger; // constructors and destructor // HLTDisplacedtktkVtxProducer::HLTDisplacedtktkVtxProducer(const edm::ParameterSet& iConfig) - : srcTag_(iConfig.getParameter("Src")), + : transientTrackRecordToken_(esConsumes(edm::ESInputTag("", "TransientTrackBuilder"))), + srcTag_(iConfig.getParameter("Src")), srcToken_(consumes(srcTag_)), previousCandTag_(iConfig.getParameter("PreviousCandTag")), previousCandToken_(consumes(previousCandTag_)), @@ -45,9 +39,7 @@ HLTDisplacedtktkVtxProducer::HLTDisplacedtktkVtxProducer(const edm::ParameterSet massParticle1_(iConfig.getParameter("massParticle1")), massParticle2_(iConfig.getParameter("massParticle2")), chargeOpt_(iConfig.getParameter("ChargeOpt")), - triggerTypeDaughters_(iConfig.getParameter("triggerTypeDaughters")) - -{ + triggerTypeDaughters_(iConfig.getParameter("triggerTypeDaughters")) { produces(); } @@ -81,9 +73,8 @@ void HLTDisplacedtktkVtxProducer::produce(edm::Event& iEvent, const edm::EventSe Handle trackcands; iEvent.getByToken(srcToken_, trackcands); - //get the transient track builder: - edm::ESHandle theB; - iSetup.get().get("TransientTrackBuilder", theB); + // get the transient track builder + auto const& theB = iSetup.getHandle(transientTrackRecordToken_); std::unique_ptr vertexCollection(new VertexCollection()); diff --git a/HLTrigger/btau/plugins/HLTDisplacedtktkVtxProducer.h b/HLTrigger/btau/plugins/HLTDisplacedtktkVtxProducer.h index ede224a3e548b..949c209d7c012 100644 --- a/HLTrigger/btau/plugins/HLTDisplacedtktkVtxProducer.h +++ b/HLTrigger/btau/plugins/HLTDisplacedtktkVtxProducer.h @@ -24,6 +24,8 @@ #include "DataFormats/TrackReco/interface/TrackFwd.h" #include "DataFormats/HLTReco/interface/TriggerFilterObjectWithRefs.h" #include "DataFormats/HLTReco/interface/TriggerRefsCollections.h" +#include "TrackingTools/Records/interface/TransientTrackRecord.h" +#include "TrackingTools/TransientTrack/interface/TransientTrackBuilder.h" #include namespace edm { @@ -40,6 +42,7 @@ class HLTDisplacedtktkVtxProducer : public edm::stream::EDProducer<> { private: bool checkPreviousCand(const reco::TrackRef& trackref, const std::vector& ref2) const; + const edm::ESGetToken transientTrackRecordToken_; const edm::InputTag srcTag_; const edm::EDGetTokenT srcToken_; const edm::InputTag previousCandTag_; diff --git a/HLTrigger/btau/plugins/HLTDisplacedtktktkVtxProducer.cc b/HLTrigger/btau/plugins/HLTDisplacedtktktkVtxProducer.cc index 50eb2ecd073f6..f5a54a6a986c6 100644 --- a/HLTrigger/btau/plugins/HLTDisplacedtktktkVtxProducer.cc +++ b/HLTrigger/btau/plugins/HLTDisplacedtktktkVtxProducer.cc @@ -3,7 +3,6 @@ #include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" - #include "DataFormats/Candidate/interface/CandidateFwd.h" #include "DataFormats/RecoCandidate/interface/RecoCandidate.h" #include "DataFormats/RecoCandidate/interface/RecoChargedCandidate.h" @@ -11,18 +10,13 @@ #include "DataFormats/Candidate/interface/Candidate.h" #include "DataFormats/HLTReco/interface/TriggerFilterObjectWithRefs.h" #include "DataFormats/HLTReco/interface/TriggerRefsCollections.h" - #include "DataFormats/TrackReco/interface/TrackFwd.h" #include "DataFormats/TrackReco/interface/Track.h" -#include "TrackingTools/TransientTrack/interface/TransientTrackBuilder.h" -#include "TrackingTools/Records/interface/TransientTrackRecord.h" - -#include "RecoVertex/KalmanVertexFit/interface/KalmanVertexFitter.h" -#include "RecoVertex/VertexPrimitives/interface/TransientVertex.h" #include "DataFormats/VertexReco/interface/Vertex.h" #include "DataFormats/VertexReco/interface/VertexFwd.h" #include "DataFormats/Common/interface/RefToBase.h" - +#include "RecoVertex/KalmanVertexFit/interface/KalmanVertexFitter.h" +#include "RecoVertex/VertexPrimitives/interface/TransientVertex.h" #include "HLTDisplacedtktktkVtxProducer.h" using namespace edm; @@ -33,7 +27,8 @@ using namespace trigger; // constructors and destructor // HLTDisplacedtktktkVtxProducer::HLTDisplacedtktktkVtxProducer(const edm::ParameterSet& iConfig) - : srcTag_(iConfig.getParameter("Src")), + : transientTrackRecordToken_(esConsumes(edm::ESInputTag("", "TransientTrackBuilder"))), + srcTag_(iConfig.getParameter("Src")), srcToken_(consumes(srcTag_)), previousCandTag_(iConfig.getParameter("PreviousCandTag")), previousCandToken_(consumes(previousCandTag_)), @@ -52,9 +47,7 @@ HLTDisplacedtktktkVtxProducer::HLTDisplacedtktktkVtxProducer(const edm::Paramete massParticle3_(iConfig.getParameter("massParticle3")), chargeOpt_(iConfig.getParameter("ChargeOpt")), resOpt_(iConfig.getParameter("ResOpt")), - triggerTypeDaughters_(iConfig.getParameter("triggerTypeDaughters")) - -{ + triggerTypeDaughters_(iConfig.getParameter("triggerTypeDaughters")) { produces(); firstTrackMass = massParticle1_; @@ -112,9 +105,8 @@ void HLTDisplacedtktktkVtxProducer::produce(edm::Event& iEvent, const edm::Event if (trackcands->size() < 3) return; - //get the transient track builder: - edm::ESHandle theB; - iSetup.get().get("TransientTrackBuilder", theB); + // get the transient track builder + auto const& theB = iSetup.getHandle(transientTrackRecordToken_); std::unique_ptr vertexCollection(new VertexCollection()); diff --git a/HLTrigger/btau/plugins/HLTDisplacedtktktkVtxProducer.h b/HLTrigger/btau/plugins/HLTDisplacedtktktkVtxProducer.h index 877405a1bdbbe..f3138ca5d3e2e 100644 --- a/HLTrigger/btau/plugins/HLTDisplacedtktktkVtxProducer.h +++ b/HLTrigger/btau/plugins/HLTDisplacedtktktkVtxProducer.h @@ -24,6 +24,8 @@ #include "DataFormats/TrackReco/interface/TrackFwd.h" #include "DataFormats/HLTReco/interface/TriggerFilterObjectWithRefs.h" #include "DataFormats/HLTReco/interface/TriggerRefsCollections.h" +#include "TrackingTools/TransientTrack/interface/TransientTrackBuilder.h" +#include "TrackingTools/Records/interface/TransientTrackRecord.h" #include namespace edm { @@ -40,6 +42,7 @@ class HLTDisplacedtktktkVtxProducer : public edm::stream::EDProducer<> { private: bool checkPreviousCand(const reco::TrackRef& trackref, const std::vector& ref2) const; + const edm::ESGetToken transientTrackRecordToken_; const edm::InputTag srcTag_; const edm::EDGetTokenT srcToken_; const edm::InputTag previousCandTag_; diff --git a/HLTrigger/btau/plugins/HLTmmkFilter.cc b/HLTrigger/btau/plugins/HLTmmkFilter.cc index a920c18840478..8c970e872917e 100644 --- a/HLTrigger/btau/plugins/HLTmmkFilter.cc +++ b/HLTrigger/btau/plugins/HLTmmkFilter.cc @@ -35,6 +35,8 @@ using namespace trigger; // ---------------------------------------------------------------------- HLTmmkFilter::HLTmmkFilter(const edm::ParameterSet& iConfig) : HLTFilter(iConfig), + transientTrackRecordToken_(esConsumes(edm::ESInputTag("", "TransientTrackBuilder"))), + idealMagneticFieldRecordToken_(esConsumes()), muCandTag_(iConfig.getParameter("MuCand")), muCandToken_(consumes(muCandTag_)), trkCandTag_(iConfig.getParameter("TrackCand")), @@ -95,18 +97,15 @@ bool HLTmmkFilter::hltFilter(edm::Event& iEvent, unique_ptr output(new CandidateCollection()); unique_ptr vertexCollection(new VertexCollection()); - //get the transient track builder: - edm::ESHandle theB; - iSetup.get().get("TransientTrackBuilder", theB); + // get the transient track builder + auto const& theB = iSetup.getHandle(transientTrackRecordToken_); - //get the beamspot position + // get the beamspot position edm::Handle recoBeamSpotHandle; iEvent.getByToken(beamSpotToken_, recoBeamSpotHandle); const reco::BeamSpot& vertexBeamSpot = *recoBeamSpotHandle; - ESHandle bFieldHandle; - iSetup.get().get(bFieldHandle); - + auto const& bFieldHandle = iSetup.getHandle(idealMagneticFieldRecordToken_); const MagneticField* magField = bFieldHandle.product(); TSCBLBuilderNoMaterial blsBuilder; diff --git a/HLTrigger/btau/plugins/HLTmmkFilter.h b/HLTrigger/btau/plugins/HLTmmkFilter.h index 9d7127a21b2a3..8ee7444e67f2b 100644 --- a/HLTrigger/btau/plugins/HLTmmkFilter.h +++ b/HLTrigger/btau/plugins/HLTmmkFilter.h @@ -18,16 +18,19 @@ // Last Modification: 13.02.2007 // -// system include files #include #include "HLTrigger/HLTcore/interface/HLTFilter.h" +#include "DataFormats/RecoCandidate/interface/RecoChargedCandidateFwd.h" +#include "DataFormats/BeamSpot/interface/BeamSpot.h" +#include "TrackingTools/Records/interface/TransientTrackRecord.h" +#include "TrackingTools/TransientTrack/interface/TransientTrackBuilder.h" +#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" +#include "MagneticField/Engine/interface/MagneticField.h" + namespace edm { class ConfigurationDescriptions; } -#include "DataFormats/RecoCandidate/interface/RecoChargedCandidateFwd.h" -#include "DataFormats/BeamSpot/interface/BeamSpot.h" -// ---------------------------------------------------------------------- namespace reco { class Candidate; @@ -53,6 +56,9 @@ class HLTmmkFilter : public HLTFilter { static int overlap(const reco::Candidate&, const reco::Candidate&); static FreeTrajectoryState initialFreeState(const reco::Track&, const MagneticField*); + const edm::ESGetToken transientTrackRecordToken_; + const edm::ESGetToken idealMagneticFieldRecordToken_; + edm::InputTag muCandTag_; edm::EDGetTokenT muCandToken_; edm::InputTag trkCandTag_; diff --git a/HLTrigger/btau/plugins/HLTmmkkFilter.cc b/HLTrigger/btau/plugins/HLTmmkkFilter.cc index fabbb20d964bf..17fb2922c5854 100644 --- a/HLTrigger/btau/plugins/HLTmmkkFilter.cc +++ b/HLTrigger/btau/plugins/HLTmmkkFilter.cc @@ -2,29 +2,20 @@ #include #include -#include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" - +#include "DataFormats/BeamSpot/interface/BeamSpot.h" +#include "DataFormats/Math/interface/deltaPhi.h" #include "DataFormats/RecoCandidate/interface/RecoCandidate.h" #include "DataFormats/RecoCandidate/interface/RecoChargedCandidate.h" - -#include "TrackingTools/TransientTrack/interface/TransientTrackBuilder.h" -#include "TrackingTools/Records/interface/TransientTrackRecord.h" - -#include "RecoVertex/KalmanVertexFit/interface/KalmanVertexFitter.h" -#include "RecoVertex/VertexPrimitives/interface/TransientVertex.h" #include "DataFormats/VertexReco/interface/Vertex.h" #include "DataFormats/VertexReco/interface/VertexFwd.h" #include "DataFormats/HLTReco/interface/TriggerFilterObjectWithRefs.h" #include "TrackingTools/PatternTools/interface/TSCBLBuilderNoMaterial.h" #include "TrackingTools/TrajectoryState/interface/FreeTrajectoryState.h" #include "TrackingTools/TrajectoryParametrization/interface/GlobalTrajectoryParameters.h" - -#include "DataFormats/BeamSpot/interface/BeamSpot.h" - -#include "DataFormats/Math/interface/deltaPhi.h" - +#include "RecoVertex/KalmanVertexFit/interface/KalmanVertexFitter.h" +#include "RecoVertex/VertexPrimitives/interface/TransientVertex.h" #include "HLTmmkkFilter.h" using namespace edm; @@ -35,6 +26,8 @@ using namespace trigger; // ---------------------------------------------------------------------- HLTmmkkFilter::HLTmmkkFilter(const edm::ParameterSet& iConfig) : HLTFilter(iConfig), + transientTrackRecordToken_(esConsumes(edm::ESInputTag("", "TransientTrackBuilder"))), + idealMagneticFieldRecordToken_(esConsumes()), muCandTag_(iConfig.getParameter("MuCand")), muCandToken_(consumes(muCandTag_)), trkCandTag_(iConfig.getParameter("TrackCand")), @@ -98,18 +91,15 @@ bool HLTmmkkFilter::hltFilter(edm::Event& iEvent, unique_ptr output(new CandidateCollection()); unique_ptr vertexCollection(new VertexCollection()); - //get the transient track builder: - edm::ESHandle theB; - iSetup.get().get("TransientTrackBuilder", theB); + // get the transient track builder + auto const& theB = iSetup.getHandle(transientTrackRecordToken_); - //get the beamspot position + // get the beamspot position edm::Handle recoBeamSpotHandle; iEvent.getByToken(beamSpotToken_, recoBeamSpotHandle); const reco::BeamSpot& vertexBeamSpot = *recoBeamSpotHandle; - ESHandle bFieldHandle; - iSetup.get().get(bFieldHandle); - + auto const& bFieldHandle = iSetup.getHandle(idealMagneticFieldRecordToken_); const MagneticField* magField = bFieldHandle.product(); TSCBLBuilderNoMaterial blsBuilder; diff --git a/HLTrigger/btau/plugins/HLTmmkkFilter.h b/HLTrigger/btau/plugins/HLTmmkkFilter.h index 708250d4e1bf2..c7d3be929c249 100644 --- a/HLTrigger/btau/plugins/HLTmmkkFilter.h +++ b/HLTrigger/btau/plugins/HLTmmkkFilter.h @@ -18,16 +18,19 @@ // Last Modification: 13.02.2007 // -// system include files #include #include "HLTrigger/HLTcore/interface/HLTFilter.h" +#include "DataFormats/BeamSpot/interface/BeamSpot.h" +#include "DataFormats/RecoCandidate/interface/RecoChargedCandidateFwd.h" +#include "TrackingTools/Records/interface/TransientTrackRecord.h" +#include "TrackingTools/TransientTrack/interface/TransientTrackBuilder.h" +#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" +#include "MagneticField/Engine/interface/MagneticField.h" + namespace edm { class ConfigurationDescriptions; } -#include "DataFormats/RecoCandidate/interface/RecoChargedCandidateFwd.h" -#include "DataFormats/BeamSpot/interface/BeamSpot.h" -// ---------------------------------------------------------------------- namespace reco { class Candidate; @@ -53,6 +56,9 @@ class HLTmmkkFilter : public HLTFilter { static int overlap(const reco::Candidate &, const reco::Candidate &); static FreeTrajectoryState initialFreeState(const reco::Track &, const MagneticField *); + const edm::ESGetToken transientTrackRecordToken_; + const edm::ESGetToken idealMagneticFieldRecordToken_; + edm::InputTag muCandTag_; edm::EDGetTokenT muCandToken_; edm::InputTag trkCandTag_; diff --git a/HLTrigger/btau/plugins/HLTmumutkVtxProducer.cc b/HLTrigger/btau/plugins/HLTmumutkVtxProducer.cc index 8727c463bff60..ed46fdb03ab6f 100644 --- a/HLTrigger/btau/plugins/HLTmumutkVtxProducer.cc +++ b/HLTrigger/btau/plugins/HLTmumutkVtxProducer.cc @@ -2,25 +2,20 @@ #include #include -#include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" - #include "DataFormats/BeamSpot/interface/BeamSpot.h" +#include "DataFormats/Math/interface/deltaR.h" #include "DataFormats/RecoCandidate/interface/RecoCandidate.h" #include "DataFormats/RecoCandidate/interface/RecoChargedCandidate.h" #include "DataFormats/VertexReco/interface/Vertex.h" #include "DataFormats/VertexReco/interface/VertexFwd.h" #include "TrackingTools/PatternTools/interface/TSCBLBuilderNoMaterial.h" -#include "TrackingTools/Records/interface/TransientTrackRecord.h" #include "TrackingTools/TrajectoryParametrization/interface/GlobalTrajectoryParameters.h" #include "TrackingTools/TrajectoryState/interface/FreeTrajectoryState.h" -#include "TrackingTools/TransientTrack/interface/TransientTrackBuilder.h" #include "RecoVertex/KalmanVertexFit/interface/KalmanVertexFitter.h" #include "RecoVertex/VertexPrimitives/interface/TransientVertex.h" - #include "HLTmumutkVtxProducer.h" -#include using namespace edm; using namespace reco; @@ -29,13 +24,15 @@ using namespace trigger; // ---------------------------------------------------------------------- HLTmumutkVtxProducer::HLTmumutkVtxProducer(const edm::ParameterSet& iConfig) - : muCandTag_(iConfig.getParameter("MuCand")), + : transientTrackRecordToken_(esConsumes(edm::ESInputTag("", "TransientTrackBuilder"))), + muCandTag_(iConfig.getParameter("MuCand")), muCandToken_(consumes(muCandTag_)), trkCandTag_(iConfig.getParameter("TrackCand")), trkCandToken_(consumes(trkCandTag_)), previousCandTag_(iConfig.getParameter("PreviousCandTag")), previousCandToken_(consumes(previousCandTag_)), mfName_(iConfig.getParameter("SimpleMagneticField")), + idealMagneticFieldRecordToken_(esConsumes(edm::ESInputTag("", mfName_))), thirdTrackMass_(iConfig.getParameter("ThirdTrackMass")), maxEta_(iConfig.getParameter("MaxEta")), minPt_(iConfig.getParameter("MinPt")), @@ -78,17 +75,15 @@ void HLTmumutkVtxProducer::produce(edm::Event& iEvent, const edm::EventSetup& iS Handle mucands; iEvent.getByToken(muCandToken_, mucands); - //get the transient track builder: - edm::ESHandle theB; - iSetup.get().get("TransientTrackBuilder", theB); + // get the transient track builder + auto const& theB = iSetup.getHandle(transientTrackRecordToken_); //get the beamspot position edm::Handle recoBeamSpotHandle; iEvent.getByToken(beamSpotToken_, recoBeamSpotHandle); //get the b field - ESHandle bFieldHandle; - iSetup.get().get(mfName_, bFieldHandle); + auto const& bFieldHandle = iSetup.getHandle(idealMagneticFieldRecordToken_); const MagneticField* magField = bFieldHandle.product(); TSCBLBuilderNoMaterial blsBuilder; diff --git a/HLTrigger/btau/plugins/HLTmumutkVtxProducer.h b/HLTrigger/btau/plugins/HLTmumutkVtxProducer.h index b178c11b71b6c..84a8890e4035a 100644 --- a/HLTrigger/btau/plugins/HLTmumutkVtxProducer.h +++ b/HLTrigger/btau/plugins/HLTmumutkVtxProducer.h @@ -24,6 +24,10 @@ #include "DataFormats/HLTReco/interface/TriggerFilterObjectWithRefs.h" #include "DataFormats/HLTReco/interface/TriggerRefsCollections.h" #include "DataFormats/BeamSpot/interface/BeamSpot.h" +#include "TrackingTools/Records/interface/TransientTrackRecord.h" +#include "TrackingTools/TransientTrack/interface/TransientTrackBuilder.h" +#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" +#include "MagneticField/Engine/interface/MagneticField.h" #include namespace edm { @@ -52,6 +56,8 @@ class HLTmumutkVtxProducer : public edm::stream::EDProducer<> { static FreeTrajectoryState initialFreeState(const reco::Track&, const MagneticField*); bool checkPreviousCand(const reco::TrackRef& trackref, const std::vector& ref2) const; + const edm::ESGetToken transientTrackRecordToken_; + const edm::InputTag muCandTag_; const edm::EDGetTokenT muCandToken_; const edm::InputTag trkCandTag_; @@ -60,6 +66,7 @@ class HLTmumutkVtxProducer : public edm::stream::EDProducer<> { const edm::EDGetTokenT previousCandToken_; const std::string mfName_; + const edm::ESGetToken idealMagneticFieldRecordToken_; const double thirdTrackMass_; const double maxEta_; diff --git a/HLTrigger/btau/plugins/HLTmumutktkVtxProducer.cc b/HLTrigger/btau/plugins/HLTmumutktkVtxProducer.cc index 4a69670edefce..0caf95649a1f9 100644 --- a/HLTrigger/btau/plugins/HLTmumutktkVtxProducer.cc +++ b/HLTrigger/btau/plugins/HLTmumutktkVtxProducer.cc @@ -5,23 +5,18 @@ #include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" - #include "DataFormats/BeamSpot/interface/BeamSpot.h" +#include "DataFormats/Math/interface/deltaR.h" #include "DataFormats/RecoCandidate/interface/RecoCandidate.h" #include "DataFormats/RecoCandidate/interface/RecoChargedCandidate.h" #include "DataFormats/VertexReco/interface/Vertex.h" #include "DataFormats/VertexReco/interface/VertexFwd.h" #include "TrackingTools/PatternTools/interface/TSCBLBuilderNoMaterial.h" -#include "TrackingTools/Records/interface/TransientTrackRecord.h" #include "TrackingTools/TrajectoryParametrization/interface/GlobalTrajectoryParameters.h" #include "TrackingTools/TrajectoryState/interface/FreeTrajectoryState.h" -#include "TrackingTools/TransientTrack/interface/TransientTrackBuilder.h" #include "RecoVertex/KalmanVertexFit/interface/KalmanVertexFitter.h" #include "RecoVertex/VertexPrimitives/interface/TransientVertex.h" - #include "HLTmumutktkVtxProducer.h" -#include -#include "TMath.h" using namespace edm; using namespace reco; @@ -30,13 +25,15 @@ using namespace trigger; // ---------------------------------------------------------------------- HLTmumutktkVtxProducer::HLTmumutktkVtxProducer(const edm::ParameterSet& iConfig) - : muCandTag_(iConfig.getParameter("MuCand")), + : transientTrackRecordToken_(esConsumes(edm::ESInputTag("", "TransientTrackBuilder"))), + muCandTag_(iConfig.getParameter("MuCand")), muCandToken_(consumes(muCandTag_)), trkCandTag_(iConfig.getParameter("TrackCand")), trkCandToken_(consumes(trkCandTag_)), previousCandTag_(iConfig.getParameter("PreviousCandTag")), previousCandToken_(consumes(previousCandTag_)), mfName_(iConfig.getParameter("SimpleMagneticField")), + idealMagneticFieldRecordToken_(esConsumes(edm::ESInputTag("", mfName_))), thirdTrackMass_(iConfig.getParameter("ThirdTrackMass")), fourthTrackMass_(iConfig.getParameter("FourthTrackMass")), maxEta_(iConfig.getParameter("MaxEta")), @@ -88,17 +85,15 @@ void HLTmumutktkVtxProducer::produce(edm::Event& iEvent, const edm::EventSetup& Handle mucands; iEvent.getByToken(muCandToken_, mucands); - //get the transient track builder: - edm::ESHandle theB; - iSetup.get().get("TransientTrackBuilder", theB); + // get the transient track builder + auto const& theB = iSetup.getHandle(transientTrackRecordToken_); - //get the beamspot position + // get the beamspot position edm::Handle recoBeamSpotHandle; iEvent.getByToken(beamSpotToken_, recoBeamSpotHandle); - //get the b field - ESHandle bFieldHandle; - iSetup.get().get(mfName_, bFieldHandle); + // get the b field + auto const& bFieldHandle = iSetup.getHandle(idealMagneticFieldRecordToken_); const MagneticField* magField = bFieldHandle.product(); TSCBLBuilderNoMaterial blsBuilder; diff --git a/HLTrigger/btau/plugins/HLTmumutktkVtxProducer.h b/HLTrigger/btau/plugins/HLTmumutktkVtxProducer.h index 930f5d1968cb5..f0fe3a1dee872 100644 --- a/HLTrigger/btau/plugins/HLTmumutktkVtxProducer.h +++ b/HLTrigger/btau/plugins/HLTmumutktkVtxProducer.h @@ -7,9 +7,6 @@ /**\class HLTmumutktkVtxProducer */ -// system include files -#include - #include "FWCore/Framework/interface/stream/EDProducer.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/Framework/interface/Event.h" @@ -20,7 +17,12 @@ #include "DataFormats/HLTReco/interface/TriggerRefsCollections.h" #include "DataFormats/VertexReco/interface/VertexFwd.h" #include "DataFormats/BeamSpot/interface/BeamSpot.h" +#include "TrackingTools/Records/interface/TransientTrackRecord.h" +#include "TrackingTools/TransientTrack/interface/TransientTrackBuilder.h" +#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" +#include "MagneticField/Engine/interface/MagneticField.h" #include +#include namespace edm { class ConfigurationDescriptions; @@ -48,6 +50,8 @@ class HLTmumutktkVtxProducer : public edm::stream::EDProducer<> { static FreeTrajectoryState initialFreeState(const reco::Track&, const MagneticField*); bool checkPreviousCand(const reco::TrackRef& trackref, const std::vector& ref2) const; + const edm::ESGetToken transientTrackRecordToken_; + const edm::InputTag muCandTag_; const edm::EDGetTokenT muCandToken_; const edm::InputTag trkCandTag_; @@ -56,6 +60,8 @@ class HLTmumutktkVtxProducer : public edm::stream::EDProducer<> { const edm::EDGetTokenT previousCandToken_; const std::string mfName_; + const edm::ESGetToken idealMagneticFieldRecordToken_; + const double thirdTrackMass_; const double fourthTrackMass_; const double maxEta_; From 8e2ddbcd24ba9ce7899525676cbc54a8a2258b5e Mon Sep 17 00:00:00 2001 From: Marino Missiroli Date: Wed, 24 Mar 2021 00:47:04 +0100 Subject: [PATCH 9/9] esConsumes migration of HLTrigger/special --- .../special/plugins/EcalMIPRecHitFilter.cc | 35 +++++++++-------- .../special/plugins/HLTCSCOverlapFilter.cc | 15 ++++--- .../special/plugins/HLTCSCOverlapFilter.h | 4 ++ .../special/plugins/HLTCSCRing2or3Filter.cc | 10 ++--- .../special/plugins/HLTCSCRing2or3Filter.h | 6 ++- .../special/plugins/HLTDTActivityFilter.cc | 9 ++--- .../special/plugins/HLTDTActivityFilter.h | 6 ++- .../special/plugins/HLTEcalPhiSymFilter.cc | 21 +++++----- .../special/plugins/HLTEcalPhiSymFilter.h | 8 +++- .../special/plugins/HLTEcalResonanceFilter.cc | 14 ++++--- .../special/plugins/HLTEcalResonanceFilter.h | 18 ++++----- .../plugins/HLTPPSJetComparisonFilter.cc | 8 ++-- .../special/plugins/HLTPixelActivityFilter.cc | 20 +++++----- .../plugins/HLTPixelClusterShapeFilter.cc | 39 +++++++++---------- .../special/plugins/HLTRPCTrigNoSyncFilter.cc | 6 +-- .../special/plugins/HLTRPCTrigNoSyncFilter.h | 27 ++++--------- .../plugins/HLTRegionalEcalResonanceFilter.cc | 14 ++++--- .../plugins/HLTRegionalEcalResonanceFilter.h | 11 +++--- 18 files changed, 132 insertions(+), 139 deletions(-) diff --git a/HLTrigger/special/plugins/EcalMIPRecHitFilter.cc b/HLTrigger/special/plugins/EcalMIPRecHitFilter.cc index 3e2966bade2d3..87d37ed90b151 100644 --- a/HLTrigger/special/plugins/EcalMIPRecHitFilter.cc +++ b/HLTrigger/special/plugins/EcalMIPRecHitFilter.cc @@ -63,6 +63,11 @@ class EcalMIPRecHitFilter : public edm::EDFilter { bool filter(edm::Event&, edm::EventSetup const&) override; // ----------member data --------------------------- + const edm::ESGetToken caloTopologyRecordToken_; + const edm::ESGetToken ecalIntercalibConstantsRcdToken_; + const edm::ESGetToken ecalLaserDbRecordToken_; + const edm::ESGetToken ecalADCToGeVConstantRcdToken_; + const edm::EDGetTokenT EcalRecHitToken_; const double minAmp1_; const double minAmp2_; @@ -75,7 +80,11 @@ class EcalMIPRecHitFilter : public edm::EDFilter { // constructors and destructor // EcalMIPRecHitFilter::EcalMIPRecHitFilter(const edm::ParameterSet& iConfig) - : EcalRecHitToken_(consumes(iConfig.getParameter("EcalRecHitCollection"))), + : caloTopologyRecordToken_(esConsumes()), + ecalIntercalibConstantsRcdToken_(esConsumes()), + ecalLaserDbRecordToken_(esConsumes()), + ecalADCToGeVConstantRcdToken_(esConsumes()), + EcalRecHitToken_(consumes(iConfig.getParameter("EcalRecHitCollection"))), minAmp1_(iConfig.getUntrackedParameter("AmpMinSeed", 0.063)), minAmp2_(iConfig.getUntrackedParameter("AmpMin2", 0.045)), minSingleAmp_(iConfig.getUntrackedParameter("SingleAmpMin", 0.108)), @@ -109,23 +118,17 @@ bool EcalMIPRecHitFilter::filter(edm::Event& iEvent, edm::EventSetup const& iSet return false; } - edm::ESHandle caloTopo; - iSetup.get().get(caloTopo); + auto const& caloTopo = iSetup.getHandle(caloTopologyRecordToken_); // Intercalib constants - edm::ESHandle pIcal; - iSetup.get().get(pIcal); - const EcalIntercalibConstants* ical = pIcal.product(); - const EcalIntercalibConstantMap& icalMap = ical->getMap(); - - edm::ESHandle pLaser; - iSetup.get().get(pLaser); - - edm::ESHandle pAgc; - iSetup.get().get(pAgc); - const EcalADCToGeVConstant* agc = pAgc.product(); - //std::cout << "Global EB ADC->GeV scale: " << agc->getEBValue() << " GeV/ADC count" ; - float adcconst = agc->getEBValue(); + auto const& ical = iSetup.getData(ecalIntercalibConstantsRcdToken_); + const EcalIntercalibConstantMap& icalMap = ical.getMap(); + + auto const& pLaser = iSetup.getHandle(ecalLaserDbRecordToken_); + + auto const& agc = iSetup.getData(ecalADCToGeVConstantRcdToken_); + //std::cout << "Global EB ADC->GeV scale: " << agc.getEBValue() << " GeV/ADC count" ; + float adcconst = agc.getEBValue(); bool thereIsSignal = false; // loop on rechits diff --git a/HLTrigger/special/plugins/HLTCSCOverlapFilter.cc b/HLTrigger/special/plugins/HLTCSCOverlapFilter.cc index 5c8637cd9f935..bec19a6a5fb01 100644 --- a/HLTrigger/special/plugins/HLTCSCOverlapFilter.cc +++ b/HLTrigger/special/plugins/HLTCSCOverlapFilter.cc @@ -1,20 +1,19 @@ #include "HLTCSCOverlapFilter.h" -#include "DataFormats/Common/interface/Handle.h" #include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" - -#include "DataFormats/MuonDetId/interface/CSCDetId.h" -#include "Geometry/CSCGeometry/interface/CSCGeometry.h" -#include "Geometry/Records/interface/MuonGeometryRecord.h" #include "FWCore/ServiceRegistry/interface/Service.h" -#include "CommonTools/UtilAlgos/interface/TFileService.h" - #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" #include "FWCore/ParameterSet/interface/ParameterSetDescription.h" +#include "CommonTools/UtilAlgos/interface/TFileService.h" +#include "DataFormats/Common/interface/Handle.h" +#include "DataFormats/MuonDetId/interface/CSCDetId.h" +#include "Geometry/CSCGeometry/interface/CSCGeometry.h" +#include "Geometry/Records/interface/MuonGeometryRecord.h" HLTCSCOverlapFilter::HLTCSCOverlapFilter(const edm::ParameterSet& iConfig) : HLTFilter(iConfig), + muonGeometryRecordToken_(esConsumes()), m_input(iConfig.getParameter("input")), m_minHits(iConfig.getParameter("minHits")), m_xWindow(iConfig.getParameter("xWindow")), @@ -101,7 +100,7 @@ bool HLTCSCOverlapFilter::hltFilter(edm::Event& iEvent, std::map >::const_iterator chamber_next = chamber_tohit.find(next_id); if (chamber_next != chamber_tohit.end() && chamber_next->second.size() >= m_minHits) { if (!got_cscGeometry) { - iSetup.get().get(cscGeometry); + cscGeometry = iSetup.getHandle(muonGeometryRecordToken_); got_cscGeometry = true; } diff --git a/HLTrigger/special/plugins/HLTCSCOverlapFilter.h b/HLTrigger/special/plugins/HLTCSCOverlapFilter.h index 05e4778f3bc0c..ddd46227c3bce 100644 --- a/HLTrigger/special/plugins/HLTCSCOverlapFilter.h +++ b/HLTrigger/special/plugins/HLTCSCOverlapFilter.h @@ -7,6 +7,9 @@ #include "HLTrigger/HLTcore/interface/HLTFilter.h" #include "FWCore/Utilities/interface/InputTag.h" #include "DataFormats/CSCRecHit/interface/CSCRecHit2DCollection.h" +#include "Geometry/CSCGeometry/interface/CSCGeometry.h" +#include "Geometry/Records/interface/MuonGeometryRecord.h" + #include "TH1F.h" namespace edm { @@ -23,6 +26,7 @@ class HLTCSCOverlapFilter : public HLTFilter { static void fillDescriptions(edm::ConfigurationDescriptions &descriptions); private: + edm::ESGetToken const muonGeometryRecordToken_; edm::InputTag m_input; edm::EDGetTokenT cscrechitsToken; unsigned int m_minHits; diff --git a/HLTrigger/special/plugins/HLTCSCRing2or3Filter.cc b/HLTrigger/special/plugins/HLTCSCRing2or3Filter.cc index 537a83662d54c..d594d8a0cbbc2 100644 --- a/HLTrigger/special/plugins/HLTCSCRing2or3Filter.cc +++ b/HLTrigger/special/plugins/HLTCSCRing2or3Filter.cc @@ -3,18 +3,14 @@ #include "DataFormats/Common/interface/Handle.h" #include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" - -#include "DataFormats/MuonDetId/interface/CSCDetId.h" -#include "Geometry/CSCGeometry/interface/CSCGeometry.h" -#include "Geometry/Records/interface/MuonGeometryRecord.h" #include "FWCore/ServiceRegistry/interface/Service.h" -#include "CommonTools/UtilAlgos/interface/TFileService.h" - #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" #include "FWCore/ParameterSet/interface/ParameterSetDescription.h" +#include "DataFormats/MuonDetId/interface/CSCDetId.h" HLTCSCRing2or3Filter::HLTCSCRing2or3Filter(const edm::ParameterSet& iConfig) : HLTFilter(iConfig), + muonGeometryRecordToken_(esConsumes()), m_input(iConfig.getParameter("input")), m_minHits(iConfig.getParameter("minHits")), m_xWindow(iConfig.getParameter("xWindow")), @@ -65,7 +61,7 @@ bool HLTCSCRing2or3Filter::hltFilter(edm::Event& iEvent, ++chamber_iter) { if (chamber_iter->second.size() >= m_minHits) { if (!got_cscGeometry) { - iSetup.get().get(cscGeometry); + cscGeometry = iSetup.getHandle(muonGeometryRecordToken_); got_cscGeometry = true; } diff --git a/HLTrigger/special/plugins/HLTCSCRing2or3Filter.h b/HLTrigger/special/plugins/HLTCSCRing2or3Filter.h index bfc7fefb3562f..9e091c36a480b 100644 --- a/HLTrigger/special/plugins/HLTCSCRing2or3Filter.h +++ b/HLTrigger/special/plugins/HLTCSCRing2or3Filter.h @@ -5,9 +5,10 @@ #include #include "HLTrigger/HLTcore/interface/HLTFilter.h" -#include "DataFormats/CSCRecHit/interface/CSCRecHit2DCollection.h" #include "FWCore/Utilities/interface/InputTag.h" -#include "TH1F.h" +#include "DataFormats/CSCRecHit/interface/CSCRecHit2DCollection.h" +#include "Geometry/CSCGeometry/interface/CSCGeometry.h" +#include "Geometry/Records/interface/MuonGeometryRecord.h" namespace edm { class ConfigurationDescriptions; @@ -23,6 +24,7 @@ class HLTCSCRing2or3Filter : public HLTFilter { static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); private: + edm::ESGetToken const muonGeometryRecordToken_; edm::EDGetTokenT cscrechitsToken; edm::InputTag m_input; unsigned int m_minHits; diff --git a/HLTrigger/special/plugins/HLTDTActivityFilter.cc b/HLTrigger/special/plugins/HLTDTActivityFilter.cc index 6c11559aa4c9b..66a0d279ee936 100644 --- a/HLTrigger/special/plugins/HLTDTActivityFilter.cc +++ b/HLTrigger/special/plugins/HLTDTActivityFilter.cc @@ -28,10 +28,7 @@ Description: Filter to select events with activity in the muon barrel system // Fwk header files #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" #include "FWCore/ParameterSet/interface/ParameterSetDescription.h" - #include "DataFormats/GeometryVector/interface/GlobalPoint.h" -#include "Geometry/Records/interface/MuonGeometryRecord.h" -#include "Geometry/DTGeometry/interface/DTGeometry.h" #include "DataFormats/GeometryVector/interface/Pi.h" // Typedefs @@ -40,7 +37,8 @@ typedef std::map > activityMap; // bitset map accordin // // constructors and destructor // -HLTDTActivityFilter::HLTDTActivityFilter(const edm::ParameterSet& iConfig) : HLTFilter(iConfig) { +HLTDTActivityFilter::HLTDTActivityFilter(const edm::ParameterSet& iConfig) + : HLTFilter(iConfig), muonGeometryRecordToken_(esConsumes()) { using namespace std; inputTag_[DCC] = iConfig.getParameter("inputDCC"); @@ -206,8 +204,7 @@ bool HLTDTActivityFilter::hltFilter(edm::Event& iEvent, } if (process_[RPC]) { - edm::ESHandle dtGeom; - iSetup.get().get(dtGeom); + auto const& dtGeom = iSetup.getHandle(muonGeometryRecordToken_); edm::Handle gmtrc; iEvent.getByToken(inputRPCToken_, gmtrc); diff --git a/HLTrigger/special/plugins/HLTDTActivityFilter.h b/HLTrigger/special/plugins/HLTDTActivityFilter.h index 2b9576a8afd98..cf68a0d669563 100644 --- a/HLTrigger/special/plugins/HLTDTActivityFilter.h +++ b/HLTrigger/special/plugins/HLTDTActivityFilter.h @@ -22,15 +22,15 @@ Description: Filter to select events with activity in the muon barrel system #include "FWCore/Framework/interface/Frameworkfwd.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" -#include "FWCore/Framework/interface/ESHandle.h" #include "HLTrigger/HLTcore/interface/HLTFilter.h" - #include "DataFormats/L1GlobalMuonTrigger/interface/L1MuGMTReadoutCollection.h" #include "DataFormats/L1GlobalMuonTrigger/interface/L1MuRegionalCand.h" #include "DataFormats/L1DTTrackFinder/interface/L1MuDTChambPhContainer.h" #include "DataFormats/L1DTTrackFinder/interface/L1MuDTChambThContainer.h" #include "DataFormats/DTDigi/interface/DTLocalTriggerCollection.h" #include "DataFormats/DTDigi/interface/DTDigiCollection.h" +#include "Geometry/Records/interface/MuonGeometryRecord.h" +#include "Geometry/DTGeometry/interface/DTGeometry.h" // c++ header files #include @@ -65,6 +65,8 @@ class HLTDTActivityFilter : public HLTFilter { // ----------member data --------------------------- + edm::ESGetToken const muonGeometryRecordToken_; + edm::InputTag inputTag_[4]; bool process_[4]; std::bitset<15> activeSecs_; diff --git a/HLTrigger/special/plugins/HLTEcalPhiSymFilter.cc b/HLTrigger/special/plugins/HLTEcalPhiSymFilter.cc index 727f5424ce988..638533524c238 100644 --- a/HLTrigger/special/plugins/HLTEcalPhiSymFilter.cc +++ b/HLTrigger/special/plugins/HLTEcalPhiSymFilter.cc @@ -1,19 +1,17 @@ #include "HLTEcalPhiSymFilter.h" -#include "DataFormats/HLTReco/interface/TriggerFilterObjectWithRefs.h" -#include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "CondFormats/EcalObjects/interface/EcalChannelStatus.h" -#include "CondFormats/DataRecord/interface/EcalChannelStatusRcd.h" #include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Framework/interface/EventSetup.h" #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" #include "FWCore/ParameterSet/interface/ParameterSetDescription.h" +#include "FWCore/MessageLogger/interface/MessageLogger.h" #include "Calibration/Tools/interface/EcalRingCalibrationTools.h" +#include "DataFormats/HLTReco/interface/TriggerFilterObjectWithRefs.h" #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h" -#include "Geometry/CaloGeometry/interface/CaloGeometry.h" -#include "Geometry/Records/interface/CaloGeometryRecord.h" HLTEcalPhiSymFilter::HLTEcalPhiSymFilter(const edm::ParameterSet& config) - : barrelDigisToken_(consumes(config.getParameter("barrelDigiCollection"))), + : ecalChannelStatusRcdToken_(esConsumes()), + caloGeometryRecordToken_(esConsumes()), + barrelDigisToken_(consumes(config.getParameter("barrelDigiCollection"))), endcapDigisToken_(consumes(config.getParameter("endcapDigiCollection"))), barrelUncalibHitsToken_( consumes(config.getParameter("barrelUncalibHitCollection"))), @@ -72,15 +70,14 @@ bool HLTEcalPhiSymFilter::filter(edm::StreamID, edm::Event& event, const edm::Ev using namespace edm; using namespace std; - //Get ChannelStatus from DB + // Get ChannelStatus from DB edm::ESHandle csHandle; if (!useRecoFlag_) - setup.get().get(csHandle); + csHandle = setup.getHandle(ecalChannelStatusRcdToken_); const EcalChannelStatus& channelStatus = *csHandle; - //Get iRing-geometry - edm::ESHandle geoHandle; - setup.get().get(geoHandle); + // Get iRing-geometry + auto const& geoHandle = setup.getHandle(caloGeometryRecordToken_); EcalRingCalibrationTools::setCaloGeometry(geoHandle.product()); EcalRingCalibrationTools CalibRing; diff --git a/HLTrigger/special/plugins/HLTEcalPhiSymFilter.h b/HLTrigger/special/plugins/HLTEcalPhiSymFilter.h index 5f53c0c305200..1afdefb1813f9 100644 --- a/HLTrigger/special/plugins/HLTEcalPhiSymFilter.h +++ b/HLTrigger/special/plugins/HLTEcalPhiSymFilter.h @@ -34,11 +34,14 @@ #include "FWCore/Framework/interface/global/EDFilter.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/Utilities/interface/InputTag.h" - +#include "CondFormats/EcalObjects/interface/EcalChannelStatus.h" +#include "CondFormats/DataRecord/interface/EcalChannelStatusRcd.h" #include "DataFormats/EcalDetId/interface/EBDetId.h" #include "DataFormats/EcalDetId/interface/EEDetId.h" #include "DataFormats/EcalRecHit/interface/EcalRecHitCollections.h" #include "DataFormats/EcalDigi/interface/EcalDigiCollections.h" +#include "Geometry/CaloGeometry/interface/CaloGeometry.h" +#include "Geometry/Records/interface/CaloGeometryRecord.h" namespace edm { class ConfigurationDescriptions; @@ -57,6 +60,9 @@ class HLTEcalPhiSymFilter : public edm::global::EDFilter<> { static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); private: + edm::ESGetToken const ecalChannelStatusRcdToken_; + edm::ESGetToken const caloGeometryRecordToken_; + const edm::EDGetTokenT barrelDigisToken_; const edm::EDGetTokenT endcapDigisToken_; const edm::EDGetTokenT barrelUncalibHitsToken_; diff --git a/HLTrigger/special/plugins/HLTEcalResonanceFilter.cc b/HLTrigger/special/plugins/HLTEcalResonanceFilter.cc index ac99b2250517a..9f25b7a627de1 100644 --- a/HLTrigger/special/plugins/HLTEcalResonanceFilter.cc +++ b/HLTrigger/special/plugins/HLTEcalResonanceFilter.cc @@ -1,11 +1,15 @@ #include "HLTEcalResonanceFilter.h" #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" #include "FWCore/ParameterSet/interface/ParameterSetDescription.h" +#include "TLorentzVector.h" using namespace std; using namespace edm; -HLTEcalResonanceFilter::HLTEcalResonanceFilter(const edm::ParameterSet &iConfig) { +HLTEcalResonanceFilter::HLTEcalResonanceFilter(const edm::ParameterSet &iConfig) + : caloTopologyRecordToken_(esConsumes()), + ecalChannelStatusRcdToken_(esConsumes()), + caloGeometryRecordToken_(esConsumes()) { barrelHits_ = iConfig.getParameter("barrelHits"); barrelClusters_ = iConfig.getParameter("barrelClusters"); barrelHitsToken_ = consumes(barrelHits_); @@ -202,13 +206,11 @@ bool HLTEcalResonanceFilter::filter(edm::Event &iEvent, const edm::EventSetup &i vector selectedEBDetIds; vector selectedEEDetIds; - edm::ESHandle pTopology; - iSetup.get().get(pTopology); + auto const &pTopology = iSetup.getHandle(caloTopologyRecordToken_); const CaloSubdetectorTopology *topology_eb = pTopology->getSubdetectorTopology(DetId::Ecal, EcalBarrel); const CaloSubdetectorTopology *topology_ee = pTopology->getSubdetectorTopology(DetId::Ecal, EcalEndcap); - edm::ESHandle geoHandle; - iSetup.get().get(geoHandle); + auto const &geoHandle = iSetup.getHandle(caloGeometryRecordToken_); const CaloSubdetectorGeometry *geometry_es = geoHandle->getSubdetectorGeometry(DetId::Ecal, EcalPreshower); std::unique_ptr topology_es; if (geometry_es) { @@ -220,7 +222,7 @@ bool HLTEcalResonanceFilter::filter(edm::Event &iEvent, const edm::EventSetup &i ///get status from DB edm::ESHandle csHandle; if (useDBStatus_) - iSetup.get().get(csHandle); + csHandle = iSetup.getHandle(ecalChannelStatusRcdToken_); const EcalChannelStatus &channelStatus = *csHandle; ///==============Start to process barrel part==================/// diff --git a/HLTrigger/special/plugins/HLTEcalResonanceFilter.h b/HLTrigger/special/plugins/HLTEcalResonanceFilter.h index f770021317a06..c200ba4bea755 100644 --- a/HLTrigger/special/plugins/HLTEcalResonanceFilter.h +++ b/HLTrigger/special/plugins/HLTEcalResonanceFilter.h @@ -11,6 +11,9 @@ Description: Producer for EcalRecHits to be used for pi0/eta ECAL calibration. // system include files #include +#include +#include +#include // user include files #include "FWCore/Framework/interface/Frameworkfwd.h" @@ -53,19 +56,10 @@ Description: Producer for EcalRecHits to be used for pi0/eta ECAL calibration. #include "Geometry/CaloTopology/interface/EcalPreshowerTopology.h" #include "DataFormats/EgammaReco/interface/PreshowerClusterFwd.h" -// -//Ecal status +// Ecal status #include "CondFormats/DataRecord/interface/EcalChannelStatusRcd.h" #include "CondFormats/EcalObjects/interface/EcalChannelStatus.h" -// class declaration -// -#include -#include - -#include "TLorentzVector.h" -#include - namespace edm { class ConfigurationDescriptions; } @@ -118,6 +112,10 @@ class HLTEcalResonanceFilter : public edm::EDFilter { static float DeltaPhi(float phi1, float phi2); static float GetDeltaR(float eta1, float eta2, float phi1, float phi2); + edm::ESGetToken const caloTopologyRecordToken_; + edm::ESGetToken const ecalChannelStatusRcdToken_; + edm::ESGetToken const caloGeometryRecordToken_; + // Input hits & clusters edm::InputTag barrelHits_; edm::InputTag endcapHits_; diff --git a/HLTrigger/special/plugins/HLTPPSJetComparisonFilter.cc b/HLTrigger/special/plugins/HLTPPSJetComparisonFilter.cc index 6d6a4bb9fce28..4d56ee86ab30d 100644 --- a/HLTrigger/special/plugins/HLTPPSJetComparisonFilter.cc +++ b/HLTrigger/special/plugins/HLTPPSJetComparisonFilter.cc @@ -37,6 +37,8 @@ class HLTPPSJetComparisonFilter : public edm::global::EDFilter<> { private: // ----------member data --------------------------- + edm::ESGetToken const lhcInfoRcdToken_; + edm::ParameterSet param_; edm::InputTag jetInputTag_; // Input tag identifying the jet track @@ -90,7 +92,8 @@ void HLTPPSJetComparisonFilter::fillDescriptions(edm::ConfigurationDescriptions HLTPPSJetComparisonFilter::~HLTPPSJetComparisonFilter() = default; HLTPPSJetComparisonFilter::HLTPPSJetComparisonFilter(const edm::ParameterSet &iConfig) - : jetInputTag_(iConfig.getParameter("jetInputTag")), + : lhcInfoRcdToken_(esConsumes()), + jetInputTag_(iConfig.getParameter("jetInputTag")), jet_token_(consumes(jetInputTag_)), forwardProtonInputTag_(iConfig.getParameter("forwardProtonInputTag")), @@ -110,8 +113,7 @@ HLTPPSJetComparisonFilter::HLTPPSJetComparisonFilter(const edm::ParameterSet &iC // member functions // bool HLTPPSJetComparisonFilter::filter(edm::StreamID, edm::Event &iEvent, const edm::EventSetup &iSetup) const { - edm::ESHandle hLHCInfo; - iSetup.get().get(lhcInfoLabel_, hLHCInfo); + auto const &hLHCInfo = iSetup.getHandle(lhcInfoRcdToken_); float sqs = 2. * hLHCInfo->energy(); // get sqrt(s) edm::Handle jets; diff --git a/HLTrigger/special/plugins/HLTPixelActivityFilter.cc b/HLTrigger/special/plugins/HLTPixelActivityFilter.cc index d43c20ff684f7..bfd7185a0b0e0 100644 --- a/HLTrigger/special/plugins/HLTPixelActivityFilter.cc +++ b/HLTrigger/special/plugins/HLTPixelActivityFilter.cc @@ -1,9 +1,14 @@ #include "HLTrigger/HLTcore/interface/HLTFilter.h" +#include "FWCore/Framework/interface/Event.h" +#include "FWCore/Framework/interface/EventSetup.h" +#include "FWCore/MessageLogger/interface/MessageLogger.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" #include "FWCore/ParameterSet/interface/ParameterSetDescription.h" - +#include "DataFormats/Common/interface/Handle.h" +#include "DataFormats/HLTReco/interface/TriggerFilterObjectWithRefs.h" +#include "DataFormats/HLTReco/interface/TriggerTypeDefs.h" #include "DataFormats/SiPixelCluster/interface/SiPixelCluster.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" #include "Geometry/Records/interface/TrackerTopologyRcd.h" @@ -23,7 +28,7 @@ class HLTPixelActivityFilter : public HLTFilter { const edm::EventSetup&, trigger::TriggerFilterObjectWithRefs& filterproduct) const override; // int countLayersWithClusters(edm::Handle > & clusterCol,const TrackerTopology& tTopo); - + edm::ESGetToken const trackerTopologyRcdToken_; edm::InputTag inputTag_; // input tag identifying product containing pixel clusters unsigned int min_clusters_; // minimum number of clusters unsigned int max_clusters_; // maximum number of clusters @@ -38,18 +43,13 @@ class HLTPixelActivityFilter : public HLTFilter { edm::EDGetTokenT > inputToken_; }; -#include "FWCore/Framework/interface/Event.h" -#include "FWCore/Framework/interface/EventSetup.h" -#include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "DataFormats/Common/interface/Handle.h" -#include "DataFormats/HLTReco/interface/TriggerFilterObjectWithRefs.h" -#include "DataFormats/HLTReco/interface/TriggerTypeDefs.h" // // constructors and destructor // HLTPixelActivityFilter::HLTPixelActivityFilter(const edm::ParameterSet& config) : HLTFilter(config), + trackerTopologyRcdToken_(esConsumes()), inputTag_(config.getParameter("inputTag")), min_clusters_(config.getParameter("minClusters")), max_clusters_(config.getParameter("maxClusters")), @@ -121,8 +121,8 @@ bool HLTPixelActivityFilter::hltFilter(edm::Event& event, accept &= (clusterSize <= max_clusters_); if (min_layersBPix_ > 0 || max_layersBPix_ > 0 || min_layersFPix_ > 0 || max_layersFPix_ > 0 || min_clustersBPix_ > 0 || max_clustersBPix_ > 0 || min_clustersFPix_ > 0 || max_clustersFPix_ > 0) { - edm::ESHandle tTopoHandle; - iSetup.get().get(tTopoHandle); + auto const& tTopoHandle = iSetup.getHandle(trackerTopologyRcdToken_); + const TrackerTopology& tTopo = *tTopoHandle; unsigned int layerCountBPix = 0; unsigned int layerCountFPix = 0; diff --git a/HLTrigger/special/plugins/HLTPixelClusterShapeFilter.cc b/HLTrigger/special/plugins/HLTPixelClusterShapeFilter.cc index 64275d8953319..7e8c62506319f 100644 --- a/HLTrigger/special/plugins/HLTPixelClusterShapeFilter.cc +++ b/HLTrigger/special/plugins/HLTPixelClusterShapeFilter.cc @@ -1,10 +1,22 @@ #include "HLTrigger/HLTcore/interface/HLTFilter.h" - #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" #include "FWCore/ParameterSet/interface/ParameterSetDescription.h" - +#include "FWCore/Framework/interface/Event.h" +#include "FWCore/Framework/interface/EventSetup.h" +#include "FWCore/MessageLogger/interface/MessageLogger.h" +#include "DataFormats/Common/interface/Handle.h" +#include "DataFormats/HLTReco/interface/TriggerFilterObjectWithRefs.h" +#include "DataFormats/HLTReco/interface/TriggerTypeDefs.h" +#include "DataFormats/GeometryVector/interface/LocalPoint.h" +#include "DataFormats/GeometryVector/interface/GlobalPoint.h" +#include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h" #include "DataFormats/TrackerRecHit2D/interface/SiPixelRecHitCollection.h" +#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonTopologies/interface/PixelTopology.h" +#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" // // class declaration @@ -17,6 +29,7 @@ class HLTPixelClusterShapeFilter : public HLTFilter { static void fillDescriptions(edm::ConfigurationDescriptions &descriptions); private: + edm::ESGetToken const trackerDigiGeometryRecordToken_; edm::EDGetTokenT inputToken_; edm::InputTag inputTag_; // input tag identifying product containing pixel clusters double minZ_; // beginning z-vertex position @@ -39,29 +52,13 @@ class HLTPixelClusterShapeFilter : public HLTFilter { int getContainedHits(const std::vector &hits, double z0, double &chi) const; }; -#include "FWCore/Framework/interface/Event.h" -#include "FWCore/Framework/interface/EventSetup.h" -#include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "DataFormats/Common/interface/Handle.h" -#include "DataFormats/HLTReco/interface/TriggerFilterObjectWithRefs.h" -#include "DataFormats/HLTReco/interface/TriggerTypeDefs.h" - -#include "FWCore/Framework/interface/ESHandle.h" -#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" -#include "Geometry/CommonTopologies/interface/PixelTopology.h" -#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" -#include "DataFormats/GeometryVector/interface/LocalPoint.h" -#include "DataFormats/GeometryVector/interface/GlobalPoint.h" -#include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h" - // // constructors and destructor // HLTPixelClusterShapeFilter::HLTPixelClusterShapeFilter(const edm::ParameterSet &config) : HLTFilter(config), + trackerDigiGeometryRecordToken_(esConsumes()), inputTag_(config.getParameter("inputTag")), minZ_(config.getParameter("minZ")), maxZ_(config.getParameter("maxZ")), @@ -114,8 +111,8 @@ bool HLTPixelClusterShapeFilter::hltFilter(edm::Event &event, // get tracker geometry if (hRecHits.isValid()) { - edm::ESHandle trackerHandle; - iSetup.get().get(trackerHandle); + auto const &trackerHandle = iSetup.getHandle(trackerDigiGeometryRecordToken_); + const TrackerGeometry *tgeo = trackerHandle.product(); const SiPixelRecHitCollection *hits = hRecHits.product(); diff --git a/HLTrigger/special/plugins/HLTRPCTrigNoSyncFilter.cc b/HLTrigger/special/plugins/HLTRPCTrigNoSyncFilter.cc index 4d35fea98930f..6c02cc0d6557d 100644 --- a/HLTrigger/special/plugins/HLTRPCTrigNoSyncFilter.cc +++ b/HLTrigger/special/plugins/HLTRPCTrigNoSyncFilter.cc @@ -45,7 +45,8 @@ bool bigmag(const RPC4DHit& Point1, const RPC4DHit& Point2) { return false; } -HLTRPCTrigNoSyncFilter::HLTRPCTrigNoSyncFilter(const edm::ParameterSet& iConfig) : HLTFilter(iConfig) { +HLTRPCTrigNoSyncFilter::HLTRPCTrigNoSyncFilter(const edm::ParameterSet& iConfig) + : HLTFilter(iConfig), muonGeometryRecordToken_(esConsumes()) { //now do what ever initialization is needed m_GMTInputTag = iConfig.getParameter("GMTInputTag"); rpcRecHitsLabel = iConfig.getParameter("rpcRecHits"); @@ -96,8 +97,7 @@ bool HLTRPCTrigNoSyncFilter::hltFilter(edm::Event& iEvent, RPCRecHitCollection::const_iterator recHit; - edm::ESHandle rpcGeo; - iSetup.get().get(rpcGeo); + auto const& rpcGeo = iSetup.getHandle(muonGeometryRecordToken_); int k = 0; diff --git a/HLTrigger/special/plugins/HLTRPCTrigNoSyncFilter.h b/HLTrigger/special/plugins/HLTRPCTrigNoSyncFilter.h index 5d897ab6ef282..2288ccb33626d 100644 --- a/HLTrigger/special/plugins/HLTRPCTrigNoSyncFilter.h +++ b/HLTrigger/special/plugins/HLTRPCTrigNoSyncFilter.h @@ -1,49 +1,35 @@ - #ifndef HLTRPCTrigNoSyncFilter_h #define HLTRPCTrigNoSyncFilter_h -// user include files - #include "HLTrigger/HLTcore/interface/HLTFilter.h" #include "FWCore/Utilities/interface/InputTag.h" - #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/MakerMacros.h" - #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" #include "FWCore/ParameterSet/interface/ParameterSetDescription.h" - #include "DataFormats/RPCRecHit/interface/RPCRecHitCollection.h" #include "DataFormats/MuonDetId/interface/RPCDetId.h" - #include "DataFormats/Common/interface/Handle.h" -#include "FWCore/Framework/interface/ESHandle.h" - -#include "Geometry/RPCGeometry/interface/RPCGeometry.h" -#include -#include -#include -#include -#include "RecoMuon/TransientTrackingRecHit/interface/MuonTransientTrackingRecHit.h" - +#include "DataFormats/TrackingRecHit/interface/TrackingRecHit.h" #include "DataFormats/L1GlobalMuonTrigger/interface/L1MuGMTCand.h" #include "DataFormats/L1GlobalMuonTrigger/interface/L1MuGMTExtendedCand.h" - #include "DataFormats/L1GlobalMuonTrigger/interface/L1MuGMTReadoutCollection.h" - #include "DataFormats/L1GlobalMuonTrigger/interface/L1MuGMTCand.h" - #include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutSetupFwd.h" #include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutSetup.h" #include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutRecord.h" #include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerObjectMapRecord.h" #include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerObjectMap.h" - #include "DataFormats/L1GlobalMuonTrigger/interface/L1MuGMTReadoutCollection.h" #include "DataFormats/L1GlobalMuonTrigger/interface/L1MuGMTCand.h" #include "DataFormats/L1GlobalMuonTrigger/interface/L1MuGMTExtendedCand.h" #include "DataFormats/L1GlobalMuonTrigger/interface/L1MuRegionalCand.h" +#include "Geometry/RPCGeometry/interface/RPCGeometry.h" +#include "Geometry/RPCGeometry/interface/RPCRoll.h" +#include "Geometry/Records/interface/MuonGeometryRecord.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "RecoMuon/TransientTrackingRecHit/interface/MuonTransientTrackingRecHit.h" // // class declaration @@ -61,6 +47,7 @@ class HLTRPCTrigNoSyncFilter : public HLTFilter { const edm::EventSetup&, trigger::TriggerFilterObjectWithRefs& filterproduct) const override; void endJob() override; + edm::ESGetToken const muonGeometryRecordToken_; edm::InputTag m_GMTInputTag; edm::InputTag rpcRecHitsLabel; edm::EDGetTokenT m_GMTInputToken; diff --git a/HLTrigger/special/plugins/HLTRegionalEcalResonanceFilter.cc b/HLTrigger/special/plugins/HLTRegionalEcalResonanceFilter.cc index 0c13cf4b1a393..72dc5b0e82eba 100644 --- a/HLTrigger/special/plugins/HLTRegionalEcalResonanceFilter.cc +++ b/HLTrigger/special/plugins/HLTRegionalEcalResonanceFilter.cc @@ -8,7 +8,10 @@ using namespace std; using namespace edm; -HLTRegionalEcalResonanceFilter::HLTRegionalEcalResonanceFilter(const edm::ParameterSet &iConfig) { +HLTRegionalEcalResonanceFilter::HLTRegionalEcalResonanceFilter(const edm::ParameterSet &iConfig) + : caloTopologyRecordToken_(esConsumes()), + ecalChannelStatusRcdToken_(esConsumes()), + caloGeometryRecordToken_(esConsumes()) { barrelHits_ = iConfig.getParameter("barrelHits"); barrelClusters_ = iConfig.getParameter("barrelClusters"); barrelHitsToken_ = consumes(barrelHits_); @@ -298,14 +301,13 @@ bool HLTRegionalEcalResonanceFilter::filter(edm::Event &iEvent, const edm::Event vector selectedEBDetIds; vector selectedEEDetIds; - edm::ESHandle pTopology; - iSetup.get().get(pTopology); + auto const &pTopology = iSetup.getHandle(caloTopologyRecordToken_); const CaloSubdetectorTopology *topology_eb = pTopology->getSubdetectorTopology(DetId::Ecal, EcalBarrel); const CaloSubdetectorTopology *topology_ee = pTopology->getSubdetectorTopology(DetId::Ecal, EcalEndcap); - edm::ESHandle geoHandle; - iSetup.get().get(geoHandle); + auto const &geoHandle = iSetup.getHandle(caloGeometryRecordToken_); const CaloSubdetectorGeometry *geometry_es = geoHandle->getSubdetectorGeometry(DetId::Ecal, EcalPreshower); + std::unique_ptr topology_es; if (geometry_es) { topology_es = std::make_unique(); @@ -316,7 +318,7 @@ bool HLTRegionalEcalResonanceFilter::filter(edm::Event &iEvent, const edm::Event ///get status from DB edm::ESHandle csHandle; if (useDBStatus_) - iSetup.get().get(csHandle); + csHandle = iSetup.getHandle(ecalChannelStatusRcdToken_); const EcalChannelStatus &channelStatus = *csHandle; ///==============Start to process barrel part==================/// diff --git a/HLTrigger/special/plugins/HLTRegionalEcalResonanceFilter.h b/HLTrigger/special/plugins/HLTRegionalEcalResonanceFilter.h index 16413212a407f..9491f6e462720 100644 --- a/HLTrigger/special/plugins/HLTRegionalEcalResonanceFilter.h +++ b/HLTrigger/special/plugins/HLTRegionalEcalResonanceFilter.h @@ -54,17 +54,12 @@ Description: Producer for EcalRecHits to be used for pi0/eta ECAL calibration. #include "Geometry/CaloTopology/interface/EcalPreshowerTopology.h" #include "DataFormats/EgammaReco/interface/PreshowerClusterFwd.h" -// -//Ecal status +// Ecal status #include "CondFormats/DataRecord/interface/EcalChannelStatusRcd.h" #include "CondFormats/EcalObjects/interface/EcalChannelStatus.h" -// class declaration -// #include #include - -#include "TLorentzVector.h" #include namespace edm { @@ -116,6 +111,10 @@ class HLTRegionalEcalResonanceFilter : public edm::stream::EDFilter<> { int diff_neta_s(int, int); int diff_nphi_s(int, int); + edm::ESGetToken const caloTopologyRecordToken_; + edm::ESGetToken const ecalChannelStatusRcdToken_; + edm::ESGetToken const caloGeometryRecordToken_; + // Input hits & clusters edm::InputTag barrelHits_; edm::InputTag endcapHits_;