Merge pull request cms-sw#36566 from bsunanda/Run3-gex105A

Run3-gex105A Make use of ESGetToken in GeometryReaders/XMLIdealGeometryESSource

Author: cmsbuild

GeometryReaders/XMLIdealGeometryESSource/src/XMLIdealMagneticFieldGeometryESProducer.cc

@@ -36,6 +36,7 @@ class XMLIdealMagneticFieldGeometryESProducer : public edm::ESProducer {
 private:
   std::string rootDDName_;  // this must be the form namespace:name
   std::string label_;
+  edm::ESGetToken<FileBlob, MFGeometryFileRcd> geomToken_;
 
   DDI::Store<DDName, DDI::Material*> matStore_;
   DDI::Store<DDName, DDI::Solid*> solidStore_;
@@ -47,7 +48,9 @@ class XMLIdealMagneticFieldGeometryESProducer : public edm::ESProducer {
 XMLIdealMagneticFieldGeometryESProducer::XMLIdealMagneticFieldGeometryESProducer(const edm::ParameterSet& iConfig)
     : rootDDName_(iConfig.getParameter<std::string>("rootDDName")), label_(iConfig.getParameter<std::string>("label")) {
   usesResources({{edm::ESSharedResourceNames::kDDGeometry}});
-  setWhatProduced(this);
+
+  auto cc = setWhatProduced(this);
+  geomToken_ = cc.consumesFrom<FileBlob, MFGeometryFileRcd>(edm::ESInputTag("", label_));
 }
 
 XMLIdealMagneticFieldGeometryESProducer::~XMLIdealMagneticFieldGeometryESProducer(void) {}
@@ -56,8 +59,7 @@ XMLIdealMagneticFieldGeometryESProducer::ReturnType XMLIdealMagneticFieldGeometr
     const IdealMagneticFieldRecord& iRecord) {
   using namespace edm::es;
 
-  edm::ESTransientHandle<FileBlob> gdd;
-  iRecord.getRecord<MFGeometryFileRcd>().get(label_, gdd);
+  edm::ESTransientHandle<FileBlob> gdd = iRecord.getTransientHandle(geomToken_);
 
   DDName ddName(rootDDName_);
   DDLogicalPart rootNode(ddName);

GeometryReaders/XMLIdealGeometryESSource/test/ExtractXMLFile.cc

@@ -54,20 +54,21 @@ class ExtractXMLFile : public edm::one::EDAnalyzer<> {
 private:
   std::string label_;
   std::string fname_;
+  edm::ESGetToken<FileBlob, GeometryFileRcd> geomToken_;
 };
 
 ExtractXMLFile::ExtractXMLFile(const edm::ParameterSet& iConfig)
     : label_(iConfig.getUntrackedParameter<std::string>("label", "")),
-      fname_(iConfig.getUntrackedParameter<std::string>("fname", "")) {}
+      fname_(iConfig.getUntrackedParameter<std::string>("fname", "")),
+      geomToken_(esConsumes<FileBlob, GeometryFileRcd>(edm::ESInputTag("", label_))) {}
 
 ExtractXMLFile::~ExtractXMLFile() {}
 
 void ExtractXMLFile::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
   using namespace edm;
 
   std::cout << "Here I am " << std::endl;
-  edm::ESHandle<FileBlob> gdd;
-  iSetup.get<GeometryFileRcd>().get(label_, gdd);
+  edm::ESHandle<FileBlob> gdd = iSetup.getHandle(geomToken_);
   std::ofstream f(fname_.c_str());
   (*gdd).write(f);
   std::cout << "finished" << std::endl;

GeometryReaders/XMLIdealGeometryESSource/test/PerfectGeometryAnalyzer.cc

@@ -59,6 +59,8 @@ class PerfectGeometryAnalyzer : public edm::one::EDAnalyzer<> {
   int nNodes_;
   bool fromDB_;
   std::string ddRootNodeName_;
+  edm::ESGetToken<DDCompactView, IdealGeometryRecord> geomToken1_;
+  edm::ESGetToken<DDCompactView, IdealMagneticFieldRecord> geomToken2_;
 };
 
 PerfectGeometryAnalyzer::PerfectGeometryAnalyzer(const edm::ParameterSet& iConfig)
@@ -74,6 +76,10 @@ PerfectGeometryAnalyzer::PerfectGeometryAnalyzer(const edm::ParameterSet& iConfi
   if (isMagField_) {
     label_ = "magfield";
   }
+  if (!isMagField_)
+    geomToken1_ = esConsumes<DDCompactView, IdealGeometryRecord>(edm::ESInputTag("", label_));
+  else
+    geomToken2_ = esConsumes<DDCompactView, IdealMagneticFieldRecord>(edm::ESInputTag("", label_));
 }
 
 PerfectGeometryAnalyzer::~PerfectGeometryAnalyzer() {}
@@ -83,12 +89,8 @@ void PerfectGeometryAnalyzer::analyze(const edm::Event& iEvent, const edm::Event
 
   std::cout << "Here I am " << std::endl;
 
-  edm::ESTransientHandle<DDCompactView> pDD;
-  if (!isMagField_) {
-    iSetup.get<IdealGeometryRecord>().get(label_, pDD);
-  } else {
-    iSetup.get<IdealMagneticFieldRecord>().get(label_, pDD);
-  }
+  edm::ESTransientHandle<DDCompactView> pDD =
+      (!isMagField_) ? iSetup.getTransientHandle(geomToken1_) : iSetup.getTransientHandle(geomToken2_);
   if (pDD.description()) {
     edm::LogInfo("PerfectGeometryAnalyzer") << pDD.description()->type_ << " label: " << pDD.description()->label_;
   } else {

GeometryReaders/XMLIdealGeometryESSource/test/TestCompareDDDumpFiles.cc

@@ -28,7 +28,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"
 
 class TestCompareDDDumpFiles : public edm::one::EDAnalyzer<> {

GeometryReaders/XMLIdealGeometryESSource/test/TestIdealGeometryESProducer.cc

@@ -48,18 +48,21 @@ class TestIdealGeometryESProducer : public edm::one::EDAnalyzer<> {
   void beginJob() override {}
   void analyze(edm::Event const&, edm::EventSetup const&) override;
   void endJob() override {}
+
+private:
+  const edm::ESGetToken<DDCompactView, IdealGeometryRecord> ddToken_;
 };
 
-TestIdealGeometryESProducer::TestIdealGeometryESProducer(const edm::ParameterSet& iConfig) {}
+TestIdealGeometryESProducer::TestIdealGeometryESProducer(const edm::ParameterSet& iConfig)
+    : ddToken_(esConsumes<DDCompactView, IdealGeometryRecord>()) {}
 
 TestIdealGeometryESProducer::~TestIdealGeometryESProducer() {}
 
 void TestIdealGeometryESProducer::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
   using namespace edm;
 
   std::cout << "Here I am " << std::endl;
-  edm::ESTransientHandle<DDCompactView> pDD;
-  iSetup.get<IdealGeometryRecord>().get(pDD);
+  edm::ESTransientHandle<DDCompactView> pDD = iSetup.getTransientHandle(ddToken_);
 
   GeometryInfoDump gidump;
   gidump.dumpInfo(true, true, true, *pDD);

GeometryReaders/XMLIdealGeometryESSource/test/TestSpecParAnalyzer.cc

@@ -48,24 +48,25 @@ class TestSpecParAnalyzer : public edm::one::EDAnalyzer<> {
   void endJob() override {}
 
 private:
-  std::string specName_;
-  std::string specStrValue_;
-  double specDblValue_;
+  const std::string specName_;
+  const std::string specStrValue_;
+  const double specDblValue_;
+  const edm::ESGetToken<DDCompactView, IdealGeometryRecord> ddToken_;
 };
 
 TestSpecParAnalyzer::TestSpecParAnalyzer(const edm::ParameterSet& iConfig)
     : specName_(iConfig.getParameter<std::string>("specName")),
       specStrValue_(iConfig.getUntrackedParameter<std::string>("specStrValue", "frederf")),
-      specDblValue_(iConfig.getUntrackedParameter<double>("specDblValue", 0.0)) {}
+      specDblValue_(iConfig.getUntrackedParameter<double>("specDblValue", 0.0)),
+      ddToken_(esConsumes<DDCompactView, IdealGeometryRecord>()) {}
 
 TestSpecParAnalyzer::~TestSpecParAnalyzer() {}
 
 void TestSpecParAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
   using namespace edm;
 
   std::cout << "Here I am " << std::endl;
-  edm::ESTransientHandle<DDCompactView> pDD;
-  iSetup.get<IdealGeometryRecord>().get("", pDD);
+  edm::ESTransientHandle<DDCompactView> pDD = iSetup.getTransientHandle(ddToken_);
   const DDCompactView& cpv(*pDD);
   if (specStrValue_ != "frederf") {
     std::cout << "specName = " << specName_ << " and specStrValue = " << specStrValue_ << std::endl;