use max instead if infinity which hasundefined behavior

cms-sw · Jul 18, 2024 · a6977b4 · a6977b4
1 parent 6648f85
commit a6977b4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/DataFormats/EgammaReco/interface/ElectronSeed.h b/DataFormats/EgammaReco/interface/ElectronSeed.h
@@ -112,14 +112,14 @@ namespace reco {
 
     unsigned int hitsMask() const;
     void initTwoHitSeed(const unsigned char hitMask);
-    void setNegAttributes(const float dRZ2 = std::numeric_limits<float>::infinity(),
-                          const float dPhi2 = std::numeric_limits<float>::infinity(),
-                          const float dRZ1 = std::numeric_limits<float>::infinity(),
-                          const float dPhi1 = std::numeric_limits<float>::infinity());
-    void setPosAttributes(const float dRZ2 = std::numeric_limits<float>::infinity(),
-                          const float dPhi2 = std::numeric_limits<float>::infinity(),
-                          const float dRZ1 = std::numeric_limits<float>::infinity(),
-                          const float dPhi1 = std::numeric_limits<float>::infinity());
+    void setNegAttributes(const float dRZ2 = std::numeric_limits<float>::max(),
+                          const float dPhi2 = std::numeric_limits<float>::max(),
+                          const float dRZ1 = std::numeric_limits<float>::max(),
+                          const float dPhi1 = std::numeric_limits<float>::max());
+    void setPosAttributes(const float dRZ2 = std::numeric_limits<float>::max(),
+                          const float dPhi2 = std::numeric_limits<float>::max(),
+                          const float dRZ1 = std::numeric_limits<float>::max(),
+                          const float dPhi1 = std::numeric_limits<float>::max());
 
     //this is a backwards compatible function designed to
     //convert old format ElectronSeeds to the new format
@@ -140,7 +140,7 @@ namespace reco {
     static float bestVal(float val1, float val2) { return std::abs(val1) < std::abs(val2) ? val1 : val2; }
     template <typename T>
     T getVal(unsigned int hitNr, T PMVars::*val) const {
-      return hitNr < hitInfo_.size() ? hitInfo_[hitNr].*val : std::numeric_limits<T>::infinity();
+      return hitNr < hitInfo_.size() ? hitInfo_[hitNr].*val : std::numeric_limits<T>::max();
     }
     static std::vector<unsigned int> hitNrsFromMask(unsigned int hitMask);
 

diff --git a/DataFormats/Math/interface/approx_log.h b/DataFormats/Math/interface/approx_log.h
@@ -131,7 +131,7 @@ constexpr float approx_logf(float x) {
 
   //x = std::max(std::min(x,MAXNUMF),0.f);
   float res = unsafe_logf<DEGREE>(x);
-  res = (x < MAXNUMF) ? res : std::numeric_limits<float>::infinity();
+  res = (x < MAXNUMF) ? res : std::numeric_limits<float>::max();
   return (x > 0) ? res : std::numeric_limits<float>::quiet_NaN();
 }