From 87445abfab4c601a5a939c860b245fa037f67f98 Mon Sep 17 00:00:00 2001 From: "P.M. Sutter" Date: Tue, 13 May 2014 08:11:16 -0500 Subject: [PATCH] made getArray more general; updated gitignore --- .gitignore | 10 ++++++++++ python_tools/void_python_tools/voidUtil/catalogUtil.py | 7 ++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 036a3ea..e18bbb3 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,16 @@ .mydepend ./pipeline/miscTools/*.out +c_tools/hod/hod +c_tools/zobov2/jozov2/jozov2 +c_tools/zobov2/voz1b1/voz1b1_2 +external/libsdf/Objfiles/ +external/libsdf/apps/SDFcvt/SDFcvt.x86_64 +pipeline/prepareInputs.py +zobov/jozov +zobov/voz1b1 +zobov/vozinit +zobov/voztie CMakeCache.txt CMakeFiles/ Makefile diff --git a/python_tools/void_python_tools/voidUtil/catalogUtil.py b/python_tools/void_python_tools/voidUtil/catalogUtil.py index 7de4c57..b72d0c2 100644 --- a/python_tools/void_python_tools/voidUtil/catalogUtil.py +++ b/python_tools/void_python_tools/voidUtil/catalogUtil.py @@ -447,7 +447,12 @@ def loadVoidCatalog(sampleDir, dataPortion="central", loadParticles=True, def getArray(objectList, attr): if hasattr(objectList[0], attr): - return np.fromiter((getattr(v, attr) for v in objectList), float) + ndim = np.shape( np.atleast_1d( getattr(objectList[0], attr) ) )[0] + attrArr = np.zeros(( len(objectList), ndim )) + for idim in xrange(ndim): + attrArr[:,idim] = np.fromiter((np.atleast_1d(getattr(v, attr))[idim] \ + for v in objectList), float ) + return attrArr else: print " Attribute", attr, "not found!" return -1