rename susy contributions flag variable

FlexibleSUSY · Feb 5, 2015 · f24d2ea · f24d2ea
1 parent ea0a41c
commit f24d2ea
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/src/weinberg_angle.cpp b/src/weinberg_angle.cpp
@@ -220,14 +220,15 @@ double Weinberg_angle::calculate(double rho_start, double sin_start) const
  * @param rho rho-hat-parameter
  * @param sinThetaW sin(theta_W)
  * @param data data structure with model parameters
+ * @param add_susy_contributions add SUSY particle contributions
  *
  * @return \f$\Delta\hat{\rho}\f$ as defined in (C.5) and (C.5) from hep-ph/9606211
  */
 double Weinberg_angle::calculate_delta_rho(
    double rho,
    double sinThetaW,
    const Data& data,
-   bool susy_contributions
+   bool add_susy_contributions
 )
 {
    const double mz = data.mz_pole;
@@ -258,7 +259,7 @@ double Weinberg_angle::calculate_delta_rho(
 #endif
 
    double hmix_r = 1.0;
-   if (susy_contributions)
+   if (add_susy_contributions)
       hmix_r = Sqr(hmix12 / sinb);
 
    const double deltaRho2LoopSm = alphaDRbar * Sqr(g3) /
@@ -283,14 +284,15 @@ double Weinberg_angle::calculate_delta_rho(
  * @param rho rho-hat-parameter
  * @param sinThetaW sin(theta_W)
  * @param data data structure with model parameters
+ * @param add_susy_contributions add SUSY particle contributions
  *
  * @return \f$\Delta\hat{r}\f$ as defined in (C.5) and (C.5) from hep-ph/9606211
  */
 double Weinberg_angle::calculate_delta_r(
    double rho,
    double sinThetaW,
    const Data& data,
-   bool susy_contributions
+   bool add_susy_contributions
 )
 {
    const double outcos = Cos(ArcSin(sinThetaW));
@@ -323,10 +325,10 @@ double Weinberg_angle::calculate_delta_r(
 #endif
 
    const double dvb
-      = calculate_delta_vb(rho, sinThetaW, data, susy_contributions);
+      = calculate_delta_vb(rho, sinThetaW, data, add_susy_contributions);
 
    double hmix_r = 1.0;
-   if (susy_contributions)
+   if (add_susy_contributions)
       hmix_r = Sqr(hmix12 / sinb);
 
    const double deltaR = rho * piwwt0 / Sqr(mw) -
@@ -352,20 +354,20 @@ double Weinberg_angle::calculate_delta_r(
  * @param rho rho-hat-parameter
  * @param sinThetaW sin(theta_W)
  * @param data data structure with model parameters
- * @param susy_contributions use SUSY particle contributions
+ * @param add_susy_contributions add SUSY particle contributions
  *
  * @return \f$\delta_{\text{VB}}\f$ as defined in (C.11) from hep-ph/9606211
  */
 double Weinberg_angle::calculate_delta_vb(
    double rho,
    double sinThetaW,
    const Data& data,
-   bool susy_contributions)
+   bool add_susy_contributions)
 {
    double deltaVbSusy = 0.;
    const double deltaVbSm = calculate_delta_vb_sm(rho, sinThetaW, data);
 
-   if (susy_contributions)
+   if (add_susy_contributions)
       deltaVbSusy = calculate_delta_vb_susy(rho, sinThetaW, data);
 
    const double deltaVb = deltaVbSm + deltaVbSusy;

diff --git a/src/weinberg_angle.hpp b/src/weinberg_angle.hpp
@@ -103,9 +103,9 @@ class Weinberg_angle {
    Data data;
    bool susy_contributions;       ///< model type
 
-   static double calculate_delta_r(double, double, const Data&, bool susy_contributions = true);
-   static double calculate_delta_rho(double, double, const Data&, bool susy_contributions = true);
-   static double calculate_delta_vb(double, double, const Data&, bool susy_contributions = true);
+   static double calculate_delta_r(double, double, const Data&, bool add_susy_contributions = true);
+   static double calculate_delta_rho(double, double, const Data&, bool add_susy_contributions = true);
+   static double calculate_delta_vb(double, double, const Data&, bool add_susy_contributions = true);
    static double calculate_delta_vb_sm(double, double, const Data&);
    static double calculate_delta_vb_susy(double, double, const Data&);
    static double rho_2(double);