diff --git a/src/interpolate.cpp b/src/interpolate.cpp index 0c3513f..407627c 100644 --- a/src/interpolate.cpp +++ b/src/interpolate.cpp @@ -75,6 +75,8 @@ const Interpolate& Interpolate::operator=(const Interpolate& a) spline = gsl_spline_alloc (gsl_interp_linear, a.spline->size); accel_interp = gsl_interp_accel_alloc (); gsl_spline_init(spline, a.spline->x, a.spline->y, a.spline->size); + logx = a.logx; + logy = a.logy; } double Interpolate::getMaxX() const diff --git a/src/kdtree_leaf.hpp b/src/kdtree_leaf.hpp index 3a3a0b6..145fa57 100644 --- a/src/kdtree_leaf.hpp +++ b/src/kdtree_leaf.hpp @@ -70,9 +70,11 @@ namespace CosmoTool { uint32_t getNumberInNode(const Node *n) const { return n->numNodes; } #else uint32_t getNumberInNode(const Node *n) const { + if (n->leaf) + return 1; if (n == 0) return 0; - return 1+getNumberInNode(n->children[0])+getNumberInNode(n->children[1]); + return getNumberInNode(n->children[0])+getNumberInNode(n->children[1]); } #endif diff --git a/src/powerSpectrum.cpp b/src/powerSpectrum.cpp index b73d019..9f3d7c8 100644 --- a/src/powerSpectrum.cpp +++ b/src/powerSpectrum.cpp @@ -21,7 +21,7 @@ using namespace std; #define POWER_BDM 7 #define POWER_TEST 8 -#define POWER_SPECTRUM HU_BARYON +#define POWER_SPECTRUM HU_WIGGLES namespace Cosmology {