Merge pull request #40541 from aandvalenzuela/l1-clang14

[L1][CLANG] Fix warnings reported by clang 14
cms-sw · Jan 17, 2023 · 0e11028 · 0e11028
2 parents 7833c90 + 1f03b5c
commit 0e11028
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/SimCalorimetry/HcalTrigPrimAlgos/src/HcalFinegrainBit.cc b/SimCalorimetry/HcalTrigPrimAlgos/src/HcalFinegrainBit.cc
@@ -11,7 +11,7 @@ std::bitset<2> HcalFinegrainBit::compute(const HcalFinegrainBit::Tower& tower) c
 
     // First layer consistent with a MIP, at least one layer with more
     // than MIP energy deposition
-    result[1] = result[0] & (tower[is_above_mip].count() > 0);
+    result[1] = result[0] && (tower[is_above_mip].count() > 0);
 
     // There layers consistent with a MIP
     //    result[2] = tower[is_mip].count() >= 3;

diff --git a/SimCalorimetry/HcalTrigPrimAlgos/src/HcalTriggerPrimitiveAlgo.cc b/SimCalorimetry/HcalTrigPrimAlgos/src/HcalTriggerPrimitiveAlgo.cc
@@ -479,8 +479,8 @@ void HcalTriggerPrimitiveAlgo::analyzeQIE11(IntegerCaloSamples& samples,
       int sampleTSminus1 = samples[ibin];
 
       if (fix_saturation_ && (sample_saturation.size() > ibin + 1))
-        check_sat = (sample_saturation[ibin + 1] | (sampleTS >= QIE11_MAX_LINEARIZATION_ET) | sample_saturation[ibin] |
-                     (sampleTSminus1 >= QIE11_MAX_LINEARIZATION_ET));
+        check_sat = (sample_saturation[ibin + 1] || (sampleTS >= QIE11_MAX_LINEARIZATION_ET) ||
+                     sample_saturation[ibin] || (sampleTSminus1 >= QIE11_MAX_LINEARIZATION_ET));
 
       if (sampleTS > QIE11_MAX_LINEARIZATION_ET)
         sampleTS = QIE11_MAX_LINEARIZATION_ET;