Merge branch 'feature-input-mw' into development

FlexibleSUSY · Jan 9, 2015 · 3be0551 · 3be0551
2 parents 0a61cae + 8ca8f38
commit 3be0551
Show file tree

Hide file tree

Showing 27 changed files with 46 additions and 9 deletions.
diff --git a/examples/customized-betas/LesHouches.in.MSSMcbs b/examples/customized-betas/LesHouches.in.MSSMcbs
@@ -15,6 +15,7 @@ Block FlexibleSUSY
     9   1                    # Higgs 2-loop corrections O(alpha_b alpha_s)
    10   1                    # Higgs 2-loop corrections O(alpha_t^2 + alpha_t alpha_b + alpha_b^2)
    11   1                    # Higgs 2-loop corrections O(alpha_tau^2)
+   12   80.404               # MW pole
 Block SMINPUTS               # Standard Model inputs
     1   1.279340000e+02      # alpha^(-1) SM MSbar(MZ)
     2   1.166370000e-05      # G_Fermi

diff --git a/examples/tower/LesHouches.in.tower b/examples/tower/LesHouches.in.tower
@@ -15,6 +15,7 @@ Block FlexibleSUSY
     9   1                    # Higgs 2-loop corrections O(alpha_b alpha_s)
    10   1                    # Higgs 2-loop corrections O(alpha_t^2 + alpha_t alpha_b + alpha_b^2)
    11   1                    # Higgs 2-loop corrections O(alpha_tau^2)
+   12   80.404               # MW pole
 Block SMINPUTS               # Standard Model inputs
     1   1.279340000e+02      # alpha^(-1) SM MSbar(MZ)
     2   1.166370000e-05      # G_Fermi

diff --git a/model_files/CMSSM/LesHouches.in.CMSSM b/model_files/CMSSM/LesHouches.in.CMSSM
@@ -13,6 +13,7 @@ Block FlexibleSUSY
     9   1                    # Higgs 2-loop corrections O(alpha_b alpha_s)
    10   1                    # Higgs 2-loop corrections O(alpha_t^2 + alpha_t alpha_b + alpha_b^2)
    11   1                    # Higgs 2-loop corrections O(alpha_tau^2)
+   12   80.404               # MW pole
 Block SMINPUTS               # Standard Model inputs
     1   1.279340000e+02      # alpha^(-1) SM MSbar(MZ)
     2   1.166370000e-05      # G_Fermi

diff --git a/model_files/CMSSMNoFV/LesHouches.in.CMSSMNoFV b/model_files/CMSSMNoFV/LesHouches.in.CMSSMNoFV
@@ -13,6 +13,7 @@ Block FlexibleSUSY
     9   1                    # Higgs 2-loop corrections O(alpha_b alpha_s)
    10   1                    # Higgs 2-loop corrections O(alpha_t^2 + alpha_t alpha_b + alpha_b^2)
    11   1                    # Higgs 2-loop corrections O(alpha_tau^2)
+   12   80.404               # MW pole
 Block SMINPUTS               # Standard Model inputs
     1   1.279340000e+02      # alpha^(-1) SM MSbar(MZ)
     2   1.166370000e-05      # G_Fermi

diff --git a/model_files/E6SSM/LesHouches.in.E6SSM b/model_files/E6SSM/LesHouches.in.E6SSM
@@ -13,6 +13,7 @@ Block FlexibleSUSY
     9   1                    # Higgs 2-loop corrections O(alpha_b alpha_s)
    10   1                    # Higgs 2-loop corrections O(alpha_t^2 + alpha_t alpha_b + alpha_b^2)
    11   1                    # Higgs 2-loop corrections O(alpha_tau^2)
+   12   80.404               # MW pole
 Block SMINPUTS               # Standard Model inputs
     1   1.279340000e+02      # alpha^(-1) SM MSbar(MZ)
     2   1.166370000e-05      # G_Fermi

diff --git a/model_files/LHInputMSSM/LesHouches.in.LHInputMSSM b/model_files/LHInputMSSM/LesHouches.in.LHInputMSSM
@@ -13,6 +13,7 @@ Block FlexibleSUSY
     9   1                    # Higgs 2-loop corrections O(alpha_b alpha_s)
    10   1                    # Higgs 2-loop corrections O(alpha_t^2 + alpha_t alpha_b + alpha_b^2)
    11   1                    # Higgs 2-loop corrections O(alpha_tau^2)
+   12   80.404               # MW pole
 Block SMINPUTS               # Standard Model inputs
     1   1.279340000e+02      # alpha^(-1) SM MSbar(MZ)
     2   1.166370000e-05      # G_Fermi

diff --git a/model_files/MRSSM/LesHouches.in.MRSSM b/model_files/MRSSM/LesHouches.in.MRSSM
@@ -25,6 +25,7 @@ Block FlexibleSUSY
     9   1                    # Higgs 2-loop corrections O(alpha_b alpha_s)
    10   1                    # Higgs 2-loop corrections O(alpha_t^2 + alpha_t alpha_b + alpha_b^2)
    11   1                    # Higgs 2-loop corrections O(alpha_tau^2)
+   12   80.404               # MW pole
 Block SPhenoInput         # SPheno specific input
     1 -1          # error level
     2  1          # SPA conventions

diff --git a/model_files/MSSM/LesHouches.in.MSSM b/model_files/MSSM/LesHouches.in.MSSM
@@ -13,6 +13,7 @@ Block FlexibleSUSY
     9   1                    # Higgs 2-loop corrections O(alpha_b alpha_s)
    10   1                    # Higgs 2-loop corrections O(alpha_t^2 + alpha_t alpha_b + alpha_b^2)
    11   1                    # Higgs 2-loop corrections O(alpha_tau^2)
+   12   80.404               # MW pole
 Block SMINPUTS               # Standard Model inputs
     1   1.279340000e+02      # alpha^(-1) SM MSbar(MZ)
     2   1.166370000e-05      # G_Fermi

diff --git a/model_files/MSSMNoFV/LesHouches.in.MSSMNoFV b/model_files/MSSMNoFV/LesHouches.in.MSSMNoFV
@@ -13,6 +13,7 @@ Block FlexibleSUSY
     9   1                    # Higgs 2-loop corrections O(alpha_b alpha_s)
    10   1                    # Higgs 2-loop corrections O(alpha_t^2 + alpha_t alpha_b + alpha_b^2)
    11   1                    # Higgs 2-loop corrections O(alpha_tau^2)
+   12   80.404               # MW pole
 Block SMINPUTS               # Standard Model inputs
     1   1.279340000e+02      # alpha^(-1) SM MSbar(MZ)
     2   1.166370000e-05      # G_Fermi

diff --git a/model_files/MSSMNoFVatMGUT/LesHouches.in.MSSMNoFVatMGUT b/model_files/MSSMNoFVatMGUT/LesHouches.in.MSSMNoFVatMGUT
@@ -13,6 +13,7 @@ Block FlexibleSUSY
     9   1                    # Higgs 2-loop corrections O(alpha_b alpha_s)
    10   1                    # Higgs 2-loop corrections O(alpha_t^2 + alpha_t alpha_b + alpha_b^2)
    11   1                    # Higgs 2-loop corrections O(alpha_tau^2)
+   12   80.404               # MW pole
 Block SMINPUTS               # Standard Model inputs
     1   1.279340000e+02      # alpha^(-1) SM MSbar(MZ)
     2   1.166370000e-05      # G_Fermi

diff --git a/model_files/MSSMatMGUT/LesHouches.in.MSSMatMGUT b/model_files/MSSMatMGUT/LesHouches.in.MSSMatMGUT
@@ -13,6 +13,7 @@ Block FlexibleSUSY
     9   1                    # Higgs 2-loop corrections O(alpha_b alpha_s)
    10   1                    # Higgs 2-loop corrections O(alpha_t^2 + alpha_t alpha_b + alpha_b^2)
    11   1                    # Higgs 2-loop corrections O(alpha_tau^2)
+   12   80.404               # MW pole
 Block SMINPUTS               # Standard Model inputs
     1   1.279340000e+02      # alpha^(-1) SM MSbar(MZ)
     2   1.166370000e-05      # G_Fermi

diff --git a/model_files/NMSSM/LesHouches.in.NMSSM b/model_files/NMSSM/LesHouches.in.NMSSM
@@ -13,6 +13,7 @@ Block FlexibleSUSY
     9   1                    # Higgs 2-loop corrections O(alpha_b alpha_s)
    10   1                    # Higgs 2-loop corrections O(alpha_t^2 + alpha_t alpha_b + alpha_b^2)
    11   1                    # Higgs 2-loop corrections O(alpha_tau^2)
+   12   80.404               # MW pole
 Block SMINPUTS               # Standard Model inputs
     1   1.279340000e+02      # alpha^(-1) SM MSbar(MZ)
     2   1.166370000e-05      # G_Fermi

diff --git a/model_files/NUHMNMSSM/LesHouches.in.NUHMNMSSM b/model_files/NUHMNMSSM/LesHouches.in.NUHMNMSSM
@@ -14,6 +14,7 @@ Block FlexibleSUSY
     9   1                    # Higgs 2-loop corrections O(alpha_b alpha_s)
    10   1                    # Higgs 2-loop corrections O(alpha_t^2 + alpha_t alpha_b + alpha_b^2)
    11   1                    # Higgs 2-loop corrections O(alpha_tau^2)
+   12   80.404               # MW pole
 Block SMINPUTS               # Standard Model inputs
     1   1.279340000e+02      # alpha^(-1) SM MSbar(MZ)
     2   1.166370000e-05      # G_Fermi

diff --git a/model_files/NUHMSSM/LesHouches.in.NUHMSSM b/model_files/NUHMSSM/LesHouches.in.NUHMSSM
@@ -13,6 +13,7 @@ Block FlexibleSUSY
     9   1                    # Higgs 2-loop corrections O(alpha_b alpha_s)
    10   1                    # Higgs 2-loop corrections O(alpha_t^2 + alpha_t alpha_b + alpha_b^2)
    11   1                    # Higgs 2-loop corrections O(alpha_tau^2)
+   12   80.404               # MW pole
 Block SMINPUTS               # Standard Model inputs
     1   1.279340000e+02      # alpha^(-1) SM MSbar(MZ)
     2   1.166370000e-05      # G_Fermi

diff --git a/model_files/NUTNMSSM/LesHouches.in.NUTNMSSM_1308.1333_BP1 b/model_files/NUTNMSSM/LesHouches.in.NUTNMSSM_1308.1333_BP1
@@ -13,6 +13,7 @@ Block FlexibleSUSY
     9   1                    # Higgs 2-loop corrections O(alpha_b alpha_s)
    10   1                    # Higgs 2-loop corrections O(alpha_t^2 + alpha_t alpha_b + alpha_b^2)
    11   1                    # Higgs 2-loop corrections O(alpha_tau^2)
+   12   80.404               # MW pole
 Block SMINPUTS               # Standard Model inputs
     1   127.944	             # ALPHA_EM^-1(MZ)
     2   1.1663787E-5         # GF

diff --git a/model_files/NUTNMSSM/LesHouches.in.NUTNMSSM_1308.1333_BP2 b/model_files/NUTNMSSM/LesHouches.in.NUTNMSSM_1308.1333_BP2
@@ -13,6 +13,7 @@ Block FlexibleSUSY
     9   1                    # Higgs 2-loop corrections O(alpha_b alpha_s)
    10   1                    # Higgs 2-loop corrections O(alpha_t^2 + alpha_t alpha_b + alpha_b^2)
    11   1                    # Higgs 2-loop corrections O(alpha_tau^2)
+   12   80.404               # MW pole
 Block SMINPUTS               # Standard Model inputs
     1   127.944	             # ALPHA_EM^-1(MZ)
     2   1.1663787E-5         # GF

diff --git a/model_files/NUTNMSSM/LesHouches.in.NUTNMSSM_1308.1333_BP3 b/model_files/NUTNMSSM/LesHouches.in.NUTNMSSM_1308.1333_BP3
@@ -13,6 +13,7 @@ Block FlexibleSUSY
     9   1                    # Higgs 2-loop corrections O(alpha_b alpha_s)
    10   1                    # Higgs 2-loop corrections O(alpha_t^2 + alpha_t alpha_b + alpha_b^2)
    11   1                    # Higgs 2-loop corrections O(alpha_tau^2)
+   12   80.404               # MW pole
 Block SMINPUTS               # Standard Model inputs
     1   127.944	             # ALPHA_EM^-1(MZ)
     2   1.1663787E-5         # GF

diff --git a/model_files/UMSSM/LesHouches.in.UMSSM b/model_files/UMSSM/LesHouches.in.UMSSM
@@ -13,6 +13,7 @@ Block FlexibleSUSY
     9   1                    # Higgs 2-loop corrections O(alpha_b alpha_s)
    10   1                    # Higgs 2-loop corrections O(alpha_t^2 + alpha_t alpha_b + alpha_b^2)
    11   1                    # Higgs 2-loop corrections O(alpha_tau^2)
+   12   80.404               # MW pole
 Block SMINPUTS               # Standard Model inputs
     1   1.279340000e+02      # alpha^(-1) SM MSbar(MZ)
     2   1.166370000e-05      # G_Fermi

diff --git a/model_files/lowMSSM/LesHouches.in.lowMSSM b/model_files/lowMSSM/LesHouches.in.lowMSSM
@@ -9,6 +9,7 @@ Block FlexibleSUSY
     9   1                    # Higgs 2-loop corrections O(alpha_b alpha_s)
    10   1                    # Higgs 2-loop corrections O(alpha_t^2 + alpha_t alpha_b + alpha_b^2)
    11   1                    # Higgs 2-loop corrections O(alpha_tau^2)
+   12   80.404               # MW pole
 Block SMINPUTS               # Standard Model inputs
     1   1.279340000e+02      # alpha^(-1) SM MSbar(MZ)
     2   1.166370000e-05      # G_Fermi

diff --git a/model_files/munuSSM/LesHouches.in.munuSSM b/model_files/munuSSM/LesHouches.in.munuSSM
@@ -13,6 +13,7 @@ Block FlexibleSUSY
     9   1                    # Higgs 2-loop corrections O(alpha_b alpha_s)
    10   1                    # Higgs 2-loop corrections O(alpha_t^2 + alpha_t alpha_b + alpha_b^2)
    11   1                    # Higgs 2-loop corrections O(alpha_tau^2)
+   12   80.404               # MW pole
 Block SMINPUTS               # Standard Model inputs
     1   1.279340000e+02      # alpha^(-1) SM MSbar(MZ)
     2   1.166370000e-05      # G_Fermi

diff --git a/src/lowe.cpp b/src/lowe.cpp
@@ -7,6 +7,7 @@
 */
 
 #include "lowe.h"
+#include "ew_input.hpp"
 
 namespace softsusy {
 
@@ -16,7 +17,9 @@ static QedQcd *tempLe;
 
 QedQcd::QedQcd()
   : a(2), mf(9), mtPole(PMTOP), mbPole(PMBOTTOM), mbMb(MBOTTOM), 
-    mtauPole(MTAU) {
+    mtauPole(MTAU)
+  , mwPole(flexiblesusy::Electroweak_constants::MW)
+  , mzPole(flexiblesusy::Electroweak_constants::MZ) {
   setPars(11);
   // Default object: 1998 PDB defined in 'def.h'
   mf(1) = MUP; mf(2) = MCHARM; 
@@ -35,6 +38,8 @@ const QedQcd & QedQcd::operator=(const QedQcd & m) {
   mbPole = m.mbPole;
   mbMb   = m.mbMb;
   mtauPole = m.mtauPole;
+  mwPole = m.mwPole;
+  mzPole = m.mzPole;
   a = m.a;
   mf = m.mf;
   setLoops(m.displayLoops());

diff --git a/src/lowe.h b/src/lowe.h
@@ -60,6 +60,8 @@ class QedQcd: public RGE
   double mtPole, mbPole; ///< pole masses of third family quarks
   double mbMb; ///< mb(mb) in the MSbar scheme with only QCD corrections
   double mtauPole; ///< tau pole mass
+  double mwPole; ///< W boson pole mass
+  double mzPole; ///< Z boson pole mass
 
 public:
   QedQcd(); ///< Initialises with default values defined in lowe.h
@@ -71,6 +73,8 @@ class QedQcd: public RGE
   void setPoleMb(double mb) { mbPole = mb; }; ///< set pole bottom mass
   void setPoleMtau(double mtau) { mtauPole = mtau; }; ///< set pole tau mass
   void setMbMb(double mb)   { mbMb = mb;   }; ///< set mb(mb)
+  void setPoleMW(double mw) { mwPole = mw; } ///< set W boson pole mass
+  void setPoleMZ(double mz) { mzPole = mz; } ///< set Z boson pole mass
   /// sets a running quark mass
   void setMass(mass mno, double m) { mf(mno) = m; }; 
   /// sets QED or QCD structure constant
@@ -84,6 +88,10 @@ class QedQcd: public RGE
   double displayPoleMtau() const { return mtauPole; };
   /// Returns bottom "pole" mass
   double displayPoleMb() const { return mbPole; };
+  /// Returns W boson pole mass
+  double displayPoleMW() const { return mwPole; }
+  /// Returns Z boson pole mass
+  double displayPoleMZ() const { return mzPole; }
   /// Returns a vector of running fermion masses
   const DoubleVector & displayMass() const { return mf; };
   /// Returns a single running mass
@@ -149,7 +157,7 @@ double getRunMtFromMz(double poleMt, double asMZ);
 
 inline QedQcd::QedQcd(const QedQcd &m)
   : RGE(), a(m.a), mf(m.mf), mtPole(m.mtPole), mbPole(m.mbPole), mbMb(m.mbMb), 
-   mtauPole(m.mtauPole) {
+   mtauPole(m.mtauPole), mwPole(m.mwPole), mzPole(m.mzPole) {
   setPars(11); 
   setMu(m.displayMu());
   setLoops(m.displayLoops());

diff --git a/src/slha_io.cpp b/src/slha_io.cpp
@@ -290,7 +290,7 @@ void SLHA_io::set_sminputs(const softsusy::QedQcd& qedqcd_)
    ss << FORMAT_ELEMENT( 1, alphaEmInv                   , "alpha^(-1) SM MSbar(MZ)");
    ss << FORMAT_ELEMENT( 2, 1.166370000e-05              , "G_Fermi");
    ss << FORMAT_ELEMENT( 3, qedqcd.displayAlpha(ALPHAS)  , "alpha_s(MZ) SM MSbar");
-   ss << FORMAT_ELEMENT( 4, Electroweak_constants::MZ    , "MZ(pole)");
+   ss << FORMAT_ELEMENT( 4, qedqcd.displayPoleMZ()       , "MZ(pole)");
    ss << FORMAT_ELEMENT( 5, qedqcd.displayMbMb()         , "mb(mb) SM MSbar");
    ss << FORMAT_ELEMENT( 6, qedqcd.displayPoleMt()       , "mtop(pole)");
    ss << FORMAT_ELEMENT( 7, qedqcd.displayPoleMtau()     , "mtau(pole)");
@@ -377,8 +377,7 @@ void SLHA_io::process_sminputs_tuple(QedQcd& oneset, int key, double value)
       oneset.setAlpha(ALPHAS, value);
       break;
    case 4:
-      // MZ cannot be set yet
-      // oneset.setMu(value);
+      oneset.setPoleMZ(value);
       break;
    case 5:
       oneset.setMass(mBottom, value);

diff --git a/src/spectrum_generator_settings.cpp b/src/spectrum_generator_settings.cpp
@@ -17,6 +17,7 @@
 // ====================================================================
 
 #include "spectrum_generator_settings.hpp"
+#include "ew_input.hpp"
 
 #include <cassert>
 
@@ -62,6 +63,7 @@ void Spectrum_generator_settings::set(Settings o, double value)
  * | higgs_2loop_correction_ab_as     | 0, 1                         | 1 (= enabled)   |
  * | higgs_2loop_correction_at_at     | 0, 1                         | 1 (= enabled)   |
  * | higgs_2loop_correction_atau_atau | 0, 1                         | 1 (= enabled)   |
+ * | mw_pole                          | any positive double          | 80.404          |
  */
 void Spectrum_generator_settings::reset()
 {
@@ -77,6 +79,7 @@ void Spectrum_generator_settings::reset()
    values[higgs_2loop_correction_ab_as]     = 1.;
    values[higgs_2loop_correction_at_at]     = 1.;
    values[higgs_2loop_correction_atau_atau] = 1.;
+   values[mw_pole]               = Electroweak_constants::MW;
 }
 
 Higgs_2loop_corrections Spectrum_generator_settings::get_higgs_2loop_corrections() const

diff --git a/src/spectrum_generator_settings.hpp b/src/spectrum_generator_settings.hpp
@@ -46,6 +46,7 @@ class Spectrum_generator_settings {
       higgs_2loop_correction_ab_as,     ///< [9]  Higgs 2-loop correction O(alpha_b alpha_s)
       higgs_2loop_correction_at_at,     ///< [10] Higgs 2-loop correction O(alpha_t alpha_t + alpha_t alpha_b + alpha_b alpha_b)
       higgs_2loop_correction_atau_atau, ///< [11] Higgs 2-loop correction O(alpha_tau alpha_tau)
+      mw_pole, ///< [12] W boson pole mass
       NUMBER_OF_OPTIONS      ///< number of possible options
    };
 

diff --git a/templates/run.cpp.in b/templates/run.cpp.in
@@ -67,6 +67,7 @@ int main(int argc, const char* argv[])
    }
 
    oneset.toMz(); // run SM fermion masses to MZ
+   oneset.setPoleMW(spectrum_generator_settings.get(Spectrum_generator_settings::mw_pole));
 
    @ModelName@_spectrum_generator<algorithm_type> spectrum_generator;
    spectrum_generator.set_precision_goal(

diff --git a/templates/two_scale_low_scale_constraint.cpp.in b/templates/two_scale_low_scale_constraint.cpp.in
@@ -175,12 +175,12 @@ void @ModelName@_low_scale_constraint<Two_scale>::calculate_DRbar_gauge_coupling
    const double e_drbar        = Sqrt(4.0 * Pi * alpha_em_drbar);
 
    // interface variables
-   MZDRbar = Electroweak_constants::MZ;
-   double MWDRbar = Electroweak_constants::MW;
+   MZDRbar = oneset.displayPoleMZ();
+   double MWDRbar = oneset.displayPoleMW();
 
    if (model->get_thresholds()) {
-      MZDRbar = model->calculate_M@VectorZ@_DRbar(Electroweak_constants::MZ);
-      MWDRbar = model->calculate_M@VectorW@_DRbar(Electroweak_constants::MW);
+      MZDRbar = model->calculate_M@VectorZ@_DRbar(oneset.displayPoleMZ());
+      MWDRbar = model->calculate_M@VectorW@_DRbar(oneset.displayPoleMW());
    }
 
    const double AlphaS = alpha_s_drbar;