Merge pull request #33374 from fabiocos/fc-mtdclangtidy

MTD geometry, digitization, reconstruction and validation: technical cleaning of code
cms-sw · Apr 12, 2021 · 10afb05 · 10afb05
2 parents f7a9a30 + 7a81e69
commit 10afb05
Show file tree

Hide file tree

Showing 59 changed files with 188 additions and 2,587 deletions.
diff --git a/Geometry/MTDCommonData/test/DD4hep_TestMTDIdealGeometry.cc b/Geometry/MTDCommonData/test/DD4hep_TestMTDIdealGeometry.cc
@@ -40,7 +40,7 @@ using namespace cms;
 class DD4hep_TestMTDIdealGeometry : public edm::one::EDAnalyzer<> {
 public:
   explicit DD4hep_TestMTDIdealGeometry(const edm::ParameterSet&);
-  ~DD4hep_TestMTDIdealGeometry() = default;
+  ~DD4hep_TestMTDIdealGeometry() override = default;
 
   void beginJob() override {}
   void analyze(edm::Event const&, edm::EventSetup const&) override;

diff --git a/Geometry/MTDCommonData/test/TestMTDIdealGeometry.cc b/Geometry/MTDCommonData/test/TestMTDIdealGeometry.cc
@@ -43,23 +43,25 @@ class TestMTDIdealGeometry : public edm::one::EDAnalyzer<> {
   void theBaseNumber(const DDGeoHistory& gh);
 
 private:
-  std::string label_;
   int nNodes_;
   std::string ddTopNodeName_;
   uint32_t theLayout_;
 
   MTDBaseNumber thisN_;
   BTLNumberingScheme btlNS_;
   ETLNumberingScheme etlNS_;
+
+  edm::ESGetToken<DDCompactView, IdealGeometryRecord> cpvToken_;
 };
 
 TestMTDIdealGeometry::TestMTDIdealGeometry(const edm::ParameterSet& iConfig)
-    : label_(iConfig.getUntrackedParameter<std::string>("label", "")),
-      ddTopNodeName_(iConfig.getUntrackedParameter<std::string>("ddTopNodeName", "BarrelTimingLayer")),
+    : ddTopNodeName_(iConfig.getUntrackedParameter<std::string>("ddTopNodeName", "BarrelTimingLayer")),
       theLayout_(iConfig.getUntrackedParameter<uint32_t>("theLayout", 1)),
       thisN_(),
       btlNS_(),
-      etlNS_() {}
+      etlNS_() {
+  cpvToken_ = esConsumes<DDCompactView, IdealGeometryRecord>();
+}
 
 TestMTDIdealGeometry::~TestMTDIdealGeometry() {}
 
@@ -74,8 +76,7 @@ void TestMTDIdealGeometry::analyze(const edm::Event& iEvent, const edm::EventSet
     return;
   }
 
-  edm::ESTransientHandle<DDCompactView> pDD;
-  iSetup.get<IdealGeometryRecord>().get(label_, pDD);
+  auto pDD = iSetup.getTransientHandle(cpvToken_);
 
   if (!pDD.isValid()) {
     edm::LogError("TestMTDIdealGeometry") << "ESTransientHandle<DDCompactView> pDD is not valid!";
@@ -145,9 +146,9 @@ void TestMTDIdealGeometry::analyze(const edm::Event& iEvent, const edm::EventSet
 
       bool isSens = false;
 
-      if (fv.geoHistory()[num - 1].logicalPart().specifics().size() > 0) {
+      if (!fv.geoHistory()[num - 1].logicalPart().specifics().empty()) {
         for (auto vec : fv.geoHistory()[num - 1].logicalPart().specifics()) {
-          for (auto elem : *vec) {
+          for (const auto& elem : *vec) {
             if (elem.second.name() == "SensitiveDetector") {
               isSens = true;
               break;

diff --git a/Geometry/MTDCommonData/test/testMTDinDDD.py b/Geometry/MTDCommonData/test/testMTDinDDD.py
@@ -64,13 +64,11 @@
 process.load('Configuration.Geometry.GeometryExtended2026D76_cff')
 
 process.testBTL = cms.EDAnalyzer("TestMTDIdealGeometry",
-                               label = cms.untracked.string(''),
                                ddTopNodeName = cms.untracked.string('BarrelTimingLayer'),
                                theLayout = cms.untracked.uint32(4)
                                )
 
 process.testETL = cms.EDAnalyzer("TestMTDIdealGeometry",
-                               label = cms.untracked.string(''),
                                ddTopNodeName = cms.untracked.string('EndcapTimingLayer'),
                                theLayout = cms.untracked.uint32(4)
                                )

diff --git a/Geometry/MTDGeometryBuilder/test/MTDDigiGeometryAnalyzer.cc b/Geometry/MTDGeometryBuilder/test/MTDDigiGeometryAnalyzer.cc
@@ -30,7 +30,7 @@
 
 class MTDDigiGeometryAnalyzer : public edm::one::EDAnalyzer<> {
 public:
-  explicit MTDDigiGeometryAnalyzer(const edm::ParameterSet&) {}
+  explicit MTDDigiGeometryAnalyzer(const edm::ParameterSet&);
   ~MTDDigiGeometryAnalyzer() override = default;
 
   void beginJob() override {}
@@ -42,17 +42,22 @@ class MTDDigiGeometryAnalyzer : public edm::one::EDAnalyzer<> {
   void checkRotation(const GeomDetUnit& det);
 
   std::stringstream sunitt;
+
+  edm::ESGetToken<MTDGeometry, MTDDigiGeometryRecord> mtdgeoToken_;
 };
 
 using cms_rounding::roundIfNear0, cms_rounding::roundVecIfNear0;
 
+MTDDigiGeometryAnalyzer::MTDDigiGeometryAnalyzer(const edm::ParameterSet& iConfig) {
+  mtdgeoToken_ = esConsumes<MTDGeometry, MTDDigiGeometryRecord>();
+}
+
 // ------------ method called to produce the data  ------------
 void MTDDigiGeometryAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
   //
   // get the MTDGeometry
   //
-  edm::ESHandle<MTDGeometry> pDD;
-  iSetup.get<MTDDigiGeometryRecord>().get(pDD);
+  auto pDD = iSetup.getTransientHandle(mtdgeoToken_);
   edm::LogInfo("MTDDigiGeometryAnalyzer")
       << "Geometry node for MTDGeom is  " << &(*pDD) << "\n"
       << " # detectors = " << pDD->detUnits().size() << "\n"

diff --git a/Geometry/MTDNumberingBuilder/src/CmsMTDStringToEnum.cc b/Geometry/MTDNumberingBuilder/src/CmsMTDStringToEnum.cc
@@ -18,7 +18,7 @@ CmsMTDStringToEnum::Impl::Impl() {
 GeometricTimingDet::GeometricTimingEnumType CmsMTDStringToEnum::type(std::string const& s) const {
   // remove namespace if present
   std::string_view v = s;
-  auto first = v.find_first_of(":");
+  auto first = v.find_first_of(':');
   v.remove_prefix(std::min(first + 1, v.size()));
   MapEnumType::const_iterator p = map().find({v.data(), v.size()});
   if (p != map().end())

diff --git a/Geometry/MTDNumberingBuilder/test/BuildFile.xml b/Geometry/MTDNumberingBuilder/test/BuildFile.xml
@@ -8,31 +8,4 @@
   <flags EDM_PLUGIN="1"/>
 </library>
 
-<library name="MTDTopologyAnalyzer" file="MTDTopologyAnalyzer.cc">
-  <use name="DataFormats/ForwardDetId"/>
-  <use name="DetectorDescription/Core"/>
-  <use name="FWCore/Framework"/>
-  <use name="FWCore/MessageLogger"/>
-  <use name="FWCore/ParameterSet"/>
-  <use name="Geometry/MTDCommonData"/>
-  <use name="Geometry/MTDNumberingBuilder"/>
-  <use name="Geometry/Records"/>
-  <use name="rootcling"/>
-  <flags EDM_PLUGIN="1"/>
-</library>
-
-<library name="DD4hep_MTDTopologyAnalyzer" file="DD4hep_MTDTopologyAnalyzer.cc">
-  <use name="DataFormats/ForwardDetId"/>
-  <use name="DetectorDescription/DDCMS"/>
-  <use name="FWCore/Framework"/>
-  <use name="FWCore/MessageLogger"/>
-  <use name="FWCore/ParameterSet"/>
-  <use name="Geometry/MTDCommonData"/>
-  <use name="Geometry/MTDNumberingBuilder"/>
-  <use name="Geometry/Records"/>
-  <use name="dd4hep"/>
-  <use name="rootcling"/>
-  <flags EDM_PLUGIN="1"/>
-</library>
-
 <test name="GeometryMTDNumberingBuilderTestDriver" command="runTest.sh"/>
diff --git a/Geometry/MTDNumberingBuilder/test/DD4hep_MTDTopologyAnalyzer.cc b/Geometry/MTDNumberingBuilder/test/DD4hep_MTDTopologyAnalyzer.cc