From f905ae92af5080da26cf5e6f40871d1c178b56ac Mon Sep 17 00:00:00 2001 From: "P.M. Sutter" Date: Wed, 14 May 2014 18:22:13 -0500 Subject: [PATCH 1/2] bug fix to getPartTree --- python_tools/void_python_tools/voidUtil/catalogUtil.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python_tools/void_python_tools/voidUtil/catalogUtil.py b/python_tools/void_python_tools/voidUtil/catalogUtil.py index b72d0c2..d3583d9 100644 --- a/python_tools/void_python_tools/voidUtil/catalogUtil.py +++ b/python_tools/void_python_tools/voidUtil/catalogUtil.py @@ -196,7 +196,7 @@ def loadPartVel(sampleDir): def getPartTree(catalog): sample = catalog.sampleInfo - partData = catalog.partData + partData = catalog.partPos boxLen = catalog.boxLen periodicLine = getPeriodic(sample) From 9791ddcfa3e678a43c7fcd160f34a3aeec2f764e Mon Sep 17 00:00:00 2001 From: "P.M. Sutter" Date: Wed, 14 May 2014 18:35:50 -0500 Subject: [PATCH 2/2] bug fixes in profiles --- python_tools/void_python_tools/voidUtil/profileUtil.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/python_tools/void_python_tools/voidUtil/profileUtil.py b/python_tools/void_python_tools/voidUtil/profileUtil.py index 04d4705..73e61fe 100644 --- a/python_tools/void_python_tools/voidUtil/profileUtil.py +++ b/python_tools/void_python_tools/voidUtil/profileUtil.py @@ -67,7 +67,7 @@ def buildProfile(catalog, rMin, rMax): shiftedPart = shiftPart(localPart, center, periodicLine, catalog.ranges) dist = np.sqrt(np.sum(shiftedPart[:,:]**2, axis=1)) - thisProfile, radii = np.histogram(dist, bins=nBins, range=(0,rMaxProfile)) + thisProfile, radii = np.histogram(dist, bins=10, range=(0,rMaxProfile)) deltaV = 4*np.pi/3*(radii[1:]**3-radii[0:(radii.size-1)]**3) thisProfile = np.float32(thisProfile) thisProfile /= deltaV @@ -75,6 +75,7 @@ def buildProfile(catalog, rMin, rMax): allProfiles.append(thisProfile) binCenters = 0.5*(radii[1:] + radii[:-1]) + nVoid = len(voidsToStack) stackedProfile = np.std(allProfiles, axis=0) / np.sqrt(nVoids) sigmas = np.std(allProfiles, axis=0) / np.sqrt(nVoids)