Merge pull request cms-sw#36569 from bsunanda/Run3-gex105B

Run3-gex105B Use ESGetToken in SimTracker/TrackerMaterialAnalysis

Author: cmsbuild

SimTracker/TrackerMaterialAnalysis/plugins/ListGroups.cc

@@ -87,7 +87,9 @@ class ListGroups : public edm::one::EDAnalyzer<> {
   void fillGradient();
   std::vector<std::pair<std::shared_ptr<TLine>, std::shared_ptr<TText> > > overlayEtaReferences();
   void produceAndSaveSummaryPlot(const edm::EventSetup &);
-  bool m_saveSummaryPlot;
+
+  const bool m_saveSummaryPlot;
+  const edm::ESGetToken<DDCompactView, IdealGeometryRecord> ddToken_;
   std::vector<TH2F *> m_plots;
   std::set<std::string> m_group_names;
   std::vector<MaterialAccountingGroup *> m_groups;
@@ -107,8 +109,9 @@ class ListGroups : public edm::one::EDAnalyzer<> {
   std::map<std::string, std::pair<float, float> > m_values;
 };
 
-ListGroups::ListGroups(const edm::ParameterSet &iPSet) {
-  m_saveSummaryPlot = iPSet.getUntrackedParameter<bool>("SaveSummaryPlot");
+ListGroups::ListGroups(const edm::ParameterSet &iPSet)
+    : m_saveSummaryPlot(iPSet.getUntrackedParameter<bool>("SaveSummaryPlot")),
+      ddToken_(esConsumes<DDCompactView, IdealGeometryRecord>()) {
   m_plots.clear();
   m_groups.clear();
   TColor::InitializeColors();
@@ -312,8 +315,7 @@ void ListGroups::produceAndSaveSummaryPlot(const edm::EventSetup &setup) {
                                  kOpenCross,
                                  kFullStar};
 
-  edm::ESTransientHandle<DDCompactView> hDdd;
-  setup.get<IdealGeometryRecord>().get(hDdd);
+  edm::ESTransientHandle<DDCompactView> hDdd = setup.getTransientHandle(ddToken_);
 
   for (const auto &n : m_group_names) {
     m_groups.push_back(new MaterialAccountingGroup(n, *hDdd));
@@ -424,8 +426,7 @@ void ListGroups::produceAndSaveSummaryPlot(const edm::EventSetup &setup) {
 }
 
 void ListGroups::analyze(const edm::Event &evt, const edm::EventSetup &setup) {
-  edm::ESTransientHandle<DDCompactView> hDdd;
-  setup.get<IdealGeometryRecord>().get(hDdd);
+  edm::ESTransientHandle<DDCompactView> hDdd = setup.getTransientHandle(ddToken_);
 
   DDSpecificsHasNamedValueFilter filter{"TrackingMaterialGroup"};
   DDFilteredView fv(*hDdd, filter);

SimTracker/TrackerMaterialAnalysis/plugins/dd4hep/DD4hep_ListGroups.cc

@@ -42,9 +42,11 @@ class DD4hep_ListGroups : public edm::one::EDAnalyzer<> {
   void analyze(const edm::Event &, const edm::EventSetup &) override;
   void beginJob() override {}
   void endJob() override;
+
   const edm::ESInputTag m_tag;
+  const bool m_saveSummaryPlot;
+  const edm::ESGetToken<cms::DDCompactView, IdealGeometryRecord> ddToken_;
 
-  bool m_saveSummaryPlot;
   std::vector<TH2F *> m_plots;
   std::set<std::string_view> m_group_names;
   std::vector<unsigned int> m_color;
@@ -62,8 +64,9 @@ class DD4hep_ListGroups : public edm::one::EDAnalyzer<> {
 #include "DD4hep_ListGroupsMaterialDifference.h"
 
 DD4hep_ListGroups::DD4hep_ListGroups(const edm::ParameterSet &iConfig)
-    : m_tag(iConfig.getParameter<edm::ESInputTag>("DDDetector")) {
-  m_saveSummaryPlot = iConfig.getUntrackedParameter<bool>("SaveSummaryPlot");
+    : m_tag(iConfig.getParameter<edm::ESInputTag>("DDDetector")),
+      m_saveSummaryPlot(iConfig.getUntrackedParameter<bool>("SaveSummaryPlot")),
+      ddToken_(esConsumes<cms::DDCompactView, IdealGeometryRecord>(m_tag)) {
   m_plots.clear();
   m_groups.clear();
   TColor::InitializeColors();
@@ -361,8 +364,7 @@ std::vector<std::pair<std::shared_ptr<TLine>, std::shared_ptr<TText>>> DD4hep_Li
 }
 
 void DD4hep_ListGroups::analyze(const edm::Event &evt, const edm::EventSetup &setup) {
-  edm::ESTransientHandle<cms::DDCompactView> cpv;
-  setup.get<IdealGeometryRecord>().get(m_tag, cpv);
+  edm::ESTransientHandle<cms::DDCompactView> cpv = setup.getTransientHandle(ddToken_);
   cms::DDFilter filter("TrackingMaterialGroup", "");
   cms::DDFilteredView fv(*cpv, filter);