From 42ff05eab1761aea67c1d9d53a7be60583e10cb8 Mon Sep 17 00:00:00 2001 From: "P.M. Sutter" Date: Fri, 30 May 2014 11:05:37 -0500 Subject: [PATCH] harmonized array ordering --- python_tools/void_python_tools/voidUtil/catalogUtil.py | 8 ++++---- python_tools/void_python_tools/voidUtil/plotUtil.py | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/python_tools/void_python_tools/voidUtil/catalogUtil.py b/python_tools/void_python_tools/voidUtil/catalogUtil.py index cd9ee71..6e69102 100644 --- a/python_tools/void_python_tools/voidUtil/catalogUtil.py +++ b/python_tools/void_python_tools/voidUtil/catalogUtil.py @@ -542,10 +542,10 @@ def stackVoids(catalog, stackMode = "ball"): localPart = catalog.partPos[ getBall(partTree, center, rMax) ] else: voidPart = getVoidPart(catalog, void.voidID) - localPart = np.zeros((3,len(voidPart))) - localPart[0,:] = getArray(voidPart, 'x') - localPart[1,:] = getArray(voidPart, 'y') - localPart[2,:] = getArray(voidPart, 'z') + localPart = np.zeros((len(voidPart),3)) + localPart[:,0] = getArray(voidPart, 'x') + localPart[:,1] = getArray(voidPart, 'y') + localPart[:,2] = getArray(voidPart, 'z') shiftedPart = shiftPart(localPart, center, periodicLine, catalog.ranges) diff --git a/python_tools/void_python_tools/voidUtil/plotUtil.py b/python_tools/void_python_tools/voidUtil/plotUtil.py index 5002209..2314470 100644 --- a/python_tools/void_python_tools/voidUtil/plotUtil.py +++ b/python_tools/void_python_tools/voidUtil/plotUtil.py @@ -253,13 +253,13 @@ def plotVoidCells(catalog, voidPart = getVoidPart(catalog, voidID) - newpart = np.zeros((3,len(voidPart))) + newpart = np.zeros((len(voidPart),3)) volume=np.zeros(len(voidPart)) radius=np.zeros(len(voidPart)) - newpart[0,:] = getArray(voidPart, 'x') - newpart[1,:] = getArray(voidPart, 'y') - newpart[2,:] = getArray(voidPart, 'z') + newpart[:,0] = getArray(voidPart, 'x') + newpart[:,1] = getArray(voidPart, 'y') + newpart[:,2] = getArray(voidPart, 'z') volume = getArray(voidPart, 'volume') radius = (3.*volume/(4.*np.pi))**(1./3.)