Small change in clang format

.clang-format

@@ -9,7 +9,6 @@ AllowShortCaseLabelsOnASingleLine: 'true'
 AllowShortFunctionsOnASingleLine: InlineOnly
 AllowShortIfStatementsOnASingleLine: WithoutElse
 AllowShortLoopsOnASingleLine: 'false'
-AlwaysBreakAfterReturnType: All
 BinPackArguments: 'false'
 BinPackParameters: 'false'
 BreakBeforeBraces: Allman

include/BSMPT/Kfactors/Kfactors.h

@@ -47,8 +47,7 @@ struct GSL_integration
 /**
  * Helper function which displays the numbers in a more readable way
  */
-void
-display_results(std::string title, double result, double error);
+void display_results(std::string title, double result, double error);
 
 /**
  * Calculates the distribution f0, defined in Eq(13) in 0604159
@@ -58,8 +57,7 @@ display_results(std::string title, double result, double error);
  * @param diff number of derivatives w.r.t. E0, diff = 0 no derivative and diff
  * = 1 or 2 accordingly
  */
-double
-distribution_f0(double E0, int s, double Temp, int diff = 0);
+double distribution_f0(double E0, int s, double Temp, int diff = 0);
 
 /**
  * Evaluates the integrand in the K functions
@@ -70,19 +68,17 @@ distribution_f0(double E0, int s, double Temp, int diff = 0);
  * @param s s=-1 yields the function for a bosonic distribution, s=+1 for a
  * fermionic one
  */
-double
-K_integrand(const std::vector<double> &p,
-            double masssquared,
-            int switchvalue,
-            int s,
-            double Temp);
+double K_integrand(const std::vector<double> &p,
+                   double masssquared,
+                   int switchvalue,
+                   int s,
+                   double Temp);
 
 /**
  * Interface to communicate the value of K_integrand() to the GSL integration
  * routine
  */
-double
-K_integrand_gsl(double *x, std::size_t dim, void *params);
+double K_integrand_gsl(double *x, std::size_t dim, void *params);
 
 /**
  * Calculates the values of the K functions given in Eq (23) in 0604159 without
@@ -93,8 +89,7 @@ K_integrand_gsl(double *x, std::size_t dim, void *params);
  * @param s s=-1 yields the function for a bosonic distribution, s=+1 for a
  * fermionic one
  */
-double
-K_integration(double masssquared, double Temp, int switchvalue, int s);
+double K_integration(double masssquared, double Temp, int switchvalue, int s);
 
 /**
  * Calculates the normalized K function
@@ -104,24 +99,21 @@ K_integration(double masssquared, double Temp, int switchvalue, int s);
  * @param s s=-1 yields the function for a bosonic distribution, s=+1 for a
  * fermionic one
  */
-double
-K_functions(double masssquared, double Temp, int switchvalue, int s);
+double K_functions(double masssquared, double Temp, int switchvalue, int s);
 /**
  * Integrand to calculate the normalization for the Ktilde functions. Used in
  * Ktilde_normalization()
  * @param x vector which containts the momentum
  * @param params GSL_integration struct
  */
-double
-Ktilde_normalization_func(double x, void *params);
+double Ktilde_normalization_func(double x, void *params);
 /**
  * Calculates the normalization for the non tilde K functions
  * @param Temp Temperature
  * @param s +1 for fermions and -1 for bosons
  * @param masssquared m^2 value
  */
-double
-Ktilde_normalization(double Temp, int s, double masssquared);
+double Ktilde_normalization(double Temp, int s, double masssquared);
 
 } // namespace Kfactors
 } // namespace BSMPT

include/BSMPT/Kfactors/KfactorsinterpolatedGSL.h

@@ -44,17 +44,15 @@ namespace Kfactors
  * Calculates the norm for < > Integrals
  * @param T temperature at which the normalisation should be evaluated
  */
-double
-CalculateNorm1(const double &T);
+double CalculateNorm1(const double &T);
 
 /**
  * Calculates the norm for [] Integrals
  * @param msquared m^2 value at which the normalisation should be evaluated
  * @param T temperature at which the normalisation should be evaluated
  * @param s switch for bosons (s=-1) and fermions (s=1)
  */
-double
-CalculateNorm2(const double &msquared, const double &T, const int &s);
+double CalculateNorm2(const double &msquared, const double &T, const int &s);
 
 /**
  * @brief initializeK1fermionGrid
@@ -121,144 +119,124 @@ initializeK9fermionGrid();
  * @param msquared m^2 [GeV^2]
  * @param T temperature [GeV]
  */
-double
-K1fermion(double msquared, double T);
+double K1fermion(double msquared, double T);
 
 /**
  * Calculates the non normalised function K1 for bosons
  * @param msquared m^2 [GeV^2]
  * @param T temperature [GeV]
  */
-double
-K1boson(double msquared, double T);
+double K1boson(double msquared, double T);
 
 /**
  * Calculates the non normalised function K2 for fermions
  * @param msquared m^2 [GeV^2]
  * @param T temperature [GeV]
  */
-double
-K2fermion(double msquared, double T);
+double K2fermion(double msquared, double T);
 /**
  * Calculates the non normalised function K4 for fermions
  * @param msquared m^2 [GeV^2]
  * @param T temperature [GeV]
  */
-double
-K4fermion(double msquared, double T);
+double K4fermion(double msquared, double T);
 /**
  * Calculates the non normalised function K4 for bosons
  * @param msquared m^2 [GeV^2]
  * @param T temperature [GeV]
  */
-double
-K4boson(double msquared, double T);
+double K4boson(double msquared, double T);
 /**
  * Calculates the non normalised function K5 for fermions
  * @param msquared m^2 [GeV^2]
  * @param T temperature [GeV]
  */
-double
-K5fermion(double msquared, double T);
+double K5fermion(double msquared, double T);
 /**
  * Calculates the non normalised function K5 for bosons
  * @param msquared m^2 [GeV^2]
  * @param T temperature [GeV]
  */
-double
-K5boson(double msquared, double T);
+double K5boson(double msquared, double T);
 /**
  * Calculates the non normalised function K6 for fermions
  * @param msquared m^2 [GeV^2]
  * @param T temperature [GeV]
  */
-double
-K6fermion(double msquared, double T);
+double K6fermion(double msquared, double T);
 /**
  * Calculates the non normalised function K8 for fermions
  * @param msquared m^2 [GeV^2]
  * @param T temperature [GeV]
  */
-double
-K8fermion(double msquared, double T);
+double K8fermion(double msquared, double T);
 /**
  * Calculates the non normalised function K9 for fermions
  * @param msquared m^2 [GeV^2]
  * @param T temperature [GeV]
  */
-double
-K9fermion(double msquared, double T);
+double K9fermion(double msquared, double T);
 
 /**
  * Calculates the normalised function K1 for fermions
  * @param msquared m^2 [GeV^2]
  * @param T temperature [GeV]
  */
-double
-K1fermion_normalized(double msquared, double T);
+double K1fermion_normalized(double msquared, double T);
 /**
  * Calculates the normalised function K1 for bosons
  * @param msquared m^2 [GeV^2]
  * @param T temperature [GeV]
  */
-double
-K1boson_normalized(double msquared, double T);
+double K1boson_normalized(double msquared, double T);
 /**
  * Calculates the normalised function K2 for fermions
  * @param msquared m^2 [GeV^2]
  * @param T temperature [GeV]
  */
-double
-K2fermion_normalized(double msquared, double T);
+double K2fermion_normalized(double msquared, double T);
 /**
  * Calculates the normalised function K4 for fermions
  * @param msquared m^2 [GeV^2]
  * @param T temperature [GeV]
  */
-double
-K4fermion_normalized(double msquared, double T);
+double K4fermion_normalized(double msquared, double T);
 /**
  * Calculates the normalised function K4 for bosons
  * @param msquared m^2 [GeV^2]
  * @param T temperature [GeV]
  */
-double
-K4boson_normalized(double msquared, double T);
+double K4boson_normalized(double msquared, double T);
 /**
  * Calculates the normalised function K5 for fermions
  * @param msquared m^2 [GeV^2]
  * @param T temperature [GeV]
  */
-double
-K5fermion_normalized(double msquared, double T);
+double K5fermion_normalized(double msquared, double T);
 /**
  * Calculates the normalised function K5 for bosons
  * @param msquared m^2 [GeV^2]
  * @param T temperature [GeV]
  */
-double
-K5boson_normalized(double msquared, double T);
+double K5boson_normalized(double msquared, double T);
 /**
  * Calculates the normalised function K6 for fermions
  * @param msquared m^2 [GeV^2]
  * @param T temperature [GeV]
  */
-double
-K6fermion_normalized(double msquared, double T);
+double K6fermion_normalized(double msquared, double T);
 /**
  * Calculates the normalised function K8 for fermions
  * @param msquared m^2 [GeV^2]
  * @param T temperature [GeV]
  */
-double
-K8fermion_normalized(double msquared, double T);
+double K8fermion_normalized(double msquared, double T);
 /**
  * Calculates the normalised function K9 for fermions
  * @param msquared m^2 [GeV^2]
  * @param T temperature [GeV]
  */
-double
-K9fermion_normalized(double msquared, double T);
+double K9fermion_normalized(double msquared, double T);
 
 } // namespace Kfactors
 } // namespace BSMPT

include/BSMPT/ThermalFunctions/ThermalFunctions.h

@@ -64,8 +64,7 @@ const double C_euler_gamma = 0.5772156649015328606065;
  * @param diff Returns the integrand of J_- for diff = 0 and for the dJ_-/dx for
  * diff = 1
  */
-double
-JbosonIntegrand(const double &x, const double &k, int diff = 0);
+double JbosonIntegrand(const double &x, const double &k, int diff = 0);
 /**
  * Numerical integration of the thermical integral for the bosons \f$ J_-(x) =
  * \int\limits_{0}^{\infty} \,\mathrm{d}k \, k^2 \log\left[ 1 - \exp\left(
@@ -74,8 +73,7 @@ JbosonIntegrand(const double &x, const double &k, int diff = 0);
  * @param diff Returns the numerical integration of J_- for diff = 0 and J_-/dx
  * for diff = 1
  */
-double
-JbosonNumericalIntegration(const double &x, int diff = 0);
+double JbosonNumericalIntegration(const double &x, int diff = 0);
 /**
  * Taylor expansion of J_- for small x=m^2/T^2, \f$ J_{_,s}(x,n) =
  * -\frac{\pi^4}{45} + \frac{\pi}{12} x - \frac{\pi}{6} x^{3/2} -
@@ -87,23 +85,20 @@ JbosonNumericalIntegration(const double &x, int diff = 0);
  * @param diff Returns the expansion for diff = 0 and its derivative for diff =
  * 1
  */
-double
-JbosonInterpolatedLow(const double &x, const int &n, int diff = 0);
+double JbosonInterpolatedLow(const double &x, const int &n, int diff = 0);
 /**
  * Using linear interpolation with data points to interpolate the thermal
  * integral for bosons for x=m^2/T^2 < 0
  * @param x The ratio m^2/T^2
  */
-double
-JbosonInterpolatedNegative(const double &x);
+double JbosonInterpolatedNegative(const double &x);
 /**
  * Puts together the separate interpolations for J_-
  * @param x The ratio m^2/T^2
  * @param diff Returns the interpolation of J_- for diff = 0 and for dJ_-/dx for
  * diff = 1
  */
-double
-JbosonInterpolated(const double &x, int diff = 0);
+double JbosonInterpolated(const double &x, int diff = 0);
 
 /**
  * Integrand of the thermic integral for the fermions \f$ J_+(x) =
@@ -114,8 +109,7 @@ JbosonInterpolated(const double &x, int diff = 0);
  * @param diff Returns the integrand of J_+ for diff = 0 and for the dJ_+/dx for
  * diff = 1
  */
-double
-JfermionIntegrand(const double &x, const double &k, int diff = 0);
+double JfermionIntegrand(const double &x, const double &k, int diff = 0);
 /**
  * Numerical integration of the thermical integral for the fermions \f$ J_+(x) =
  * \int\limits_{0}^{\infty} \,\mathrm{d}k \, k^2 \log\left[ 1 + \exp\left(
@@ -124,8 +118,7 @@ JfermionIntegrand(const double &x, const double &k, int diff = 0);
  * @param diff Returns the integrand of J_+ for diff = 0 and for the dJ_+/dx for
  * diff = 1
  */
-double
-JfermionNumericalIntegration(const double &x, int diff = 0);
+double JfermionNumericalIntegration(const double &x, int diff = 0);
 /**
  * Taylor expansion of J_+ for small x=m^2/T^2, \f$ J_{+,s}(x,n) =
  * -\frac{7\pi^4}{360} + \frac{\pi^2}{24} x + \frac{x^2}{32}\left( \log x - c_+
@@ -136,17 +129,15 @@ JfermionNumericalIntegration(const double &x, int diff = 0);
  * @param n The order of the taylor expansion
  * @param diff Returns the expansion for diff = 0 and dJ_+/dx for diff = 1
  */
-double
-JfermionInterpolatedLow(const double &x, const int &n, int diff = 0);
+double JfermionInterpolatedLow(const double &x, const int &n, int diff = 0);
 /**
  * Puts together the separate interpolations for J_+, see Eq. (2.44) in the
  * manual
  * @param x The ratio m^2/T^2
  * @param diff Returns the interpolation of J_+ for diff = 0 and dJ_+/dx for
  * diff = 1
  */
-double
-JfermionInterpolated(const double &x, int diff = 0);
+double JfermionInterpolated(const double &x, int diff = 0);
 
 /**
  * Expansion for large x = m^2/T^2 of the thermal integrals, \f$ J_{\pm,l}(x,n)
@@ -158,8 +149,7 @@ JfermionInterpolated(const double &x, int diff = 0);
  * @param diff Returns the expansion for diff = 0 and for its derivative for
  * diff = 1
  */
-double
-JInterpolatedHigh(const double &x, const int &n, int diff = 0);
+double JInterpolatedHigh(const double &x, const int &n, int diff = 0);
 
 } // namespace ThermalFunctions
 } // namespace BSMPT