Merge branch 'feature-2.0' into feature-2.0-HSSUSY-scale-variation

FlexibleSUSY · Sep 29, 2017 · 8e3d781 · 8e3d781
2 parents 6780a0a + d9d8354
commit 8e3d781
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/src/sm_twoloophiggs.cpp b/src/sm_twoloophiggs.cpp
@@ -19,7 +19,6 @@
 #include "sm_twoloophiggs.hpp"
 #include "wrappers.hpp"
 #include "pv.hpp"
-#include "logger.hpp"
 
 #include <cmath>
 
@@ -146,9 +145,9 @@ double self_energy_higgs_2loop_at_as_sm(
    const double lnt = std::log(t/q);
 
    const double result =
-      - (1./3.) * g32 * yt2 * (240*t + 37*s
-                               - 12*(12*t + 5*s) * lnt
-                               + 36*(12*t - s) * Sqr(lnt));
+      1./135. * g32 * yt2 * (-10800*t - 1665*p2 + (122*Sqr(p2))/t +
+                             540*(12*t + 5*p2) * lnt -
+                             1620*(12*t - p2) * Sqr(lnt));
 
    return result * twoLoop;
 }

diff --git a/src/wrappers.hpp b/src/wrappers.hpp
@@ -320,6 +320,17 @@ typename Eigen::MatrixBase<Derived>::PlainObject Diag(const Eigen::MatrixBase<De
    return diag;
 }
 
+inline std::complex<double> ComplexLog(double a) noexcept
+{
+   std::complex<double> z(a,0.);
+   return std::log(z);
+}
+
+inline std::complex<double> ComplexLog(const std::complex<double>& z) noexcept
+{
+   return std::log(z);
+}
+
 inline double FiniteLog(double a) noexcept
 {
    const double l = std::log(a);