Merge remote-tracking branch 'organization/development' into feature-2.0

Conflicts: templates/librarylink.cpp.in
FlexibleSUSY · Feb 6, 2017 · ecf897e · ecf897e
2 parents b44b0d2 + a446515
commit ecf897e
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 11 deletions.
diff --git a/model_files/MSSMtower/FlexibleSUSY.m.in b/model_files/MSSMtower/FlexibleSUSY.m.in
@@ -4,10 +4,6 @@ FSDefaultSARAHModel = MSSM;
 OnlyLowEnergyFlexibleSUSY = True;
 FlexibleEFTHiggs = True;
 
-MINPAR = {
-    {4, Sign[\[Mu]]}
-};
-
 EXTPAR = {
     {0, MSUSY},
     {1, M1Input},

diff --git a/model_files/MSSMtower/LesHouches.in.MSSMtower b/model_files/MSSMtower/LesHouches.in.MSSMtower
@@ -43,8 +43,6 @@ Block SMINPUTS               # Standard Model inputs
    22   2.400000000e-03      # mu(2 GeV) MS-bar
    23   1.040000000e-01      # ms(2 GeV) MS-bar
    24   1.270000000e+00      # mc(mc) MS-bar
-Block MINPAR                 # Input parameters
-    4   1                    # SignMu
 Block EXTPAR
     0   2000                 # Ms
     1   2000                 # M1(MSUSY)

diff --git a/templates/librarylink.cpp.in b/templates/librarylink.cpp.in
@@ -62,16 +62,16 @@ using namespace flexiblesusy;
 
 using Handle = mint;
 
-class Redirect_output {
+class Redirect_@ModelName@_output {
 public:
-   explicit Redirect_output(MLINK link_)
+   explicit Redirect_@ModelName@_output(MLINK link_)
       : link(link_)
       , buffer()
       , old_cout(std::cout.rdbuf(buffer.rdbuf()))
       , old_cerr(std::cerr.rdbuf(buffer.rdbuf()))
       {}
 
-   ~Redirect_output() {
+   ~Redirect_@ModelName@_output() {
       std::cout.rdbuf(old_cout);
       std::cerr.rdbuf(old_cerr);
       flush();
@@ -1043,7 +1043,7 @@ DLLEXPORT int FS@ModelName@CalculateSpectrum(
       auto& data = find_@ModelName@_data(hid);
 
       {
-         Redirect_output crd(link);
+         Redirect_@ModelName@_output crd(link);
          data->calculate_spectrum();
       }
 
@@ -1077,7 +1077,7 @@ DLLEXPORT int FS@ModelName@CalculateObservables(
       }
 
       {
-         Redirect_output crd(link);
+         Redirect_@ModelName@_output crd(link);
          data->calculate_model_observables();
       }
 

diff --git a/templates/standard_model_high_scale_spectrum_generator.hpp.in b/templates/standard_model_high_scale_spectrum_generator.hpp.in
@@ -59,6 +59,7 @@ public:
    virtual ~@ModelName@_spectrum_generator() {}
 
    const standard_model::StandardModel<T>& get_eft() const { return eft; }
+   standard_model::StandardModel<T>& get_eft() { return eft; }
    double get_high_scale() const { return high_scale; }
    double get_susy_scale() const { return susy_scale; }
    double get_low_scale()  const { return low_scale;  }

diff --git a/templates/standard_model_low_scale_spectrum_generator.hpp.in b/templates/standard_model_low_scale_spectrum_generator.hpp.in
@@ -57,6 +57,7 @@ public:
    virtual ~@ModelName@_spectrum_generator() {}
 
    const standard_model::StandardModel<T>& get_eft() const { return eft; }
+   standard_model::StandardModel<T>& get_eft() { return eft; }
    double get_high_scale() const { return 0.; }
    double get_susy_scale() const { return susy_scale; }
    double get_low_scale()  const { return low_scale;  }

diff --git a/templates/standard_model_two_scale_high_scale_spectrum_generator.hpp.in b/templates/standard_model_two_scale_high_scale_spectrum_generator.hpp.in
@@ -49,6 +49,7 @@ public:
    { return std::make_tuple(this->get_model_slha(), eft); }
 
    const standard_model::StandardModel<Two_scale>& get_eft() const { return eft; }
+   standard_model::StandardModel<Two_scale>& get_eft() { return eft; }
 
    double get_high_scale() const { return high_scale; }
    double get_susy_scale() const { return susy_scale; }

diff --git a/templates/standard_model_two_scale_low_scale_spectrum_generator.hpp.in b/templates/standard_model_two_scale_low_scale_spectrum_generator.hpp.in
@@ -49,6 +49,7 @@ public:
    { return std::make_tuple(this->get_model_slha(), eft); }
 
    const standard_model::StandardModel<Two_scale>& get_eft() const { return eft; }
+   standard_model::StandardModel<Two_scale>& get_eft() { return eft; }
 
    double get_high_scale() const { return 0.; }
    double get_susy_scale() const { return susy_scale; }