Merge branch 'feature-2.0' into feature-2.0-HSSUSY-scale-variation

.gitattributes

@@ -14,6 +14,16 @@ examples/lattice_numerical_fmssm.cpp        export-ignore
 examples/lattice_numerical_fmssm_fmssmn.cpp export-ignore
 examples/switch_MSSM.cpp                    export-ignore
 
+meta/MSSM/allgennb.log          export-ignore
+meta/MSSM/extract_*.m           export-ignore
+meta/MSSM/*.expr                export-ignore
+meta/MSSM/*_to_cpp.m            export-ignore
+meta/MSSM/dmbas2.m              export-ignore
+meta/MSSM/dmtas2.m              export-ignore
+
+meta/SM/beta_m2_1303.4364.m     export-ignore
+meta/SM/extract_*.m             export-ignore
+
 model_files/BetaSM              export-ignore
 model_files/cCMSSM              export-ignore
 model_files/complexMSSM         export-ignore

README

@@ -17,7 +17,7 @@ References:              CPC 190 (2015) 139-172 (arxiv:1406.2319 [hep-ph]),
 Requirements
 ============
 
- * C++ compiler (g++ >= 4.8.4 or clang++ >= 3.1 or icpc >= 12.1)
+ * C++ compiler (g++ >= 4.8.4 or clang++ >= 3.4 or icpc >= 12.1)
  * Fortran compiler (gfortran, ifort)
  * Mathematica (version 7.0 or higher)
  * SARAH (version 4.11.0 or higher)   http://sarah.hepforge.org

config/Makefile.in

@@ -52,8 +52,6 @@ SOLVERS            := @SOLVERS@
 CXX                := @CXX@
 CPPFLAGS           := @CPPFLAGS@ $(patsubst %,-I%,$(MODULES)) -I.
 CXXFLAGS           := @CXXFLAGS@
-CC                 := @CC@
-CFLAGS             := @CFLAGS@ $(patsubst %,-I%,$(MODULES)) -I.
 FC                 := @FC@
 FFLAGS             := @FFLAGS@
 FLIBS              := @FLIBS@

configure

@@ -96,8 +96,8 @@ options="                    \
    enable_librarylink        \
    enable_looptools          \
    enable_mass_error_check   \
-   enable_silent             \
    enable_shared_libs        \
+   enable_silent             \
    enable_sqlite             \
    enable_static             \
    enable_threads            \
@@ -168,14 +168,12 @@ looptools_inc_dir=""
 GSLFLAGS=""
 CPPFLAGS=""
 CXXFLAGS="-std=c++11 -O2 -fPIC"
-CFLAGS="-O2"
 FFLAGS="-O2 -fPIC"
 FLIBS=""
 BOOSTTESTLIBS=""
 BOOSTTHREADLIBS=""
 THREADLIBS=""
 CXX="g++"
-CC="gcc"
 EIGENFLAGS=""
 FC="gfortran"
 GSLLIBS=""
@@ -1468,20 +1466,6 @@ get_clang_version() {
     eval "$ret_var=\"$major.$minor.$patch\""
 }
 
-#_____________________________________________________________________
-check_cc() {
-    checking_msg "C compiler $CC"
-    exists_in_path "$CC"
-    if [ -z "$cmd" ] ; then
-        result "not found"
-        message "Error: A C compiler must be installed to compile FlexibleSUSY!"
-        message "   Use --with-cc= to specify the C compiler to be used."
-        exit 1
-    else
-        result "found $cmd"
-    fi
-}
-
 #_____________________________________________________________________
 check_cxx() {
     checking_msg "C++ compiler $CXX"
@@ -2491,8 +2475,6 @@ replace_markers() {
 	-e "s|@CPPFLAGS@|$CPPFLAGS|"       \
 	-e "s|@CXXFLAGS@|$CXXFLAGS|"       \
 	-e "s|@CXX@|$CXX|"                 \
-	-e "s|@CFLAGS@|$CFLAGS|"           \
-	-e "s|@CC@|$CC|"                   \
 	-e "s|@FC@|$FC|"                   \
 	-e "s|@FFLAGS@|$FFLAGS|"           \
 	-e "s|@FLIBS@|$FLIBS|"             \
@@ -2559,21 +2541,22 @@ enable/disable options, prefix with either --enable- or --disable-
   compile           Compile the source code (default: $enable_compile)
   compiler-warnings Enable compiler warnings (default: $enable_compiler_warnings)
   debug             Debug messages and assertions (no default)
-  mass-error-check  Check mass eigenvalue precision (default: $enable_mass_error_check)
   fflite            Use fflite to compute the loop functions (default: $enable_fflite)
+  himalaya          Enable Himalaya (default: $enable_himalaya)
   lapack            Enable LAPACK (default: $enable_lapack)
   librarylink       Build LibraryLink library for Mathematica interface (default: $enable_librarylink)
   looptools         Use LoopTools to compute the loop functions (default: $enable_looptools)
+  mass-error-check  Check mass eigenvalue precision (default: $enable_mass_error_check)
 EOF
 # BEGIN: NOT EXPORTED ##########################################
 cat <<EOF
   meta              Create model classes (default: $enable_meta)
 EOF
 # END:   NOT EXPORTED ##########################################
 cat <<EOF
+  shared-libs       Create shared libraries (default: $enable_shared_libs)
   silent            Suppress all command line output (default: $enable_silent)
   sqlite            Enable SQLite (default: $enable_sqlite)
-  shared-libs       Create shared libraries (default: $enable_shared_libs)
   static            Create statically linked executables (default: $enable_static)
   threads           Enable multi-threading (default: $enable_threads)
   tsil              Enable TSIL (default: $enable_tsil)
@@ -2705,8 +2688,6 @@ if test $# -gt 0 ; then
             --with-blas-libs=*)      BLASLIBS=$optarg ;;
             --with-boost-libdir=*)   boost_lib_dir=$optarg ;;
             --with-boost-incdir=*)   boost_inc_dir=$optarg ;;
-            --with-cc=*)             CC=$optarg ;;
-            --with-cflags=*)         CFLAGS=$optarg ;;
             --with-cppflags=*)       CPPFLAGS=$optarg ;;
             --with-cxx=*)            CXX=$optarg ;;
             --with-cxxflags=*)       CXXFLAGS=$optarg ;;
@@ -2771,7 +2752,6 @@ if test "x${enable_compile}" = "xyes"; then
     check_cxx_compiler_version
     check_cxx_compiler_features
     check_cxxflags
-    check_cc
     check_fc
     check_fflags
     check_linking
@@ -2847,8 +2827,6 @@ sed -e "s|@FLEXIBLESUSY_VERSION@|$FLEXIBLESUSY_VERSION|" \
     -e "s|@CPPFLAGS@|$CPPFLAGS|"                     \
     -e "s|@CXX@|$CXX|"                               \
     -e "s|@CXXFLAGS@|$CXXFLAGS|"                     \
-    -e "s|@CC@|$CC|"                                 \
-    -e "s|@CFLAGS@|$CFLAGS|"                         \
     -e "s|@EIGENFLAGS@|$EIGENFLAGS|"                 \
     -e "s|@FC@|$FC|"                                 \
     -e "s|@FFLAGS@|$FFLAGS|"                         \

doc/building.dox

@@ -24,12 +24,12 @@ Optional:
 Before you setup a FlexibleSUSY model, you have to provide a SARAH
 model file.  To make it available in FlexibleSUSY, you can put it
 either into FlexibleSUSY's SARAH model directory
-`FlexibleSUSY/sarah/<model>/` or directly into SARAH's own model
-directly `SARAH/Models/<model>/`.
+(`FlexibleSUSY/sarah/<model>/`) or directly into SARAH's own model
+directly (`SARAH/Models/<model>/`).
 
-Here `<model>` is the name of your model (e.g. MSSM, NMSSM, etc.).
-Note, that there are already plenty of pre-installed model files under
-`SARAH/Models/` that can be used.
+Here `<model>` is the name of your SARAH model (e.g. SM, MSSM, NMSSM,
+etc.).  Note, that there are already plenty of pre-installed model
+files under `SARAH/Models/` that can be used.
 
 Setup a FlexibleSUSY model
 

doc/hssusy.dox

@@ -8,7 +8,7 @@ HSSUSY (high scale supersymmetry) is an implementation of the Standard
 Model, matched to the MSSM at the SUSY scale, \f$M_\text{SUSY}\f$.  At
 the SUSY scale, the quartic Higgs coupling,
 \f$\lambda(M_\text{SUSY})\f$ is predicted from the matching to the
-MSSM using the threshold corrections of [arXiv:1407.4081,
+MSSM using the 1- and 2-loop threshold corrections of [arXiv:1407.4081,
 arxiv:1504.05200, arXiv:1703.08166].  The 3-loop renormalization group
 equations of [arxiv:1504.05200, arxiv:1303.4364] are used to run
 \f$\lambda(M_\text{SUSY})\f$ down to the electroweak scale.  At the
@@ -24,6 +24,9 @@ at the full 1-loop level from the top pole mass, taking optionally
 2-loop [hep-ph/9803493] and 3-loop [arxiv:hep-ph/9911434] corrections
 into account, see @ref FlexibleSUSY_config .
 
+In @ref librarylink an example Mathematica script can be found, which
+illustrates how to perform a parameter scan using the HSSUSY model.
+
 __Input parameters__
 
  Parameter                                  | description                                                  | input block/field

doc/librarylink.dox

@@ -474,14 +474,16 @@ FSCMSSMCalculateObservables[handle]
 _Output_:
 
 ~~~~~~~~~~~~~~~~~~~~{.m}
-{ FlexibleSUSYObservable`CpHiggsPhotonPhoton ->
-    {0.0000296409 - 2.1245*10^-7 I, 7.82123*10^-7 + 9.1076*10^-7 I},
-  FlexibleSUSYObservable`CpHiggsGluonGluon ->
-    {-0.0000670724 - 2.65658*10^-6 I, 2.72135*10^-6 + 4.91993*10^-6 I},
-  FlexibleSUSYObservable`CpPseudoScalarPhotonPhoton ->
-    1.05105*10^-6 - 8.33068*10^-7 I,
-  FlexibleSUSYObservable`CpPseudoScalarGluonGluon ->
-    6.71448*10^-6 + 8.41625*10^-7 I }
+{CMSSM ->
+   { FlexibleSUSYObservable`CpHiggsPhotonPhoton ->
+       {0.0000296409 - 2.1245*10^-7 I, 7.82123*10^-7 + 9.1076*10^-7 I},
+     FlexibleSUSYObservable`CpHiggsGluonGluon ->
+       {-0.0000670724 - 2.65658*10^-6 I, 2.72135*10^-6 + 4.91993*10^-6 I},
+     FlexibleSUSYObservable`CpPseudoScalarPhotonPhoton ->
+       1.05105*10^-6 - 8.33068*10^-7 I,
+     FlexibleSUSYObservable`CpPseudoScalarGluonGluon ->
+       6.71448*10^-6 + 8.41625*10^-7 I }
+}
 ~~~~~~~~~~~~~~~~~~~~
 
 \subsubsection FS_model_GetProblems FS<model>GetProblems and FS<model>GetWarnings
@@ -504,8 +506,10 @@ FSCMSSMGetProblems[handle]
 _Output_:
 
 ~~~~~~~~~~~~~~~~~~~~{.m}
-{ Tachyons -> {M[Sd], M[Su]},
-  NoPoleMassConvergence -> {Pole[M[hh]]} }
+{CMSSM ->
+  { Tachyons -> {M[Sd], M[Su]},
+    NoPoleMassConvergence -> {Pole[M[hh]]} }
+}
 ~~~~~~~~~~~~~~~~~~~~
 
 This list of problems states, that the running up-type and down-type

doc/mainpage.dox.in

@@ -4,9 +4,9 @@
 
 <a href="https://flexiblesusy.hepforge.org/">FlexibleSUSY</a> provides
 Mathematica and C++ code to create fast and modular spectrum
-generators for supersymmetric models. It is based on <a
-href="http://softsusy.hepforge.org/">SoftSUSY</a> and <a
-href="http://sarah.hepforge.org/">SARAH</a>.
+generators for supersymmetric and non-supersymmetric models. It is
+based on <a href="http://sarah.hepforge.org/">SARAH</a> and uses
+components from <a href="http://softsusy.hepforge.org/">SOFTSUSY</a>.
 
 \section quick_start Quick start
 
@@ -26,6 +26,10 @@ the shell
 
     ./models/NMSSM/run_NMSSM.x --slha-input-file=model_files/NMSSM/LesHouches.in.NMSSM
 
+Alternatively, the Mathematica interface of FlexibleSUSY may be used:
+
+    math -run "<< \"models/NMSSM/run_NMSSM.m\""
+
 \section further_reading Documentation
 
 \subsection Documentation_Installation Installation
@@ -72,7 +76,7 @@ href="https://inspirehep.net/record/1484857">JHEP 1701 (2017)
 079</a>].
 
 FlexibleSUSY depends on SARAH and contains components from
-Softsusy. Therefore, please also cite the following publications along
+SOFTSUSY. Therefore, please also cite the following publications along
 with FlexibleSUSY:
 
  - SARAH
@@ -81,7 +85,7 @@ with FlexibleSUSY:
     <a href="http://arxiv.org/abs/1207.0906">CPC 184 (2013) 1792-1809</a>,
     <a href="http://arxiv.org/abs/1309.7223">CPC 185 (2014) 1773-1790</a>]
 
- -  SoftSUSY
+ -  SOFTSUSY
     [<a href="http://arxiv.org/abs/hep-ph/0104145">CPC 143 (2002) 305-331</a>,
      <a href="http://arxiv.org/abs/1311.7659">CPC 185 (2014) 2322</a>]
 

doc/model_file.dox

@@ -1257,6 +1257,30 @@ ExtraSLHAOutputBlocks = {
 };
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+\subsection edm_FS BSM contributions to the electric dipole moment (EDM)
+
+Since version 2.0 FlexibleSUSY can calculate the BSM contributions to
+the electric dipole moments (EDM) of fermions at the 1-loop level in
+models with complex parameters.  The following table lists the
+Mathematica symbols to enable the calculation of the EDM
+\f$d_f^{\text{BSM}}\f$ of the fermion \f$f\f$.
+
+| Observable                      | Symbol                                      |
+|---------------------------------|---------------------------------------------|
+| \f$d_f^{\text{BSM}}\f$          | \c FlexibleSUSYObservable\`EDM[f]           |
+
+Example: To calculate the EDMs of the electron, muon and tau lepton in
+the CP-violating MSSM, add the following to the FlexibleSUSY model file:
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.m}
+ExtraSLHAOutputBlocks = {
+   {FlexibleSUSYLowEnergy,
+           {{23, FlexibleSUSYObservable`EDM[Fe[1]]},
+            {24, FlexibleSUSYObservable`EDM[Fe[2]]},
+            {25, FlexibleSUSYObservable`EDM[Fe[3]]} } }
+};
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
 
 \section output_blocks Output blocks
 
@@ -1298,6 +1322,8 @@ ExtraSLHAOutputBlocks = {
            {{0, Hold[HighScale]},
             {1, Hold[SUSYScale]},
             {2, Hold[LowScale]} } },
+   {FlexibleSUSYLowEnergy,
+           {{21, FlexibleSUSYObservable`aMuon} } },
    {EFFHIGGSCOUPLINGS, NoScale,
            {{1, FlexibleSUSYObservable`CpHiggsPhotonPhoton},
             {2, FlexibleSUSYObservable`CpHiggsGluonGluon},
@@ -1368,6 +1394,21 @@ arxiv:1708.05720] can be used by setting in the model file
 UseHiggs3LoopMSSM = True; (* use 3-loop Higgs corrections *)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+\note The Himalaya library [<a
+href="https://github.com/jklappert/Himalaya">https://github.com/jklappert/Himalaya</a>]
+must be linked to FlexibleSUSY in order to enable the 3-loop
+contributions:
+\code{.sh}
+./configure \
+   --with-models=MSSMNoFVatMGUTHimalaya \
+   --enable-himalaya \
+   --with-himalaya-incdir=${HIMALAYA_DIR}/source/include \
+   --with-himalaya-libdir=${HIMALAYA_DIR}/build
+\endcode
+`MSSMNoFVatMGUTHimalaya` is a pre-defined FlexibleSUSY model which
+includes the 3-loop contributions to the light CP-even Higgs mass from
+Himalaya.  `${HIMALAYA_DIR}` is the path to the Himalaya directory.
+
 To make use of the 2-loop and/or 3-loop corrections the effective
 \f$\mu\f$ parameter must be specified using the `EffectiveMu`
 variable:
@@ -1376,10 +1417,13 @@ variable:
 EffectiveMu = \[Mu];
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-\note When the 3-loop corrections are used, the following switch
-should be set to `True` for consistency:
+\note When the 3-loop corrections are used, the following switches
+will be set automatically for consistency:
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.m}
+SARAH`UseHiggs2LoopMSSM = True;
 UseMSSMYukawa2Loop = True; (* use 2-loop SQCD corrections to yt and yb *)
+UseMSSMAlphaS2Loop = True; (* use 2-loop SQCD corrections to alpha_s *)
+UseMSSM3LoopRGEs = True;   (* use 3-loop RGEs *)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 #### NMSSM ####
@@ -1422,6 +1466,15 @@ order \f$O(\alpha_t\alpha_s^2 + \alpha_t^2\alpha_s + \alpha_t^3)\f$
 UseHiggs3LoopSM = True;
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+\note When the 3-loop corrections are used, the following switches
+will be set automatically for consistency:
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.m}
+UseHiggs2LoopSM = True;
+UseSMAlphaS3Loop = True;    (* use 2- and 3-loop QCD corrections to alpha_s *)
+UseYukawa3LoopQCD = True;   (* use 2- and 3-loop QCD corrections to m_t *)
+UseSM3LoopRGEs = True;      (* use 3-loop RGEs *)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
 #### Split-MSSM (SplitMSSM) ####
 
 In the split-MSSM the two-loop Higgs pole mass corrections from
@@ -1501,7 +1554,7 @@ UseMSSMYukawa2Loop = True; (* use two-loop threshold for yt and yb *)
 The known MSSM two-loop corrections of order \f$O(\alpha_s^2 +
 \alpha_s\alpha_t + \alpha_s\alpha_b)\f$ to the strong coupling
 constant are known by [hep-ph/0509048, arXiv:0810.5101,
-arXiv:1009.5455] They can be taken into account by setting in the
+arXiv:1009.5455]. They can be taken into account by setting in the
 model file:
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.m}

doc/package.dox

@@ -36,4 +36,8 @@
    spectrum generators
 
  - <code>test/</code> contains the FlexibleSUSY test suite
+
+ - <code>utils/</code> contains some utility scripts to perform scans
+   or extract data from SLHA files.
+
 */