diff --git a/c_tools/mock/generateMock.cpp b/c_tools/mock/generateMock.cpp index f1832a4..6dd3ef8 100644 --- a/c_tools/mock/generateMock.cpp +++ b/c_tools/mock/generateMock.cpp @@ -11,6 +11,7 @@ #include #include #include +#include #include "generateMock_conf.h" #include "gslIntegrate.hpp" #include @@ -23,9 +24,6 @@ using boost::format; #define LIGHT_SPEED 299792.458 typedef boost::function2 MetricFunctor; -{ - return a*a*a; -} struct TotalExpansion { @@ -33,7 +31,7 @@ struct TotalExpansion double operator()(double z) { - return 1/sqrt(Omega_M*cubic(1+z) + Omega_L); + return 1/sqrt(Omega_M*cube(1+z) + Omega_L); } }; diff --git a/c_tools/mock/loaders/multidark_loader.cpp b/c_tools/mock/loaders/multidark_loader.cpp index b37e4ef..9509c64 100644 --- a/c_tools/mock/loaders/multidark_loader.cpp +++ b/c_tools/mock/loaders/multidark_loader.cpp @@ -41,7 +41,7 @@ public: return 0; ifstream fp(darkname.c_str()); - SimuData *simu; + SimuData *simu = new SimuData; fp >> simu->BoxSize >> simu->Omega_M >> simu->Hubble >> simu->time >> simu->NumPart; simu->time = 1./(1.+simu->time); // convert to scale factor