Merge pull request #29594 from mrodozov/fix-llvm10-warns-calibration

[LLVM10] Calibration fix clang warnings
cms-sw · May 5, 2020 · b33c077 · b33c077
2 parents e6e9442 + adcb0a1
commit b33c077
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git 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
@@ -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
@@ -173,7 +173,7 @@ CTPPSPixelDAQMappingESSourceXML::CTPPSPixelDAQMappingESSourceXML(const edm::Para
       subSystemName(conf.getUntrackedParameter<string>("subSystem")),
       currentBlock(0),
       currentBlockValid(false) {
-  for (const auto it : conf.getParameter<vector<ParameterSet>>("configuration")) {
+  for (const auto &it : conf.getParameter<vector<ParameterSet>>("configuration")) {
     ConfigBlock b;
     b.validityRange = it.getParameter<EventRange>("validityRange");
     b.mappingFileNames = it.getParameter<vector<string>>("mappingFileNames");

diff --git a/CalibPPS/ESProducers/plugins/TotemDAQMappingESSourceXML.cc b/CalibPPS/ESProducers/plugins/TotemDAQMappingESSourceXML.cc
@@ -246,7 +246,7 @@ TotemDAQMappingESSourceXML::TotemDAQMappingESSourceXML(const edm::ParameterSet &
       subSystemName(conf.getUntrackedParameter<string>("subSystem")),
       currentBlock(0),
       currentBlockValid(false) {
-  for (const auto it : conf.getParameter<vector<ParameterSet>>("configuration")) {
+  for (const auto &it : conf.getParameter<vector<ParameterSet>>("configuration")) {
     ConfigBlock b;
     b.validityRange = it.getParameter<EventRange>("validityRange");
     b.mappingFileNames = it.getParameter<vector<string>>("mappingFileNames");

diff --git 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<std::string, LEAFTYPE> 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
@@ -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
@@ -453,7 +453,7 @@ void RecAnalyzerMinbias::analyze(const edm::Event& iEvent, const edm::EventSetup
     edm::Handle<QIE11DigiCollection> 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<QIE10DigiCollection> 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++)