Update templates to allow extra parameters and EWSB substitutions

FlexibleSUSY · Dec 8, 2016 · f2a9177 · f2a9177
1 parent 2c48509
commit f2a9177
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/templates/mass_eigenstates.cpp.in b/templates/mass_eigenstates.cpp.in
@@ -65,6 +65,7 @@ using namespace @ModelName@_info;
 #define INPUT(parameter) model.get_input().parameter
 #define LOCALINPUT(parameter) input.parameter
 #define MODELPARAMETER(parameter) model.get_##parameter()
+#define EXTRAPARAMETER(parameter) model.get_##parameter()
 
 #define HIGGS_2LOOP_CORRECTION_AT_AS     two_loop_corrections.higgs_at_as
 #define HIGGS_2LOOP_CORRECTION_AB_AS     two_loop_corrections.higgs_ab_as
@@ -265,6 +266,7 @@ int CLASSNAME::solve_ewsb_iteratively()
    auto ewsb_stepper = [model](const EWSB_vector_t& ewsb_pars) mutable -> EWSB_vector_t {
 @getEWSBParametersFromVector@
 @setEWSBParametersFromLocalCopies@
+@applyEWSBSubstitutions@
       if (model.get_ewsb_loop_order() > 0)
          model.calculate_DRbar_masses();
 
@@ -274,6 +276,7 @@ int CLASSNAME::solve_ewsb_iteratively()
    auto tadpole_stepper = [model](const EWSB_vector_t& ewsb_pars) mutable -> EWSB_vector_t {
 @getEWSBParametersFromVector@
 @setEWSBParametersFromLocalCopies@
+@applyEWSBSubstitutions@
       if (model.get_ewsb_loop_order() > 0)
          model.calculate_DRbar_masses();
 
@@ -348,6 +351,7 @@ void CLASSNAME::set_ewsb_solution(const EWSB_solver* solver)
    const auto solution = solver->get_solution();
 
 @setEWSBSolution@
+@setModelParametersFromEWSB@
    calculate_DRbar_masses();
 }
 

diff --git a/templates/mass_eigenstates.hpp.in b/templates/mass_eigenstates.hpp.in
@@ -114,6 +114,8 @@ public:
 @higgsMassGetterPrototypes@
 @mixingMatrixGetters@
 @phasesGetterSetters@
+@extraParameterSetters@
+@extraParameterGetters@
 @massCalculationPrototypes@
 @tadpoleEqPrototypes@
 @selfEnergyPrototypes@
@@ -179,6 +181,8 @@ private:
 @mixingMatricesDef@
    // phases
 @phasesDefinition@
+   // extra parameters
+@extraParameterDefs@
 };
 
 std::ostream& operator<<(std::ostream&, const @ModelName@_mass_eigenstates&);