From f4ec46cf80b65f7820d526a9e087750474c2d4c7 Mon Sep 17 00:00:00 2001 From: mmusich Date: Fri, 31 Jul 2020 10:30:02 +0200 Subject: [PATCH] further clean-up --- .../interface/ShallowDigisProducer.h | 4 ++-- .../interface/ShallowEventDataProducer.h | 8 +++---- .../interface/ShallowGainCalibration.h | 1 - .../interface/ShallowRechitClustersProducer.h | 8 +++---- .../interface/ShallowSimTracksProducer.h | 24 +++++++++++++++++++ .../interface/ShallowSimhitClustersProducer.h | 14 ++++++++--- .../interface/ShallowTrackClustersProducer.h | 14 +++++++++-- .../interface/ShallowTracksProducer.h | 8 +++---- .../plugins/ShallowClustersProducer.cc | 14 ++++++----- .../plugins/ShallowEventDataProducer.cc | 2 +- .../plugins/ShallowRechitClustersProducer.cc | 2 +- .../plugins/ShallowSimTracksProducer.cc | 2 +- .../plugins/ShallowSimhitClustersProducer.cc | 20 ++++++---------- .../plugins/ShallowTrackClustersProducer.cc | 20 +++++----------- .../plugins/ShallowTracksProducer.cc | 2 +- .../plugins/SiStripBFieldFilter.cc | 8 +++---- 16 files changed, 90 insertions(+), 61 deletions(-) create mode 100644 CalibTracker/SiStripCommon/interface/ShallowSimTracksProducer.h diff --git a/CalibTracker/SiStripCommon/interface/ShallowDigisProducer.h b/CalibTracker/SiStripCommon/interface/ShallowDigisProducer.h index 912f109c0c4d9..1b7da31dcfa04 100644 --- a/CalibTracker/SiStripCommon/interface/ShallowDigisProducer.h +++ b/CalibTracker/SiStripCommon/interface/ShallowDigisProducer.h @@ -1,13 +1,13 @@ #ifndef SHALLOW_DIGIS_PRODUCER #define SHALLOW_DIGIS_PRODUCER -#include "FWCore/Framework/interface/EDProducer.h" +#include "FWCore/Framework/interface/stream/EDProducer.h" #include "FWCore/Framework/interface/Frameworkfwd.h" #include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Utilities/interface/InputTag.h" class SiStripNoises; -class ShallowDigisProducer : public edm::EDProducer { +class ShallowDigisProducer : public edm::stream::EDProducer<> { public: explicit ShallowDigisProducer(const edm::ParameterSet &); diff --git a/CalibTracker/SiStripCommon/interface/ShallowEventDataProducer.h b/CalibTracker/SiStripCommon/interface/ShallowEventDataProducer.h index 776c2d73b0355..dc2da2f6d53f3 100644 --- a/CalibTracker/SiStripCommon/interface/ShallowEventDataProducer.h +++ b/CalibTracker/SiStripCommon/interface/ShallowEventDataProducer.h @@ -1,18 +1,18 @@ #ifndef SHALLOW_EVENTDATA_PRODUCER #define SHALLOW_EVENTDATA_PRODUCER -#include "FWCore/Framework/interface/global/EDProducer.h" +#include "FWCore/Framework/interface/stream/EDProducer.h" #include "FWCore/Framework/interface/Frameworkfwd.h" #include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutRecord.h" #include "DataFormats/Scalers/interface/LumiScalers.h" #include -class ShallowEventDataProducer : public edm::global::EDProducer<> { +class ShallowEventDataProducer : public edm::stream::EDProducer<> { public: - explicit ShallowEventDataProducer(const edm::ParameterSet &); + explicit ShallowEventDataProducer(const edm::ParameterSet&); private: - void produce(edm::StreamID, edm::Event &, const edm::EventSetup &) const override; + void produce(edm::Event& iEvent, const edm::EventSetup& iSetup) override; edm::EDGetTokenT trig_token_; edm::EDGetTokenT scalerToken_; }; diff --git a/CalibTracker/SiStripCommon/interface/ShallowGainCalibration.h b/CalibTracker/SiStripCommon/interface/ShallowGainCalibration.h index ed52b4a5c610b..a17a52fdb74b3 100644 --- a/CalibTracker/SiStripCommon/interface/ShallowGainCalibration.h +++ b/CalibTracker/SiStripCommon/interface/ShallowGainCalibration.h @@ -48,7 +48,6 @@ #include "DataFormats/DetId/interface/DetId.h" #include "DataFormats/SiStripDetId/interface/StripSubdetector.h" #include "FWCore/Utilities/interface/ESGetToken.h" -#include "FWCore/Utilities/interface/ReusableObjectHolder.h" using DetIdMap = std::map; diff --git a/CalibTracker/SiStripCommon/interface/ShallowRechitClustersProducer.h b/CalibTracker/SiStripCommon/interface/ShallowRechitClustersProducer.h index d79ab6aa0415e..d421570768c1d 100644 --- a/CalibTracker/SiStripCommon/interface/ShallowRechitClustersProducer.h +++ b/CalibTracker/SiStripCommon/interface/ShallowRechitClustersProducer.h @@ -1,7 +1,7 @@ #ifndef SHALLOW_RECHITCLUSTERS_PRODUCER #define SHALLOW_RECHITCLUSTERS_PRODUCER -#include "FWCore/Framework/interface/global/EDProducer.h" +#include "FWCore/Framework/interface/stream/EDProducer.h" #include "FWCore/Framework/interface/Frameworkfwd.h" #include "FWCore/Utilities/interface/InputTag.h" #include "DataFormats/Common/interface/DetSetVectorNew.h" @@ -10,9 +10,9 @@ #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -class ShallowRechitClustersProducer : public edm::global::EDProducer<> { +class ShallowRechitClustersProducer : public edm::stream::EDProducer<> { public: - explicit ShallowRechitClustersProducer(const edm::ParameterSet &); + explicit ShallowRechitClustersProducer(const edm::ParameterSet&); private: std::string Suffix; @@ -20,7 +20,7 @@ class ShallowRechitClustersProducer : public edm::global::EDProducer<> { const edm::ESGetToken geomToken_; const edm::EDGetTokenT > clusters_token_; std::vector > rec_hits_tokens_; - void produce(edm::StreamID, edm::Event &, const edm::EventSetup &) const override; + void produce(edm::Event& iEvent, const edm::EventSetup& iSetup) override; }; #endif diff --git a/CalibTracker/SiStripCommon/interface/ShallowSimTracksProducer.h b/CalibTracker/SiStripCommon/interface/ShallowSimTracksProducer.h new file mode 100644 index 0000000000000..0bc84a857bd2c --- /dev/null +++ b/CalibTracker/SiStripCommon/interface/ShallowSimTracksProducer.h @@ -0,0 +1,24 @@ +#ifndef SHALLOW_SIMTRACKS_PRODUCER +#define SHALLOW_SIMTRACKS_PRODUCER + +#include "FWCore/Framework/interface/stream/EDProducer.h" +#include "FWCore/Framework/interface/Frameworkfwd.h" +#include "FWCore/Utilities/interface/InputTag.h" +#include "DataFormats/Common/interface/DetSetVectorNew.h" +#include "DataFormats/TrackReco/interface/Track.h" +#include "SimDataFormats/TrackingAnalysis/interface/TrackingParticle.h" +#include "SimDataFormats/Associations/interface/TrackToTrackingParticleAssociator.h" + +class ShallowSimTracksProducer : public edm::stream::EDProducer<> { +public: + explicit ShallowSimTracksProducer(const edm::ParameterSet &); + +private: + const std::string Prefix; + const std::string Suffix; + const edm::EDGetTokenT trackingParticles_token_; + const edm::EDGetTokenT associator_token_; + const edm::EDGetTokenT > tracks_token_; + void produce(edm::Event& iEvent, const edm::EventSetup& iSetup) override; +}; +#endif diff --git a/CalibTracker/SiStripCommon/interface/ShallowSimhitClustersProducer.h b/CalibTracker/SiStripCommon/interface/ShallowSimhitClustersProducer.h index 807e23dd6a518..7a77496ee3cb3 100644 --- a/CalibTracker/SiStripCommon/interface/ShallowSimhitClustersProducer.h +++ b/CalibTracker/SiStripCommon/interface/ShallowSimhitClustersProducer.h @@ -1,22 +1,30 @@ #ifndef SHALLOW_SIMHITCLUSTERS_PRODUCER #define SHALLOW_SIMHITCLUSTERS_PRODUCER -#include "FWCore/Framework/interface/EDProducer.h" +#include "FWCore/Framework/interface/stream/EDProducer.h" #include "FWCore/Framework/interface/Frameworkfwd.h" #include "FWCore/Utilities/interface/InputTag.h" #include "CalibTracker/SiStripCommon/interface/ShallowTools.h" #include "DataFormats/Common/interface/DetSetVectorNew.h" #include "DataFormats/SiStripCluster/interface/SiStripCluster.h" #include "SimDataFormats/TrackingHit/interface/PSimHit.h" +#include "MagneticField/Engine/interface/MagneticField.h" +#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" +#include "CondFormats/SiStripObjects/interface/SiStripLorentzAngle.h" +#include "CondFormats/DataRecord/interface/SiStripLorentzAngleRcd.h" +#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" +#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -class ShallowSimhitClustersProducer : public edm::EDProducer { +class ShallowSimhitClustersProducer : public edm::stream::EDProducer<> { public: explicit ShallowSimhitClustersProducer(const edm::ParameterSet&); private: - //std::vector inputTags; std::vector > > simhits_tokens_; const edm::EDGetTokenT > clusters_token_; + const edm::ESGetToken geomToken_; + const edm::ESGetToken magFieldToken_; + const edm::ESGetToken laToken_; std::string Prefix; std::string runningmode_; diff --git a/CalibTracker/SiStripCommon/interface/ShallowTrackClustersProducer.h b/CalibTracker/SiStripCommon/interface/ShallowTrackClustersProducer.h index bbd89e120f007..5a2699d75ef62 100644 --- a/CalibTracker/SiStripCommon/interface/ShallowTrackClustersProducer.h +++ b/CalibTracker/SiStripCommon/interface/ShallowTrackClustersProducer.h @@ -1,15 +1,22 @@ #ifndef SHALLOW_TRACKCLUSTERS_PRODUCER #define SHALLOW_TRACKCLUSTERS_PRODUCER -#include "FWCore/Framework/interface/EDProducer.h" +#include "FWCore/Framework/interface/stream/EDProducer.h" #include "FWCore/Framework/interface/Frameworkfwd.h" #include "FWCore/Utilities/interface/InputTag.h" #include "DataFormats/Common/interface/DetSetVectorNew.h" #include "DataFormats/SiStripCluster/interface/SiStripCluster.h" #include "DataFormats/TrackReco/interface/Track.h" #include "TrackingTools/PatternTools/interface/TrajTrackAssociation.h" +#include "MagneticField/Engine/interface/MagneticField.h" +#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" +#include "CondFormats/SiStripObjects/interface/SiStripLorentzAngle.h" +#include "CondFormats/DataRecord/interface/SiStripLorentzAngleRcd.h" +#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" +#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" +#include "CalibTracker/Records/interface/SiStripDependentRecords.h" -class ShallowTrackClustersProducer : public edm::EDProducer { +class ShallowTrackClustersProducer : public edm::stream::EDProducer<> { public: explicit ShallowTrackClustersProducer(const edm::ParameterSet &); @@ -17,6 +24,9 @@ class ShallowTrackClustersProducer : public edm::EDProducer { const edm::EDGetTokenT > tracks_token_; const edm::EDGetTokenT association_token_; const edm::EDGetTokenT > clusters_token_; + const edm::ESGetToken geomToken_; + const edm::ESGetToken magFieldToken_; + const edm::ESGetToken laToken_; std::string Suffix; std::string Prefix; diff --git a/CalibTracker/SiStripCommon/interface/ShallowTracksProducer.h b/CalibTracker/SiStripCommon/interface/ShallowTracksProducer.h index 3f077b28a7be0..f880e8998f64a 100644 --- a/CalibTracker/SiStripCommon/interface/ShallowTracksProducer.h +++ b/CalibTracker/SiStripCommon/interface/ShallowTracksProducer.h @@ -1,15 +1,15 @@ #ifndef SHALLOW_TRACKS_PRODUCER #define SHALLOW_TRACKS_PRODUCER -#include "FWCore/Framework/interface/global/EDProducer.h" +#include "FWCore/Framework/interface/stream/EDProducer.h" #include "FWCore/Framework/interface/Frameworkfwd.h" #include "FWCore/Utilities/interface/InputTag.h" #include "DataFormats/TrackReco/interface/Track.h" -class ShallowTracksProducer : public edm::global::EDProducer<> { +class ShallowTracksProducer : public edm::stream::EDProducer<> { public: - explicit ShallowTracksProducer(const edm::ParameterSet &); - void produce(edm::StreamID, edm::Event &, const edm::EventSetup &) const override; + explicit ShallowTracksProducer(const edm::ParameterSet&); + void produce(edm::Event& iEvent, const edm::EventSetup& iSetup) override; private: const edm::EDGetTokenT > tracks_token_; diff --git a/CalibTracker/SiStripCommon/plugins/ShallowClustersProducer.cc b/CalibTracker/SiStripCommon/plugins/ShallowClustersProducer.cc index 6a16deafdc8c6..d07e963f2bbf2 100644 --- a/CalibTracker/SiStripCommon/plugins/ShallowClustersProducer.cc +++ b/CalibTracker/SiStripCommon/plugins/ShallowClustersProducer.cc @@ -6,7 +6,7 @@ #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" #include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "DataFormats/SiStripDetId/interface/SiStripDetId.h" -#include "FWCore/Framework/interface/EDProducer.h" +#include "FWCore/Framework/interface/stream/EDProducer.h" #include "FWCore/Framework/interface/Frameworkfwd.h" #include "FWCore/Utilities/interface/InputTag.h" #include "FWCore/Utilities/interface/EDGetToken.h" @@ -15,14 +15,14 @@ #include "DataFormats/SiStripCluster/interface/SiStripCluster.h" #include "RecoLocalTracker/SiStripClusterizer/interface/SiStripClusterInfo.h" -class ShallowClustersProducer : public edm::EDProducer { +class ShallowClustersProducer : public edm::stream::EDProducer<> { public: explicit ShallowClustersProducer(const edm::ParameterSet&); private: edm::InputTag theClustersLabel; std::string Prefix; - void produce(edm::Event&, const edm::EventSetup&) override; + void produce(edm::Event& iEvent, const edm::EventSetup& iSetup) override; struct moduleVars { moduleVars(uint32_t, const TrackerTopology*); @@ -40,6 +40,7 @@ class ShallowClustersProducer : public edm::EDProducer { float outsideasymm() const { return (last - first) / (last + first); } }; + const edm::ESGetToken topoToken_; edm::EDGetTokenT> theClustersToken_; edm::EDGetTokenT> theDigisToken_; SiStripClusterInfo siStripClusterInfo_; @@ -49,7 +50,9 @@ class ShallowClustersProducer : public edm::EDProducer { DEFINE_FWK_MODULE(ShallowClustersProducer); ShallowClustersProducer::ShallowClustersProducer(const edm::ParameterSet& iConfig) - : Prefix(iConfig.getParameter("Prefix")), siStripClusterInfo_(consumesCollector()) { + : Prefix(iConfig.getParameter("Prefix")), + topoToken_(esConsumes()), + siStripClusterInfo_(consumesCollector()) { produces>(Prefix + "number"); produces>(Prefix + "width"); produces>(Prefix + "variance"); @@ -93,8 +96,7 @@ ShallowClustersProducer::ShallowClustersProducer(const edm::ParameterSet& iConfi void ShallowClustersProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) { //Retrieve tracker topology from geometry - edm::ESHandle tTopoHandle; - iSetup.get().get(tTopoHandle); + edm::ESHandle tTopoHandle = iSetup.getHandle(topoToken_); const TrackerTopology* const tTopo = tTopoHandle.product(); siStripClusterInfo_.initEvent(iSetup); diff --git a/CalibTracker/SiStripCommon/plugins/ShallowEventDataProducer.cc b/CalibTracker/SiStripCommon/plugins/ShallowEventDataProducer.cc index a78ed198001b7..4e8328a497572 100644 --- a/CalibTracker/SiStripCommon/plugins/ShallowEventDataProducer.cc +++ b/CalibTracker/SiStripCommon/plugins/ShallowEventDataProducer.cc @@ -22,7 +22,7 @@ ShallowEventDataProducer::ShallowEventDataProducer(const edm::ParameterSet& iCon scalerToken_ = consumes(iConfig.getParameter("lumiScalers")); } -void ShallowEventDataProducer::produce(edm::StreamID, edm::Event& iEvent, const edm::EventSetup& iSetup) const { +void ShallowEventDataProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) { auto run = std::make_unique(iEvent.id().run()); auto event = std::make_unique(iEvent.id().event()); auto bx = std::make_unique(iEvent.bunchCrossing()); diff --git a/CalibTracker/SiStripCommon/plugins/ShallowRechitClustersProducer.cc b/CalibTracker/SiStripCommon/plugins/ShallowRechitClustersProducer.cc index 85c90f22c932d..544ffab2757d9 100644 --- a/CalibTracker/SiStripCommon/plugins/ShallowRechitClustersProducer.cc +++ b/CalibTracker/SiStripCommon/plugins/ShallowRechitClustersProducer.cc @@ -29,7 +29,7 @@ ShallowRechitClustersProducer::ShallowRechitClustersProducer(const edm::Paramete produces>(Prefix + "globalz" + Suffix); } -void ShallowRechitClustersProducer::produce(edm::StreamID, edm::Event& iEvent, const edm::EventSetup& iSetup) const { +void ShallowRechitClustersProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) { shallow::CLUSTERMAP clustermap = shallow::make_cluster_map(iEvent, clusters_token_); int size = clustermap.size(); diff --git a/CalibTracker/SiStripCommon/plugins/ShallowSimTracksProducer.cc b/CalibTracker/SiStripCommon/plugins/ShallowSimTracksProducer.cc index adf3bcd513059..d910f7156cb0a 100644 --- a/CalibTracker/SiStripCommon/plugins/ShallowSimTracksProducer.cc +++ b/CalibTracker/SiStripCommon/plugins/ShallowSimTracksProducer.cc @@ -30,7 +30,7 @@ ShallowSimTracksProducer::ShallowSimTracksProducer(const edm::ParameterSet& conf produces>(Prefix + "vz" + Suffix); } -void ShallowSimTracksProducer::produce(edm::StreamID, edm::Event& event, const edm::EventSetup& iSetup) const { +void ShallowSimTracksProducer::produce(edm::Event& event, const edm::EventSetup& iSetup) { edm::Handle> tracks; event.getByToken(tracks_token_, tracks); edm::Handle trackingParticles; diff --git a/CalibTracker/SiStripCommon/plugins/ShallowSimhitClustersProducer.cc b/CalibTracker/SiStripCommon/plugins/ShallowSimhitClustersProducer.cc index 38184f42a44a0..9880e2caff8fc 100644 --- a/CalibTracker/SiStripCommon/plugins/ShallowSimhitClustersProducer.cc +++ b/CalibTracker/SiStripCommon/plugins/ShallowSimhitClustersProducer.cc @@ -2,13 +2,6 @@ #include "CalibTracker/SiStripCommon/interface/ShallowTools.h" #include "DataFormats/SiStripCluster/interface/SiStripCluster.h" - -#include "MagneticField/Engine/interface/MagneticField.h" -#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" -#include "CondFormats/SiStripObjects/interface/SiStripLorentzAngle.h" -#include "CondFormats/DataRecord/interface/SiStripLorentzAngleRcd.h" -#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h" #include "Geometry/CommonTopologies/interface/StripTopology.h" #include "FWCore/Framework/interface/ESHandle.h" @@ -17,6 +10,10 @@ ShallowSimhitClustersProducer::ShallowSimhitClustersProducer(const edm::ParameterSet& iConfig) : clusters_token_(consumes>(iConfig.getParameter("Clusters"))), + geomToken_(esConsumes()), + magFieldToken_(esConsumes()), + laToken_(esConsumes( + edm::ESInputTag(iConfig.getParameter("runningMode")))), Prefix(iConfig.getParameter("Prefix")), runningmode_(iConfig.getParameter("runningMode")) { std::vector simhits_tags = iConfig.getParameter>("InputTags"); @@ -55,12 +52,9 @@ void ShallowSimhitClustersProducer::produce(edm::Event& iEvent, const edm::Event auto particle = std::make_unique>(size, -500); auto process = std::make_unique>(size, 0); - edm::ESHandle theTrackerGeometry; - iSetup.get().get(theTrackerGeometry); - edm::ESHandle magfield; - iSetup.get().get(magfield); - edm::ESHandle SiStripLorentzAngle; - iSetup.get().get(runningmode_, SiStripLorentzAngle); + edm::ESHandle theTrackerGeometry = iSetup.getHandle(geomToken_); + edm::ESHandle magfield = iSetup.getHandle(magFieldToken_); + edm::ESHandle SiStripLorentzAngle = iSetup.getHandle(laToken_); edm::Handle> clusters; iEvent.getByLabel("siStripClusters", "", clusters); diff --git a/CalibTracker/SiStripCommon/plugins/ShallowTrackClustersProducer.cc b/CalibTracker/SiStripCommon/plugins/ShallowTrackClustersProducer.cc index 87145e29fce92..d452b1130b5e4 100644 --- a/CalibTracker/SiStripCommon/plugins/ShallowTrackClustersProducer.cc +++ b/CalibTracker/SiStripCommon/plugins/ShallowTrackClustersProducer.cc @@ -7,26 +7,21 @@ #include "DataFormats/TrackerRecHit2D/interface/SiStripRecHit1D.h" #include "DataFormats/TrackerRecHit2D/interface/SiStripRecHit2D.h" #include "DataFormats/TrackerRecHit2D/interface/SiStripMatchedRecHit2D.h" - -#include "MagneticField/Engine/interface/MagneticField.h" -#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" -#include "CondFormats/SiStripObjects/interface/SiStripLorentzAngle.h" -#include "CondFormats/DataRecord/interface/SiStripLorentzAngleRcd.h" -#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h" #include "Geometry/CommonTopologies/interface/StripTopology.h" #include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" -#include "CalibTracker/Records/interface/SiStripDependentRecords.h" #include ShallowTrackClustersProducer::ShallowTrackClustersProducer(const edm::ParameterSet& iConfig) : tracks_token_(consumes>(iConfig.getParameter("Tracks"))), association_token_(consumes(iConfig.getParameter("Tracks"))), clusters_token_(consumes>(iConfig.getParameter("Clusters"))), + geomToken_(esConsumes()), + magFieldToken_(esConsumes()), + laToken_(esConsumes()), Suffix(iConfig.getParameter("Suffix")), Prefix(iConfig.getParameter("Prefix")) { produces>(Prefix + "clusterIdx" + Suffix); //link: on trk cluster --> general cluster info @@ -154,12 +149,9 @@ void ShallowTrackClustersProducer::produce(edm::Event& iEvent, const edm::EventS auto globalZofunitlocalY = std::make_unique>(); globalZofunitlocalY->reserve(size); - edm::ESHandle theTrackerGeometry; - iSetup.get().get(theTrackerGeometry); - edm::ESHandle magfield; - iSetup.get().get(magfield); - edm::ESHandle SiStripLorentzAngle; - iSetup.get().get(SiStripLorentzAngle); + edm::ESHandle theTrackerGeometry = iSetup.getHandle(geomToken_); + edm::ESHandle magfield = iSetup.getHandle(magFieldToken_); + edm::ESHandle SiStripLorentzAngle = iSetup.getHandle(laToken_); edm::Handle associations; iEvent.getByToken(association_token_, associations); diff --git a/CalibTracker/SiStripCommon/plugins/ShallowTracksProducer.cc b/CalibTracker/SiStripCommon/plugins/ShallowTracksProducer.cc index d0cc7aca7d5fd..abaaa4a25be8e 100644 --- a/CalibTracker/SiStripCommon/plugins/ShallowTracksProducer.cc +++ b/CalibTracker/SiStripCommon/plugins/ShallowTracksProducer.cc @@ -38,7 +38,7 @@ ShallowTracksProducer::ShallowTracksProducer(const edm::ParameterSet& iConfig) produces>(Prefix + "algo" + Suffix); } -void ShallowTracksProducer::produce(edm::StreamID, edm::Event& iEvent, const edm::EventSetup& iSetup) const { +void ShallowTracksProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) { auto number = std::make_unique(0); auto chi2 = std::make_unique>(); auto ndof = std::make_unique>(); diff --git a/CalibTracker/SiStripCommon/plugins/SiStripBFieldFilter.cc b/CalibTracker/SiStripCommon/plugins/SiStripBFieldFilter.cc index 9e3c122015da8..a182193bd75f8 100644 --- a/CalibTracker/SiStripCommon/plugins/SiStripBFieldFilter.cc +++ b/CalibTracker/SiStripCommon/plugins/SiStripBFieldFilter.cc @@ -1,6 +1,6 @@ #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/EventSetup.h" -#include "FWCore/Framework/interface/global/EDFilter.h" +#include "FWCore/Framework/interface/stream/EDFilter.h" #include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/Utilities/interface/ESGetToken.h" @@ -11,7 +11,7 @@ // -- Class Deleration // -class SiStripBFieldFilter : public edm::global::EDFilter<> { +class SiStripBFieldFilter : public edm::stream::EDFilter<> { public: SiStripBFieldFilter(const edm::ParameterSet&); ~SiStripBFieldFilter() override; @@ -21,7 +21,7 @@ class SiStripBFieldFilter : public edm::global::EDFilter<> { double MagFieldCurrentTh_; /*!< Threshold for the Magnet current. */ bool HIpassFilter_; /*!< Swith for HI/Low filter. */ - bool filter(edm::StreamID, edm::Event&, const edm::EventSetup&) const override; + bool filter(edm::Event&, edm::EventSetup const&) override; }; // @@ -38,7 +38,7 @@ SiStripBFieldFilter::SiStripBFieldFilter(const edm::ParameterSet& pset) // SiStripBFieldFilter::~SiStripBFieldFilter() {} -bool SiStripBFieldFilter::filter(edm::StreamID id, edm::Event& evt, const edm::EventSetup& es) const { +bool SiStripBFieldFilter::filter(edm::Event& evt, edm::EventSetup const& es) { edm::ESHandle runInfo = es.getHandle(runInfoToken_); double average_current = runInfo.product()->m_avg_current;