put GM2Calc interface into src/ module

FlexibleSUSY · Dec 20, 2015 · c8d8ac7 · c8d8ac7
1 parent 0d3ed1f
commit c8d8ac7
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 6 deletions.
diff --git a/addons/gm2calc/module.mk b/addons/gm2calc/module.mk
@@ -6,7 +6,6 @@ LIBgm2calc_SRC := \
 		$(DIR)/ffunctions.cpp \
 		$(DIR)/gm2_1loop.cpp \
 		$(DIR)/gm2_2loop.cpp \
-		$(DIR)/gm2_flexiblesusy_interface.cpp \
 		$(DIR)/gm2_mb.cpp \
 		$(DIR)/gm2_slha_io.cpp \
 		$(DIR)/gm2_uncertainty.cpp \
@@ -27,7 +26,6 @@ LIBgm2calc_HDR := \
 		$(DIR)/ffunctions.hpp \
 		$(DIR)/gm2_1loop.hpp \
 		$(DIR)/gm2_2loop.hpp \
-		$(DIR)/gm2_flexiblesusy_interface.hpp \
 		$(DIR)/gm2_error.hpp \
 		$(DIR)/gm2_mb.hpp \
 		$(DIR)/gm2_slha_io.hpp \

diff --git a/...ns/gm2calc/gm2_flexiblesusy_interface.cpp → src/gm2calc_interface.cpp b/...ns/gm2calc/gm2_flexiblesusy_interface.cpp → src/gm2calc_interface.cpp
@@ -16,12 +16,21 @@
 // <http://www.gnu.org/licenses/>.
 // ====================================================================
 
-#include "gm2_flexiblesusy_interface.hpp"
+#include "gm2calc_interface.hpp"
+#include "config.h"
 
 namespace gm2calc {
 
+#ifdef ENABLE_GM2Calc
 double fs_calculate_amu()
 {
+   return 0.;
 }
+#else
+double fs_calculate_amu()
+{
+   return 0.;
+}
+#endif
 
 } // namespace gm2calc
diff --git a/...ns/gm2calc/gm2_flexiblesusy_interface.hpp → src/gm2calc_interface.hpp b/...ns/gm2calc/gm2_flexiblesusy_interface.hpp → src/gm2calc_interface.hpp
@@ -16,8 +16,8 @@
 // <http://www.gnu.org/licenses/>.
 // ====================================================================
 
-#ifndef GM2CALC_FLEXIBLESUSY_INTERFACE_H
-#define GM2CALC_FLEXIBLESUSY_INTERFACE_H
+#ifndef GM2CALC_INTERFACE_H
+#define GM2CALC_INTERFACE_H
 
 namespace gm2calc {
 

diff --git a/src/module.mk b/src/module.mk
@@ -14,6 +14,7 @@ LIBFLEXI_SRC := \
 		$(DIR)/dilog.cpp \
 		$(DIR)/dilogc.f \
 		$(DIR)/error.cpp \
+		$(DIR)/gm2calc_interface.cpp \
 		$(DIR)/gsl_utils.cpp \
 		$(DIR)/linalg.cpp \
 		$(DIR)/lowe.cpp \
@@ -60,6 +61,7 @@ LIBFLEXI_HDR := \
 		$(DIR)/ewsb_solver.hpp \
 		$(DIR)/fixed_point_iterator.hpp \
 		$(DIR)/functors.hpp \
+		$(DIR)/gm2calc_interface.hpp \
 		$(DIR)/gsl_utils.hpp \
 		$(DIR)/gut_scale_calculator.hpp \
 		$(DIR)/two_loop_corrections.hpp \

diff --git a/templates/observables.cpp.in b/templates/observables.cpp.in
@@ -20,7 +20,7 @@
 
 #include "@ModelName@_observables.hpp"
 #include "@ModelName@_mass_eigenstates.hpp"
-#include "gm2_flexiblesusy_interface.hpp"
+#include "gm2calc_interface.hpp"
 
 #define MODEL model
 #define AMUGM2CALC a_muon_gm2calc