From adcb0a1550dcc20f18b60e9da237b0fe5e1174e5 Mon Sep 17 00:00:00 2001 From: Mircho Rodozov Date: Wed, 29 Apr 2020 23:22:18 +0200 Subject: [PATCH] [LLVM10] Calibration fix clang warnings --- CalibCalorimetry/EcalTPGTools/plugins/EcalTPGParamBuilder.cc | 2 +- CalibFormats/SiStripObjects/src/SiStripModule.cc | 2 +- .../ESProducers/plugins/CTPPSPixelDAQMappingESSourceXML.cc | 2 +- CalibPPS/ESProducers/plugins/TotemDAQMappingESSourceXML.cc | 2 +- CalibTracker/SiStripCommon/plugins/ShallowTree.cc | 2 +- .../plugins/fake/SiStripBadModuleConfigurableFakeESSource.cc | 2 +- Calibration/HcalCalibAlgos/plugins/RecAnalyzerMinbias.cc | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CalibCalorimetry/EcalTPGTools/plugins/EcalTPGParamBuilder.cc b/CalibCalorimetry/EcalTPGTools/plugins/EcalTPGParamBuilder.cc index 8e429fa92b618..9409777c5a677 100644 --- a/CalibCalorimetry/EcalTPGTools/plugins/EcalTPGParamBuilder.cc +++ b/CalibCalorimetry/EcalTPGTools/plugins/EcalTPGParamBuilder.cc @@ -375,7 +375,7 @@ bool EcalTPGParamBuilder::checkIfOK(EcalPedestals::Item item) { int EcalTPGParamBuilder::getEtaSlice(int tccId, int towerInTCC) { int etaSlice = (towerInTCC - 1) / 4 + 1; // barrel - if (tccId > 36 || tccId < 73) + if (tccId > 36 && tccId < 73) return etaSlice; //endcap else { diff --git a/CalibFormats/SiStripObjects/src/SiStripModule.cc b/CalibFormats/SiStripObjects/src/SiStripModule.cc index 57148fa3b442e..c0456930e8ef8 100644 --- a/CalibFormats/SiStripObjects/src/SiStripModule.cc +++ b/CalibFormats/SiStripObjects/src/SiStripModule.cc @@ -155,7 +155,7 @@ void SiStripModule::addApv(const uint16_t &apv_address) { edm::LogWarning(mlCabling_) << "SiStripModule::" << __func__ << "]" << " Null APV I2C address!"; return; - } else if (apv_address < 32 && apv_address > 37) { + } else if (apv_address < 32 || apv_address > 37) { edm::LogWarning(mlCabling_) << "SiStripModule::" << __func__ << "]" << " Unexpected I2C address (" << apv_address << ") for APV!"; return; diff --git a/CalibPPS/ESProducers/plugins/CTPPSPixelDAQMappingESSourceXML.cc b/CalibPPS/ESProducers/plugins/CTPPSPixelDAQMappingESSourceXML.cc index cb0e75909333a..9693d79f6d9b4 100644 --- a/CalibPPS/ESProducers/plugins/CTPPSPixelDAQMappingESSourceXML.cc +++ b/CalibPPS/ESProducers/plugins/CTPPSPixelDAQMappingESSourceXML.cc @@ -173,7 +173,7 @@ CTPPSPixelDAQMappingESSourceXML::CTPPSPixelDAQMappingESSourceXML(const edm::Para subSystemName(conf.getUntrackedParameter("subSystem")), currentBlock(0), currentBlockValid(false) { - for (const auto it : conf.getParameter>("configuration")) { + for (const auto &it : conf.getParameter>("configuration")) { ConfigBlock b; b.validityRange = it.getParameter("validityRange"); b.mappingFileNames = it.getParameter>("mappingFileNames"); diff --git a/CalibPPS/ESProducers/plugins/TotemDAQMappingESSourceXML.cc b/CalibPPS/ESProducers/plugins/TotemDAQMappingESSourceXML.cc index 34cb19316f68d..c71512755b9a9 100644 --- a/CalibPPS/ESProducers/plugins/TotemDAQMappingESSourceXML.cc +++ b/CalibPPS/ESProducers/plugins/TotemDAQMappingESSourceXML.cc @@ -246,7 +246,7 @@ TotemDAQMappingESSourceXML::TotemDAQMappingESSourceXML(const edm::ParameterSet & subSystemName(conf.getUntrackedParameter("subSystem")), currentBlock(0), currentBlockValid(false) { - for (const auto it : conf.getParameter>("configuration")) { + for (const auto &it : conf.getParameter>("configuration")) { ConfigBlock b; b.validityRange = it.getParameter("validityRange"); b.mappingFileNames = it.getParameter>("mappingFileNames"); diff --git a/CalibTracker/SiStripCommon/plugins/ShallowTree.cc b/CalibTracker/SiStripCommon/plugins/ShallowTree.cc index 949fd699e31b0..fcee1c2586df1 100644 --- a/CalibTracker/SiStripCommon/plugins/ShallowTree.cc +++ b/CalibTracker/SiStripCommon/plugins/ShallowTree.cc @@ -150,7 +150,7 @@ ShallowTree::ShallowTree(const edm::ParameterSet& iConfig) { default: { std::string leafstring = ""; typedef std::pair pair_t; - for (const pair_t& leaf : leafmap) { + for (const pair_t leaf : leafmap) { leafstring += "\t" + leaf.first + "\n"; } diff --git a/CalibTracker/SiStripESProducers/plugins/fake/SiStripBadModuleConfigurableFakeESSource.cc b/CalibTracker/SiStripESProducers/plugins/fake/SiStripBadModuleConfigurableFakeESSource.cc index 0ca8e2c568ed2..a086a58997147 100644 --- a/CalibTracker/SiStripESProducers/plugins/fake/SiStripBadModuleConfigurableFakeESSource.cc +++ b/CalibTracker/SiStripESProducers/plugins/fake/SiStripBadModuleConfigurableFakeESSource.cc @@ -121,7 +121,7 @@ SiStripBadModuleConfigurableFakeESSource::ReturnType SiStripBadModuleConfigurabl << "[produce] number of selected dets to be removed " << selAPVs.size() << std::endl; std::stringstream ss; - for (const auto selId : selAPVs) { + for (const auto& selId : selAPVs) { SiStripQuality::InputVector theSiStripVector; auto the_detid = selId.first; diff --git a/Calibration/HcalCalibAlgos/plugins/RecAnalyzerMinbias.cc b/Calibration/HcalCalibAlgos/plugins/RecAnalyzerMinbias.cc index 15cc3a52e96fa..605185c6a535a 100644 --- a/Calibration/HcalCalibAlgos/plugins/RecAnalyzerMinbias.cc +++ b/Calibration/HcalCalibAlgos/plugins/RecAnalyzerMinbias.cc @@ -453,7 +453,7 @@ void RecAnalyzerMinbias::analyze(const edm::Event& iEvent, const edm::EventSetup edm::Handle qie11digi; iEvent.getByToken(tok_qie11digi_, qie11digi); if (qie11digi.isValid()) { - for (QIE11DataFrame const& digi : *(qie11digi.product())) { + for (QIE11DataFrame const digi : *(qie11digi.product())) { double amplitudefullTSs = 0.; if (HcalDetId(digi.id()).subdet() == HcalBarrel) { for (int i = 0; i < digi.samples(); i++) @@ -490,7 +490,7 @@ void RecAnalyzerMinbias::analyze(const edm::Event& iEvent, const edm::EventSetup edm::Handle qie10digi; iEvent.getByToken(tok_qie10digi_, qie10digi); if (qie10digi.isValid()) { - for (QIE10DataFrame const& digi : *(qie10digi.product())) { + for (QIE10DataFrame const digi : *(qie10digi.product())) { double amplitudefullTSs = 0.; if (HcalDetId(digi.id()).subdet() == HcalForward) { for (int i = 0; i < digi.samples(); i++)