always activate 3L RGEs in Softsusy

FlexibleSUSY · Dec 7, 2016 · 8765257 · 8765257
1 parent 29fbac8
commit 8765257
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 16 deletions.
diff --git a/models/SoftsusyNMSSM/run_softpoint.cpp b/models/SoftsusyNMSSM/run_softpoint.cpp
@@ -43,9 +43,7 @@ void errorCall() {
 #ifdef COMPILE_FULL_SUSY_THRESHOLD
   if (USE_TWO_LOOP_THRESHOLD) ii << "--two-loop-susy-thresholds switches on leading 2-loop SUSY threshold corrections to third generation Yukawa couplings and g3.\n";
 #endif //COMPILE_FULL_SUSY_THRESHOLD
-#ifdef COMPILE_THREE_LOOP_RGE
   if (USE_THREE_LOOP_RGE) ii << "--three-loop-rges switches on 3-loop RGEs\n";
-#endif //COMPILE_THREE_LOOP_RGE
   ii << "--mgut=unified sets the scale at which SUSY breaking terms are set to the GUT\n";
   ii << "scale where g1=g2. --mgut=<value> sets it to a fixed scale, ";
   ii << "whereas --mgut=msusy\nsets it to MSUSY\n\n";
@@ -192,23 +190,17 @@ int main(int argc, char *argv[]) {
 #endif
 	}
 	else if (starts_with(argv[i], "--disable-three-loop-rges")) {
-#ifdef COMPILE_THREE_LOOP_RGE
 	  USE_THREE_LOOP_RGE = false;
-#else
 	  compilationProblem = true;
 	  cout << "Two-loop thresholds not compiled.\n";
 	  cout << "Please use the --enable-two-loop-susy-thresholds with ./configure\n";
 	  cout << "Make sure you install the CLN and GiNaC packages beforehand.\n";
-#endif
 	}
 	else if (starts_with(argv[i], "--three-loop-rges")) {
-#ifdef COMPILE_THREE_LOOP_RGE
 	  USE_THREE_LOOP_RGE = true;
-#else
 	  compilationProblem = true;
 	  cout << "Three-loop RGEs not compiled.\n";
 	  cout << "Please use the --enable-three-loop-rges with ./configure\n";
-#endif
 	}
 	else if (starts_with(argv[i], "--QEWSB=")) 
 	  QEWSB = get_value(argv[i], "--QEWSB=");
@@ -1179,15 +1171,13 @@ int main(int argc, char *argv[]) {
                     if(num == 1) softsusy::SoftHiggsOut = true;
                   }
                      break;
-#ifdef COMPILE_THREE_LOOP_RGE
 		  case 19: {
                     int num = int(d + EPSTOL);
 		    if (num == 1) USE_THREE_LOOP_RGE = true;
 		    else if (num == 0) USE_THREE_LOOP_RGE = false;
 		    else cout << "WARNING: incorrect setting for SOFTSUSY Block 19 (should be 0 or 1)\n";
 		    break;			     
 		  }
-#endif
 #ifdef COMPILE_FULL_SUSY_THRESHOLD
 		  case 20: {
                     int num = int(d + EPSTOL);

diff --git a/src/def.cpp b/src/def.cpp
@@ -79,10 +79,8 @@ namespace softsusy {
   /// tree-level masses computed with the 2-loop Higgs potential
   bool sphenoMassConv = false;
 
-#ifdef COMPILE_THREE_LOOP_RGE
   /// Controls the use of MSSM three-loop RGEs
   bool USE_THREE_LOOP_RGE = false;
-#endif
 
 #ifdef COMPILE_FULL_SUSY_THRESHOLD 
 

diff --git a/src/def.h b/src/def.h
@@ -12,8 +12,6 @@
 #ifndef DEF_H
 #define DEF_H
 
-#define COMPILE_THREE_LOOP_RGE
-
 #ifdef HAVE_CONFIG_H
  #include <config.h>
 #endif
@@ -107,10 +105,8 @@ namespace softsusy{
   /// Switch to use SPHENO conventions for masses in loops
   extern bool sphenoMassConv;
 
-#ifdef COMPILE_THREE_LOOP_RGE
   /// Controls the use of MSSM three-loop RGEs
   extern bool USE_THREE_LOOP_RGE;
-#endif
 
 #ifdef COMPILE_FULL_SUSY_THRESHOLD
   /// Threshold to prevent the re-evaluation of two-loop leading SUSY