From 82e3787f5c2a165a2e4b509cf25cc90274779075 Mon Sep 17 00:00:00 2001
From: Dylan Harries <dylan.harries@adelaide.edu.au>
Date: Tue, 24 Jan 2017 08:56:33 +1030
Subject: [PATCH] Use in-class initialization for semi-analytic initial guesser

---
 ...analytic_high_scale_initial_guesser.cpp.in | 10 -------
 ...analytic_high_scale_initial_guesser.hpp.in | 30 +++++++++----------
 2 files changed, 15 insertions(+), 25 deletions(-)

diff --git a/templates/semi_analytic_high_scale_initial_guesser.cpp.in b/templates/semi_analytic_high_scale_initial_guesser.cpp.in
index 5252b1d39..2fdec3b4a 100644
--- a/templates/semi_analytic_high_scale_initial_guesser.cpp.in
+++ b/templates/semi_analytic_high_scale_initial_guesser.cpp.in
@@ -47,16 +47,6 @@ namespace flexiblesusy {
 )
    : model(model_)
    , qedqcd(qedqcd_)
-   , mu_guess(0.)
-   , mc_guess(0.)
-   , mt_guess(0.)
-   , md_guess(0.)
-   , ms_guess(0.)
-   , mb_guess(0.)
-   , me_guess(0.)
-   , mm_guess(0.)
-   , mtau_guess(0.)
-   , running_precision(1.0e-3)
    , low_constraint(low_constraint_)
    , susy_constraint(susy_constraint_)
    , high_constraint(high_constraint_)
diff --git a/templates/semi_analytic_high_scale_initial_guesser.hpp.in b/templates/semi_analytic_high_scale_initial_guesser.hpp.in
index ea8915131..759e468ac 100644
--- a/templates/semi_analytic_high_scale_initial_guesser.hpp.in
+++ b/templates/semi_analytic_high_scale_initial_guesser.hpp.in
@@ -53,21 +53,21 @@ public:
    void set_running_precision(double p) { running_precision = p; }
 
 private:
-   @ModelName@<Semi_analytic>* model; ///< pointer to model class
-   softsusy::QedQcd qedqcd;           ///< Standard Model low-energy data
-   double mu_guess; ///< guessed DR-bar mass of up-quark
-   double mc_guess; ///< guessed DR-bar mass of charm-quark
-   double mt_guess; ///< guessed DR-bar mass of top-quark
-   double md_guess; ///< guessed DR-bar mass of down-quark
-   double ms_guess; ///< guessed DR-bar mass of strange-quark
-   double mb_guess; ///< guessed DR-bar mass of bottom-quark
-   double me_guess; ///< guessed DR-bar mass of electron
-   double mm_guess; ///< guessed DR-bar mass of muon
-   double mtau_guess; ///< guessed DR-bar mass of tau
-   double running_precision; ///< Runge-Kutta RG running precision
-   @ModelName@_low_scale_constraint<Semi_analytic> low_constraint;
-   @ModelName@_susy_scale_constraint<Semi_analytic> susy_constraint;
-   @ModelName@_high_scale_constraint<Semi_analytic> high_constraint;
+   @ModelName@<Semi_analytic>* model{nullptr}; ///< pointer to model class
+   softsusy::QedQcd qedqcd{};           ///< Standard Model low-energy data
+   double mu_guess{0.}; ///< guessed DR-bar mass of up-quark
+   double mc_guess{0.}; ///< guessed DR-bar mass of charm-quark
+   double mt_guess{0.}; ///< guessed DR-bar mass of top-quark
+   double md_guess{0.}; ///< guessed DR-bar mass of down-quark
+   double ms_guess{0.}; ///< guessed DR-bar mass of strange-quark
+   double mb_guess{0.}; ///< guessed DR-bar mass of bottom-quark
+   double me_guess{0.}; ///< guessed DR-bar mass of electron
+   double mm_guess{0.}; ///< guessed DR-bar mass of muon
+   double mtau_guess{0.}; ///< guessed DR-bar mass of tau
+   double running_precision{1.e-3}; ///< Runge-Kutta RG running precision
+   @ModelName@_low_scale_constraint<Semi_analytic> low_constraint{};
+   @ModelName@_susy_scale_constraint<Semi_analytic> susy_constraint{};
+   @ModelName@_high_scale_constraint<Semi_analytic> high_constraint{};
 
    void initial_guess_low_scale_parameters();
    void initial_guess_high_scale_parameters();