Merge branch 'development' of https://github.com/FlexibleSUSY/Flexibl…

…eSUSY into development
FlexibleSUSY · Oct 23, 2014 · 7c2502b · 7c2502b
2 parents 6065348 + 9de6336
commit 7c2502b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/doc/flexiblesusy-paper.tex b/doc/flexiblesusy-paper.tex
@@ -3056,6 +3056,11 @@ \section{Speed test SLHA input file}
     4   2                    # pole mass loop order
     5   2                    # EWSB loop order
     6   2                    # beta-functions loop order
+    7   1                    # threshold corrections loop order
+    8   1                    # Higgs 2-loop corrections O(alpha_t alpha_s)
+    9   1                    # Higgs 2-loop corrections O(alpha_b alpha_s)
+   10   1                    # Higgs 2-loop corrections O(alpha_t^2 + alpha_t alpha_b + alpha_b^2)
+   11   1                    # Higgs 2-loop corrections O(alpha_tau^2)
 Block SPhenoInput            # SPheno specific input
     1  -1                    # error level
     2   1                    # SPA conventions

diff --git a/examples/tower/MSSMD5O_MSSMRHN_two_scale_matching.cpp b/examples/tower/MSSMD5O_MSSMRHN_two_scale_matching.cpp
@@ -59,10 +59,6 @@ struct CompareSpectrum {
     const Eigen::Array3d& s;
 };
 
-struct ReciprocalOp {
-    double operator() (const double& x) const { return 1 / x; }
-};
-
 }
 
 void MSSMD5O_MSSMRHN_matching<Two_scale>::invert_seesaw_formula
@@ -78,8 +74,7 @@ void MSSMD5O_MSSMRHN_matching<Two_scale>::invert_seesaw_formula
 	      CompareSpectrum(vSpectrum));
     uh.transpose() *= p.inverse();
     Eigen::Matrix3d UPMNS = uh.adjoint().real();
-    Eigen::Vector3d YvDiagInv;
-    YvDiagInv = YvDiag.unaryExpr(ReciprocalOp());
+    Eigen::Vector3d YvDiagInv = 1 / YvDiag.array();
     Eigen::Matrix3d YvInv = UPMNS * YvDiagInv.asDiagonal();
 
     Mv = (YvInv.transpose() * WOp * YvInv).inverse();