From d4e610f4bbc54249e6f582ffd6c97600908329a8 Mon Sep 17 00:00:00 2001 From: Mircho Rodozov Date: Fri, 17 Jul 2020 17:35:11 +0200 Subject: [PATCH] clang checks --- DetectorDescription/Core/src/DDLogicalPart.cc | 2 +- .../OfflineDBLoader/plugins/OutputDDToDDL.cc | 2 +- .../Parser/src/DDLSAX2ConfigHandler.cc | 2 +- .../RegressionTest/src/DDCheckMaterials.cc | 2 +- Geometry/CaloGeometry/src/IdealZPrism.cc | 6 +++-- .../EcalMapping/src/ESElectronicsMapper.cc | 3 ++- .../plugins/DDTECModuleAlgo.cc | 2 +- .../src/TrackerGeometry.cc | 26 +++++++++---------- 8 files changed, 24 insertions(+), 21 deletions(-) diff --git a/DetectorDescription/Core/src/DDLogicalPart.cc b/DetectorDescription/Core/src/DDLogicalPart.cc index 58e1e3dbd4465..507bd20b4db41 100644 --- a/DetectorDescription/Core/src/DDLogicalPart.cc +++ b/DetectorDescription/Core/src/DDLogicalPart.cc @@ -204,7 +204,7 @@ bool DDLogicalPart::hasDDValue(const DDValue& v) const { return rep().hasDDValue namespace { struct Regex { explicit Regex(const std::string& s) : m_ok(false), me(s) { - size_t p = me.find("."); + size_t p = me.find('.'); m_ok = p != std::string::npos; if (m_ok) { if (p > 0) { diff --git a/DetectorDescription/OfflineDBLoader/plugins/OutputDDToDDL.cc b/DetectorDescription/OfflineDBLoader/plugins/OutputDDToDDL.cc index 822d4f6f7b200..79d78061489a8 100644 --- a/DetectorDescription/OfflineDBLoader/plugins/OutputDDToDDL.cc +++ b/DetectorDescription/OfflineDBLoader/plugins/OutputDDToDDL.cc @@ -176,7 +176,7 @@ void OutputDDToDDL::beginRun(const edm::Run&, edm::EventSetup const& es) { (*m_xos) << std::scientific << std::setprecision(18); (*m_xos) << "" << std::endl; - for (auto it : matStore) { + for (const auto& it : matStore) { if (!it.isDefined().second) continue; out.material(it, *m_xos); diff --git a/DetectorDescription/Parser/src/DDLSAX2ConfigHandler.cc b/DetectorDescription/Parser/src/DDLSAX2ConfigHandler.cc index fa9f45ecb2063..ac47f6052f527 100644 --- a/DetectorDescription/Parser/src/DDLSAX2ConfigHandler.cc +++ b/DetectorDescription/Parser/src/DDLSAX2ConfigHandler.cc @@ -43,7 +43,7 @@ void DDLSAX2ConfigHandler::startElement(const XMLCh* const uri, std::string fileName = toString(attrs.getValue(uStr("fileName").ptr())); std::string logicalPartName = toString(attrs.getValue(uStr("logicalPartName").ptr())); - fileName = fileName.substr(0, fileName.find(".")); + fileName = fileName.substr(0, fileName.find('.')); DDLogicalPart root(DDName(logicalPartName, fileName)); DDRootDef::instance().set(root); cpv_.setRoot(root); diff --git a/DetectorDescription/RegressionTest/src/DDCheckMaterials.cc b/DetectorDescription/RegressionTest/src/DDCheckMaterials.cc index 23241cf1fdcf9..50d3aed5a98c9 100644 --- a/DetectorDescription/RegressionTest/src/DDCheckMaterials.cc +++ b/DetectorDescription/RegressionTest/src/DDCheckMaterials.cc @@ -106,7 +106,7 @@ bool DDCheckMaterials(std::ostream& os, std::vector +#include + typedef IdealZPrism::CCGFloat CCGFloat; typedef IdealZPrism::Pt3D Pt3D; @@ -25,14 +27,14 @@ namespace { IdealZPrism::IdealZPrism(const IdealZPrism& idzp) : CaloCellGeometry(idzp) { if (idzp.forPF()) - m_geoForPF.reset(new IdealZPrism(*idzp.forPF())); + m_geoForPF = std::make_unique(*idzp.forPF()); } IdealZPrism& IdealZPrism::operator=(const IdealZPrism& idzp) { if (&idzp != this) { CaloCellGeometry::operator=(idzp); if (idzp.forPF()) - m_geoForPF.reset(new IdealZPrism(*idzp.forPF())); + m_geoForPF = std::make_unique(*idzp.forPF()); } return *this; } diff --git a/Geometry/EcalMapping/src/ESElectronicsMapper.cc b/Geometry/EcalMapping/src/ESElectronicsMapper.cc index 23e3e8d372f3d..f3dc9cc37a874 100644 --- a/Geometry/EcalMapping/src/ESElectronicsMapper.cc +++ b/Geometry/EcalMapping/src/ESElectronicsMapper.cc @@ -59,7 +59,8 @@ ESElectronicsMapper::ESElectronicsMapper(const edm::ParameterSet& ps) { for (int i = 0; i < 18; ++i) { // loop over EE feds std::vector esFeds; - for (int esFed = 0; esFed < nesfed[i]; esFed++) + esFeds.reserve(nesfed[i]); + for (int esFed = 0; esFed < nesfed[i]; esFed++) esFeds.emplace_back(esfed[i][esFed]); ee_es_map_.insert(make_pair(eefed[i], esFeds)); } diff --git a/Geometry/TrackerCommonData/plugins/DDTECModuleAlgo.cc b/Geometry/TrackerCommonData/plugins/DDTECModuleAlgo.cc index bb5eab60299d1..1dfb38b3204bd 100644 --- a/Geometry/TrackerCommonData/plugins/DDTECModuleAlgo.cc +++ b/Geometry/TrackerCommonData/plugins/DDTECModuleAlgo.cc @@ -343,7 +343,7 @@ void DDTECModuleAlgo::doPos(DDLogicalPart toPos, double x, double y, double z, s if (rotName == "NULL") rotName = standardRot; - doPos(move(toPos), parent(), copyNr, x, y, z, rotName, cpv); + doPos(toPos, parent(), copyNr, x, y, z, rotName, cpv); } void DDTECModuleAlgo::execute(DDCompactView& cpv) { diff --git a/Geometry/TrackerGeometryBuilder/src/TrackerGeometry.cc b/Geometry/TrackerGeometryBuilder/src/TrackerGeometry.cc index d0f1caa5ba2d9..1c6cc137d003f 100644 --- a/Geometry/TrackerGeometryBuilder/src/TrackerGeometry.cc +++ b/Geometry/TrackerGeometryBuilder/src/TrackerGeometry.cc @@ -226,7 +226,7 @@ bool TrackerGeometry::isThere(GeomDetEnumerators::SubDetector subdet) const { void TrackerGeometry::fillTestMap(const GeometricDet* gd) { const std::string& temp = gd->name(); - std::string name = temp.substr(temp.find(":") + 1); + std::string name = temp.substr(temp.find(':') + 1); DetId detid = gd->geographicalId(); float thickness = gd->bounds()->thickness(); std::string nameTag; @@ -292,7 +292,7 @@ TrackerGeometry::ModuleType TrackerGeometry::moduleType(const std::string& name) // TIB else if (name.find("TIB") != std::string::npos) { - if (name.find("0") != std::string::npos) + if (name.find('0') != std::string::npos) return ModuleType::IB1; else return ModuleType::IB2; @@ -300,7 +300,7 @@ TrackerGeometry::ModuleType TrackerGeometry::moduleType(const std::string& name) // TOB else if (name.find("TOB") != std::string::npos) { - if (name.find("0") != std::string::npos) + if (name.find('0') != std::string::npos) return ModuleType::OB1; else return ModuleType::OB2; @@ -308,29 +308,29 @@ TrackerGeometry::ModuleType TrackerGeometry::moduleType(const std::string& name) // TID else if (name.find("TID") != std::string::npos) { - if (name.find("0") != std::string::npos) + if (name.find('0') != std::string::npos) return ModuleType::W1A; - else if (name.find("1") != std::string::npos) + else if (name.find('1') != std::string::npos) return ModuleType::W2A; - else if (name.find("2") != std::string::npos) + else if (name.find('2') != std::string::npos) return ModuleType::W3A; } // TEC else if (name.find("TEC") != std::string::npos) { - if (name.find("0") != std::string::npos) + if (name.find('0') != std::string::npos) return ModuleType::W1B; - else if (name.find("1") != std::string::npos) + else if (name.find('1') != std::string::npos) return ModuleType::W2B; - else if (name.find("2") != std::string::npos) + else if (name.find('2') != std::string::npos) return ModuleType::W3B; - else if (name.find("3") != std::string::npos) + else if (name.find('3') != std::string::npos) return ModuleType::W4; - else if (name.find("4") != std::string::npos) + else if (name.find('4') != std::string::npos) return ModuleType::W5; - else if (name.find("5") != std::string::npos) + else if (name.find('5') != std::string::npos) return ModuleType::W6; - else if (name.find("6") != std::string::npos) + else if (name.find('6') != std::string::npos) return ModuleType::W7; }