From 49615d2d3ae8c9de51720e762a20551d571aa94a Mon Sep 17 00:00:00 2001 From: Suvankar Roy Chowdhury Date: Sun, 5 Sep 2021 19:58:04 +0200 Subject: [PATCH] midgrate modules to use esConsumes --- .../Geometry/plugins/CSCRecoIdealDBLoader.cc | 16 +++-- .../Geometry/plugins/DTRecoIdealDBLoader.cc | 16 +++-- .../Geometry/plugins/GEMRecoIdealDBLoader.cc | 17 +++-- .../plugins/HcalParametersDBBuilder.cc | 10 +-- .../Geometry/plugins/ME0RecoIdealDBLoader.cc | 16 +++-- .../Geometry/plugins/PCaloGeometryBuilder.cc | 64 +++++++++++-------- .../Geometry/plugins/PGeometricDetBuilder.cc | 16 +++-- .../plugins/PHGCalParametersDBBuilder.cc | 11 ++-- .../plugins/PTrackerParametersDBBuilder.cc | 10 +-- .../Geometry/plugins/RPCRecoIdealDBLoader.cc | 16 +++-- .../Geometry/plugins/XMLGeometryReader.cc | 5 +- 11 files changed, 113 insertions(+), 84 deletions(-) diff --git a/CondTools/Geometry/plugins/CSCRecoIdealDBLoader.cc b/CondTools/Geometry/plugins/CSCRecoIdealDBLoader.cc index ab0ee4eb17814..885ca3858378a 100644 --- a/CondTools/Geometry/plugins/CSCRecoIdealDBLoader.cc +++ b/CondTools/Geometry/plugins/CSCRecoIdealDBLoader.cc @@ -28,10 +28,16 @@ class CSCRecoIdealDBLoader : public edm::one::EDAnalyzer { private: bool fromDD4Hep_; + edm::ESGetToken dd4HepCompactViewToken_; + edm::ESGetToken compactViewToken_; + edm::ESGetToken muonGeomConstantsToken_; }; CSCRecoIdealDBLoader::CSCRecoIdealDBLoader(const edm::ParameterSet& iC) { fromDD4Hep_ = iC.getUntrackedParameter("fromDD4Hep", false); + dd4HepCompactViewToken_ = esConsumes(); + compactViewToken_ = esConsumes(); + muonGeomConstantsToken_ = esConsumes(); } void CSCRecoIdealDBLoader::beginRun(const edm::Run&, edm::EventSetup const& es) { @@ -45,19 +51,15 @@ void CSCRecoIdealDBLoader::beginRun(const edm::Run&, edm::EventSetup const& es) return; } - edm::ESHandle pMNDC; + auto pMNDC = es.getHandle(muonGeomConstantsToken_); CSCGeometryParsFromDD cscgp; if (fromDD4Hep_) { - edm::ESTransientHandle pDD; - es.get().get(pDD); - es.get().get(pMNDC); + auto pDD = es.getTransientHandle(dd4HepCompactViewToken_); const cms::DDCompactView& cpv = *pDD; cscgp.build(&cpv, *pMNDC, *rig, *rdp); } else { - edm::ESTransientHandle pDD; - es.get().get(pDD); - es.get().get(pMNDC); + auto pDD = es.getTransientHandle(compactViewToken_); const DDCompactView& cpv = *pDD; cscgp.build(&cpv, *pMNDC, *rig, *rdp); } diff --git a/CondTools/Geometry/plugins/DTRecoIdealDBLoader.cc b/CondTools/Geometry/plugins/DTRecoIdealDBLoader.cc index 1311f825cedde..c8f9dc2795fce 100644 --- a/CondTools/Geometry/plugins/DTRecoIdealDBLoader.cc +++ b/CondTools/Geometry/plugins/DTRecoIdealDBLoader.cc @@ -29,10 +29,16 @@ class DTRecoIdealDBLoader : public edm::one::EDAnalyzer { private: bool fromDD4Hep_; + edm::ESGetToken dd4HepCompactViewToken_; + edm::ESGetToken compactViewToken_; + edm::ESGetToken muonGeomConstantsToken_; }; DTRecoIdealDBLoader::DTRecoIdealDBLoader(const edm::ParameterSet& iC) { fromDD4Hep_ = iC.getUntrackedParameter("fromDD4Hep", false); + dd4HepCompactViewToken_ = esConsumes(); + compactViewToken_ = esConsumes(); + muonGeomConstantsToken_ = esConsumes(); } void DTRecoIdealDBLoader::beginRun(const edm::Run&, edm::EventSetup const& es) { @@ -43,19 +49,15 @@ void DTRecoIdealDBLoader::beginRun(const edm::Run&, edm::EventSetup const& es) { return; } - edm::ESHandle pMNDC; + auto pMNDC = es.getHandle(muonGeomConstantsToken_); DTGeometryParsFromDD dtgp; if (fromDD4Hep_) { - edm::ESTransientHandle pDD; - es.get().get(pDD); - es.get().get(pMNDC); + auto pDD = es.getTransientHandle(dd4HepCompactViewToken_); const cms::DDCompactView& cpv = *pDD; dtgp.build(&cpv, *pMNDC, *rig); } else { - edm::ESTransientHandle pDD; - es.get().get(pDD); - es.get().get(pMNDC); + auto pDD = es.getTransientHandle(compactViewToken_); const DDCompactView& cpv = *pDD; dtgp.build(&cpv, *pMNDC, *rig); } diff --git a/CondTools/Geometry/plugins/GEMRecoIdealDBLoader.cc b/CondTools/Geometry/plugins/GEMRecoIdealDBLoader.cc index 48fd98f03488b..7787aa61d5e33 100644 --- a/CondTools/Geometry/plugins/GEMRecoIdealDBLoader.cc +++ b/CondTools/Geometry/plugins/GEMRecoIdealDBLoader.cc @@ -30,10 +30,16 @@ class GEMRecoIdealDBLoader : public edm::one::EDAnalyzer { private: bool fromDD4Hep_; + edm::ESGetToken dd4HepCompactViewToken_; + edm::ESGetToken compactViewToken_; + edm::ESGetToken muonGeomConstantsToken_; }; GEMRecoIdealDBLoader::GEMRecoIdealDBLoader(const edm::ParameterSet& iC) { fromDD4Hep_ = iC.getUntrackedParameter("fromDD4Hep", false); // set true for DD4HEP + dd4HepCompactViewToken_ = esConsumes(); + compactViewToken_ = esConsumes(); + muonGeomConstantsToken_ = esConsumes(); } void GEMRecoIdealDBLoader::beginRun(const edm::Run&, edm::EventSetup const& es) { @@ -46,22 +52,19 @@ void GEMRecoIdealDBLoader::beginRun(const edm::Run&, edm::EventSetup const& es) } if (mydbservice->isNewTagRequest("GEMRecoGeometryRcd")) { - edm::ESHandle pMNDC; + auto pMNDC = es.getHandle(muonGeomConstantsToken_); + GEMGeometryParsFromDD rpcpd; RecoIdealGeometry* rig = new RecoIdealGeometry; if (fromDD4Hep_) { edm::LogVerbatim("GEMRecoIdealDBLoader") << "(0) GEMRecoIdealDBLoader - DD4HEP "; - edm::ESTransientHandle pDD; - es.get().get(pDD); - es.get().get(pMNDC); + auto pDD = es.getTransientHandle(dd4HepCompactViewToken_); const cms::DDCompactView& cpv = *pDD; rpcpd.build(&cpv, *pMNDC, *rig); } else { edm::LogVerbatim("GEMRecoIdealDBLoader") << "(0) GEMRecoIdealDBLoader - DDD "; - edm::ESTransientHandle pDD; - es.get().get(pDD); - es.get().get(pMNDC); + auto pDD = es.getTransientHandle(compactViewToken_); const DDCompactView& cpv = *pDD; rpcpd.build(&cpv, *pMNDC, *rig); } diff --git a/CondTools/Geometry/plugins/HcalParametersDBBuilder.cc b/CondTools/Geometry/plugins/HcalParametersDBBuilder.cc index bd49e5ac6aafb..1a21df2ad7a8f 100644 --- a/CondTools/Geometry/plugins/HcalParametersDBBuilder.cc +++ b/CondTools/Geometry/plugins/HcalParametersDBBuilder.cc @@ -26,6 +26,8 @@ class HcalParametersDBBuilder : public edm::one::EDAnalyzer private: bool fromDD4Hep_; + edm::ESGetToken dd4HepCompactViewToken_; + edm::ESGetToken compactViewToken_; }; HcalParametersDBBuilder::HcalParametersDBBuilder(const edm::ParameterSet& ps) @@ -34,6 +36,8 @@ HcalParametersDBBuilder::HcalParametersDBBuilder(const edm::ParameterSet& ps) edm::LogVerbatim("HCalGeom") << "HcalParametersDBBuilder::HcalParametersDBBuilder called with dd4hep: " << fromDD4Hep_; #endif + dd4HepCompactViewToken_ = esConsumes(); + compactViewToken_ = esConsumes(); } void HcalParametersDBBuilder::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { @@ -56,15 +60,13 @@ void HcalParametersDBBuilder::beginRun(const edm::Run&, edm::EventSetup const& e #ifdef EDM_ML_DEBUG edm::LogVerbatim("HCalGeom") << "HcalParametersDBBuilder::Try to access cms::DDCompactView"; #endif - edm::ESTransientHandle cpv; - es.get().get(cpv); + auto cpv = es.getTransientHandle(dd4HepCompactViewToken_); builder.build((*cpv), *php); } else { #ifdef EDM_ML_DEBUG edm::LogVerbatim("HCalGeom") << "HcalParametersDBBuilder::Try to access DDCompactView"; #endif - edm::ESTransientHandle cpv; - es.get().get(cpv); + auto cpv = es.getTransientHandle(compactViewToken_); builder.build(&(*cpv), *php); } diff --git a/CondTools/Geometry/plugins/ME0RecoIdealDBLoader.cc b/CondTools/Geometry/plugins/ME0RecoIdealDBLoader.cc index c28765de7483a..84e71da6d2888 100644 --- a/CondTools/Geometry/plugins/ME0RecoIdealDBLoader.cc +++ b/CondTools/Geometry/plugins/ME0RecoIdealDBLoader.cc @@ -28,10 +28,16 @@ class ME0RecoIdealDBLoader : public edm::one::EDAnalyzer { private: bool fromDD4Hep_; + edm::ESGetToken dd4HepCompactViewToken_; + edm::ESGetToken compactViewToken_; + edm::ESGetToken muonGeomConstantsToken_; }; ME0RecoIdealDBLoader::ME0RecoIdealDBLoader(const edm::ParameterSet& iC) { fromDD4Hep_ = iC.getUntrackedParameter("fromDD4Hep", false); // set true for DD4HEP + dd4HepCompactViewToken_ = esConsumes(); + compactViewToken_ = esConsumes(); + muonGeomConstantsToken_ = esConsumes(); } void ME0RecoIdealDBLoader::beginRun(const edm::Run&, edm::EventSetup const& es) { @@ -44,21 +50,17 @@ void ME0RecoIdealDBLoader::beginRun(const edm::Run&, edm::EventSetup const& es) } if (mydbservice->isNewTagRequest("ME0RecoGeometryRcd")) { - edm::ESHandle pMNDC; + auto pMNDC = es.getHandle(muonGeomConstantsToken_); ME0GeometryParsFromDD me0pd; RecoIdealGeometry* rig = new RecoIdealGeometry; if (fromDD4Hep_) { edm::LogVerbatim("ME0RecoIdealDBLoader") << "(0) ME0RecoIdealDBLoader - DD4HEP "; - edm::ESTransientHandle pDD; - es.get().get(pDD); - es.get().get(pMNDC); + auto pDD = es.getTransientHandle(dd4HepCompactViewToken_); const cms::DDCompactView& cpv = *pDD; me0pd.build(&cpv, *pMNDC, *rig); } else { edm::LogVerbatim("ME0RecoIdealDBLoader") << "(0) ME0RecoIdealDBLoader - DDD "; - edm::ESTransientHandle pDD; - es.get().get(pDD); - es.get().get(pMNDC); + auto pDD = es.getTransientHandle(compactViewToken_); const DDCompactView& cpv = *pDD; me0pd.build(&cpv, *pMNDC, *rig); } diff --git a/CondTools/Geometry/plugins/PCaloGeometryBuilder.cc b/CondTools/Geometry/plugins/PCaloGeometryBuilder.cc index 258b2d17fcc6a..a5542127e73c1 100644 --- a/CondTools/Geometry/plugins/PCaloGeometryBuilder.cc +++ b/CondTools/Geometry/plugins/PCaloGeometryBuilder.cc @@ -19,7 +19,17 @@ class PCaloGeometryBuilder : public edm::one::EDAnalyzer { PCaloGeometryBuilder(const edm::ParameterSet& pset) : m_ecalE(pset.getUntrackedParameter("EcalE", true)), m_ecalP(pset.getUntrackedParameter("EcalP", true)), - m_hgcal(pset.getUntrackedParameter("HGCal", false)) {} + m_hgcal(pset.getUntrackedParameter("HGCal", false)) { + const std::string toDB("_toDB"); + ebGeomToken_ = esConsumes(edm::ESInputTag(EcalBarrelGeometry::producerTag() + toDB)); + eeGeomToken_ = esConsumes(edm::ESInputTag(EcalEndcapGeometry::producerTag() + toDB)); + esGeomToken_ = esConsumes(edm::ESInputTag(EcalPreshowerGeometry::producerTag() + toDB)); + hgcalGeomToken_ = esConsumes(edm::ESInputTag(HGCalGeometry::producerTag() + toDB)); + hcalGeomToken_ = esConsumes(edm::ESInputTag(HcalGeometry::producerTag() + toDB)); + ctGeomToken_ = esConsumes(edm::ESInputTag(CaloTowerGeometry::producerTag() + toDB)); + zdcGeomToken_ = esConsumes(edm::ESInputTag(ZdcGeometry::producerTag() + toDB)); + castGeomToken_ = esConsumes(edm::ESInputTag(CastorGeometry::producerTag() + toDB)); + } void beginRun(edm::Run const& iEvent, edm::EventSetup const&) override; void analyze(edm::Event const& iEvent, edm::EventSetup const&) override {} @@ -29,48 +39,46 @@ class PCaloGeometryBuilder : public edm::one::EDAnalyzer { bool m_ecalE; bool m_ecalP; bool m_hgcal; + edm::ESGetToken ebGeomToken_; + edm::ESGetToken eeGeomToken_; + edm::ESGetToken esGeomToken_; + edm::ESGetToken hgcalGeomToken_; + edm::ESGetToken hcalGeomToken_; + edm::ESGetToken ctGeomToken_; + edm::ESGetToken zdcGeomToken_; + edm::ESGetToken castGeomToken_; }; void PCaloGeometryBuilder::beginRun(const edm::Run&, edm::EventSetup const& es) { - const std::string toDB("_toDB"); - - std::cout << "Writing out " << EcalBarrelGeometry::producerTag() << std::endl; - edm::ESHandle pGeb; - es.get().get(EcalBarrelGeometry::producerTag() + toDB, pGeb); - + edm::LogInfo("PCaloGeometryBuilder") << "Writing out " << EcalBarrelGeometry::producerTag() << std::endl; + auto pGeb = es.getHandle(ebGeomToken_); if (m_ecalE) { - std::cout << "Writing out " << EcalEndcapGeometry::producerTag() << std::endl; - edm::ESHandle pGee; - es.get().get(EcalEndcapGeometry::producerTag() + toDB, pGee); + edm::LogInfo("PCaloGeometryBuilder") << "Writing out " << EcalEndcapGeometry::producerTag() << std::endl; + auto pGeb = es.getHandle(eeGeomToken_); } if (m_ecalP) { - std::cout << "Writing out " << EcalPreshowerGeometry::producerTag() << std::endl; - edm::ESHandle pGes; - es.get().get(EcalPreshowerGeometry::producerTag() + toDB, pGes); + edm::LogInfo("PCaloGeometryBuilder") << "Writing out " << EcalPreshowerGeometry::producerTag() << std::endl; + auto pGes = es.getHandle(esGeomToken_); } if (m_hgcal) { - std::cout << "Writing out " << HGCalGeometry::producerTag() << std::endl; - edm::ESHandle pGee; - es.get().get(HGCalGeometry::producerTag() + toDB, pGee); + edm::LogInfo("PCaloGeometryBuilder") << "Writing out " << HGCalGeometry::producerTag() << std::endl; + auto pGhgcal = es.getHandle(hgcalGeomToken_); + ; } - std::cout << "Writing out " << HcalGeometry::producerTag() << std::endl; - edm::ESHandle pGhcal; - es.get().get(HcalGeometry::producerTag() + toDB, pGhcal); + edm::LogInfo("PCaloGeometryBuilder") << "Writing out " << HcalGeometry::producerTag() << std::endl; + auto pGhcal = es.getHandle(hcalGeomToken_); - std::cout << "Writing out " << CaloTowerGeometry::producerTag() << std::endl; - edm::ESHandle pGct; - es.get().get(CaloTowerGeometry::producerTag() + toDB, pGct); + edm::LogInfo("PCaloGeometryBuilder") << "Writing out " << CaloTowerGeometry::producerTag() << std::endl; + auto pGct = es.getHandle(ctGeomToken_); - std::cout << "Writing out " << ZdcGeometry::producerTag() << std::endl; - edm::ESHandle pGzdc; - es.get().get(ZdcGeometry::producerTag() + toDB, pGzdc); + edm::LogInfo("PCaloGeometryBuilder") << "Writing out " << ZdcGeometry::producerTag() << std::endl; + auto pGzdc = es.getHandle(zdcGeomToken_); - std::cout << "Writing out " << CastorGeometry::producerTag() << std::endl; - edm::ESHandle pGcast; - es.get().get(CastorGeometry::producerTag() + toDB, pGcast); + edm::LogInfo("PCaloGeometryBuilder") << "Writing out " << CastorGeometry::producerTag() << std::endl; + auto pGcast = es.getHandle(castGeomToken_); } DEFINE_FWK_MODULE(PCaloGeometryBuilder); diff --git a/CondTools/Geometry/plugins/PGeometricDetBuilder.cc b/CondTools/Geometry/plugins/PGeometricDetBuilder.cc index 2e9fae089ae4c..5b4ad5d8d4302 100644 --- a/CondTools/Geometry/plugins/PGeometricDetBuilder.cc +++ b/CondTools/Geometry/plugins/PGeometricDetBuilder.cc @@ -32,10 +32,16 @@ class PGeometricDetBuilder : public edm::one::EDAnalyzer { private: void putOne(const GeometricDet* gd, PGeometricDet* pgd, int lev); bool fromDD4hep_; + edm::ESGetToken dd4HepCompactViewToken_; + edm::ESGetToken compactViewToken_; + edm::ESGetToken geometricDetToken_; }; PGeometricDetBuilder::PGeometricDetBuilder(const edm::ParameterSet& iConfig) { fromDD4hep_ = iConfig.getParameter("fromDD4hep"); + dd4HepCompactViewToken_ = esConsumes(); + compactViewToken_ = esConsumes(); + geometricDetToken_ = esConsumes(); } void PGeometricDetBuilder::beginRun(const edm::Run&, edm::EventSetup const& es) { @@ -46,15 +52,11 @@ void PGeometricDetBuilder::beginRun(const edm::Run&, edm::EventSetup const& es) return; } if (!fromDD4hep_) { - edm::ESTransientHandle pDD; - es.get().get(pDD); + auto pDD = es.getTransientHandle(compactViewToken_); } else { - edm::ESTransientHandle pDD; - es.get().get(pDD); + auto pDD = es.getTransientHandle(dd4HepCompactViewToken_); } - edm::ESHandle rDD; - es.get().get(rDD); - const GeometricDet* tracker = &(*rDD); + const GeometricDet* tracker = &es.getData(geometricDetToken_); // so now I have the tracker itself. loop over all its components to store them. putOne(tracker, pgd, 0); diff --git a/CondTools/Geometry/plugins/PHGCalParametersDBBuilder.cc b/CondTools/Geometry/plugins/PHGCalParametersDBBuilder.cc index 6e70a64d40ed5..5468c050f6d70 100644 --- a/CondTools/Geometry/plugins/PHGCalParametersDBBuilder.cc +++ b/CondTools/Geometry/plugins/PHGCalParametersDBBuilder.cc @@ -31,6 +31,8 @@ class PHGCalParametersDBBuilder : public edm::one::EDAnalyzer dd4HepCompactViewToken_; + edm::ESGetToken compactViewToken_; }; PHGCalParametersDBBuilder::PHGCalParametersDBBuilder(const edm::ParameterSet& iC) { @@ -40,6 +42,9 @@ PHGCalParametersDBBuilder::PHGCalParametersDBBuilder(const edm::ParameterSet& iC namec_ = iC.getParameter("nameC"); namet_ = iC.getParameter("nameT"); fromDD4Hep_ = iC.getParameter("fromDD4Hep"); + dd4HepCompactViewToken_ = esConsumes(); + compactViewToken_ = esConsumes(); + #ifdef EDM_ML_DEBUG edm::LogVerbatim("HGCalGeom") << "HGCalParametersESModule for " << name_ << ":" << name2_ << ":" << namew_ << ":" << namec_ << ":" << namet_ << " and fromDD4Hep flag " << fromDD4Hep_; @@ -71,15 +76,13 @@ void PHGCalParametersDBBuilder::beginRun(const edm::Run&, edm::EventSetup const& #ifdef EDM_ML_DEBUG edm::LogVerbatim("HGCalGeom") << "PHGCalParametersDBBuilder::Try to access cm::DDCompactView"; #endif - edm::ESTransientHandle cpv; - es.get().get(cpv); + auto cpv = es.getTransientHandle(dd4HepCompactViewToken_); builder.build(cpv.product(), *ptp, name_, namew_, namec_, namet_, name2_); } else { #ifdef EDM_ML_DEBUG edm::LogVerbatim("HGCalGeom") << "PHGCalParametersDBBuilder::Try to access DDCompactView"; #endif - edm::ESTransientHandle cpv; - es.get().get(cpv); + auto cpv = es.getTransientHandle(compactViewToken_); builder.build(cpv.product(), *ptp, name_, namew_, namec_, namet_); } swapParameters(ptp, phgp); diff --git a/CondTools/Geometry/plugins/PTrackerParametersDBBuilder.cc b/CondTools/Geometry/plugins/PTrackerParametersDBBuilder.cc index 834408e29356c..7013331e71f41 100644 --- a/CondTools/Geometry/plugins/PTrackerParametersDBBuilder.cc +++ b/CondTools/Geometry/plugins/PTrackerParametersDBBuilder.cc @@ -20,10 +20,14 @@ class PTrackerParametersDBBuilder : public edm::one::EDAnalyzer dd4HepCompactViewToken_; + edm::ESGetToken compactViewToken_; }; PTrackerParametersDBBuilder::PTrackerParametersDBBuilder(const edm::ParameterSet& iConfig) { fromDD4hep_ = iConfig.getParameter("fromDD4hep"); + dd4HepCompactViewToken_ = esConsumes(); + compactViewToken_ = esConsumes(); } void PTrackerParametersDBBuilder::beginRun(const edm::Run&, edm::EventSetup const& es) { @@ -37,12 +41,10 @@ void PTrackerParametersDBBuilder::beginRun(const edm::Run&, edm::EventSetup cons TrackerParametersFromDD builder; if (!fromDD4hep_) { - edm::ESTransientHandle cpv; - es.get().get(cpv); + auto cpv = es.getTransientHandle(compactViewToken_); builder.build(&(*cpv), *ptp); } else { - edm::ESTransientHandle cpv; - es.get().get(cpv); + auto cpv = es.getTransientHandle(dd4HepCompactViewToken_); builder.build(&(*cpv), *ptp); } diff --git a/CondTools/Geometry/plugins/RPCRecoIdealDBLoader.cc b/CondTools/Geometry/plugins/RPCRecoIdealDBLoader.cc index 2c7fd91be2331..69332ef488c9e 100644 --- a/CondTools/Geometry/plugins/RPCRecoIdealDBLoader.cc +++ b/CondTools/Geometry/plugins/RPCRecoIdealDBLoader.cc @@ -28,10 +28,16 @@ class RPCRecoIdealDBLoader : public edm::one::EDAnalyzer { private: bool fromDD4Hep_; + edm::ESGetToken dd4HepCompactViewToken_; + edm::ESGetToken compactViewToken_; + edm::ESGetToken muonGeomConstantsToken_; }; RPCRecoIdealDBLoader::RPCRecoIdealDBLoader(const edm::ParameterSet& iC) { fromDD4Hep_ = iC.getUntrackedParameter("fromDD4Hep", false); + dd4HepCompactViewToken_ = esConsumes(); + compactViewToken_ = esConsumes(); + muonGeomConstantsToken_ = esConsumes(); } void RPCRecoIdealDBLoader::beginRun(const edm::Run&, edm::EventSetup const& es) { @@ -42,19 +48,15 @@ void RPCRecoIdealDBLoader::beginRun(const edm::Run&, edm::EventSetup const& es) return; } - edm::ESHandle pMNDC; + auto pMNDC = es.getHandle(muonGeomConstantsToken_); RPCGeometryParsFromDD rpcpd; if (fromDD4Hep_) { - edm::ESTransientHandle pDD; - es.get().get(pDD); - es.get().get(pMNDC); + auto pDD = es.getTransientHandle(dd4HepCompactViewToken_); const cms::DDCompactView& cpv = *pDD; rpcpd.build(&cpv, *pMNDC, *rig); } else { - edm::ESTransientHandle pDD; - es.get().get(pDD); - es.get().get(pMNDC); + auto pDD = es.getTransientHandle(compactViewToken_); const DDCompactView& cpv = *pDD; rpcpd.build(&cpv, *pMNDC, *rig); } diff --git a/CondTools/Geometry/plugins/XMLGeometryReader.cc b/CondTools/Geometry/plugins/XMLGeometryReader.cc index e1011abab24e7..ff6350373266d 100644 --- a/CondTools/Geometry/plugins/XMLGeometryReader.cc +++ b/CondTools/Geometry/plugins/XMLGeometryReader.cc @@ -25,18 +25,19 @@ class XMLGeometryReader : public edm::one::EDAnalyzer { private: std::string m_fname; std::string m_label; + edm::ESGetToken fileBlobToken_; }; XMLGeometryReader::XMLGeometryReader(const edm::ParameterSet& iConfig) { m_fname = iConfig.getUntrackedParameter("XMLFileName", "test.xml"); m_label = iConfig.getUntrackedParameter("geomLabel", "Extended"); + fileBlobToken_ = esConsumes(); } void XMLGeometryReader::beginRun(edm::Run const& run, edm::EventSetup const& iSetup) { edm::LogInfo("XMLGeometryReader") << "XMLGeometryReader::beginRun"; - edm::ESHandle geometry; - iSetup.get().get(m_label, geometry); + auto geometry = iSetup.getHandle(fileBlobToken_); std::unique_ptr > blob((*geometry).getUncompressedBlob()); std::string outfile1(m_fname);