git-svn-id: file:///home/svn/opt_utilities@59 ed2142bd-67ad-457f-ba7c-d818d4011675

25 files changed, 29 insertions, 5 deletions

diff --git a/models/add_model.hpp b/models/add_model.hpp
index 7e4a6c7..46aa76c 100644
--- a/models/add_model.hpp
+++ b/models/add_model.hpp
@@ -1,5 +1,6 @@
 #ifndef ADD_MODEL_H_
 #define ADD_MODEL_H_
+#define OPT_HEADER
 #include <core/fitter.hpp>
 #include <cmath>
 
diff --git a/models/beta1d.hpp b/models/beta1d.hpp
index 418722f..79e9a67 100644
--- a/models/beta1d.hpp
+++ b/models/beta1d.hpp
@@ -1,5 +1,6 @@
 #ifndef BETA_MODEL_H_
 #define BETA_MODEL_H_
+#define OPT_HEADER
 #include <core/fitter.hpp>
 #include <cmath>
 #include <iostream>
diff --git a/models/beta2d.hpp b/models/beta2d.hpp
index 650e179..2955e75 100644
--- a/models/beta2d.hpp
+++ b/models/beta2d.hpp
@@ -1,5 +1,6 @@
 #ifndef BETA_MODEL2d_H_
 #define BETA_MODEL2d_H_
+#define OPT_HEADER
 #include <core/fitter.hpp>
 #include <cmath>
 #include <cassert>
diff --git a/models/beta2d2.hpp b/models/beta2d2.hpp
index ab5c4bb..860d986 100644
--- a/models/beta2d2.hpp
+++ b/models/beta2d2.hpp
@@ -1,5 +1,6 @@
 #ifndef BETA_MODEL2d2_H_
 #define BETA_MODEL2d2_H_
+#define OPT_HEADER
 #include <core/fitter.hpp>
 #include <cmath>
 #include <cassert>
diff --git a/models/bl1d.hpp b/models/bl1d.hpp
index 2f6afb5..6dd24b3 100644
--- a/models/bl1d.hpp
+++ b/models/bl1d.hpp
@@ -1,5 +1,6 @@
 #ifndef BROKEN_LINE_MODEL_H_
 #define BROKEN_LINE_MODEL_H_
+#define OPT_HEADER
 #include <core/fitter.hpp>
 #include <cmath>
 
diff --git a/models/bpl1d.hpp b/models/bpl1d.hpp
index be32d8a..1c34016 100644
--- a/models/bpl1d.hpp
+++ b/models/bpl1d.hpp
@@ -1,5 +1,6 @@
 #ifndef BROKEN_POWER_LAW_MODEL_H_
 #define BROKEN_POWER_LAW_MODEL_H_
+#define OPT_HEADER
 #include <core/fitter.hpp>
 #include <cmath>
 
diff --git a/models/bremss.hpp b/models/bremss.hpp
index af48519..147e724 100644
--- a/models/bremss.hpp
+++ b/models/bremss.hpp
@@ -1,5 +1,6 @@
 #ifndef BREMSS_MODEL_H_
 #define BREMSS_MODEL_H_
+#define OPT_HEADER
 #include <core/fitter.hpp>
 #include <cmath>
 
diff --git a/models/constant.hpp b/models/constant.hpp
index f052756..666051f 100644
--- a/models/constant.hpp
+++ b/models/constant.hpp
@@ -1,5 +1,6 @@
 #ifndef CONSTANT_MODEL_H_
 #define CONSTANT_MODEL_H_
+#define OPT_HEADER
 #include <core/fitter.hpp>
 #include <cmath>
 
diff --git a/models/dbeta1d.hpp b/models/dbeta1d.hpp
index 44f6060..3ecd5b1 100644
--- a/models/dbeta1d.hpp
+++ b/models/dbeta1d.hpp
@@ -1,5 +1,6 @@
 #ifndef DBETA_MODEL_H_
 #define DBETA_MODEL_H_
+#define OPT_HEADER
 #include <core/fitter.hpp>
 #include <cmath>
 #include <iostream>
diff --git a/models/dbeta2d.hpp b/models/dbeta2d.hpp
index 473dd19..89003c9 100644
--- a/models/dbeta2d.hpp
+++ b/models/dbeta2d.hpp
@@ -1,5 +1,6 @@
 #ifndef DBETA_MODEL2d_H_
 #define DBETA_MODEL2d_H_
+#define OPT_HEADER
 #include <core/fitter.hpp>
 #include <cmath>
 #include <cassert>
diff --git a/models/dbeta2d2.hpp b/models/dbeta2d2.hpp
index 7c9adbc..e1ee307 100644
--- a/models/dbeta2d2.hpp
+++ b/models/dbeta2d2.hpp
@@ -1,5 +1,6 @@
 #ifndef DDBETA_OOOMODEL2d2_H_
 #define DDBETA_OOOMODEL2d2_H_
+#define OPT_HEADER
 #include <core/fitter.hpp>
 #include <cmath>
 #include <cassert>
diff --git a/models/dbeta2d3.hpp b/models/dbeta2d3.hpp
index 8db6efb..38052ec 100644
--- a/models/dbeta2d3.hpp
+++ b/models/dbeta2d3.hpp
@@ -1,5 +1,6 @@
 #ifndef DDBETA3_MODEL2d2_H_
 #define DDBETA3_MODEL2d2_H_
+#define OPT_HEADER
 #include <core/fitter.hpp>
 #include <cmath>
 #include <cassert>
diff --git a/models/dl_model.hpp b/models/dl_model.hpp
index 9188736..92a9820 100644
--- a/models/dl_model.hpp
+++ b/models/dl_model.hpp
@@ -1,7 +1,8 @@
 #ifdef __linux__
 
-#ifndef DL_MODEL_H_
-#define DL_MODEL_H_
+#ifndef DL_MODEL_HPP
+#define DL_MODEL_HPP
+#define OPT_HEADER
 #include <core/fitter.hpp>
 #include <cmath>
 #include <iostream>
diff --git a/models/func_model.hpp b/models/func_model.hpp
index b47043a..2234cc1 100644
--- a/models/func_model.hpp
+++ b/models/func_model.hpp
@@ -1,5 +1,6 @@
 #ifndef FUNC_MODEL_H_
 #define FUNC_MODEL_H_
+#define OPT_HEADER
 #include <core/fitter.hpp>
 #include <cmath>
 #include <iostream>
diff --git a/models/gauss1d.hpp b/models/gauss1d.hpp
index 8221178..a31ace1 100644
--- a/models/gauss1d.hpp
+++ b/models/gauss1d.hpp
@@ -1,5 +1,6 @@
 #ifndef GAUSS_MODEL_H_
 #define GAUSS_MODEL_H_
+#define OPT_HEADER
 #include <core/fitter.hpp>
 #include <cmath>
 
diff --git a/models/lin1d.hpp b/models/lin1d.hpp
index 1a07424..0f6ac98 100644
--- a/models/lin1d.hpp
+++ b/models/lin1d.hpp
@@ -1,5 +1,6 @@
 #ifndef LINEAR_MODEL_H_
 #define LINEAR_MODEL_H_
+#define OPT_HEADER
 #include <core/fitter.hpp>
 #include <cmath>
 
diff --git a/models/models.hpp b/models/models.hpp
index 79201e8..3b78fc2 100644
--- a/models/models.hpp
+++ b/models/models.hpp
@@ -1,6 +1,6 @@
 #ifndef MODELS_HPP
 #define MODELS_HPP
-
+#define OPT_HEADER
 #include <core/fitter.hpp>
 #include <map>
 #include <string>
diff --git a/models/mul_model.hpp b/models/mul_model.hpp
index d7cfbe2..9c9da8e 100644
--- a/models/mul_model.hpp
+++ b/models/mul_model.hpp
@@ -1,5 +1,6 @@
-#ifndef MUL_MODEL_H_
-#define MUL_MODEL_H_
+#ifndef MUL_MODEL_HPP
+#define MUL_MODEL_HPP
+#define OPT_HEADER
 #include <core/fitter.hpp>
 #include <cmath>
 
diff --git a/models/nbeta1d.hpp b/models/nbeta1d.hpp
index 83f43a3..ad00201 100644
--- a/models/nbeta1d.hpp
+++ b/models/nbeta1d.hpp
@@ -1,5 +1,6 @@
 #ifndef NBETA_MODEL_H_
 #define NBETA_MODEL_H_
+#define OPT_HEADER
 #include <core/fitter.hpp>
 #include <cmath>
 #include <iostream>
diff --git a/models/nfw1d.hpp b/models/nfw1d.hpp
index 6ce9df0..4dc1970 100644
--- a/models/nfw1d.hpp
+++ b/models/nfw1d.hpp
@@ -1,5 +1,6 @@
 #ifndef NFW_MODEL_H_
 #define NFW_MODEL_H_
+#define OPT_HEADER
 #include <core/fitter.hpp>
 #include <cmath>
 #include <iostream>
diff --git a/models/pl1d.hpp b/models/pl1d.hpp
index 3b52832..c048334 100644
--- a/models/pl1d.hpp
+++ b/models/pl1d.hpp
@@ -1,5 +1,6 @@
 #ifndef POWER_LAW_MODEL_H_
 #define POWER_LAW_MODEL_H_
+#define OPT_HEADER
 #include <core/fitter.hpp>
 #include <cmath>
 
diff --git a/models/poly1d.hpp b/models/poly1d.hpp
index 457ce3a..142f6ba 100644
--- a/models/poly1d.hpp
+++ b/models/poly1d.hpp
@@ -1,5 +1,6 @@
 #ifndef POLY_MODEL_H_
 #define POLY_MODEL_H_
+#define OPT_HEADER
 #include <core/fitter.hpp>
 #include <cmath>
 #include <sstream>
diff --git a/models/pow_model.hpp b/models/pow_model.hpp
index 3e1ea17..6702236 100644
--- a/models/pow_model.hpp
+++ b/models/pow_model.hpp
@@ -1,5 +1,6 @@
 #ifndef POW_MODEL_H_
 #define POW_MODEL_H_
+#define OPT_HEADER
 #include <core/fitter.hpp>
 #include <core/opt_traits.hpp>
 #include <cmath>
diff --git a/models/strmodel1d.hpp b/models/strmodel1d.hpp
index af74453..4cb1786 100644
--- a/models/strmodel1d.hpp
+++ b/models/strmodel1d.hpp
@@ -1,5 +1,6 @@
 #ifndef STRMODEL1D_HPP
 #define STRMODEL1D_HPP
+#define OPT_HEADER
 #include <core/fitter.hpp>
 #include <cmath>
 #include <sstream>
diff --git a/models/vecn.hpp b/models/vecn.hpp
index 8b65361..b37ff11 100644
--- a/models/vecn.hpp
+++ b/models/vecn.hpp
@@ -1,5 +1,6 @@
 #ifndef VECN_HPP
 #define VECN_HPP
+#define OPT_HEADER
 #include <iostream>
 namespace opt_utilities
 {