Merge branch 'development' of https://github.com/FlexibleSUSY/Flexibl…

…eSUSY into development
FlexibleSUSY · Nov 14, 2014 · 0879762 · 0879762
2 parents 52d2af4 + b2a6328
commit 0879762
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 22 deletions.
diff --git a/meta/WriteOut.m b/meta/WriteOut.m
@@ -110,15 +110,15 @@
               If[pdg != 0,
                  eigenstateNameStr = CConversion`RValueToCFormString[eigenstateName];
                  result = "<< FORMAT_MASS(" <> ToString[pdg] <>
-                          ", EWCONSTANT(MW), \"" <> eigenstateNameStr <> "\")\n";
+                          ", SM(MW), \"" <> eigenstateNameStr <> "\")\n";
                 ];
               ,
               For[i = 1, i <= dim, i++,
                   pdg = Abs[pdgList[[i]]];
                   If[pdg != 0,
                      eigenstateNameStr = CConversion`RValueToCFormString[eigenstateName] <> "(" <> ToString[i] <> ")";
                      result = result <> "<< FORMAT_MASS(" <> ToString[pdg] <>
-                              ", EWCONSTANT(MW), \"" <> eigenstateNameStr <> "\")\n";
+                              ", SM(MW), \"" <> eigenstateNameStr <> "\")\n";
                     ];
                  ];
              ];
@@ -283,7 +283,7 @@
     Flatten @ Join[CreateRulesForProtectedHead[expr,#]& /@ protectedHeads];
 
 WrapPreprocessorMacroAround[expr_, symbols_, macroSymbol_,
-                             protectedHeads_List:{FlexibleSUSY`Pole}] :=
+                             protectedHeads_List:{FlexibleSUSY`Pole, SARAH`SM}] :=
     Module[{replacements, protectionRules, exprWithoutProtectedSymbols},
            replacements = Join[
                RuleDelayed[#     , macroSymbol[#]   ]& /@ symbols,

diff --git a/model_files/MSSMNoFV/FlexibleSUSY.m.in b/model_files/MSSMNoFV/FlexibleSUSY.m.in
@@ -137,22 +137,7 @@ ExtraSLHAOutputBlocks = {
             {1000023, Pole[M[Chi[2]]] },
             {1000025, Pole[M[Chi[3]]] },
             {1000035, Pole[M[Chi[4]]] },
-            {     21, Pole[M[VG]]     },
-            {     22, Pole[M[VP]]     },
-            {     23, Pole[M[VZ]]     },
-            {      1, Pole[M[Fd]]     },
-            {      3, Pole[M[Fs]]     },
-            {      5, Pole[M[Fb]]     },
-            {      2, Pole[M[Fu]]     },
-            {      4, Pole[M[Fc]]     },
-            {      6, Pole[M[Ft]]     },
-            {     12, Pole[M[Fve]]    },
-            {     14, Pole[M[Fvm]]    },
-            {     16, Pole[M[Fvt]]    },
-            {     11, Pole[M[Fe]]     },
-            {     13, Pole[M[Fm]]     },
-            {     15, Pole[M[Ftau]]   },
-            {     24, Pole[M[VWm]]    } } }
+            {     24, SM[MW]          } } }
 };
 
 TopQuark    = Ft;

diff --git a/templates/slha_io.cpp.in b/templates/slha_io.cpp.in
@@ -26,15 +26,12 @@
 #include "spectrum_generator_settings.hpp"
 #include "lowe.h"
 #include "config.h"
-#include "ew_input.hpp"
 
 #include <fstream>
 #include <sstream>
 #include <iostream>
 #include <boost/bind.hpp>
 
-#define EWCONSTANT(p) Electroweak_constants::p
-
 using namespace softsusy;
 
 namespace flexiblesusy {

diff --git a/templates/slha_io.hpp.in b/templates/slha_io.hpp.in
@@ -25,6 +25,7 @@
 #include "@ModelName@_info.hpp"
 #include "@ModelName@_physical.hpp"
 #include "slha_io.hpp"
+#include "ew_input.hpp"
 
 #include <Eigen/Core>
 #include <string>
@@ -38,6 +39,7 @@
    typename std::remove_const<typename std::remove_reference<decltype(MODELPARAMETER(p))>::type>::type p;
 #define DEFINE_POLE_MASS(p)                                            \
    typename std::remove_const<typename std::remove_reference<decltype(PHYSICAL(p))>::type>::type p;
+#define SM(p) Electroweak_constants::p
 
 namespace flexiblesusy {