fix running in the Standard_model class, pass two_loop_corrections do…

…wn the tower
FlexibleSUSY · Jul 24, 2016 · dd0c59a · dd0c59a
1 parent bc29c57
commit dd0c59a
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 7 deletions.
diff --git a/src/standard_model.cpp b/src/standard_model.cpp
@@ -1355,24 +1355,40 @@ void Standard_model::calc_beta_traces(Beta_traces& traces) const
 {
    const unsigned loops = get_loops();
    if (loops > 0) {
+
       traces.traceYdAdjYd = Re((Yd*Yd.adjoint()).trace());
       traces.traceYeAdjYe = Re((Ye*Ye.adjoint()).trace());
       traces.traceYuAdjYu = Re((Yu*Yu.adjoint()).trace());
-
-   }
-
-   if (loops > 1) {
+
       traces.traceYdAdjYdYdAdjYd = Re((Yd*Yd.adjoint()*Yd*Yd.adjoint())
          .trace());
-      traces.traceYdAdjYuYuAdjYd = Re((Yd*Yu.adjoint()*Yu*Yd.adjoint())
-         .trace());
       traces.traceYeAdjYeYeAdjYe = Re((Ye*Ye.adjoint()*Ye*Ye.adjoint())
          .trace());
       traces.traceYuAdjYuYuAdjYu = Re((Yu*Yu.adjoint()*Yu*Yu.adjoint())
          .trace());
 
    }
 
+   if (loops > 1) {
+
+      traces.traceYdAdjYuYuAdjYd = Re((Yd*Yu.adjoint()*Yu*Yd.adjoint())
+         .trace());
+
+      traces.traceYdAdjYdYdAdjYdYdAdjYd = Re((Yd*Yd.adjoint()*Yd*Yd.adjoint(
+         )*Yd*Yd.adjoint()).trace());
+      traces.traceYdAdjYdYdAdjYuYuAdjYd = Re((Yd*Yd.adjoint()*Yd*Yu.adjoint(
+         )*Yu*Yd.adjoint()).trace());
+      traces.traceYdAdjYuYuAdjYdYdAdjYd = Re((Yd*Yu.adjoint()*Yu*Yd.adjoint(
+         )*Yd*Yd.adjoint()).trace());
+      traces.traceYdAdjYuYuAdjYuYuAdjYd = Re((Yd*Yu.adjoint()*Yu*Yu.adjoint(
+         )*Yu*Yd.adjoint()).trace());
+      traces.traceYeAdjYeYeAdjYeYeAdjYe = Re((Ye*Ye.adjoint()*Ye*Ye.adjoint(
+         )*Ye*Ye.adjoint()).trace());
+      traces.traceYuAdjYuYuAdjYuYuAdjYu = Re((Yu*Yu.adjoint()*Yu*Yu.adjoint(
+         )*Yu*Yu.adjoint()).trace());
+
+   }
+
    if (loops > 2) {
 
    }

diff --git a/src/standard_model_two_scale_low_scale_constraint.cpp b/src/standard_model_two_scale_low_scale_constraint.cpp
@@ -116,12 +116,12 @@ void Standard_model_low_scale_constraint<Two_scale>::apply()
    calculate_Yd_DRbar();
    calculate_Ye_DRbar();
 
-
    model->set_g1(new_g1);
    model->set_g2(new_g2);
    model->set_g3(new_g3);
 
    recalculate_mw_pole();
+
 }
 
 const Eigen::Matrix<std::complex<double>,3,3>& Standard_model_low_scale_constraint<Two_scale>::get_ckm()

diff --git a/templates/standard_model_high_scale_spectrum_generator.hpp.in b/templates/standard_model_high_scale_spectrum_generator.hpp.in
@@ -115,6 +115,7 @@ void @ModelName@_standard_model_spectrum_generator<T>::run(const softsusy::QedQc
    eft.set_ewsb_iteration_precision(this->model.get_ewsb_iteration_precision());
    eft.set_number_of_ewsb_iterations(this->model.get_number_of_ewsb_iterations());
    eft.set_number_of_mass_iterations(this->model.get_number_of_mass_iterations());
+   eft.set_two_loop_corrections(this->model.get_two_loop_corrections());
 
    high_scale_constraint.clear();
    susy_scale_constraint.clear();

diff --git a/templates/standard_model_low_scale_spectrum_generator.hpp.in b/templates/standard_model_low_scale_spectrum_generator.hpp.in
@@ -110,6 +110,7 @@ void @ModelName@_standard_model_spectrum_generator<T>::run(const softsusy::QedQc
    eft.set_ewsb_iteration_precision(this->model.get_ewsb_iteration_precision());
    eft.set_number_of_ewsb_iterations(this->model.get_number_of_ewsb_iterations());
    eft.set_number_of_mass_iterations(this->model.get_number_of_mass_iterations());
+   eft.set_two_loop_corrections(this->model.get_two_loop_corrections());
 
 
    susy_scale_constraint.clear();