Merge pull request #12088 from davidlt/HcalTimeSlew-delay-std-fmin

Use std::fmin instead of std::min in HcalTimeSlew::delay
cms-sw · Oct 30, 2015 · c728165 · c728165
2 parents 9f3fbc4 + bf26bcd
commit c728165
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/CalibCalorimetry/HcalAlgos/src/HcalTimeSlew.cc b/CalibCalorimetry/HcalAlgos/src/HcalTimeSlew.cc
@@ -20,10 +20,10 @@ double HcalTimeSlew::delay(double fC, ParaSource source, BiasSetting bias, doubl
     return HcalTimeSlew::delay(fC, bias);
   }
   else if (source==InputPars) {
-    return std::min(cap, par0 + par1*log(fC+par2));
+    return std::fmin(cap, par0 + par1*log(fC+par2));
   }
   else if (source==Data || source==MC){
-    return std::min(cap,tspar0[source-1]+tspar1[source-1]*log(fC+tspar2[source-1]));
+    return std::fmin(cap,tspar0[source-1]+tspar1[source-1]*log(fC+tspar2[source-1]));
   }
   return 0;
 }