make trace struct a local const object

FlexibleSUSY · Dec 6, 2016 · 0f9f5c8 · 0f9f5c8
1 parent 0509315
commit 0f9f5c8
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 8 deletions.
diff --git a/meta/BetaFunction.m b/meta/BetaFunction.m
@@ -251,8 +251,7 @@
            allBeta = allDecl <> "\n" <>
                      "if (get_loops() > 0) {\n" <>
                      TextFormatting`IndentText[
-                         "TRACE_STRUCT_TYPE TRACE_STRUCT;\n" <>
-                         "CALCULATE_TRACES();\n\n" <>
+                         "const auto TRACE_STRUCT = CALCULATE_TRACES();\n\n" <>
                          allBeta1L <> "\n" <>
                          "if (get_loops() > 1) {\n" <>
                          allBeta2L <> "\n" <>

diff --git a/templates/soft_parameters.cpp.in b/templates/soft_parameters.cpp.in
@@ -29,7 +29,7 @@ namespace flexiblesusy {
 #define INPUT(parameter) input.parameter
 #define TRACE_STRUCT soft_traces
 #define TRACE_STRUCT_TYPE Soft_traces
-#define CALCULATE_TRACES() calc_soft_traces(TRACE_STRUCT);
+#define CALCULATE_TRACES() calc_soft_traces();
 
 const int @ModelName@_soft_parameters::numberOfParameters;
 
@@ -103,8 +103,10 @@ void @ModelName@_soft_parameters::set(const Eigen::ArrayXd& pars)
 @set@
 }
 
-void @ModelName@_soft_parameters::calc_soft_traces(Soft_traces& soft_traces) const
+@ModelName@_soft_parameters::Soft_traces @ModelName@_soft_parameters::calc_soft_traces() const
 {
+   Soft_traces soft_traces;
+
    if (get_loops() > 0) {
 @calc1LTraces@
    }
@@ -116,6 +118,8 @@ void @ModelName@_soft_parameters::calc_soft_traces(Soft_traces& soft_traces) con
    if (get_loops() > 2) {
 @calc3LTraces@
    }
+
+   return soft_traces;
 }
 
 std::ostream& operator<<(std::ostream& ostr, const @ModelName@_soft_parameters& soft_pars)

diff --git a/templates/soft_parameters.hpp.in b/templates/soft_parameters.hpp.in
@@ -63,7 +63,7 @@ private:
    struct Soft_traces {
 @traceDefs@
    };
-   void calc_soft_traces(Soft_traces&) const;
+   Soft_traces calc_soft_traces() const;
 
 @singleBetaFunctionsDecls@
 };

diff --git a/templates/susy_parameters.cpp.in b/templates/susy_parameters.cpp.in
@@ -30,7 +30,7 @@ namespace flexiblesusy {
 #define INPUT(parameter) input.parameter
 #define TRACE_STRUCT susy_traces
 #define TRACE_STRUCT_TYPE Susy_traces
-#define CALCULATE_TRACES() calc_susy_traces(TRACE_STRUCT);
+#define CALCULATE_TRACES() calc_susy_traces();
 
 const int @ModelName@_susy_parameters::numberOfParameters;
 
@@ -121,8 +121,10 @@ void @ModelName@_susy_parameters::set_input_parameters(const @ModelName@_input_p
    input = input_;
 }
 
-void @ModelName@_susy_parameters::calc_susy_traces(Susy_traces& susy_traces) const
+@ModelName@_susy_parameters::Susy_traces @ModelName@_susy_parameters::calc_susy_traces() const
 {
+   Susy_traces susy_traces;
+
    if (get_loops() > 0) {
 @calc1LTraces@
    }
@@ -134,6 +136,8 @@ void @ModelName@_susy_parameters::calc_susy_traces(Susy_traces& susy_traces) con
    if (get_loops() > 2) {
 @calc3LTraces@
    }
+
+   return susy_traces;
 }
 
 std::ostream& operator<<(std::ostream& ostr, const @ModelName@_susy_parameters& susy_pars)

diff --git a/templates/susy_parameters.hpp.in b/templates/susy_parameters.hpp.in
@@ -72,7 +72,7 @@ private:
    struct Susy_traces {
 @traceDefs@
    };
-   void calc_susy_traces(Susy_traces&) const;
+   Susy_traces calc_susy_traces() const;
 
 @singleBetaFunctionsDecls@
 };