Merge pull request cms-sw#34242 from bsunanda/Run3-gex80A

cmsbuild · web-flow · commit 17ae8dec0dff · 2021-06-25T09:34:51.000+02:00
Run3-gex80A Use ESGetToken in codes of Geometry/Calo... analyzers
diff --git a/Geometry/CaloEventSetup/plugins/CaloGeometryBuilder.cc b/Geometry/CaloEventSetup/plugins/CaloGeometryBuilder.cc
@@ -92,8 +92,6 @@ CaloGeometryBuilder::CaloGeometryBuilder(const edm::ParameterSet& iConfig) {
 // ------------ method called to produce the data  ------------
 
 CaloGeometryBuilder::ReturnType CaloGeometryBuilder::produceAligned(const CaloGeometryRecord& iRecord) {
-  edm::ESHandle<CaloSubdetectorGeometry> pG;
-
   ReturnType pCalo = std::make_unique<CaloGeometry>();
 
   // look for HCAL parts
diff --git a/Geometry/CaloEventSetup/plugins/CaloGeometryBuilder.h b/Geometry/CaloEventSetup/plugins/CaloGeometryBuilder.h
@@ -22,7 +22,6 @@
 // user include files
 #include "FWCore/Framework/interface/ESProducer.h"
 
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/ESGetToken.h"
 #include "Geometry/Records/interface/IdealGeometryRecord.h"
diff --git a/Geometry/CaloGeometry/doc/CaloGeometry.doc b/Geometry/CaloGeometry/doc/CaloGeometry.doc
@@ -29,15 +29,22 @@
 #include "Geometry/CaloGeometry/interface/CaloGeometry.h"
 #include "Geometry/CaloGeometry/interface/CaloCellGeometry.h"
 #include "Geometry/Records/interface/IdealGeometryRecord.h"
-#include "FWCore/Framework/interface/ESHandle.h"
+
+...
+
+private:
+  const edm::ESGetToken<CaloGeometry, CaloGeometryRecord> tokGeom_;
+
+...
+
+...(const edm::ParameterSet&)
+  : tokGeom_{esConsumes<CaloGeometry, CaloGeometryRecord>()},
 
 ...
 
 void ...(edm::Event& e, const edm::EventSetup& es) {
-  edm::ESHandle<CaloGeometry> pGeo;
-  c.get<IdealGeometryRecord>().get(pGeo);
   
-  const CaloGeometry* geom=pGeo.product();
+  const CaloGeometry* geom=es.getData(tokGeom_);
 @endcode 
 
 
@@ -46,10 +53,12 @@ void ...(edm::Event& e, const edm::EventSetup& es) {
  - CaloGeometry
  - CaloSubdetectorGeometry
  - CaloCellGeometry
+   - FlatHexagon
+   - FlatTrd
    - IdealObliquePrism
    - IdealZPrism
-   - TruncatedPyramid
    - PreshowerStrip
+   - TruncatedPyramid
 
 
 
diff --git a/Geometry/CaloTopology/interface/EcalEndcapTopology.h b/Geometry/CaloTopology/interface/EcalEndcapTopology.h
@@ -5,7 +5,6 @@
 #include "Geometry/CaloTopology/interface/CaloSubdetectorTopology.h"
 #include "Geometry/CaloGeometry/interface/CaloGeometry.h"
 #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include <utility>
 #include <vector>
 #include <iostream>
diff --git a/Geometry/CaloTopology/interface/EcalPreshowerTopology.h b/Geometry/CaloTopology/interface/EcalPreshowerTopology.h
@@ -4,7 +4,6 @@
 #include "DataFormats/EcalDetId/interface/ESDetId.h"
 #include "Geometry/CaloTopology/interface/CaloSubdetectorTopology.h"
 #include "Geometry/CaloGeometry/interface/CaloGeometry.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include <utility>
 #include <vector>
 #include <iostream>
diff --git a/Geometry/CaloTopology/test/CaloTowerMapTester.cc b/Geometry/CaloTopology/test/CaloTowerMapTester.cc
@@ -6,7 +6,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 "FWCore/ParameterSet/interface/ParameterSet.h"
@@ -39,9 +38,13 @@ class CaloTowerMapTester : public edm::one::EDAnalyzer<edm::one::WatchRuns> {
 
 private:
   // ----------member data ---------------------------
+  const edm::ESGetToken<CaloGeometry, CaloGeometryRecord> tokGeom_;
+  const edm::ESGetToken<CaloTowerConstituentsMap, CaloGeometryRecord> tokMap_;
 };
 
-CaloTowerMapTester::CaloTowerMapTester(const edm::ParameterSet&) {}
+CaloTowerMapTester::CaloTowerMapTester(const edm::ParameterSet&)
+    : tokGeom_{esConsumes<CaloGeometry, CaloGeometryRecord>(edm::ESInputTag{})},
+      tokMap_{esConsumes<CaloTowerConstituentsMap, CaloGeometryRecord>(edm::ESInputTag{})} {}
 
 void CaloTowerMapTester::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
   edm::ParameterSetDescription desc;
@@ -50,35 +53,30 @@ void CaloTowerMapTester::fillDescriptions(edm::ConfigurationDescriptions& descri
 }
 
 void CaloTowerMapTester::analyze(edm::Event const&, edm::EventSetup const& iSetup) {
-  edm::ESHandle<CaloGeometry> pG;
-  iSetup.get<CaloGeometryRecord>().get(pG);
-  edm::ESHandle<CaloTowerConstituentsMap> ct;
-  iSetup.get<CaloGeometryRecord>().get(ct);
-  if (pG.isValid() && ct.isValid())
-    doTest(pG.product(), ct.product());
-  else
-    std::cout << "CaloGeometry in EventSetup " << pG.isValid() << " and CaloTowerConstituentsMap " << ct.isValid()
-              << std::endl;
+  const CaloGeometry* geo = &iSetup.getData(tokGeom_);
+  const CaloTowerConstituentsMap* ctmap = &iSetup.getData(tokMap_);
+  doTest(geo, ctmap);
 }
 
 void CaloTowerMapTester::doTest(const CaloGeometry* geo, const CaloTowerConstituentsMap* ctmap) {
-  HcalGeometry* hgeo = (HcalGeometry*)(geo->getSubdetectorGeometry(DetId::Hcal, HcalBarrel));
+  const HcalGeometry* hgeo = static_cast<const HcalGeometry*>(geo->getSubdetectorGeometry(DetId::Hcal, HcalBarrel));
   const std::vector<DetId>& dets = hgeo->getValidDetIds(DetId::Hcal, 0);
 
   for (const auto& id : dets) {
     CaloTowerDetId tower = ctmap->towerOf(id);
     std::vector<DetId> ids = ctmap->constituentsOf(tower);
-    std::cout << HcalDetId(id) << " belongs to " << tower << " which has " << ids.size() << " constituents\n";
+    std::cout << static_cast<HcalDetId>(id) << " belongs to " << tower << " which has " << ids.size()
+              << " constituents\n";
     for (unsigned int i = 0; i < ids.size(); ++i) {
       std::cout << "[" << i << "] " << std::hex << ids[i].rawId() << std::dec;
       if (ids[i].det() == DetId::Ecal && ids[i].subdetId() == EcalBarrel) {
-        std::cout << " " << EBDetId(ids[i]) << std::endl;
+        std::cout << " " << static_cast<EBDetId>(ids[i]) << std::endl;
       } else if (ids[i].det() == DetId::Ecal && ids[i].subdetId() == EcalEndcap) {
-        std::cout << " " << EEDetId(ids[i]) << std::endl;
+        std::cout << " " << static_cast<EEDetId>(ids[i]) << std::endl;
       } else if (ids[i].det() == DetId::Ecal && ids[i].subdetId() == EcalPreshower) {
-        std::cout << " " << ESDetId(ids[i]) << std::endl;
+        std::cout << " " << static_cast<ESDetId>(ids[i]) << std::endl;
       } else if (ids[i].det() == DetId::Hcal) {
-        std::cout << " " << HcalDetId(ids[i]) << std::endl;
+        std::cout << " " << static_cast<HcalDetId>(ids[i]) << std::endl;
       } else {
         std::cout << std::endl;
       }
diff --git a/Geometry/CaloTopology/test/CaloTowerTopologyTester.cc b/Geometry/CaloTopology/test/CaloTowerTopologyTester.cc
@@ -7,7 +7,6 @@
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/ESTransientHandle.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
@@ -34,9 +33,11 @@ class CaloTowerTopologyTester : public edm::one::EDAnalyzer<edm::one::WatchRuns>
   void doTest(const CaloTowerTopology& topology);
 
   // ----------member data ---------------------------
+  const edm::ESGetToken<CaloTowerTopology, HcalRecNumberingRecord> tokTopo_;
 };
 
-CaloTowerTopologyTester::CaloTowerTopologyTester(const edm::ParameterSet&) {}
+CaloTowerTopologyTester::CaloTowerTopologyTester(const edm::ParameterSet&)
+    : tokTopo_{esConsumes<CaloTowerTopology, HcalRecNumberingRecord>(edm::ESInputTag{})} {}
 
 void CaloTowerTopologyTester::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
   edm::ParameterSetDescription desc;
@@ -45,12 +46,7 @@ void CaloTowerTopologyTester::fillDescriptions(edm::ConfigurationDescriptions& d
 }
 
 void CaloTowerTopologyTester::analyze(edm::Event const&, edm::EventSetup const& iSetup) {
-  edm::ESHandle<CaloTowerTopology> topo;
-  iSetup.get<HcalRecNumberingRecord>().get(topo);
-  if (topo.isValid())
-    doTest(*topo);
-  else
-    std::cout << "Cannot get a valid CaloTowerTopology Object\n";
+  doTest(iSetup.getData(tokTopo_));
 }
 
 void CaloTowerTopologyTester::doTest(const CaloTowerTopology& topology) {
@@ -65,19 +61,19 @@ void CaloTowerTopologyTester::doTest(const CaloTowerTopology& topology) {
         std::cout << "Neighbours for : Tower " << id << std::endl;
         std::cout << "          " << idE.size() << " sets along East:";
         for (auto& i : idE)
-          std::cout << " " << (CaloTowerDetId)(i());
+          std::cout << " " << static_cast<CaloTowerDetId>(i());
         std::cout << std::endl;
         std::cout << "          " << idW.size() << " sets along West:";
         for (auto& i : idW)
-          std::cout << " " << (CaloTowerDetId)(i());
+          std::cout << " " << static_cast<CaloTowerDetId>(i());
         std::cout << std::endl;
         std::cout << "          " << idN.size() << " sets along North:";
         for (auto& i : idN)
-          std::cout << " " << (CaloTowerDetId)(i());
+          std::cout << " " << static_cast<CaloTowerDetId>(i());
         std::cout << std::endl;
         std::cout << "          " << idS.size() << " sets along South:";
         for (auto& i : idS)
-          std::cout << " " << (CaloTowerDetId)(i());
+          std::cout << " " << static_cast<CaloTowerDetId>(i());
         std::cout << std::endl;
       }
     }
diff --git a/Geometry/CaloTopology/test/FastTimeTopologyTester.cc b/Geometry/CaloTopology/test/FastTimeTopologyTester.cc
@@ -7,7 +7,6 @@
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/ESTransientHandle.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
@@ -32,9 +31,11 @@ class FastTimeTopologyTester : public edm::one::EDAnalyzer<edm::one::WatchRuns>
   void doTest(const FastTimeTopology& topology);
 
   // ----------member data ---------------------------
+  const edm::ESGetToken<FastTimeTopology, IdealGeometryRecord> tokTopo_;
 };
 
-FastTimeTopologyTester::FastTimeTopologyTester(const edm::ParameterSet&) {}
+FastTimeTopologyTester::FastTimeTopologyTester(const edm::ParameterSet&)
+    : tokTopo_{esConsumes<FastTimeTopology, IdealGeometryRecord>(edm::ESInputTag{"", "FastTimeBarrel"})} {}
 
 void FastTimeTopologyTester::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
   edm::ParameterSetDescription desc;
@@ -43,12 +44,7 @@ void FastTimeTopologyTester::fillDescriptions(edm::ConfigurationDescriptions& de
 }
 
 void FastTimeTopologyTester::analyze(edm::Event const&, edm::EventSetup const& iSetup) {
-  edm::ESHandle<FastTimeTopology> topo;
-  iSetup.get<IdealGeometryRecord>().get("FastTimeBarrel", topo);
-  if (topo.isValid())
-    doTest(*topo);
-  else
-    std::cout << "Cannot get a valid FastTimeTopology Object for FastTimeBarrel\n";
+  doTest(iSetup.getData(tokTopo_));
 }
 
 void FastTimeTopologyTester::doTest(const FastTimeTopology& topology) {
@@ -65,19 +61,19 @@ void FastTimeTopologyTester::doTest(const FastTimeTopology& topology) {
           std::vector<DetId> idS = topology.south(id);
           std::cout << "          " << idE.size() << " sets along East:";
           for (auto& i : idE)
-            std::cout << " " << (FastTimeDetId)(i());
+            std::cout << " " << static_cast<FastTimeDetId>(i());
           std::cout << std::endl;
           std::cout << "          " << idW.size() << " sets along West:";
           for (auto& i : idW)
-            std::cout << " " << (FastTimeDetId)(i());
+            std::cout << " " << static_cast<FastTimeDetId>(i());
           std::cout << std::endl;
           std::cout << "          " << idN.size() << " sets along North:";
           for (auto& i : idN)
-            std::cout << " " << (FastTimeDetId)(i());
+            std::cout << " " << static_cast<FastTimeDetId>(i());
           std::cout << std::endl;
           std::cout << "          " << idS.size() << " sets along South:";
           for (auto& i : idS)
-            std::cout << " " << (FastTimeDetId)(i());
+            std::cout << " " << static_cast<FastTimeDetId>(i());
           std::cout << std::endl;
         }
         phi += 10;
diff --git a/Geometry/CaloTopology/test/HGCalTopologyTester.cc b/Geometry/CaloTopology/test/HGCalTopologyTester.cc
@@ -7,7 +7,6 @@
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/ESTransientHandle.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
@@ -35,6 +34,7 @@ class HGCalTopologyTester : public edm::one::EDAnalyzer<edm::one::WatchRuns> {
   // ----------member data ---------------------------
   const std::string detectorName_;
   const std::vector<int> type_, layer_, sec1_, sec2_, cell1_, cell2_;
+  const edm::ESGetToken<HGCalTopology, IdealGeometryRecord> tokTopo_;
 };
 
 HGCalTopologyTester::HGCalTopologyTester(const edm::ParameterSet& iC)
@@ -44,7 +44,8 @@ HGCalTopologyTester::HGCalTopologyTester(const edm::ParameterSet& iC)
       sec1_(iC.getParameter<std::vector<int> >("sector1")),
       sec2_(iC.getParameter<std::vector<int> >("sector2")),
       cell1_(iC.getParameter<std::vector<int> >("cell1")),
-      cell2_(iC.getParameter<std::vector<int> >("cell2")) {}
+      cell2_(iC.getParameter<std::vector<int> >("cell2")),
+      tokTopo_{esConsumes<HGCalTopology, IdealGeometryRecord>(edm::ESInputTag{"", detectorName_})} {}
 
 void HGCalTopologyTester::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
   edm::ParameterSetDescription desc;
@@ -65,12 +66,7 @@ void HGCalTopologyTester::fillDescriptions(edm::ConfigurationDescriptions& descr
 }
 
 void HGCalTopologyTester::analyze(edm::Event const&, edm::EventSetup const& iSetup) {
-  edm::ESHandle<HGCalTopology> topo;
-  iSetup.get<IdealGeometryRecord>().get(detectorName_, topo);
-  if (topo.isValid())
-    doTest(*topo);
-  else
-    std::cout << "Cannot get a valid Topology Object for " << detectorName_;
+  doTest(iSetup.getData(tokTopo_));
 }
 
 void HGCalTopologyTester::doTest(const HGCalTopology& topology) {
diff --git a/Geometry/CaloTopology/test/HcalDetId2DenseTester.cc b/Geometry/CaloTopology/test/HcalDetId2DenseTester.cc
@@ -8,7 +8,6 @@
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/ESTransientHandle.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
@@ -42,11 +41,13 @@ class HcalDetId2DenseTester : public edm::one::EDAnalyzer<edm::one::WatchRuns> {
   // ----------member data ---------------------------
   const std::string fileName_;
   const bool testCalib_;
+  const edm::ESGetToken<HcalTopology, HcalRecNumberingRecord> tokTopo_;
 };
 
 HcalDetId2DenseTester::HcalDetId2DenseTester(const edm::ParameterSet& iC)
     : fileName_(iC.getUntrackedParameter<std::string>("fileName", "")),
-      testCalib_(iC.getUntrackedParameter<bool>("testCalib", false)) {}
+      testCalib_(iC.getUntrackedParameter<bool>("testCalib", false)),
+      tokTopo_{esConsumes<HcalTopology, HcalRecNumberingRecord>(edm::ESInputTag{})} {}
 
 void HcalDetId2DenseTester::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
   edm::ParameterSetDescription desc;
@@ -56,18 +57,13 @@ void HcalDetId2DenseTester::fillDescriptions(edm::ConfigurationDescriptions& des
 }
 
 void HcalDetId2DenseTester::analyze(edm::Event const&, edm::EventSetup const& iSetup) {
-  edm::ESHandle<HcalTopology> topo;
-  iSetup.get<HcalRecNumberingRecord>().get(topo);
-  if (topo.isValid()) {
-    if (!testCalib_) {
-      doTestFile(*topo);
-      doTestHcalDetId(*topo);
-      doTestHcalCalibDetId(*topo);
-    } else {
-      doTestOnlyHcalCalibDetId(*topo);
-    }
+  const auto& topo = iSetup.getData(tokTopo_);
+  if (!testCalib_) {
+    doTestFile(topo);
+    doTestHcalDetId(topo);
+    doTestHcalCalibDetId(topo);
   } else {
-    std::cout << "Cannot get a valid HcalTopology Object\n";
+    doTestOnlyHcalCalibDetId(topo);
   }
 }
 
diff --git a/Geometry/CaloTopology/test/HcalTopologyTester.cc b/Geometry/CaloTopology/test/HcalTopologyTester.cc
