From 454f7739bc523d06abe98d07ab81c616a195e12b Mon Sep 17 00:00:00 2001
From: Mircho Rodozov <mrodozov@cern.ch>
Date: Fri, 17 Jul 2020 17:35:14 +0200
Subject: [PATCH 1/2] clang checks

---
 SimG4CMS/HGCalTestBeam/plugins/HGCPassive.cc      | 2 +-
 SimG4CMS/HGCalTestBeam/plugins/HGCalTBAnalyzer.cc | 2 +-
 SimG4CMS/HGCalTestBeam/src/AHCalGeometry.cc       | 6 +++++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/SimG4CMS/HGCalTestBeam/plugins/HGCPassive.cc b/SimG4CMS/HGCalTestBeam/plugins/HGCPassive.cc
index 86625085a6c5e..151bc145d3eab 100644
--- 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
index 6c367f117c965..308f61aa3b988 100644
--- 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
index 82408e50dc11d..e9dbf1ad5a867 100644
--- a/SimG4CMS/HGCalTestBeam/src/AHCalGeometry.cc
+++ b/SimG4CMS/HGCalTestBeam/src/AHCalGeometry.cc
@@ -1,7 +1,11 @@
+#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();

From b59c9cfe2f9b135b1681ab7976cf65fcdc907c4c Mon Sep 17 00:00:00 2001
From: Mircho Rodozov <mrodozov@cern.ch>
Date: Fri, 17 Jul 2020 17:46:03 +0200
Subject: [PATCH 2/2] clang format

---
 SimG4CMS/HGCalTestBeam/src/AHCalGeometry.cc | 2 --
 1 file changed, 2 deletions(-)

diff --git a/SimG4CMS/HGCalTestBeam/src/AHCalGeometry.cc b/SimG4CMS/HGCalTestBeam/src/AHCalGeometry.cc
index e9dbf1ad5a867..7a4b4e72d8e4f 100644
--- a/SimG4CMS/HGCalTestBeam/src/AHCalGeometry.cc
+++ b/SimG4CMS/HGCalTestBeam/src/AHCalGeometry.cc
@@ -1,7 +1,5 @@
 #include <memory>
 
-
-
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "SimG4CMS/HGCalTestBeam/interface/AHCalGeometry.h"