Merge branch 'development' into feature-SMtower

FlexibleSUSY · Aug 31, 2016 · b3932a7 · b3932a7
2 parents f5bb011 + 57a4ffd
commit b3932a7
Show file tree

Hide file tree

Showing 5 changed files with 85 additions and 38 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,7 +6,6 @@
 *.x
 
 config/config.h
-config/f++
 config/version
 config/git_commit
 config/required_sarah_version.m

diff --git a/ChangeLog b/ChangeLog
@@ -27,6 +27,9 @@ Flexiblesusy-1.7.0 [not released yet]
 
    Please refer to the README file for more information.
 
+ * Bugfix (commit 3126ac1): Catch NaNs from inside the MSSM 2L Higgs
+   mass routines of Pietro Slavich.
+
 Flexiblesusy-1.6.1 [August, 28 2016]
 
  * Bugfix (commit db67c81): Fix compilation with --disable-threads .

diff --git a/meta/SelfEnergies.m b/meta/SelfEnergies.m
@@ -613,9 +613,6 @@
 tadpole_2l(0) *= " <> CConversion`ToValidCSymbolString[SARAH`VEVSM1] <> ";
 tadpole_2l(1) *= " <> CConversion`ToValidCSymbolString[SARAH`VEVSM2] <> ";
 
-if (!IsFinite(tadpole_2l))
-   tadpole_2l.setZero();
-
 return tadpole_2l;"
           ];
 
@@ -708,9 +705,6 @@
 tadpole_2l(1) *= " <> CConversion`ToValidCSymbolString[SARAH`VEVSM2] <> ";
 tadpole_2l(2) *= " <>  svevStr <> ";
 
-if (!IsFinite(tadpole_2l))
-   tadpole_2l.setZero();
-
 return tadpole_2l;"
           ];
 

diff --git a/src/mssm_twoloophiggs.cpp b/src/mssm_twoloophiggs.cpp
@@ -42,10 +42,15 @@ Eigen::Matrix<double, 2, 1> tadpole_higgs_2loop_at_as_mssm(
 {
    Eigen::Matrix<double, 2, 1> result;
 
-   LOCK_MUTEX();
+   {
+      LOCK_MUTEX();
 
-   ewsb2loop_(&mt2, &mg, &mst12, &mst22, &sxt, &cxt, &scale2,
-              &mu, &tanb, &vev2, &gs, &result(0), &result(1));
+      ewsb2loop_(&mt2, &mg, &mst12, &mst22, &sxt, &cxt, &scale2,
+                 &mu, &tanb, &vev2, &gs, &result(0), &result(1));
+   }
+
+   if (!result.allFinite())
+      result.setZero();
 
    return -result;
 }
@@ -58,11 +63,16 @@ Eigen::Matrix<double, 2, 1> tadpole_higgs_2loop_at_at_mssm(
 {
    Eigen::Matrix<double, 2, 1> result;
 
-   LOCK_MUTEX();
+   {
+      LOCK_MUTEX();
+
+      ddstad_(&mt2, &rmbsq, &mA2, &mst12, &mst22, &msb12, &msb22,
+              &sxt, &cxt, &sxb, &cxb, &scale2, &mu, &tanb, &vev2,
+              &result(0), &result(1));
+   }
 
-   ddstad_(&mt2, &rmbsq, &mA2, &mst12, &mst22, &msb12, &msb22,
-           &sxt, &cxt, &sxb, &cxb, &scale2, &mu, &tanb, &vev2,
-           &result(0), &result(1));
+   if (!result.allFinite())
+      result.setZero();
 
    return -result;
 }
@@ -88,10 +98,15 @@ Eigen::Matrix<double, 2, 1> tadpole_higgs_2loop_atau_atau_mssm(
 {
    Eigen::Matrix<double, 2, 1> result;
 
-   LOCK_MUTEX();
+   {
+      LOCK_MUTEX();
+
+      tausqtad_(&mtau2, &mA2, &msv2, &mstau12, &mstau22, &sintau,
+                &costau, &scale2, &mu, &tanb, &vev2, &result(0), &result(1));
+   }
 
-   tausqtad_(&mtau2, &mA2, &msv2, &mstau12, &mstau22, &sintau,
-             &costau, &scale2, &mu, &tanb, &vev2, &result(0), &result(1));
+   if (!result.allFinite())
+      result.setZero();
 
    return -result;
 }
@@ -103,14 +118,19 @@ Eigen::Matrix<double, 2, 2> self_energy_higgs_2loop_at_as_mssm_with_tadpoles(
 {
    Eigen::Matrix<double, 2, 2> result;
 
-   LOCK_MUTEX();
+   {
+      LOCK_MUTEX();
 
-   dszhiggs_(&mt2, &mg, &mst12, &mst22, &sxt, &cxt, &scale2, &mu,
-             &tanb, &vev2, &gs, &scheme,
-             &result(0,0), &result(1,1), &result(0,1));
+      dszhiggs_(&mt2, &mg, &mst12, &mst22, &sxt, &cxt, &scale2, &mu,
+                &tanb, &vev2, &gs, &scheme,
+                &result(0,0), &result(1,1), &result(0,1));
+   }
 
    result(1,0) = result(0,1);
 
+   if (!result.allFinite())
+      result.setZero();
+
    return -result;
 }
 
@@ -122,14 +142,19 @@ Eigen::Matrix<double, 2, 2> self_energy_higgs_2loop_at_at_mssm_with_tadpoles(
 {
    Eigen::Matrix<double, 2, 2> result;
 
-   LOCK_MUTEX();
+   {
+      LOCK_MUTEX();
 
-   ddshiggs_(&mt2, &rmbsq, &mA2, &mst12, &mst22, &msb12, &msb22,
-             &sxt, &cxt, &sxb, &cxb, &scale2, &mu, &tanb, &vev2,
-             &result(0,0), &result(0,1), &result(1,1));
+      ddshiggs_(&mt2, &rmbsq, &mA2, &mst12, &mst22, &msb12, &msb22,
+                &sxt, &cxt, &sxb, &cxb, &scale2, &mu, &tanb, &vev2,
+                &result(0,0), &result(0,1), &result(1,1));
+   }
 
    result(1,0) = result(0,1);
 
+   if (!result.allFinite())
+      result.setZero();
+
    return -result;
 }
 
@@ -154,14 +179,19 @@ Eigen::Matrix<double, 2, 2> self_energy_higgs_2loop_atau_atau_mssm_with_tadpoles
 {
    Eigen::Matrix<double, 2, 2> result;
 
-   LOCK_MUTEX();
+   {
+      LOCK_MUTEX();
 
-   tausqhiggs_(&mtau2, &mA2, &msv2, &mstau12, &mstau22, &sintau,
-               &costau, &scale2, &mu, &tanb, &vev2, &scheme,
-               &result(0,0), &result(1,1), &result(0,1));
+      tausqhiggs_(&mtau2, &mA2, &msv2, &mstau12, &mstau22, &sintau,
+                  &costau, &scale2, &mu, &tanb, &vev2, &scheme,
+                  &result(0,0), &result(1,1), &result(0,1));
+   }
 
    result(1,0) = result(0,1);
 
+   if (!result.allFinite())
+      result.setZero();
+
    return -result;
 }
 
@@ -172,10 +202,15 @@ double self_energy_pseudoscalar_2loop_at_as_mssm_with_tadpoles(
 {
    double result;
 
-   LOCK_MUTEX();
+   {
+      LOCK_MUTEX();
+
+      dszodd_(&mt2, &mg, &mst12, &mst22, &sxt, &cxt, &scale2, &mu,
+              &tanb, &vev2, &gs, &result);
+   }
 
-   dszodd_(&mt2, &mg, &mst12, &mst22, &sxt, &cxt, &scale2, &mu,
-           &tanb, &vev2, &gs, &result);
+   if (!std::isfinite(result))
+      result = 0.;
 
    return -result;
 }
@@ -188,10 +223,15 @@ double self_energy_pseudoscalar_2loop_at_at_mssm_with_tadpoles(
 {
    double result;
 
-   LOCK_MUTEX();
+   {
+      LOCK_MUTEX();
 
-   ddsodd_(&mt2, &rmbsq, &mA2, &mst12, &mst22, &msb12, &msb22,
-           &sxt, &cxt, &sxb, &cxb, &scale2, &mu, &tanb, &vev2, &result);
+      ddsodd_(&mt2, &rmbsq, &mA2, &mst12, &mst22, &msb12, &msb22,
+              &sxt, &cxt, &sxb, &cxb, &scale2, &mu, &tanb, &vev2, &result);
+   }
+
+   if (!std::isfinite(result))
+      result = 0.;
 
    return -result;
 }
@@ -213,10 +253,15 @@ double self_energy_pseudoscalar_2loop_atau_atau_mssm_with_tadpoles(
 {
    double result;
 
-   LOCK_MUTEX();
+   {
+      LOCK_MUTEX();
+
+      tausqodd_(&mtau2, &mA2, &msv2, &mstau12, &mstau22, &sintau,
+                &costau, &scale2, &mu, &tanb, &vev2, &result);
+   }
 
-   tausqodd_(&mtau2, &mA2, &msv2, &mstau12, &mstau22, &sintau,
-             &costau, &scale2, &mu, &tanb, &vev2, &result);
+   if (!std::isfinite(result))
+      result = 0.;
 
    return -result;
 }

diff --git a/src/nmssm_twoloophiggs.cpp b/src/nmssm_twoloophiggs.cpp
@@ -174,6 +174,9 @@ Eigen::Matrix<double, 3, 3> self_energy_higgs_2loop_at_as_nmssm_with_tadpoles(
              DMS[1][0], DMS[1][1], DMS[1][2],
              DMS[2][0], DMS[2][1], DMS[2][2];
 
+   if (!result.allFinite())
+      result.setZero();
+
    return -result;
 }
 
@@ -216,6 +219,9 @@ Eigen::Matrix<double, 3, 3> self_energy_pseudoscalar_2loop_at_as_nmssm_with_tadp
              DMP[1][0], DMP[1][1], DMP[1][2],
              DMP[2][0], DMP[2][1], DMP[2][2];
 
+   if (!result.allFinite())
+      result.setZero();
+
    return -result;
 }