Merge remote-tracking branch 'origin/development' into feature-SplitMSSM

FlexibleSUSY · Sep 12, 2015 · 2acf439 · 2acf439
2 parents f9ceb96 + e64916b
commit 2acf439
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 0 deletions.
diff --git a/meta/FlexibleSUSY.m b/meta/FlexibleSUSY.m
@@ -59,6 +59,7 @@
 EDRbar;
 ThetaWDRbar;
 SCALE;
+THRESHOLD;
 UseHiggs2LoopNMSSM;
 EffectiveMu;
 EffectiveMASqr;

diff --git a/src/wrappers.hpp b/src/wrappers.hpp
@@ -479,6 +479,13 @@ std::string ToString(T a)
    return boost::lexical_cast<std::string>(a);
 }
 
+/// step function (0 for x < 0, 1 otherwise)
+template <typename T>
+unsigned UnitStep(T x)
+{
+   return x < T() ? 0 : 1;
+}
+
 inline double ZeroSqrt(double x)
 {
    return (x > 0.0 ? std::sqrt(x) : 0.0);

diff --git a/templates/two_scale_high_scale_constraint.cpp.in b/templates/two_scale_high_scale_constraint.cpp.in
@@ -46,6 +46,7 @@ namespace flexiblesusy {
 #define STANDARDDEVIATION(p) Electroweak_constants::Error_##p
 #define Pole(p) model->get_physical().p
 #define SCALE model->get_scale()
+#define THRESHOLD static_cast<int>(model->get_thresholds())
 #define MODEL model
 #define MODELCLASSNAME @ModelName@<Two_scale>
 

diff --git a/templates/two_scale_low_scale_constraint.cpp.in b/templates/two_scale_low_scale_constraint.cpp.in
@@ -50,6 +50,7 @@ namespace flexiblesusy {
 #define CKM ckm
 #define PMNS pmns
 #define THETAW theta_w
+#define THRESHOLD static_cast<int>(model->get_thresholds())
 #define ALPHA_EM_DRBAR alpha_em_drbar
 #define CALCULATE_DRBAR_MASSES() model->calculate_DRbar_masses()
 

diff --git a/templates/two_scale_susy_scale_constraint.cpp.in b/templates/two_scale_susy_scale_constraint.cpp.in
@@ -43,6 +43,7 @@ namespace flexiblesusy {
 #define STANDARDDEVIATION(p) Electroweak_constants::Error_##p
 #define Pole(p) model->get_physical().p
 #define SCALE model->get_scale()
+#define THRESHOLD static_cast<int>(model->get_thresholds())
 #define MODEL model
 #define MODELCLASSNAME @ModelName@<Two_scale>
 

diff --git a/test/test_wrappers.cpp b/test/test_wrappers.cpp
@@ -60,6 +60,17 @@ BOOST_AUTO_TEST_CASE( test_Delta )
    BOOST_CHECK_EQUAL(Delta(-2,0), 0);
 }
 
+BOOST_AUTO_TEST_CASE( test_UnitStep )
+{
+   BOOST_CHECK_EQUAL(UnitStep(-1  ), 0);
+   BOOST_CHECK_EQUAL(UnitStep(-2  ), 0);
+   BOOST_CHECK_EQUAL(UnitStep(-0.5), 0);
+   BOOST_CHECK_EQUAL(UnitStep(0   ), 1);
+   BOOST_CHECK_EQUAL(UnitStep(0.5 ), 1);
+   BOOST_CHECK_EQUAL(UnitStep(1   ), 1);
+   BOOST_CHECK_EQUAL(UnitStep(2   ), 1);
+}
+
 using namespace std;
 
 DoubleMatrix random_real_matrix(int n, int m)