put (N)MSSM 2-loop functions into a separate namespace

FlexibleSUSY · Aug 11, 2016 · 53c868e · 53c868e
1 parent 37873a7
commit 53c868e
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 1 deletion.
diff --git a/meta/SelfEnergies.m b/meta/SelfEnergies.m
@@ -548,6 +548,8 @@
            m3Str   = CConversion`RValueToCFormString[FlexibleSUSY`M[SARAH`Gluino]];
            mA0Str  = TreeMasses`CallPseudoscalarHiggsMassGetterFunction[] <> "(0)";
 "\
+using namespace flexiblesusy::mssm_twoloophiggs;
+
 // calculate 3rd generation sfermion masses and mixing angles
 double mst_1, mst_2, theta_t;
 double msb_1, msb_2, theta_b;
@@ -636,6 +638,9 @@
            mA0Str  = CConversion`RValueToCFormString[Parameters`GetEffectiveMASqr[]];
            svevStr = CConversion`RValueToCFormString[Parameters`GetParameterFromDescription["Singlet-VEV"]];
 "\
+using namespace flexiblesusy::mssm_twoloophiggs;
+using namespace flexiblesusy::nmssm_twoloophiggs;
+
 // calculate 3rd generation sfermion masses and mixing angles
 double mst_1, mst_2, theta_t;
 double msb_1, msb_2, theta_b;
@@ -812,6 +817,8 @@
            m3Str   = CConversion`RValueToCFormString[FlexibleSUSY`M[SARAH`Gluino]];
            mA0Str  = TreeMasses`CallPseudoscalarHiggsMassGetterFunction[] <> "(0)";
 "\
+using namespace flexiblesusy::mssm_twoloophiggs;
+
 // calculate 3rd generation sfermion masses and mixing angles
 double mst_1, mst_2, theta_t;
 double msb_1, msb_2, theta_b;
@@ -896,6 +903,8 @@
            m3Str   = CConversion`RValueToCFormString[FlexibleSUSY`M[SARAH`Gluino]];
            mA0Str  = TreeMasses`CallPseudoscalarHiggsMassGetterFunction[] <> "(0)";
 "\
+using namespace flexiblesusy::mssm_twoloophiggs;
+
 // calculate 3rd generation sfermion masses and mixing angles
 double mst_1, mst_2, theta_t;
 double msb_1, msb_2, theta_b;
@@ -983,6 +992,9 @@
            vsStr   = CConversion`RValueToCFormString[Parameters`GetParameterFromDescription["Singlet-VEV"]];
            lambdaStr = CConversion`RValueToCFormString[Parameters`GetParameterFromDescription["Singlet-Higgs-Interaction"]];
 "\
+using namespace flexiblesusy::mssm_twoloophiggs;
+using namespace flexiblesusy::nmssm_twoloophiggs;
+
 // calculate 3rd generation sfermion masses and mixing angles
 double mst_1, mst_2, theta_t;
 double msb_1, msb_2, theta_b;
@@ -1081,6 +1093,9 @@
            vsStr   = CConversion`RValueToCFormString[Parameters`GetParameterFromDescription["Singlet-VEV"]];
            lambdaStr = CConversion`RValueToCFormString[Parameters`GetParameterFromDescription["Singlet-Higgs-Interaction"]];
 "\
+using namespace flexiblesusy::mssm_twoloophiggs;
+using namespace flexiblesusy::nmssm_twoloophiggs;
+
 // calculate 3rd generation sfermion masses and mixing angles
 double mst_1, mst_2, theta_t;
 double msb_1, msb_2, theta_b;

diff --git a/src/mssm_twoloophiggs.cpp b/src/mssm_twoloophiggs.cpp
@@ -30,6 +30,7 @@
 #endif
 
 namespace flexiblesusy {
+namespace mssm_twoloophiggs {
 
 static std::mutex mtx_mssm; /// locks MSSM fortran functions
 
@@ -437,4 +438,5 @@ Eigen::Matrix<double, 2, 2> self_energy_pseudoscalar_2loop_atau_atau_mssm(
    return subtract_mssm_tadpoles_pseudoscalar(se, tadpoles, tanb);
 }
 
+} // namespace mssm_twoloophiggs
 } // namespace flexiblesusy
diff --git a/src/mssm_twoloophiggs.hpp b/src/mssm_twoloophiggs.hpp
@@ -22,6 +22,7 @@
 #include <Eigen/Core>
 
 namespace flexiblesusy {
+namespace mssm_twoloophiggs {
 
 // tadpoles
 
@@ -136,6 +137,7 @@ double self_energy_pseudoscalar_2loop_atau_atau_mssm_with_tadpoles(
    double mstau2sq, double sintau, double costau, double scalesq,
    double amu, double tanb, double vev2);
 
+} // namespace mssm_twoloophiggs
 } // namespace flexiblesusy
 
 #endif
diff --git a/src/nmssm_twoloophiggs.cpp b/src/nmssm_twoloophiggs.cpp
@@ -29,7 +29,10 @@
    #define LOCK_MUTEX()
 #endif
 
+using namespace flexiblesusy::mssm_twoloophiggs;
+
 namespace flexiblesusy {
+namespace nmssm_twoloophiggs {
 
 static std::mutex mtx_nmssm; /// locks MSSM fortran functions
 
@@ -246,4 +249,5 @@ Eigen::Matrix<double, 3, 3> self_energy_pseudoscalar_2loop_ab_as_nmssm_with_tadp
    return -result;
 }
 
+} // namespace nmssm_twoloophiggs
 } // namespace flexiblesusy
diff --git a/src/nmssm_twoloophiggs.hpp b/src/nmssm_twoloophiggs.hpp
@@ -22,6 +22,7 @@
 #include <Eigen/Core>
 
 namespace flexiblesusy {
+namespace nmssm_twoloophiggs {
 
 Eigen::Matrix<double, 3, 1> tadpole_higgs_2loop_at_as_nmssm(
    double rmtsq, double mg, double mst1sq, double mst2sq,
@@ -73,6 +74,7 @@ Eigen::Matrix<double, 3, 3> self_energy_pseudoscalar_2loop_ab_as_nmssm_with_tadp
    double sxb, double cxb, double scalesq, double cotb, double vevS,
    double lamS, double svevS, double as);
 
-}
+} // namespace nmssm_twoloophiggs
+} // namespace flexiblesusy
 
 #endif