diff options
| -rw-r--r-- | mass_profile/Makefile | 4 | ||||
| -rw-r--r-- | mass_profile/calc_lx.cpp | 2 | ||||
| -rw-r--r-- | mass_profile/calc_lx_beta.cpp | 6 | ||||
| -rw-r--r-- | mass_profile/calc_lx_dbeta.cpp | 6 | ||||
| -rw-r--r-- | mass_profile/cooling_time.cpp | 2 | ||||
| -rw-r--r-- | mass_profile/fit_beta_sbp.cpp | 6 | ||||
| -rw-r--r-- | mass_profile/fit_dbeta_sbp.cpp | 6 | ||||
| -rw-r--r-- | mass_profile/fit_nfw_sbp.cpp | 6 | ||||
| -rw-r--r-- | mass_profile/spline.hpp (renamed from mass_profile/spline.h) | 6 |
9 files changed, 17 insertions, 27 deletions
diff --git a/mass_profile/Makefile b/mass_profile/Makefile index b9b6136..b6418ab 100644 --- a/mass_profile/Makefile +++ b/mass_profile/Makefile @@ -1,5 +1,5 @@ # -# Makefile for `mass_profile` tools +# Makefile for `chandra-acis-analysis/mass_profile` tools # # Junhua GU # Weitian LI @@ -29,7 +29,7 @@ TARGETS= fit_nfw_sbp fit_dbeta_sbp fit_beta_sbp \ fit_direct_beta calc_distance fit_wang2012_model \ fit_nfw_mass calc_lx fit_mt_pl fit_lt_pl fit_mt_bpl \ fit_lt_bpl cooling_time calc_lx_dbeta calc_lx_beta -HEADERS= projector.hpp spline.h vchisq.hpp +HEADERS= projector.hpp spline.hpp vchisq.hpp all: pgplot $(TARGETS) diff --git a/mass_profile/calc_lx.cpp b/mass_profile/calc_lx.cpp index b1137ff..21a508c 100644 --- a/mass_profile/calc_lx.cpp +++ b/mass_profile/calc_lx.cpp @@ -1,5 +1,5 @@ #include "calc_distance.h" -#include "spline.h" +#include "spline.hpp" #include <iostream> #include <string> #include <vector> diff --git a/mass_profile/calc_lx_beta.cpp b/mass_profile/calc_lx_beta.cpp index 59ea51c..dcbf1ad 100644 --- a/mass_profile/calc_lx_beta.cpp +++ b/mass_profile/calc_lx_beta.cpp @@ -21,7 +21,7 @@ #include <methods/powell/powell_method.hpp> #include <core/freeze_param.hpp> #include <error_estimator/error_estimator.hpp> -#include "spline.h" +#include "spline.hpp" using namespace std; using namespace opt_utilities; @@ -34,9 +34,7 @@ double beta_func(double r, double n0, double rc, double beta) return abs(n0) * pow(1+r*r/rc/rc, -3./2.*abs(beta)); } -//A class enclosing the spline interpolation method of cooling function -//check spline.h for more detailed information -//this class is a thin wrapper for the spline class defined in spline.h +//A class enclosing the spline interpolation method class spline_func_obj :public func_obj<double,double> { diff --git a/mass_profile/calc_lx_dbeta.cpp b/mass_profile/calc_lx_dbeta.cpp index 5fa2cb6..c2f6a10 100644 --- a/mass_profile/calc_lx_dbeta.cpp +++ b/mass_profile/calc_lx_dbeta.cpp @@ -17,7 +17,7 @@ #include <methods/powell/powell_method.hpp> #include <core/freeze_param.hpp> #include <error_estimator/error_estimator.hpp> -#include "spline.h" +#include "spline.hpp" using namespace std; using namespace opt_utilities; @@ -34,9 +34,7 @@ double dbeta_func(double r, double n01, double rc1, double beta1, } -//A class enclosing the spline interpolation method of cooling function -//check spline.h for more detailed information -//this class is a thin wrapper for the spline class defined in spline.h +//A class enclosing the spline interpolation method class spline_func_obj :public func_obj<double,double> { diff --git a/mass_profile/cooling_time.cpp b/mass_profile/cooling_time.cpp index 12b869e..eb8af2b 100644 --- a/mass_profile/cooling_time.cpp +++ b/mass_profile/cooling_time.cpp @@ -1,7 +1,7 @@ #include <iostream> #include <fstream> #include <cmath> -#include "spline.h" +#include "spline.hpp" using namespace std; diff --git a/mass_profile/fit_beta_sbp.cpp b/mass_profile/fit_beta_sbp.cpp index c16c092..295fa1e 100644 --- a/mass_profile/fit_beta_sbp.cpp +++ b/mass_profile/fit_beta_sbp.cpp @@ -21,7 +21,7 @@ #include <methods/powell/powell_method.hpp> #include <core/freeze_param.hpp> #include <error_estimator/error_estimator.hpp> -#include "spline.h" +#include "spline.hpp" using namespace std; using namespace opt_utilities; @@ -46,9 +46,7 @@ static double calc_critical_density(double z, } -//A class enclosing the spline interpolation method of cooling function -//check spline.h for more detailed information -//this class is a thin wrapper for the spline class defined in spline.h +//A class enclosing the spline interpolation method class spline_func_obj :public func_obj<double,double> { diff --git a/mass_profile/fit_dbeta_sbp.cpp b/mass_profile/fit_dbeta_sbp.cpp index 30c4c35..71b3089 100644 --- a/mass_profile/fit_dbeta_sbp.cpp +++ b/mass_profile/fit_dbeta_sbp.cpp @@ -17,7 +17,7 @@ #include <methods/powell/powell_method.hpp> #include <core/freeze_param.hpp> #include <error_estimator/error_estimator.hpp> -#include "spline.h" +#include "spline.hpp" using namespace std; using namespace opt_utilities; @@ -45,9 +45,7 @@ static double calc_critical_density(double z, } -//A class enclosing the spline interpolation method of cooling function -//check spline.h for more detailed information -//this class is a thin wrapper for the spline class defined in spline.h +//A class enclosing the spline interpolation method class spline_func_obj :public func_obj<double,double> { diff --git a/mass_profile/fit_nfw_sbp.cpp b/mass_profile/fit_nfw_sbp.cpp index a7d0537..35e42a6 100644 --- a/mass_profile/fit_nfw_sbp.cpp +++ b/mass_profile/fit_nfw_sbp.cpp @@ -14,7 +14,7 @@ #include <methods/powell/powell_method.hpp> #include <core/freeze_param.hpp> #include <error_estimator/error_estimator.hpp> -#include "spline.h" +#include "spline.hpp" #include <cpgplot.h> using namespace std; using namespace opt_utilities; @@ -22,9 +22,7 @@ using namespace opt_utilities; const double M_sun=1.988E33;//solar mass in g const double kpc=3.086E21;//kpc in cm -//A class enclosing the spline interpolation method of cooling function -//check spline.h for more detailed information -//this class is a thin wrapper for the spline class defined in spline.h +//A class enclosing the spline interpolation method class spline_func_obj :public func_obj<double,double> { diff --git a/mass_profile/spline.h b/mass_profile/spline.hpp index 9645845..1027b61 100644 --- a/mass_profile/spline.h +++ b/mass_profile/spline.hpp @@ -1,5 +1,5 @@ -#ifndef SPLINE_H -#define SPLINE_H +#ifndef SPLINE_HPP +#define SPLINE_HPP #include <vector> #include <cstdlib> @@ -107,4 +107,4 @@ public: }; -#endif /* SPLINE_H */ +#endif /* SPLINE_HPP */ |