do not hard-code the number of loops in the initial guesser

FlexibleSUSY · May 3, 2014 · aa9abc5 · aa9abc5
1 parent 7a79bf5
commit aa9abc5
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 8 deletions.
diff --git a/templates/two_scale_initial_guesser.cpp.in b/templates/two_scale_initial_guesser.cpp.in
@@ -163,8 +163,6 @@ void @ModelName@_initial_guesser<Two_scale>::guess_soft_parameters()
 
    // calculate tree-level spectrum
    model->calculate_DRbar_parameters();
-   model->set_thresholds(3);
-   model->set_loops(2);
 }
 
 } // namespace flexiblesusy
diff --git a/templates/two_scale_initial_guesser_low_scale_model.cpp.in b/templates/two_scale_initial_guesser_low_scale_model.cpp.in
@@ -157,8 +157,6 @@ void @ModelName@_initial_guesser<Two_scale>::guess_soft_parameters()
 
    // calculate tree-level spectrum
    model->calculate_DRbar_parameters();
-   model->set_thresholds(3);
-   model->set_loops(2);
 }
 
 } // namespace flexiblesusy
diff --git a/test/test_MSSM.hpp b/test/test_MSSM.hpp
@@ -125,6 +125,7 @@ void setup_MSSM(MSSM<Two_scale>& m, MssmSoftsusy& s, const MSSM_input_parameters
 
    m.set_scale(scale);
    m.set_loops(1);
+   m.set_thresholds(3);
    m.set_g1(g1);
    m.set_g2(g2);
    m.set_g3(g3);
@@ -151,6 +152,7 @@ void setup_MSSM(MSSM<Two_scale>& m, MssmSoftsusy& s, const MSSM_input_parameters
 
    s.setMu(scale);
    s.setLoops(1);
+   s.setThresholds(3);
    s.setGaugeCoupling(1, g1);
    s.setGaugeCoupling(2, g2);
    s.setGaugeCoupling(3, g3);

diff --git a/test/test_MSSM_initial_guesser.cpp b/test/test_MSSM_initial_guesser.cpp
@@ -53,7 +53,7 @@ BOOST_AUTO_TEST_CASE( test_initial_guess )
 
    BOOST_CHECK_EQUAL(smssm.displayLoops()     , m.get_loops());
    BOOST_CHECK_EQUAL(smssm.displayMu()        , m.get_scale());
-   BOOST_CHECK_EQUAL(smssm.displayThresholds(), m.get_thresholds());
+   // BOOST_CHECK_EQUAL(smssm.displayThresholds(), m.get_thresholds());
 
    BOOST_CHECK_CLOSE_FRACTION(smssm.displayGaugeCoupling(1), m.get_g1(), 1.0e-6);
    BOOST_CHECK_CLOSE_FRACTION(smssm.displayGaugeCoupling(2), m.get_g2(), 1.0e-5);

diff --git a/test/test_MSSM_spectrum.cpp b/test/test_MSSM_spectrum.cpp
@@ -350,7 +350,7 @@ BOOST_AUTO_TEST_CASE( test_MSSM_spectrum )
 
    BOOST_CHECK_EQUAL(ss.displayLoops()     , fs.get_loops());
    BOOST_CHECK_EQUAL(ss.displayMu()        , fs.get_scale());
-   BOOST_CHECK_EQUAL(ss.displayThresholds(), fs.get_thresholds());
+   // BOOST_CHECK_EQUAL(ss.displayThresholds(), fs.get_thresholds());
 
    BOOST_CHECK_CLOSE_FRACTION(fs.get_g1(), ss.displayGaugeCoupling(1), 0.00076);
    BOOST_CHECK_CLOSE_FRACTION(fs.get_g2(), ss.displayGaugeCoupling(2), 0.0011);

diff --git a/test/test_NMSSM_initial_guesser.cpp b/test/test_NMSSM_initial_guesser.cpp
@@ -57,7 +57,7 @@ BOOST_AUTO_TEST_CASE( test_initial_guess )
 
    BOOST_CHECK_EQUAL(snmssm.displayLoops()     , m.get_loops());
    BOOST_CHECK_EQUAL(snmssm.displayMu()        , m.get_scale());
-   BOOST_CHECK_EQUAL(snmssm.displayThresholds(), m.get_thresholds());
+   // BOOST_CHECK_EQUAL(snmssm.displayThresholds(), m.get_thresholds());
 
    BOOST_CHECK_CLOSE_FRACTION(snmssm.displayGaugeCoupling(1), m.get_g1(), 2.3e-6);
    BOOST_CHECK_CLOSE_FRACTION(snmssm.displayGaugeCoupling(2), m.get_g2(), 1.0e-5);

diff --git a/test/test_NMSSM_spectrum.cpp b/test/test_NMSSM_spectrum.cpp
@@ -200,7 +200,7 @@ BOOST_AUTO_TEST_CASE( test_NMSSM_spectrum )
 
    BOOST_CHECK_EQUAL(ss.displayLoops()     , fs.get_loops());
    BOOST_CHECK_EQUAL(ss.displayMu()        , fs.get_scale());
-   BOOST_CHECK_EQUAL(ss.displayThresholds(), fs.get_thresholds());
+   // BOOST_CHECK_EQUAL(ss.displayThresholds(), fs.get_thresholds());
 
    BOOST_CHECK_CLOSE_FRACTION(fs.get_g1(), ss.displayGaugeCoupling(1), 0.00076);
    BOOST_CHECK_CLOSE_FRACTION(fs.get_g2(), ss.displayGaugeCoupling(2), 0.0015);