From ad12d629dfa1657c1411ae20b74214151c4696fc Mon Sep 17 00:00:00 2001 From: mmusich Date: Mon, 14 Feb 2022 10:57:02 +0100 Subject: [PATCH 1/9] modering RecoTracker/TkSeedingLayers/test/TestSeedingLayers.cc --- .../TkSeedingLayers/test/TestSeedingLayers.cc | 36 +++++++++---------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/RecoTracker/TkSeedingLayers/test/TestSeedingLayers.cc b/RecoTracker/TkSeedingLayers/test/TestSeedingLayers.cc index c8ad8428ee43c..0c515452364b2 100644 --- a/RecoTracker/TkSeedingLayers/test/TestSeedingLayers.cc +++ b/RecoTracker/TkSeedingLayers/test/TestSeedingLayers.cc @@ -1,38 +1,36 @@ -#include "TrackingTools/TransientTrackingRecHit/interface/SeedingLayerSetsHits.h" - -#include "FWCore/Framework/interface/EDAnalyzer.h" -#include "FWCore/Framework/interface/Event.h" #include "DataFormats/Common/interface/Handle.h" +#include "FWCore/Framework/interface/global/EDAnalyzer.h" +#include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/EventSetup.h" - #include "FWCore/ParameterSet/interface/ParameterSet.h" +#include "FWCore/MessageLogger/interface/MessageLogger.h" +#include "TrackingTools/TransientTrackingRecHit/interface/SeedingLayerSetsHits.h" #include #include -struct TestSeedingLayers final : public edm::EDAnalyzer { - explicit TestSeedingLayers(const edm::ParameterSet& conf) {} - - virtual ~TestSeedingLayers() {} - - virtual void analyze(const edm::Event& e, const edm::EventSetup&) { - edm::Handle layersH; - - std::string layerProd = "MixedLayerTriplets"; - e.getByLabel(layerProd, layersH); +struct TestSeedingLayers final : public edm::global::EDAnalyzer<> { + explicit TestSeedingLayers(const edm::ParameterSet& conf) + : SeedingLayerSetsHits_token(consumes(edm::InputTag("MixedLayerTriplets"))) {} + virtual ~TestSeedingLayers() = default; + void analyze(edm::StreamID, edm::Event const& iEvent, edm::EventSetup const&) const { + edm::Handle layersH = iEvent.getHandle(SeedingLayerSetsHits_token); auto const& layers = *layersH; - std::cout << layers.numberOfLayersInSet() << ' ' << layers.size() << std::endl; + edm::LogPrint("TestSeedingLayers") << layers.numberOfLayersInSet() << ' ' << layers.size(); for (auto const& lset : layers) { - std::cout << lset.size(); + edm::LogPrint("TestSeedingLayers") << lset.size(); for (auto const& la : lset) { - std::cout << ": " << la.name() << ' ' << la.index() << ' ' << la.hits().size(); + edm::LogPrint("TestSeedingLayers") << ": " << la.name() << ' ' << la.index() << ' ' << la.hits().size(); } - std::cout << std::endl; + edm::LogPrint("TestSeedingLayers"); } } + +private: + edm::EDGetTokenT SeedingLayerSetsHits_token; }; #include "FWCore/Framework/interface/MakerMacros.h" From 940ef8c6a7282227675272fe3e180c56b2c47427 Mon Sep 17 00:00:00 2001 From: mmusich Date: Tue, 15 Feb 2022 19:17:55 +0100 Subject: [PATCH 2/9] get rid of CMSDEPRECATED_X warnings in RecoTracker/GeometryESProducer --- .../test/TrackerRecoGeometryAnalyzer.cc | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/RecoTracker/GeometryESProducer/test/TrackerRecoGeometryAnalyzer.cc b/RecoTracker/GeometryESProducer/test/TrackerRecoGeometryAnalyzer.cc index d2de95199337c..e931fd4db6405 100644 --- a/RecoTracker/GeometryESProducer/test/TrackerRecoGeometryAnalyzer.cc +++ b/RecoTracker/GeometryESProducer/test/TrackerRecoGeometryAnalyzer.cc @@ -2,15 +2,13 @@ #include // user include files -#include "FWCore/Framework/interface/Frameworkfwd.h" -#include "FWCore/Framework/interface/one/EDAnalyzer.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/EventSetup.h" -#include "FWCore/Framework/interface/ESHandle.h" +#include "FWCore/Framework/interface/Frameworkfwd.h" #include "FWCore/Framework/interface/MakerMacros.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" - #include "RecoTracker/Record/interface/TrackerRecoGeometryRecord.h" #include "RecoTracker/TkDetLayers/interface/GeometricSearchTracker.h" @@ -19,16 +17,16 @@ using namespace std; class TrackerRecoGeometryAnalyzer : public edm::one::EDAnalyzer<> { public: TrackerRecoGeometryAnalyzer(const edm::ParameterSet&); - ~TrackerRecoGeometryAnalyzer(); + ~TrackerRecoGeometryAnalyzer() = default; - void beginJob() override {} void analyze(edm::Event const& iEvent, edm::EventSetup const&) override; - void endJob() override {} -}; -TrackerRecoGeometryAnalyzer::TrackerRecoGeometryAnalyzer(const edm::ParameterSet& iConfig) {} +private: + const edm::ESGetToken theGSTToken_; +}; -TrackerRecoGeometryAnalyzer::~TrackerRecoGeometryAnalyzer() {} +TrackerRecoGeometryAnalyzer::TrackerRecoGeometryAnalyzer(const edm::ParameterSet& iConfig) + : theGSTToken_(esConsumes()) {} void TrackerRecoGeometryAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) { using namespace edm; @@ -36,8 +34,7 @@ void TrackerRecoGeometryAnalyzer::analyze(const edm::Event& iEvent, const edm::E // // get the GeometricSearchDet // - edm::ESHandle track; - iSetup.get().get(track); + const GeometricSearchTracker* track = &iSetup.getData(theGSTToken_); //---- testing access to barrelLayers ---- vector theBarrelLayers = track->barrelLayers(); From 667964c6343d612831f92842802143fee82c39cc Mon Sep 17 00:00:00 2001 From: mmusich Date: Tue, 15 Feb 2022 19:18:11 +0100 Subject: [PATCH 3/9] get rid of CMSDEPRECATED_X warnings in RecoTracker/TkDetLayers --- .../TkDetLayers/test/TkDetLayersAnalyzer.cc | 52 ++++++++----------- 1 file changed, 21 insertions(+), 31 deletions(-) diff --git a/RecoTracker/TkDetLayers/test/TkDetLayersAnalyzer.cc b/RecoTracker/TkDetLayers/test/TkDetLayersAnalyzer.cc index 33f7a886366ed..c72cab4c8175d 100644 --- a/RecoTracker/TkDetLayers/test/TkDetLayersAnalyzer.cc +++ b/RecoTracker/TkDetLayers/test/TkDetLayersAnalyzer.cc @@ -2,24 +2,23 @@ #include // user include files -#include "FWCore/Framework/interface/Frameworkfwd.h" -#include "FWCore/Framework/interface/one/EDAnalyzer.h" +#include "DataFormats/GeometrySurface/interface/BoundSurface.h" +#include "DataFormats/TrackerCommon/interface/TrackerTopology.h" +#include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/EventSetup.h" -#include "FWCore/Framework/interface/ESHandle.h" +#include "FWCore/Framework/interface/Frameworkfwd.h" #include "FWCore/Framework/interface/MakerMacros.h" -#include "FWCore/ParameterSet/interface/ParameterSet.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" - -#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" +#include "FWCore/ParameterSet/interface/ParameterSet.h" +#include "Geometry/CommonTopologies/interface/PixelTopology.h" +#include "Geometry/CommonTopologies/interface/StripTopology.h" #include "Geometry/Records/interface/IdealGeometryRecord.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "DataFormats/TrackerCommon/interface/TrackerTopology.h" #include "Geometry/Records/interface/TrackerTopologyRcd.h" +#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h" -#include "Geometry/CommonTopologies/interface/PixelTopology.h" -#include "Geometry/CommonTopologies/interface/StripTopology.h" -#include "DataFormats/GeometrySurface/interface/BoundSurface.h" // ======= specific includes ======= #include "RecoTracker/TkDetLayers/interface/GeometricSearchTracker.h" @@ -53,7 +52,6 @@ namespace { void operator()(P p, std::string const&) { f(*p); } - F& f; }; @@ -65,34 +63,26 @@ using namespace std; class TkDetLayersAnalyzer : public edm::one::EDAnalyzer<> { public: TkDetLayersAnalyzer(const edm::ParameterSet&); - ~TkDetLayersAnalyzer(); - - void beginJob() override {} + ~TkDetLayersAnalyzer() = default; void analyze(edm::Event const& iEvent, edm::EventSetup const&) override; - void endJob() override {} -}; -TkDetLayersAnalyzer::TkDetLayersAnalyzer(const edm::ParameterSet& iConfig) { - //now do what ever initialization is needed -} +private: + const edm::ESGetToken geomToken_; + const edm::ESGetToken geomDetToken_; + const edm::ESGetToken tTopoToken_; +}; -TkDetLayersAnalyzer::~TkDetLayersAnalyzer() { - // do anything here that needs to be done at desctruction time - // (e.g. close files, deallocate resources etc.) -} +TkDetLayersAnalyzer::TkDetLayersAnalyzer(const edm::ParameterSet& iConfig) + : geomToken_(esConsumes()), geomDetToken_(esConsumes()), tTopoToken_(esConsumes()) {} void TkDetLayersAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) { - ESHandle pTrackerGeometry; - iSetup.get().get(pTrackerGeometry); + const TrackerGeometry* pTrackerGeometry = &iSetup.getData(geomToken_); - ESHandle pDD; - iSetup.get().get(pDD); + const GeometricDet* pDD = &iSetup.getData(geomDetToken_); edm::LogInfo("TkDetLayersAnalyzer") << " Top node is " << &(*pDD) << "\n" << " And Contains Daughters: " << (*pDD).components().size(); - ESHandle tTopo_handle; - iSetup.get().get(tTopo_handle); - const TrackerTopology* tTopo = tTopo_handle.product(); + const TrackerTopology* tTopo = &iSetup.getData(tTopoToken_); /* @@ -191,7 +181,7 @@ void TkDetLayersAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetu // -------- here it constructs the whole GeometricSearchTracker -------------- GeometricSearchTrackerBuilder myTrackerBuilder; - GeometricSearchTracker* testTracker = myTrackerBuilder.build(&(*pDD), &(*pTrackerGeometry), &(*tTopo_handle)); + GeometricSearchTracker* testTracker = myTrackerBuilder.build(&(*pDD), &(*pTrackerGeometry), &(*tTopo)); edm::LogInfo("TkDetLayersAnalyzer") << "testTracker: " << testTracker; for (auto const& l : testTracker->allLayers()) { From 97f30ea92be7ae6acfef85c965913d061ac868fb Mon Sep 17 00:00:00 2001 From: mmusich Date: Tue, 15 Feb 2022 19:18:26 +0100 Subject: [PATCH 4/9] get rid of CMSDEPRECATED_X warnings in RecoTracker/TransientTrackingRecHit --- .../test/TTRHBuilderTest.cc | 54 ++++++++----------- 1 file changed, 22 insertions(+), 32 deletions(-) diff --git a/RecoTracker/TransientTrackingRecHit/test/TTRHBuilderTest.cc b/RecoTracker/TransientTrackingRecHit/test/TTRHBuilderTest.cc index f119daa4006c7..fa2f2812c1986 100644 --- a/RecoTracker/TransientTrackingRecHit/test/TTRHBuilderTest.cc +++ b/RecoTracker/TransientTrackingRecHit/test/TTRHBuilderTest.cc @@ -1,53 +1,43 @@ -#include - -#include "FWCore/Framework/interface/Frameworkfwd.h" -#include "FWCore/Framework/interface/EDAnalyzer.h" -#include "FWCore/Framework/interface/EDAnalyzer.h" -#include "FWCore/Framework/interface/Event.h" +// user includes #include "DataFormats/Common/interface/Handle.h" +#include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/EventSetup.h" +#include "FWCore/Framework/interface/Frameworkfwd.h" +#include "FWCore/Framework/interface/global/EDAnalyzer.h" +#include "FWCore/MessageLogger/interface/MessageLogger.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "RecoLocalTracker/ClusterParameterEstimator/interface/PixelClusterParameterEstimator.h" #include "RecoLocalTracker/Records/interface/TrackerCPERecord.h" - -#include "FWCore/Framework/interface/Event.h" - -#include "FWCore/Framework/interface/ESHandle.h" - -#include "TrackingTools/TransientTrackingRecHit/interface/TransientTrackingRecHitBuilder.h" #include "TrackingTools/Records/interface/TransientRecHitRecord.h" +#include "TrackingTools/TransientTrackingRecHit/interface/TransientTrackingRecHitBuilder.h" +#include #include #include using namespace edm; -class TTRHBuilderTest : public edm::EDAnalyzer { +class TTRHBuilderTest : public edm::global::EDAnalyzer<> { public: - TTRHBuilderTest(const edm::ParameterSet& pset) { conf_ = pset; } - - ~TTRHBuilderTest() {} + TTRHBuilderTest(const edm::ParameterSet& pset) + : cpeName_(pset.getParameter("TTRHBuilder")), + ttrhToken_(esConsumes(edm::ESInputTag("", cpeName_))) {} + //pixelCPEToken_(esConsumes(edm::ESInputTag("",cpeName_))){} + ~TTRHBuilderTest() = default; - virtual void analyze(const edm::Event& event, const edm::EventSetup& setup) { + virtual void analyze(edm::StreamID, edm::Event const& iEvent, edm::EventSetup const& iSetup) const { using namespace std; - // std::string cpeName = conf_.getParameter("PixelCPE"); - // cout <<" Asking for the CPE with name "< theEstimator; - // setup.get().get(cpeName,theEstimator); - - std::string cpeName = conf_.getParameter("TTRHBuilder"); - cout << " Asking for the TTRHBuilder with name " << cpeName << endl; + // edm::LogPrint("TTRBuilderTest") <<" Asking for the CPE with name "< theB; - setup.get().get(cpeName, theB); - auto& r = *theB; - cout << " Got a " << typeid(r).name() << endl; - // cout <<" Strip CPE "<stripClusterParameterEstimator()<pixelClusterParameterEstimator()< ttrhToken_; + //const edm::ESGetToken pixelCPEToken_; }; From 8b8579771d551a0107817dce22d29924d602a82e Mon Sep 17 00:00:00 2001 From: mmusich Date: Tue, 15 Feb 2022 15:33:24 +0100 Subject: [PATCH 5/9] get rid of CMSDEPRECATED_X warnings in RecoTracker/ConversionSeedGenerators/ --- .../plugins/ConversionSeedFilter.cc | 54 ++++++++++--------- .../plugins/ConversionSeedFilterCharge.cc | 36 ++++++------- ...nTrajectorySeedProducerFromSingleLegAlgo.h | 1 - 3 files changed, 46 insertions(+), 45 deletions(-) diff --git a/RecoTracker/ConversionSeedGenerators/plugins/ConversionSeedFilter.cc b/RecoTracker/ConversionSeedGenerators/plugins/ConversionSeedFilter.cc index 09b2b148ec725..c8cba13fc0b0f 100644 --- a/RecoTracker/ConversionSeedGenerators/plugins/ConversionSeedFilter.cc +++ b/RecoTracker/ConversionSeedGenerators/plugins/ConversionSeedFilter.cc @@ -17,31 +17,31 @@ // #include -#include "FWCore/Framework/interface/Frameworkfwd.h" -#include "FWCore/Framework/interface/stream/EDProducer.h" +#include "DataFormats/Math/interface/deltaPhi.h" +#include "DataFormats/TrackReco/interface/Track.h" +#include "DataFormats/TrackReco/interface/TrackFwd.h" +#include "DataFormats/TrajectorySeed/interface/TrajectorySeedCollection.h" +#include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Framework/interface/Event.h" +#include "FWCore/Framework/interface/Frameworkfwd.h" #include "FWCore/Framework/interface/MakerMacros.h" +#include "FWCore/Framework/interface/stream/EDProducer.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" -#include "FWCore/Framework/interface/ESHandle.h" -#include "DataFormats/TrajectorySeed/interface/TrajectorySeedCollection.h" -#include "MagneticField/Engine/interface/MagneticField.h" -#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" +#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" +#include "MagneticField/Engine/interface/MagneticField.h" #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" +#include "TrackingTools/PatternTools/interface/TrajTrackAssociation.h" +#include "TrackingTools/PatternTools/interface/Trajectory.h" #include "TrackingTools/Records/interface/TrackingComponentsRecord.h" #include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h" #include "TrackingTools/TrajectoryState/interface/TrajectoryStateTransform.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" -#include "DataFormats/Math/interface/deltaPhi.h" -#include "DataFormats/TrackReco/interface/TrackFwd.h" -#include "DataFormats/TrackReco/interface/Track.h" -#include "TrackingTools/PatternTools/interface/Trajectory.h" -#include "TrackingTools/PatternTools/interface/TrajTrackAssociation.h" class ConversionSeedFilter : public edm::stream::EDProducer<> { public: explicit ConversionSeedFilter(const edm::ParameterSet&); - ~ConversionSeedFilter() override; + ~ConversionSeedFilter() override = default; private: void produce(edm::Event&, const edm::EventSetup&) override; @@ -65,19 +65,23 @@ class ConversionSeedFilter : public edm::stream::EDProducer<> { TrajectoryStateOnSurface getTSOS(const reco::Track& tk); TrajectoryStateOnSurface getTSOS(const Trajectory& tj, const TrajectorySeed& ts); - edm::EDGetTokenT inputCollSeedPos; - edm::EDGetTokenT inputCollSeedNeg; - edm::EDGetTokenT inputTrajectory; - double deltaPhiCut, deltaCotThetaCut, deltaRCut, deltaZCut; + const edm::ESGetToken geomToken; + const edm::ESGetToken mfToken; + const edm::EDGetTokenT inputCollSeedPos; + const edm::EDGetTokenT inputCollSeedNeg; + const edm::EDGetTokenT inputTrajectory; + const double deltaPhiCut, deltaCotThetaCut, deltaRCut, deltaZCut; - edm::ESHandle theG; - edm::ESHandle theMF; + const TrackerGeometry* theG; + const MagneticField* theMF; uint32_t maxInputSeeds; bool takeAll; }; ConversionSeedFilter::ConversionSeedFilter(const edm::ParameterSet& cfg) - : //inputCollTkPos(cfg.getParameter("tkCollectionPos")), + : geomToken(esConsumes()), + mfToken(esConsumes()), + //inputCollTkPos(cfg.getParameter("tkCollectionPos")), inputCollSeedPos(consumes(cfg.getParameter("seedCollectionPos"))), //inputCollTkNeg(cfg.getParameter("tkCollectionNeg")), inputCollSeedNeg(consumes(cfg.getParameter("seedCollectionNeg"))), @@ -91,8 +95,6 @@ ConversionSeedFilter::ConversionSeedFilter(const edm::ParameterSet& cfg) produces(); } -ConversionSeedFilter::~ConversionSeedFilter() {} - void ConversionSeedFilter::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) { using namespace edm; using namespace std; @@ -107,8 +109,8 @@ void ConversionSeedFilter::produce(edm::Event& iEvent, const edm::EventSetup& iS edm::Handle trajTrackAssociations; iEvent.getByToken(inputTrajectory, trajTrackAssociations); - iSetup.get().get(theG); - iSetup.get().get(theMF); + theG = &iSetup.getData(geomToken); + theMF = &iSetup.getData(mfToken); auto result = std::make_unique(); @@ -242,11 +244,11 @@ void ConversionSeedFilter::SearchAmongTrajectories(const TrajectorySeedCollectio TrajectoryStateOnSurface ConversionSeedFilter::getTSOS(const TrajectorySeed& ts) { PTrajectoryStateOnDet state = ts.startingState(); DetId detId(state.detId()); - return trajectoryStateTransform::transientState(state, &(theG->idToDet(detId)->surface()), theMF.product()); + return trajectoryStateTransform::transientState(state, &(theG->idToDet(detId)->surface()), theMF); } TrajectoryStateOnSurface ConversionSeedFilter::getTSOS(const reco::Track& tk) { - return trajectoryStateTransform::innerStateOnSurface(tk, *theG.product(), theMF.product()); + return trajectoryStateTransform::innerStateOnSurface(tk, *theG, theMF); } TrajectoryStateOnSurface ConversionSeedFilter::getTSOS(const Trajectory& tj, const TrajectorySeed& ts) { diff --git a/RecoTracker/ConversionSeedGenerators/plugins/ConversionSeedFilterCharge.cc b/RecoTracker/ConversionSeedGenerators/plugins/ConversionSeedFilterCharge.cc index b9c424e5658f2..0cc6f160a046f 100644 --- a/RecoTracker/ConversionSeedGenerators/plugins/ConversionSeedFilterCharge.cc +++ b/RecoTracker/ConversionSeedGenerators/plugins/ConversionSeedFilterCharge.cc @@ -17,30 +17,32 @@ // #include -#include "FWCore/Framework/interface/Frameworkfwd.h" -#include "FWCore/Framework/interface/global/EDProducer.h" +#include "DataFormats/Math/interface/deltaPhi.h" +#include "DataFormats/TrajectorySeed/interface/TrajectorySeedCollection.h" #include "FWCore/Framework/interface/Event.h" +#include "FWCore/Framework/interface/Frameworkfwd.h" #include "FWCore/Framework/interface/MakerMacros.h" +#include "FWCore/Framework/interface/global/EDProducer.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" -#include "FWCore/Framework/interface/ESHandle.h" -#include "DataFormats/TrajectorySeed/interface/TrajectorySeedCollection.h" -#include "MagneticField/Engine/interface/MagneticField.h" -#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" +#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" +#include "MagneticField/Engine/interface/MagneticField.h" #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" #include "TrackingTools/Records/interface/TrackingComponentsRecord.h" #include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h" #include "TrackingTools/TrajectoryState/interface/TrajectoryStateTransform.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" -#include "DataFormats/Math/interface/deltaPhi.h" class ConversionSeedFilterCharge : public edm::global::EDProducer<> { public: explicit ConversionSeedFilterCharge(const edm::ParameterSet&); - ~ConversionSeedFilterCharge() override; + ~ConversionSeedFilterCharge() override = default; private: void produce(edm::StreamID, edm::Event&, const edm::EventSetup&) const override; + const edm::ESGetToken geomToken; + const edm::ESGetToken mfToken; + edm::EDGetTokenT inputCollPos; edm::EDGetTokenT inputCollNeg; const double deltaPhiCut, deltaCotThetaCut, deltaRCut, deltaZCut; @@ -49,7 +51,9 @@ class ConversionSeedFilterCharge : public edm::global::EDProducer<> { }; ConversionSeedFilterCharge::ConversionSeedFilterCharge(const edm::ParameterSet& cfg) - : inputCollPos(consumes(cfg.getParameter("seedCollectionPos"))), + : geomToken(esConsumes()), + mfToken(esConsumes()), + inputCollPos(consumes(cfg.getParameter("seedCollectionPos"))), inputCollNeg(consumes(cfg.getParameter("seedCollectionNeg"))), deltaPhiCut(cfg.getParameter("deltaPhiCut")), deltaCotThetaCut(cfg.getParameter("deltaCotThetaCut")), @@ -59,8 +63,6 @@ ConversionSeedFilterCharge::ConversionSeedFilterCharge(const edm::ParameterSet& produces(); } -ConversionSeedFilterCharge::~ConversionSeedFilterCharge() {} - void ConversionSeedFilterCharge::produce(edm::StreamID, edm::Event& iEvent, const edm::EventSetup& iSetup) const { using namespace edm; using namespace std; @@ -69,10 +71,8 @@ void ConversionSeedFilterCharge::produce(edm::StreamID, edm::Event& iEvent, cons Handle pInNeg; iEvent.getByToken(inputCollNeg, pInNeg); - edm::ESHandle theG; - iSetup.get().get(theG); - edm::ESHandle theMF; - iSetup.get().get(theMF); + const TrackerGeometry* theG = &iSetup.getData(geomToken); + const MagneticField* theMF = &iSetup.getData(mfToken); auto result = std::make_unique(); result->reserve(pInPos->size()); @@ -86,7 +86,7 @@ void ConversionSeedFilterCharge::produce(edm::StreamID, edm::Event& iEvent, cons PTrajectoryStateOnDet state1 = iS1->startingState(); DetId detId1(state1.detId()); TrajectoryStateOnSurface tsos1 = - trajectoryStateTransform::transientState(state1, &(theG->idToDet(detId1)->surface()), theMF.product()); + trajectoryStateTransform::transientState(state1, &(theG->idToDet(detId1)->surface()), theMF); double phi1 = tsos1.globalMomentum().phi(); double cotTheta1 = 1 / tan(tsos1.globalMomentum().theta()); double r1 = tsos1.globalPosition().perp(); @@ -98,7 +98,7 @@ void ConversionSeedFilterCharge::produce(edm::StreamID, edm::Event& iEvent, cons PTrajectoryStateOnDet state2 = iS2->startingState(); DetId detId2(state2.detId()); TrajectoryStateOnSurface tsos2 = - trajectoryStateTransform::transientState(state2, &(theG->idToDet(detId2)->surface()), theMF.product()); + trajectoryStateTransform::transientState(state2, &(theG->idToDet(detId2)->surface()), theMF); double deltaPhi = fabs(reco::deltaPhi(phi1, tsos2.globalMomentum().phi())); double deltaCotTheta = fabs(cotTheta1 - 1 / tan(tsos2.globalMomentum().theta())); diff --git a/RecoTracker/ConversionSeedGenerators/plugins/PhotonConversionTrajectorySeedProducerFromSingleLegAlgo.h b/RecoTracker/ConversionSeedGenerators/plugins/PhotonConversionTrajectorySeedProducerFromSingleLegAlgo.h index 992058bd7d590..64f52afbdc585 100644 --- a/RecoTracker/ConversionSeedGenerators/plugins/PhotonConversionTrajectorySeedProducerFromSingleLegAlgo.h +++ b/RecoTracker/ConversionSeedGenerators/plugins/PhotonConversionTrajectorySeedProducerFromSingleLegAlgo.h @@ -2,7 +2,6 @@ #define PhotonConversionFinderFromTracks_H #include "FWCore/Framework/interface/Frameworkfwd.h" -#include "FWCore/Framework/interface/EDAnalyzer.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" From f8feb2cbb671736e4ed17c2110127d9a0650547c Mon Sep 17 00:00:00 2001 From: mmusich Date: Tue, 15 Feb 2022 19:08:08 +0100 Subject: [PATCH 6/9] get rid of CMSDEPRECATED_X warnings in RecoTracker/MeasurementDet --- .../test/MeasurementTrackerTest.cc | 76 ++++++++----------- 1 file changed, 33 insertions(+), 43 deletions(-) diff --git a/RecoTracker/MeasurementDet/test/MeasurementTrackerTest.cc b/RecoTracker/MeasurementDet/test/MeasurementTrackerTest.cc index a6574735a68c5..103fe6e056c0b 100644 --- a/RecoTracker/MeasurementDet/test/MeasurementTrackerTest.cc +++ b/RecoTracker/MeasurementDet/test/MeasurementTrackerTest.cc @@ -1,39 +1,29 @@ -#include "FWCore/Framework/interface/Frameworkfwd.h" -#include "FWCore/Framework/interface/EDAnalyzer.h" - +#include "DataFormats/Common/interface/Handle.h" +#include "DataFormats/GeometrySurface/interface/PlaneBuilder.h" +#include "DataFormats/GeometryVector/interface/GlobalPoint.h" +#include "DataFormats/GeometryVector/interface/GlobalVector.h" +#include "DataFormats/TrackerRecHit2D/interface/SiPixelRecHit.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" #include "FWCore/Framework/interface/Event.h" +#include "FWCore/Framework/interface/EventSetup.h" +#include "FWCore/Framework/interface/Frameworkfwd.h" #include "FWCore/Framework/interface/MakerMacros.h" - +#include "FWCore/MessageLogger/interface/MessageLogger.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" -#include "DataFormats/Common/interface/Handle.h" -#include "FWCore/Framework/interface/EventSetup.h" -#include "FWCore/Framework/interface/ESHandle.h" - -#include - -#include -#include -#include "TrackingTools/DetLayers/interface/NavigationSchool.h" -#include "RecoTracker/Record/interface/NavigationSchoolRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" - #include "MagneticField/Engine/interface/MagneticField.h" #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" - -#include "DataFormats/GeometryVector/interface/GlobalPoint.h" -#include "DataFormats/GeometryVector/interface/GlobalVector.h" -#include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h" #include "MagneticField/VolumeGeometry/interface/MagVolumeOutsideValidity.h" -#include "DataFormats/GeometrySurface/interface/PlaneBuilder.h" - -#include "TrackingTools/GeomPropagators/interface/AnalyticalPropagator.h" +#include "RecoTracker/MeasurementDet/interface/MeasurementTracker.h" +#include "RecoTracker/Record/interface/CkfComponentsRecord.h" +#include "RecoTracker/Record/interface/NavigationSchoolRecord.h" #include "TrackPropagation/RungeKutta/interface/defaultRKPropagator.h" -#include "TrackingTools/Records/interface/TrackingComponentsRecord.h" - +#include "TrackingTools/DetLayers/interface/NavigationSchool.h" +#include "TrackingTools/GeomPropagators/interface/AnalyticalPropagator.h" #include "TrackingTools/KalmanUpdators/interface/Chi2MeasurementEstimator.h" #include "TrackingTools/KalmanUpdators/interface/KFUpdator.h" - -#include "DataFormats/TrackerRecHit2D/interface/SiPixelRecHit.h" +#include "TrackingTools/Records/interface/TrackingComponentsRecord.h" +#include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h" namespace { @@ -46,33 +36,37 @@ namespace { } // namespace -class MeasurementTrackerTest : public edm::EDAnalyzer { +class MeasurementTrackerTest : public edm::one::EDAnalyzer<> { public: explicit MeasurementTrackerTest(const edm::ParameterSet&); - ~MeasurementTrackerTest(); + ~MeasurementTrackerTest() override = default; private: virtual void analyze(const edm::Event&, const edm::EventSetup&) override; + const edm::ESGetToken measTkToken; + const edm::ESGetToken navSchoolToken; + const edm::ESGetToken mfToken; + const edm::ESGetToken propToken; + std::string theMeasurementTrackerName; std::string theNavigationSchoolName; }; MeasurementTrackerTest::MeasurementTrackerTest(const edm::ParameterSet& iConfig) - : theMeasurementTrackerName(iConfig.getParameter("measurementTracker")), + : measTkToken(esConsumes()), + navSchoolToken(esConsumes()), + mfToken(esConsumes()), + propToken(esConsumes(edm::ESInputTag("", "PropagatorWithMaterial"))), + theMeasurementTrackerName(iConfig.getParameter("measurementTracker")), theNavigationSchoolName(iConfig.getParameter("navigationSchool")) {} -MeasurementTrackerTest::~MeasurementTrackerTest() {} - void MeasurementTrackerTest::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) { using namespace edm; //get the measurementtracker - edm::ESHandle measurementTracker; - edm::ESHandle navSchool; - - iSetup.get().get(theMeasurementTrackerName, measurementTracker); - iSetup.get().get(theNavigationSchoolName, navSchool); + const MeasurementTracker* measurementTracker = &iSetup.getData(measTkToken); + const NavigationSchool* navSchool = &iSetup.getData(navSchoolToken); auto const& geom = *(TrackerGeometry const*)(*measurementTracker).geomTracker(); auto const& searchGeom = *(*measurementTracker).geometricSearchTracker(); @@ -84,12 +78,8 @@ void MeasurementTrackerTest::analyze(const edm::Event& iEvent, const edm::EventS std::cout << "number of dets " << dus.size() << std::endl; std::cout << "Bl/Fw loc " << firstBarrel << '/' << firstForward << std::endl; - edm::ESHandle magfield; - iSetup.get().get(magfield); - - edm::ESHandle propagatorHandle; - iSetup.get().get("PropagatorWithMaterial", propagatorHandle); - auto const& ANprop = *propagatorHandle; + const MagneticField* magfield = &iSetup.getData(mfToken); + const Propagator& ANprop = iSetup.getData(propToken); // error (very very small) ROOT::Math::SMatrixIdentity id; @@ -128,7 +118,7 @@ void MeasurementTrackerTest::analyze(const edm::Event& iEvent, const edm::EventS for (auto mom : moms) { TrajectoryStateOnSurface startingStateP( - GlobalTrajectoryParameters(startingPosition, mom, 1, magfield.product()), err, *startingPlane); + GlobalTrajectoryParameters(startingPosition, mom, 1, magfield), err, *startingPlane); auto tsos = startingStateP; // auto layer = searchGeom.idToLayer(dus[firstBarrel]->geographicalId()); From ade240859b9670760cc76b0eee9f1d6134a5fa67 Mon Sep 17 00:00:00 2001 From: mmusich Date: Tue, 15 Feb 2022 20:26:42 +0100 Subject: [PATCH 7/9] get rid of CMSDEPRECATED_X warnings in RecoTracker/SiTrackerMRHTools --- .../plugins/MultiRecHitCollectorESProducer.cc | 124 ++++++++++-------- .../plugins/MultiRecHitCollectorESProducer.h | 32 ----- .../SiTrackerMultiRecHitUpdatorESProducer.cc | 73 +++++++---- .../SiTrackerMultiRecHitUpdatorESProducer.h | 21 --- .../SiTrackerMRHTools/plugins/module.cc | 12 -- 5 files changed, 117 insertions(+), 145 deletions(-) delete mode 100644 RecoTracker/SiTrackerMRHTools/plugins/MultiRecHitCollectorESProducer.h delete mode 100644 RecoTracker/SiTrackerMRHTools/plugins/SiTrackerMultiRecHitUpdatorESProducer.h delete mode 100644 RecoTracker/SiTrackerMRHTools/plugins/module.cc diff --git a/RecoTracker/SiTrackerMRHTools/plugins/MultiRecHitCollectorESProducer.cc b/RecoTracker/SiTrackerMRHTools/plugins/MultiRecHitCollectorESProducer.cc index 17779b268bd94..61bb530301bbd 100644 --- a/RecoTracker/SiTrackerMRHTools/plugins/MultiRecHitCollectorESProducer.cc +++ b/RecoTracker/SiTrackerMRHTools/plugins/MultiRecHitCollectorESProducer.cc @@ -1,73 +1,91 @@ +// user includes +#include "FWCore/Framework/interface/ESHandle.h" +#include "FWCore/Framework/interface/ESProducer.h" +#include "FWCore/Framework/interface/Event.h" +#include "FWCore/Framework/interface/EventSetup.h" #include "FWCore/Framework/interface/Frameworkfwd.h" #include "FWCore/Framework/interface/MakerMacros.h" +#include "FWCore/Framework/interface/ModuleFactory.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" - -#include "RecoTracker/SiTrackerMRHTools/interface/SiTrackerMultiRecHitUpdator.h" -#include "RecoTracker/SiTrackerMRHTools/plugins/MultiRecHitCollectorESProducer.h" -#include "TrackingTools/GeomPropagators/interface/Propagator.h" -#include "TrackingTools/KalmanUpdators/interface/Chi2MeasurementEstimatorBase.h" +#include "FWCore/ParameterSet/interface/ParameterSet.h" +#include "FWCore/PluginManager/interface/ModuleDef.h" +#include "FWCore/Utilities/interface/InputTag.h" +#include "FWCore/Utilities/interface/typelookup.h" #include "RecoTracker/MeasurementDet/interface/MeasurementTracker.h" +#include "RecoTracker/Record/interface/MultiRecHitRecord.h" #include "RecoTracker/SiTrackerMRHTools/interface/GroupedDAFHitCollector.h" +#include "RecoTracker/SiTrackerMRHTools/interface/MultiRecHitCollector.h" +#include "RecoTracker/SiTrackerMRHTools/interface/SiTrackerMultiRecHitUpdator.h" #include "RecoTracker/SiTrackerMRHTools/interface/SimpleDAFHitCollector.h" +#include "TrackingTools/GeomPropagators/interface/Propagator.h" +#include "TrackingTools/KalmanUpdators/interface/Chi2MeasurementEstimatorBase.h" -#include "FWCore/Framework/interface/EventSetup.h" -#include "FWCore/Framework/interface/ESHandle.h" -#include "FWCore/Framework/interface/ModuleFactory.h" -#include "FWCore/Framework/interface/ESProducer.h" - +// system includes #include #include +class MultiRecHitCollectorESProducer : public edm::ESProducer { +public: + MultiRecHitCollectorESProducer(const edm::ParameterSet& iConfig); + ~MultiRecHitCollectorESProducer() override = default; + std::unique_ptr produce(const MultiRecHitRecord&); + +private: + // es tokens + edm::ESGetToken mrhToken; + edm::ESGetToken propAlongToken; + edm::ESGetToken chi2MeasToken; + edm::ESGetToken measToken; + edm::ESGetToken topoToken; + edm::ESGetToken propOppositeToken; + + // configuration + std::string myname_; + std::string mrhupdator_; + std::string propagatorAlongName_; + std::string estimatorName_; + std::string measurementTrackerName_; + std::string mode_; + bool debug_; + std::string propagatorOppositeName_; +}; + using namespace edm; -MultiRecHitCollectorESProducer::MultiRecHitCollectorESProducer(const edm::ParameterSet& iConfig) { - std::string myname = iConfig.getParameter("ComponentName"); - setConf(iConfig); - setWhatProduced(this, myname); -} +MultiRecHitCollectorESProducer::MultiRecHitCollectorESProducer(const edm::ParameterSet& iConfig) + : myname_(iConfig.getParameter("ComponentName")), + mrhupdator_(iConfig.getParameter("MultiRecHitUpdator")), + propagatorAlongName_(iConfig.getParameter("propagatorAlong")), + estimatorName_(iConfig.getParameter("estimator")), + measurementTrackerName_(iConfig.getParameter("MeasurementTrackerName")), + mode_(iConfig.getParameter("Mode")), + debug_(iConfig.getParameter("Debug")), + propagatorOppositeName_(iConfig.getParameter("propagatorOpposite")) { + auto cc = setWhatProduced(this, myname_); -MultiRecHitCollectorESProducer::~MultiRecHitCollectorESProducer() {} + mrhToken = cc.consumes(); + propAlongToken = cc.consumes(edm::ESInputTag("", propagatorAlongName_)); + chi2MeasToken = cc.consumes(edm::ESInputTag("", estimatorName_)); + measToken = cc.consumes(edm::ESInputTag("", measurementTrackerName_)); + topoToken = cc.consumes(); + propOppositeToken = cc.consumes(edm::ESInputTag("", propagatorOppositeName_)); +} std::unique_ptr MultiRecHitCollectorESProducer::produce(const MultiRecHitRecord& iRecord) { - std::string mode = "Grouped"; - if (conf_.getParameter("Mode") == "Simple") - mode = "Simple"; + const SiTrackerMultiRecHitUpdator* mrhu = &iRecord.get(mrhToken); + const Propagator* propagator = &iRecord.get(propAlongToken); + const Chi2MeasurementEstimatorBase* estimator = &iRecord.get(chi2MeasToken); + const MeasurementTracker* measurement = &iRecord.get(measToken); + const TrackerTopology* trackerTopology = &iRecord.get(topoToken); - std::string mrhupdator = conf_.getParameter("MultiRecHitUpdator"); - std::string propagatorAlongName = conf_.getParameter("propagatorAlong"); - std::string estimatorName = conf_.getParameter("estimator"); - std::string measurementTrackerName = conf_.getParameter("MeasurementTrackerName"); - bool debug = conf_.getParameter("Debug"); + if (mode_ == "Grouped") { + const Propagator* propagatorOpposite = &iRecord.get(propOppositeToken); - ESHandle mrhuhandle; - iRecord.get(mrhupdator, mrhuhandle); - ESHandle propagatorhandle; - iRecord.getRecord().getRecord().get(propagatorAlongName, - propagatorhandle); - ESHandle estimatorhandle; - iRecord.getRecord().getRecord().get(estimatorName, estimatorhandle); - ESHandle measurementhandle; - iRecord.getRecord().get(measurementTrackerName, measurementhandle); - ESHandle trackerTopologyHandle; - iRecord.getRecord().getRecord().get(trackerTopologyHandle); - - if (mode == "Grouped") { - std::string propagatorOppositeName = conf_.getParameter("propagatorOpposite"); - ESHandle propagatorOppositehandle; - iRecord.getRecord().getRecord().get(propagatorOppositeName, - propagatorOppositehandle); - return std::make_unique(measurementhandle.product(), - mrhuhandle.product(), - estimatorhandle.product(), - propagatorhandle.product(), - propagatorOppositehandle.product(), - debug); + return std::make_unique( + measurement, mrhu, estimator, propagator, propagatorOpposite, debug_); } else { - return std::make_unique(trackerTopologyHandle.product(), - measurementhandle.product(), - mrhuhandle.product(), - estimatorhandle.product(), - propagatorhandle.product(), - debug); + return std::make_unique(trackerTopology, measurement, mrhu, estimator, propagator, debug_); } } + +DEFINE_FWK_EVENTSETUP_MODULE(MultiRecHitCollectorESProducer); diff --git a/RecoTracker/SiTrackerMRHTools/plugins/MultiRecHitCollectorESProducer.h b/RecoTracker/SiTrackerMRHTools/plugins/MultiRecHitCollectorESProducer.h deleted file mode 100644 index 808691d3f5158..0000000000000 --- a/RecoTracker/SiTrackerMRHTools/plugins/MultiRecHitCollectorESProducer.h +++ /dev/null @@ -1,32 +0,0 @@ -#ifndef RecoLocalTracker_ESProducers_MultiRecHitCollectorESProducer_h -#define RecoLocalTracker_ESProducers_MultiRecHitCollectorESProducer_h - -#include "FWCore/Framework/interface/EDProducer.h" -#include "FWCore/Framework/interface/Event.h" -#include "FWCore/Framework/interface/EventSetup.h" -#include "FWCore/Framework/interface/ESHandle.h" - -#include "FWCore/ParameterSet/interface/ParameterSet.h" -#include "FWCore/Utilities/interface/InputTag.h" - -#include "FWCore/Framework/interface/ESProducer.h" -#include "FWCore/ParameterSet/interface/ParameterSet.h" -#include "RecoTracker/Record/interface/MultiRecHitRecord.h" -#include "RecoTracker/SiTrackerMRHTools/interface/MultiRecHitCollector.h" - -#include - -class MultiRecHitCollectorESProducer : public edm::ESProducer { -public: - MultiRecHitCollectorESProducer(const edm::ParameterSet& iConfig); - ~MultiRecHitCollectorESProducer() override; - std::unique_ptr produce(const MultiRecHitRecord&); - - // Set parameter set - void setConf(const edm::ParameterSet& conf) { conf_ = conf; } - -private: - edm::ParameterSet conf_; -}; - -#endif // RecoLocalTracker_ESProducers_MultiRecHitCollectorESProducer_h diff --git a/RecoTracker/SiTrackerMRHTools/plugins/SiTrackerMultiRecHitUpdatorESProducer.cc b/RecoTracker/SiTrackerMRHTools/plugins/SiTrackerMultiRecHitUpdatorESProducer.cc index 3455de91ceb8d..f96a196fa1735 100644 --- a/RecoTracker/SiTrackerMRHTools/plugins/SiTrackerMultiRecHitUpdatorESProducer.cc +++ b/RecoTracker/SiTrackerMRHTools/plugins/SiTrackerMultiRecHitUpdatorESProducer.cc @@ -1,41 +1,60 @@ -#include "RecoTracker/SiTrackerMRHTools/plugins/SiTrackerMultiRecHitUpdatorESProducer.h" -#include "TrackingTools/Records/interface/TransientRecHitRecord.h" -#include "RecoTracker/Record/interface/CkfComponentsRecord.h" - -#include "FWCore/Framework/interface/EventSetup.h" +// user includes #include "FWCore/Framework/interface/ESHandle.h" -#include "FWCore/Framework/interface/ModuleFactory.h" #include "FWCore/Framework/interface/ESProducer.h" +#include "FWCore/Framework/interface/EventSetup.h" +#include "FWCore/Framework/interface/MakerMacros.h" +#include "FWCore/Framework/interface/ModuleFactory.h" +#include "FWCore/Framework/interface/ModuleFactory.h" +#include "FWCore/ParameterSet/interface/ParameterSet.h" +#include "FWCore/PluginManager/interface/ModuleDef.h" +#include "FWCore/Utilities/interface/typelookup.h" +#include "RecoTracker/Record/interface/CkfComponentsRecord.h" +#include "RecoTracker/Record/interface/MultiRecHitRecord.h" +#include "RecoTracker/SiTrackerMRHTools/interface/SiTrackerMultiRecHitUpdator.h" +#include "TrackingTools/Records/interface/TransientRecHitRecord.h" +// system includes #include #include +class SiTrackerMultiRecHitUpdatorESProducer : public edm::ESProducer { +public: + SiTrackerMultiRecHitUpdatorESProducer(const edm::ParameterSet& p); + ~SiTrackerMultiRecHitUpdatorESProducer() override = default; + std::unique_ptr produce(const MultiRecHitRecord&); + +private: + std::string myname_, sname_, hitpropagator_; + bool debug_; + std::vector annealingProgram_; + float chi2Cut1D_, chi2Cut2D_; + + edm::ESGetToken ttrhbToken; + edm::ESGetToken ttrhpToken; +}; + using namespace edm; -SiTrackerMultiRecHitUpdatorESProducer::SiTrackerMultiRecHitUpdatorESProducer(const edm::ParameterSet& p) { - std::string myname = p.getParameter("ComponentName"); - pset_ = p; - setWhatProduced(this, myname); +SiTrackerMultiRecHitUpdatorESProducer::SiTrackerMultiRecHitUpdatorESProducer(const edm::ParameterSet& p) + : myname_(p.getParameter("ComponentName")), + sname_(p.getParameter("TTRHBuilder")), + hitpropagator_(p.getParameter("HitPropagator")), + debug_(p.getParameter("Debug")), + annealingProgram_(p.getParameter >("AnnealingProgram")), + chi2Cut1D_(p.getParameter("ChiSquareCut1D")), + chi2Cut2D_(p.getParameter("ChiSquareCut2D")) { + auto cc = setWhatProduced(this, myname_); + ttrhbToken = cc.consumes(edm::ESInputTag("", sname_)); + ttrhpToken = cc.consumes(edm::ESInputTag("", hitpropagator_)); } -SiTrackerMultiRecHitUpdatorESProducer::~SiTrackerMultiRecHitUpdatorESProducer() {} - std::unique_ptr SiTrackerMultiRecHitUpdatorESProducer::produce( const MultiRecHitRecord& iRecord) { - std::vector annealingProgram = pset_.getParameter >("AnnealingProgram"); - float Chi2Cut1D = pset_.getParameter("ChiSquareCut1D"); - float Chi2Cut2D = pset_.getParameter("ChiSquareCut2D"); - - edm::ESHandle hbuilder; - std::string sname = pset_.getParameter("TTRHBuilder"); - iRecord.getRecord().get(sname, hbuilder); - std::string hitpropagator = pset_.getParameter("HitPropagator"); - edm::ESHandle hhitpropagator; - iRecord.getRecord().getRecord().get(hitpropagator, hhitpropagator); - - bool debug = pset_.getParameter("Debug"); - //_updator = std::make_unique(pDD.product(), pp, sp, mp, annealingProgram); - // _updator = std::make_unique(hhitpropagator.product(),annealingProgram); + const TransientTrackingRecHitBuilder* hbuilder = &iRecord.get(ttrhbToken); + const TrackingRecHitPropagator* hhitpropagator = &iRecord.get(ttrhpToken); + return std::make_unique( - hbuilder.product(), hhitpropagator.product(), Chi2Cut1D, Chi2Cut2D, annealingProgram, debug); + hbuilder, hhitpropagator, chi2Cut1D_, chi2Cut2D_, annealingProgram_, debug_); } + +DEFINE_FWK_EVENTSETUP_MODULE(SiTrackerMultiRecHitUpdatorESProducer); diff --git a/RecoTracker/SiTrackerMRHTools/plugins/SiTrackerMultiRecHitUpdatorESProducer.h b/RecoTracker/SiTrackerMRHTools/plugins/SiTrackerMultiRecHitUpdatorESProducer.h deleted file mode 100644 index 157365e28e42f..0000000000000 --- a/RecoTracker/SiTrackerMRHTools/plugins/SiTrackerMultiRecHitUpdatorESProducer.h +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef RecoLocalTracker_ESProducers_SiTrackerMultiRecHitUpdatorESProducer_h -#define RecoLocalTracker_ESProducers_SiTrackerMultiRecHitUpdatorESProducer_h - -#include "FWCore/Framework/interface/ESProducer.h" -#include "FWCore/ParameterSet/interface/ParameterSet.h" -#include "RecoTracker/Record/interface/MultiRecHitRecord.h" -#include "RecoTracker/SiTrackerMRHTools/interface/SiTrackerMultiRecHitUpdator.h" - -#include - -class SiTrackerMultiRecHitUpdatorESProducer : public edm::ESProducer { -public: - SiTrackerMultiRecHitUpdatorESProducer(const edm::ParameterSet &p); - ~SiTrackerMultiRecHitUpdatorESProducer() override; - std::unique_ptr produce(const MultiRecHitRecord &); - -private: - edm::ParameterSet pset_; -}; - -#endif // RecoLocalTracker_ESProducers_SiTrackerMultiRecHitUpdatorESProducer_h diff --git a/RecoTracker/SiTrackerMRHTools/plugins/module.cc b/RecoTracker/SiTrackerMRHTools/plugins/module.cc deleted file mode 100644 index 108d56e71d744..0000000000000 --- a/RecoTracker/SiTrackerMRHTools/plugins/module.cc +++ /dev/null @@ -1,12 +0,0 @@ -#include "FWCore/PluginManager/interface/ModuleDef.h" -#include "FWCore/Framework/interface/MakerMacros.h" - -#include "RecoTracker/SiTrackerMRHTools/plugins/SiTrackerMultiRecHitUpdatorESProducer.h" -#include "RecoTracker/SiTrackerMRHTools/plugins/MultiRecHitCollectorESProducer.h" - -#include "FWCore/Framework/interface/ModuleFactory.h" -#include "FWCore/Framework/interface/ESProducer.h" -#include "FWCore/Utilities/interface/typelookup.h" - -DEFINE_FWK_EVENTSETUP_MODULE(SiTrackerMultiRecHitUpdatorESProducer); -DEFINE_FWK_EVENTSETUP_MODULE(MultiRecHitCollectorESProducer); From 47393c900567f9665a02c56de215b3dc259a361b Mon Sep 17 00:00:00 2001 From: mmusich Date: Wed, 16 Feb 2022 15:00:30 +0100 Subject: [PATCH 8/9] get rid of CMSDEPRECATED_X warnings in RecoTracker/TkNavigation --- .../test/NavigationSchoolAnalyzer.cc | 102 ++++++++---------- .../test/TkMSParameterizationTest.cc | 21 ++-- 2 files changed, 54 insertions(+), 69 deletions(-) diff --git a/RecoTracker/TkNavigation/test/NavigationSchoolAnalyzer.cc b/RecoTracker/TkNavigation/test/NavigationSchoolAnalyzer.cc index fc7f1e8536475..c38fd322fef43 100644 --- a/RecoTracker/TkNavigation/test/NavigationSchoolAnalyzer.cc +++ b/RecoTracker/TkNavigation/test/NavigationSchoolAnalyzer.cc @@ -20,42 +20,39 @@ #include // user include files -#include "FWCore/Framework/interface/EDAnalyzer.h" - +#include "DataFormats/ForwardDetId/interface/BTLDetId.h" +#include "DataFormats/ForwardDetId/interface/ETLDetId.h" +#include "DataFormats/MuonDetId/interface/CSCDetId.h" +#include "DataFormats/MuonDetId/interface/DTChamberId.h" +#include "DataFormats/MuonDetId/interface/RPCDetId.h" +#include "DataFormats/TrackerCommon/interface/TrackerTopology.h" #include "FWCore/Framework/interface/ESHandle.h" - #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/MakerMacros.h" - +#include "FWCore/Framework/interface/one/EDAnalyzer.h" +#include "FWCore/MessageLogger/interface/MessageLogger.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" - -#include - -#include "DataFormats/TrackerCommon/interface/TrackerTopology.h" #include "Geometry/Records/interface/TrackerTopologyRcd.h" -#include "DataFormats/MuonDetId/interface/RPCDetId.h" -#include "DataFormats/MuonDetId/interface/CSCDetId.h" -#include "DataFormats/MuonDetId/interface/DTChamberId.h" - -#include -#include - -#include "TrackingTools/DetLayers/interface/NavigationSchool.h" #include "RecoTracker/Record/interface/NavigationSchoolRecord.h" - #include "TrackingTools/DetLayers/interface/DetLayer.h" +#include "TrackingTools/DetLayers/interface/NavigationSchool.h" // class definition -class NavigationSchoolAnalyzer : public edm::EDAnalyzer { +class NavigationSchoolAnalyzer : public edm::one::EDAnalyzer { public: explicit NavigationSchoolAnalyzer(const edm::ParameterSet&); - ~NavigationSchoolAnalyzer(); + ~NavigationSchoolAnalyzer() override = default; private: virtual void beginRun(edm::Run const& run, const edm::EventSetup&) override; virtual void analyze(const edm::Event&, const edm::EventSetup&) override; + virtual void endRun(edm::Run const& run, const edm::EventSetup&) override{}; + + const std::string theNavigationSchoolName_; + const edm::ESGetToken navSchoolToken_; + const edm::ESGetToken tTopoTokenBR_; + const edm::ESGetToken navSchoolTokenBR_; - std::string theNavigationSchoolName; const TrackerTopology* tTopo; void print(std::ostream& os, const DetLayer* dl); void print(std::ostream& os, const NavigationSchool::StateType& layers); @@ -230,65 +227,58 @@ void printOldStyle(std::ostream& os, const NavigationSchool& nav) { // the analyzer itself NavigationSchoolAnalyzer::NavigationSchoolAnalyzer(const edm::ParameterSet& iConfig) - : theNavigationSchoolName(iConfig.getParameter("navigationSchoolName")) {} - -NavigationSchoolAnalyzer::~NavigationSchoolAnalyzer() {} + : theNavigationSchoolName_(iConfig.getParameter("navigationSchoolName")), + navSchoolToken_(esConsumes(edm::ESInputTag("", theNavigationSchoolName_))), + tTopoTokenBR_(esConsumes(edm::ESInputTag("", theNavigationSchoolName_))), + navSchoolTokenBR_(esConsumes()) {} #include #include void NavigationSchoolAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) { - edm::ESHandle tTopoHandle; - iSetup.get().get(tTopoHandle); - tTopo = tTopoHandle.product(); - std::ostringstream byNav; std::ostringstream byGeom; std::ostringstream oldStyle; - std::ofstream ByNavFile(theNavigationSchoolName + "_ByNav.log"); - std::ofstream ByGeomFile(theNavigationSchoolName + "_ByGeom.log"); - std::ofstream oldStyleFile(theNavigationSchoolName + "_oldStyle.log"); + std::ofstream ByNavFile(theNavigationSchoolName_ + "_ByNav.log"); + std::ofstream ByGeomFile(theNavigationSchoolName_ + "_ByGeom.log"); + std::ofstream oldStyleFile(theNavigationSchoolName_ + "_oldStyle.log"); //get the navigation school - edm::ESHandle nav; - iSetup.get().get(theNavigationSchoolName, nav); - print(byNav, nav.product()); - printUsingGeom(byGeom, *nav.product()); - printOldStyle(oldStyle, *nav.product()); + const NavigationSchool* nav = &iSetup.getData(navSchoolToken_); + print(byNav, nav); + printUsingGeom(byGeom, *nav); + printOldStyle(oldStyle, *nav); ByNavFile << byNav.str() << std::endl; ByGeomFile << byGeom.str() << std::endl; oldStyleFile << oldStyle.str() << std::endl; if (oldStyle.str() != byGeom.str()) - std::cout << "Error: Navigation by Geom is not consistent with old Style Navigation in " << theNavigationSchoolName - << "\n" - << std::endl; - - // NavigationSetter setter(*nav.product()); - std::cout << "NavigationSchoolAnalyzer " - << "hello at event" << std::endl; - std::cout << "NavigationSchoolAnalyzer " - << "NavigationSchool display of: " << theNavigationSchoolName << "\n" - << byNav.str() << std::endl; - - std::cout << "\n\nNavigationSchoolAnalyzer " - << "NavigationSchool display using Geometry" << std::endl; - std::cout << byGeom.str() << std::endl; + edm::LogPrint("NavigationSchoolAnalyzer") + << "Error: Navigation by Geom is not consistent with old Style Navigation in " << theNavigationSchoolName_ + << "\n"; + + // NavigationSetter setter(*nav); + edm::LogPrint("NavigationSchoolAnalyzer") << "NavigationSchoolAnalyzer " + << "hello at event"; + edm::LogPrint("NavigationSchoolAnalyzer") << "NavigationSchoolAnalyzer " + << "NavigationSchool display of: " << theNavigationSchoolName_ << "\n" + << byNav.str(); + + edm::LogPrint("NavigationSchoolAnalyzer") << "\n\nNavigationSchoolAnalyzer " + << "NavigationSchool display using Geometry"; + edm::LogPrint("NavigationSchoolAnalyzer") << byGeom.str(); } void NavigationSchoolAnalyzer::beginRun(edm::Run const& run, const edm::EventSetup& iSetup) { - edm::ESHandle tTopoHandle; - iSetup.get().get(tTopoHandle); - tTopo = tTopoHandle.product(); + tTopo = &iSetup.getData(tTopoTokenBR_); //get the navigation school - edm::ESHandle nav; - iSetup.get().get(theNavigationSchoolName, nav); + const NavigationSchool* nav = &iSetup.getData(navSchoolTokenBR_); // NavigationSetter setter(*nav.product()); - edm::LogInfo("NavigationSchoolAnalyzer") << "NavigationSchool display of: " << theNavigationSchoolName << "\n"; - print(std::cout, nav.product()); + edm::LogInfo("NavigationSchoolAnalyzer") << "NavigationSchool display of: " << theNavigationSchoolName_ << "\n"; + print(std::cout, nav); } //define this as a plug-in diff --git a/RecoTracker/TkNavigation/test/TkMSParameterizationTest.cc b/RecoTracker/TkNavigation/test/TkMSParameterizationTest.cc index f040cb996b279..60b4db6bef6f5 100644 --- a/RecoTracker/TkNavigation/test/TkMSParameterizationTest.cc +++ b/RecoTracker/TkNavigation/test/TkMSParameterizationTest.cc @@ -1,29 +1,24 @@ -#include "FWCore/Framework/interface/EDAnalyzer.h" - +#include "FWCore/Framework/interface/one/EDAnalyzer.h" +#include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Framework/interface/Event.h" +#include "FWCore/Framework/interface/EventSetup.h" #include "FWCore/Framework/interface/MakerMacros.h" - #include "FWCore/ParameterSet/interface/ParameterSet.h" -#include "FWCore/Framework/interface/EventSetup.h" -#include "FWCore/Framework/interface/ESHandle.h" - -#include "RecoTracker/TkNavigation/interface/TkMSParameterization.h" #include "RecoTracker/Record/interface/TkMSParameterizationRecord.h" +#include "RecoTracker/TkNavigation/interface/TkMSParameterization.h" -class TkMSParameterizationTest final : public edm::EDAnalyzer { +class TkMSParameterizationTest final : public edm::one::EDAnalyzer<> { public: - explicit TkMSParameterizationTest(const edm::ParameterSet&) {} + explicit TkMSParameterizationTest(const edm::ParameterSet&) : tkMsParamToken_(esConsumes()) {} private: + const edm::ESGetToken tkMsParamToken_; void analyze(const edm::Event&, const edm::EventSetup&) override; }; void TkMSParameterizationTest::analyze(const edm::Event&, const edm::EventSetup& iSetup) { using namespace tkMSParameterization; - edm::ESHandle paramH; - iSetup.get().get(paramH); - - auto const& msParam = *paramH; + auto const& msParam = iSetup.getData(tkMsParamToken_); // test MSParam { From 891507613510060934ecf314218f15b296bf7bfc Mon Sep 17 00:00:00 2001 From: mmusich Date: Tue, 22 Feb 2022 11:54:23 +0100 Subject: [PATCH 9/9] removed a bunch of not needed includes in RecoTracker post esCosmues migration --- .../ConversionSeedGenerators/plugins/ConversionSeedFilter.cc | 1 - .../SiTrackerMRHTools/plugins/MultiRecHitCollectorESProducer.cc | 1 - .../plugins/SiTrackerMultiRecHitUpdatorESProducer.cc | 1 - RecoTracker/TkDetLayers/test/TkDetLayersAnalyzer.cc | 1 - RecoTracker/TkNavigation/test/NavigationSchoolAnalyzer.cc | 1 - RecoTracker/TkNavigation/test/TkMSParameterizationTest.cc | 1 - 6 files changed, 6 deletions(-) diff --git a/RecoTracker/ConversionSeedGenerators/plugins/ConversionSeedFilter.cc b/RecoTracker/ConversionSeedGenerators/plugins/ConversionSeedFilter.cc index c8cba13fc0b0f..936eda8299a02 100644 --- a/RecoTracker/ConversionSeedGenerators/plugins/ConversionSeedFilter.cc +++ b/RecoTracker/ConversionSeedGenerators/plugins/ConversionSeedFilter.cc @@ -21,7 +21,6 @@ #include "DataFormats/TrackReco/interface/Track.h" #include "DataFormats/TrackReco/interface/TrackFwd.h" #include "DataFormats/TrajectorySeed/interface/TrajectorySeedCollection.h" -#include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/Frameworkfwd.h" #include "FWCore/Framework/interface/MakerMacros.h" diff --git a/RecoTracker/SiTrackerMRHTools/plugins/MultiRecHitCollectorESProducer.cc b/RecoTracker/SiTrackerMRHTools/plugins/MultiRecHitCollectorESProducer.cc index 61bb530301bbd..f5b6dd47a651b 100644 --- a/RecoTracker/SiTrackerMRHTools/plugins/MultiRecHitCollectorESProducer.cc +++ b/RecoTracker/SiTrackerMRHTools/plugins/MultiRecHitCollectorESProducer.cc @@ -1,5 +1,4 @@ // user includes -#include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Framework/interface/ESProducer.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/EventSetup.h" diff --git a/RecoTracker/SiTrackerMRHTools/plugins/SiTrackerMultiRecHitUpdatorESProducer.cc b/RecoTracker/SiTrackerMRHTools/plugins/SiTrackerMultiRecHitUpdatorESProducer.cc index f96a196fa1735..f0fdac1668bd1 100644 --- a/RecoTracker/SiTrackerMRHTools/plugins/SiTrackerMultiRecHitUpdatorESProducer.cc +++ b/RecoTracker/SiTrackerMRHTools/plugins/SiTrackerMultiRecHitUpdatorESProducer.cc @@ -1,5 +1,4 @@ // user includes -#include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Framework/interface/ESProducer.h" #include "FWCore/Framework/interface/EventSetup.h" #include "FWCore/Framework/interface/MakerMacros.h" diff --git a/RecoTracker/TkDetLayers/test/TkDetLayersAnalyzer.cc b/RecoTracker/TkDetLayers/test/TkDetLayersAnalyzer.cc index c72cab4c8175d..de284c9d50296 100644 --- a/RecoTracker/TkDetLayers/test/TkDetLayersAnalyzer.cc +++ b/RecoTracker/TkDetLayers/test/TkDetLayersAnalyzer.cc @@ -4,7 +4,6 @@ // user include files #include "DataFormats/GeometrySurface/interface/BoundSurface.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.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/RecoTracker/TkNavigation/test/NavigationSchoolAnalyzer.cc b/RecoTracker/TkNavigation/test/NavigationSchoolAnalyzer.cc index c38fd322fef43..fabf84c03525a 100644 --- a/RecoTracker/TkNavigation/test/NavigationSchoolAnalyzer.cc +++ b/RecoTracker/TkNavigation/test/NavigationSchoolAnalyzer.cc @@ -26,7 +26,6 @@ #include "DataFormats/MuonDetId/interface/DTChamberId.h" #include "DataFormats/MuonDetId/interface/RPCDetId.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/MakerMacros.h" #include "FWCore/Framework/interface/one/EDAnalyzer.h" diff --git a/RecoTracker/TkNavigation/test/TkMSParameterizationTest.cc b/RecoTracker/TkNavigation/test/TkMSParameterizationTest.cc index 60b4db6bef6f5..87ed4014a3f93 100644 --- a/RecoTracker/TkNavigation/test/TkMSParameterizationTest.cc +++ b/RecoTracker/TkNavigation/test/TkMSParameterizationTest.cc @@ -1,5 +1,4 @@ #include "FWCore/Framework/interface/one/EDAnalyzer.h" -#include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/EventSetup.h" #include "FWCore/Framework/interface/MakerMacros.h"