Merge pull request #30808 from cms-sw/apply-new-ct-checks-for-simulat…

…ion-upgrade [Clang tidy] Apply checks for simulation-upgrade
cms-sw · Jul 22, 2020 · da9c976 · da9c976
2 parents e61db3c + b59c9cf
commit da9c976
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/SimG4CMS/HGCalTestBeam/plugins/HGCPassive.cc b/SimG4CMS/HGCalTestBeam/plugins/HGCPassive.cc
@@ -28,7 +28,7 @@ HGCPassive::HGCPassive(const edm::ParameterSet& p) : topPV_(nullptr), topLV_(nul
   edm::LogVerbatim("HGCSim") << "Name of the mother volume " << motherName_;
   unsigned k(0);
 #endif
-  for (auto name : LVNames_) {
+  for (const auto& name : LVNames_) {
     produces<edm::PassiveHitContainer>(Form("%sPassiveHits", name.c_str()));
 #ifdef EDM_ML_DEBUG
     edm::LogVerbatim("HGCSim") << "Collection name[" << k << "] " << name;

diff --git a/SimG4CMS/HGCalTestBeam/plugins/HGCalTBAnalyzer.cc b/SimG4CMS/HGCalTestBeam/plugins/HGCalTBAnalyzer.cc
@@ -166,7 +166,7 @@ HGCalTBAnalyzer::HGCalTBAnalyzer(const edm::ParameterSet& iConfig)
       stoc_smear_time_200_(iConfig.getUntrackedParameter<double>("stoc_smear_time_200", 10.24)),
       stoc_smear_time_300_(iConfig.getUntrackedParameter<double>("stoc_smear_time_300", 15.5)) {
   usesResource("TFileService");
-  ahcalGeom_.reset(new AHCalGeometry(iConfig));
+  ahcalGeom_ = std::make_unique<AHCalGeometry>(iConfig);
 
   // now do whatever initialization is needed
   ///TIME SMEARING

diff --git a/SimG4CMS/HGCalTestBeam/src/AHCalGeometry.cc b/SimG4CMS/HGCalTestBeam/src/AHCalGeometry.cc
@@ -1,7 +1,9 @@
+#include <memory>
+
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "SimG4CMS/HGCalTestBeam/interface/AHCalGeometry.h"
 
-AHCalGeometry::AHCalGeometry(edm::ParameterSet const& iC) { ahcal_.reset(new AHCalParameters(iC)); }
+AHCalGeometry::AHCalGeometry(edm::ParameterSet const& iC) { ahcal_ = std::make_unique<AHCalParameters>(iC); }
 
 std::pair<double, double> AHCalGeometry::getXY(const AHCalDetId& id) const {
   int row = id.irow();