Merge branch 'feature-SMtower' into feature-SMtower-2L

FlexibleSUSY · Sep 4, 2016 · 84d9668 · 84d9668
2 parents 9fa4b0a + cfe86f8
commit 84d9668
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/configure b/configure
@@ -199,7 +199,10 @@ tsil_inc_dir=""
 ALGORITHMS="two_scale"
 available_algorithms="two_scale lattice"
 # models that will be compiled
+MODELS="all"
+# BEGIN: NOT EXPORTED ##########################################
 MODELS=""
+# END:   NOT EXPORTED ##########################################
 # addons that will be compiled
 ADDONS=""
 

diff --git a/model_files/E6SSMtower/LesHouches.in.E6SSMtower b/model_files/E6SSMtower/LesHouches.in.E6SSMtower
@@ -5,8 +5,8 @@ Block FlexibleSUSY
     1   0                    # max. iterations (0 = automatic)
     2   0                    # algorithm (0 = two_scale, 1 = lattice)
     3   1                    # calculate SM pole masses
-    4   2                    # pole mass loop order
-    5   2                    # EWSB loop order
+    4   1                    # pole mass loop order
+    5   1                    # EWSB loop order
     6   3                    # beta-functions loop order
     7   2                    # threshold corrections loop order
     8   0                    # Higgs 2-loop corrections O(alpha_t alpha_s)

diff --git a/model_files/MRSSMtower/LesHouches.in.MRSSMtower b/model_files/MRSSMtower/LesHouches.in.MRSSMtower
@@ -5,8 +5,8 @@ Block FlexibleSUSY
     1   0                    # max. iterations (0 = automatic)
     2   0                    # algorithm (0 = two_scale, 1 = lattice)
     3   0                    # calculate SM pole masses
-    4   2                    # pole mass loop order
-    5   2                    # EWSB loop order
+    4   1                    # pole mass loop order
+    5   1                    # EWSB loop order
     6   3                    # beta-functions loop order
     7   2                    # threshold corrections loop order
     8   1                    # Higgs 2-loop corrections O(alpha_t alpha_s)

diff --git a/model_files/MSSMtower/LesHouches.in.MSSMtower b/model_files/MSSMtower/LesHouches.in.MSSMtower
@@ -5,8 +5,8 @@ Block FlexibleSUSY
     1   0                    # max. iterations (0 = automatic)
     2   0                    # algorithm (0 = two_scale, 1 = lattice)
     3   1                    # calculate SM pole masses
-    4   2                    # pole mass loop order
-    5   2                    # EWSB loop order
+    4   1                    # pole mass loop order
+    5   1                    # EWSB loop order
     6   3                    # beta-functions loop order
     7   2                    # threshold corrections loop order
     8   1                    # Higgs 2-loop corrections O(alpha_t alpha_s)

diff --git a/model_files/NMSSMtower/LesHouches.in.NMSSMtower b/model_files/NMSSMtower/LesHouches.in.NMSSMtower
@@ -5,8 +5,8 @@ Block FlexibleSUSY
     1   0                    # max. iterations (0 = automatic)
     2   0                    # algorithm (0 = two_scale, 1 = lattice)
     3   1                    # calculate SM pole masses
-    4   2                    # pole mass loop order
-    5   2                    # EWSB loop order
+    4   1                    # pole mass loop order
+    5   1                    # EWSB loop order
     6   3                    # beta-functions loop order
     7   2                    # threshold corrections loop order
     8   1                    # Higgs 2-loop corrections O(alpha_t alpha_s)