From 3a0654757f407dd766f32df284a459239f32812c Mon Sep 17 00:00:00 2001 From: Matti Kortelainen Date: Wed, 10 Nov 2021 22:38:45 +0100 Subject: [PATCH 1/4] Use esConsumes in TrackerMapTool --- .../test/TrackerMapTool.cc | 37 +++++-------------- 1 file changed, 10 insertions(+), 27 deletions(-) diff --git a/Geometry/TrackerGeometryBuilder/test/TrackerMapTool.cc b/Geometry/TrackerGeometryBuilder/test/TrackerMapTool.cc index a61070315436c..0c861a6dcb73b 100644 --- a/Geometry/TrackerGeometryBuilder/test/TrackerMapTool.cc +++ b/Geometry/TrackerGeometryBuilder/test/TrackerMapTool.cc @@ -30,7 +30,6 @@ #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/EventSetup.h" -#include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Framework/interface/MakerMacros.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" @@ -53,32 +52,17 @@ class TrackerMapTool : public edm::one::EDAnalyzer<> { public: explicit TrackerMapTool(const edm::ParameterSet&); - ~TrackerMapTool() override; - void beginJob() override {} void analyze(edm::Event const& iEvent, edm::EventSetup const&) override; - void endJob() override {} -}; -// -// constants, enums and typedefs -// - -// -// static data member definitions -// +private: + edm::ESGetToken pDDToken_; +}; // // constructors and destructor // -TrackerMapTool::TrackerMapTool(const edm::ParameterSet& iConfig) { - //now do what ever initialization is needed -} - -TrackerMapTool::~TrackerMapTool() { - // do anything here that needs to be done at desctruction time - // (e.g. close files, deallocate resources etc.) -} +TrackerMapTool::TrackerMapTool(const edm::ParameterSet& iConfig) : pDDToken_(esConsumes()) {} // // member functions @@ -116,11 +100,10 @@ void TrackerMapTool::analyze(const edm::Event& iEvent, const edm::EventSetup& iS // // get the TrackerGeom // - edm::ESHandle pDD; - iSetup.get().get(pDD); - edm::LogInfo("TrackerMapTool") << " Geometry node for TrackerGeom is " << &(*pDD); - edm::LogInfo("TrackerMapTool") << " I have " << pDD->dets().size() << " detectors"; - edm::LogInfo("TrackerMapTool") << " I have " << pDD->detTypes().size() << " types"; + auto const& pDD = iSetup.getData(pDDToken_); + edm::LogInfo("TrackerMapTool") << " Geometry node for TrackerGeom is " << &pDD; + edm::LogInfo("TrackerMapTool") << " I have " << pDD.dets().size() << " detectors"; + edm::LogInfo("TrackerMapTool") << " I have " << pDD.detTypes().size() << " types"; int spicchif[] = {24, 24, 40, 56, 40, 56, 80}; int spicchib[] = {20, 32, 44, 30, 38, 46, 56, 42, 48, 54, 60, 66, 74}; @@ -140,8 +123,8 @@ void TrackerMapTool::analyze(const edm::Event& iEvent, const edm::EventSetup& iS float width, length, thickness, widthAtHalfLength; std::ofstream output("tracker.dat", std::ios::out); - auto begin = pDD->detUnits().begin(); - auto end = pDD->detUnits().end(); + auto begin = pDD.detUnits().begin(); + auto end = pDD.detUnits().end(); for (; begin != end; ++begin) { ntotmod++; From 6092685c4a5bf4532bf133c6ca822386081dc156 Mon Sep 17 00:00:00 2001 From: Matti Kortelainen Date: Thu, 11 Nov 2021 00:20:43 +0100 Subject: [PATCH 2/4] Use esConsumes in ModuleInfo --- .../TrackerGeometryBuilder/test/ModuleInfo.cc | 32 ++++++++----------- 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/Geometry/TrackerGeometryBuilder/test/ModuleInfo.cc b/Geometry/TrackerGeometryBuilder/test/ModuleInfo.cc index 33522e0ef4fb9..54ed55bad9e66 100644 --- a/Geometry/TrackerGeometryBuilder/test/ModuleInfo.cc +++ b/Geometry/TrackerGeometryBuilder/test/ModuleInfo.cc @@ -22,7 +22,6 @@ #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/EventSetup.h" -#include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Framework/interface/MakerMacros.h" #include "FWCore/Utilities/interface/Exception.h" @@ -64,24 +63,25 @@ using namespace cms_rounding; class ModuleInfo : public edm::one::EDAnalyzer<> { public: explicit ModuleInfo(const edm::ParameterSet&); - ~ModuleInfo() override; - void beginJob() override {} void analyze(edm::Event const& iEvent, edm::EventSetup const&) override; - void endJob() override {} private: bool fromDDD_; bool printDDD_; double tolerance_; + edm::ESGetToken rDDToken_; + edm::ESGetToken pDDToken_; + edm::ESGetToken tTopoToken_; }; ModuleInfo::ModuleInfo(const edm::ParameterSet& ps) : fromDDD_(ps.getParameter("fromDDD")), printDDD_(ps.getUntrackedParameter("printDDD", true)), - tolerance_(ps.getUntrackedParameter("tolerance", 1.e-23)) {} - -ModuleInfo::~ModuleInfo() {} + tolerance_(ps.getUntrackedParameter("tolerance", 1.e-23)), + rDDToken_(esConsumes()), + pDDToken_(esConsumes()), + tTopoToken_(esConsumes()) {} // ------------ method called to produce the data ------------ void ModuleInfo::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) { @@ -98,18 +98,14 @@ void ModuleInfo::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup // get the GeometricDet // - edm::ESHandle rDD; - iSetup.get().get(rDD); + auto const& rDD = iSetup.getData(rDDToken_); - edm::LogInfo("ModuleInfo") << " Top node is " << rDD.product() << " " << rDD.product()->name() << std::endl; - edm::LogInfo("ModuleInfo") << " And Contains Daughters: " << rDD.product()->deepComponents().size() << std::endl; + edm::LogInfo("ModuleInfo") << " Top node is " << &rDD << " " << rDD.name() << std::endl; + edm::LogInfo("ModuleInfo") << " And Contains Daughters: " << rDD.deepComponents().size() << std::endl; // //first instance tracking geometry - edm::ESHandle pDD; - iSetup.get().get(pDD); - edm::ESHandle tTopo_handle; - iSetup.get().get(tTopo_handle); - const TrackerTopology* tTopo = tTopo_handle.product(); + auto const& pDD = iSetup.getData(pDDToken_); + const TrackerTopology* tTopo = &iSetup.getData(tTopoToken_); // // counters @@ -149,7 +145,7 @@ void ModuleInfo::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup unsigned int tec_r6_rphiN = 0; unsigned int tec_r7_rphiN = 0; - std::vector modules = (*rDD).deepComponents(); + std::vector modules = rDD.deepComponents(); Output << "************************ List of modules with positions ************************" << std::endl; for (auto& module : modules) { @@ -401,7 +397,7 @@ void ModuleInfo::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup } // Local axes from Reco - const GeomDet* geomdet = pDD->idToDet(module->geographicalId()); + const GeomDet* geomdet = pDD.idToDet(module->geographicalId()); // Global Coordinates (i,j,k) LocalVector xLocal(1, 0, 0); LocalVector yLocal(0, 1, 0); From 7ac80ac68bc6709e65991822eccd10bd909aa8fa Mon Sep 17 00:00:00 2001 From: Matti Kortelainen Date: Thu, 11 Nov 2021 01:05:15 +0100 Subject: [PATCH 3/4] Use esConsumes in TrackerParametersAnalyzer --- .../test/TrackerParametersAnalyzer.cc | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Geometry/TrackerGeometryBuilder/test/TrackerParametersAnalyzer.cc b/Geometry/TrackerGeometryBuilder/test/TrackerParametersAnalyzer.cc index 56892f4287632..2eaf2d87da2b8 100644 --- a/Geometry/TrackerGeometryBuilder/test/TrackerParametersAnalyzer.cc +++ b/Geometry/TrackerGeometryBuilder/test/TrackerParametersAnalyzer.cc @@ -1,7 +1,6 @@ #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/MakerMacros.h" #include "Geometry/Records/interface/PTrackerParametersRcd.h" @@ -11,26 +10,26 @@ class TrackerParametersAnalyzer : public edm::one::EDAnalyzer<> { public: - explicit TrackerParametersAnalyzer(const edm::ParameterSet&) {} + explicit TrackerParametersAnalyzer(const edm::ParameterSet&) : ptpToken_(esConsumes()) {} - void beginJob() override {} void analyze(edm::Event const& iEvent, edm::EventSetup const&) override; - void endJob() override {} + +private: + edm::ESGetToken ptpToken_; }; void TrackerParametersAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) { edm::LogVerbatim("TrackerParametersAnalyzer") << "Here I am"; - edm::ESHandle ptp; - iSetup.get().get(ptp); + auto const& ptp = iSetup.getData(ptpToken_); - for (const auto& vitem : ptp->vitems) { + for (const auto& vitem : ptp.vitems) { edm::LogVerbatim("TrackerParametersAnalyzer") << vitem.id << " has " << vitem.vpars.size() << ":"; for (const auto& in : vitem.vpars) { edm::LogVerbatim("TrackerParametersAnalyzer") << in << ";"; } } - for (int vpar : ptp->vpars) { + for (int vpar : ptp.vpars) { std::cout << vpar << "; "; } } From c96ac74a49e08c35ba737adab1427bf9c7f80ea0 Mon Sep 17 00:00:00 2001 From: Matti Kortelainen Date: Thu, 11 Nov 2021 01:14:12 +0100 Subject: [PATCH 4/4] Use esConsumes in TrackerDigiGeometryAnalyzer --- .../test/TrackerDigiGeometryAnalyzer.cc | 23 ++++++++----------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/Geometry/TrackerGeometryBuilder/test/TrackerDigiGeometryAnalyzer.cc b/Geometry/TrackerGeometryBuilder/test/TrackerDigiGeometryAnalyzer.cc index 88251f7f901c4..319d74308ae78 100644 --- a/Geometry/TrackerGeometryBuilder/test/TrackerDigiGeometryAnalyzer.cc +++ b/Geometry/TrackerGeometryBuilder/test/TrackerDigiGeometryAnalyzer.cc @@ -25,7 +25,6 @@ #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/EventSetup.h" -#include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Framework/interface/MakerMacros.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" @@ -55,22 +54,19 @@ class TrackerDigiGeometryAnalyzer : public edm::one::EDAnalyzer<> { public: explicit TrackerDigiGeometryAnalyzer(const edm::ParameterSet&); - ~TrackerDigiGeometryAnalyzer() override; - void beginJob() override {} void analyze(edm::Event const& iEvent, edm::EventSetup const&) override; - void endJob() override {} private: void analyseTrapezoidal(const GeomDetUnit& det); void checkRotation(const GeomDetUnit& det); void checkTopology(const GeomDetUnit& det); std::ostream& cylindrical(std::ostream& os, const GlobalPoint& gp) const; -}; -TrackerDigiGeometryAnalyzer::TrackerDigiGeometryAnalyzer(const edm::ParameterSet& iConfig) {} + edm::ESGetToken pDDToken_; +}; -TrackerDigiGeometryAnalyzer::~TrackerDigiGeometryAnalyzer() {} +TrackerDigiGeometryAnalyzer::TrackerDigiGeometryAnalyzer(const edm::ParameterSet& iConfig) : pDDToken_(esConsumes()) {} // ------------ method called to produce the data ------------ void TrackerDigiGeometryAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) { @@ -78,13 +74,12 @@ void TrackerDigiGeometryAnalyzer::analyze(const edm::Event& iEvent, const edm::E // // get the TrackerGeom // - edm::ESHandle pDD; - iSetup.get().get(pDD); - PRINT("TrackerDigiGeometryAnalyzer") << " Geometry node for TrackerGeom is " << &(*pDD) << '\n'; - PRINT("TrackerDigiGeometryAnalyzer") << " I have " << pDD->detUnits().size() << " detectors" << '\n'; - PRINT("TrackerDigiGeometryAnalyzer") << " I have " << pDD->detTypes().size() << " types" << '\n'; + auto const& pDD = iSetup.getData(pDDToken_); + PRINT("TrackerDigiGeometryAnalyzer") << " Geometry node for TrackerGeom is " << &pDD << '\n'; + PRINT("TrackerDigiGeometryAnalyzer") << " I have " << pDD.detUnits().size() << " detectors" << '\n'; + PRINT("TrackerDigiGeometryAnalyzer") << " I have " << pDD.detTypes().size() << " types" << '\n'; - for (auto const& it : pDD->detUnits()) { + for (auto const& it : pDD.detUnits()) { if (dynamic_cast((it)) != nullptr) { const BoundPlane& p = (dynamic_cast((it)))->specificSurface(); PRINT("TrackerDigiGeometryAnalyzer") << it->geographicalId() << " RadLeng Pixel " << p.mediumProperties().radLen() @@ -100,7 +95,7 @@ void TrackerDigiGeometryAnalyzer::analyze(const edm::Event& iEvent, const edm::E //analyseTrapezoidal(*it); } - for (auto const& it : pDD->detTypes()) { + for (auto const& it : pDD.detTypes()) { if (dynamic_cast((it)) != nullptr) { const PixelTopology& p = (dynamic_cast((it)))->specificTopology(); PRINT("TrackerDigiGeometryAnalyzer") << " PIXEL Det " // << it->geographicalId()