guilhem_lavaux/vide_public
0
0
Fork 0
mirror of https://bitbucket.org/cosmicvoids/vide_public.git synced 2025-07-04 15:21:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed catalog array handling

Browse source
This commit is contained in:
P.M. Sutter 2014-05-13 02:46:09 -05:00
parent 45a2b7f82f
commit 1aaaeee224
2 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
python_tools/void_python_tools/voidUtil/catalogUtil.py
View file

@ -434,6 +434,16 @@ def loadVoidCatalog(sampleDir, dataPortion="central", loadParticles=True):
return catalog
# -----------------------------------------------------------------------------
def getVoidArray(catalog, attr):
if hasattr(catalog.voids[0], attr):
return np.fromiter((getattr(v, attr) for v in catalog.voids), float)
else:
print " Attribute", attr, "not found!"
return -1
# -----------------------------------------------------------------------------
def getVoidPart(catalog, voidID):

8
python_tools/void_python_tools/voidUtil/plotUtil.py
View file

@ -25,6 +25,7 @@ import numpy as np
import os
import pylab as plt
import void_python_tools.apTools as vp
from void_python_tools.voidUtil import getVoidArray
def fill_between(x, y1, y2=0, ax=None, **kwargs):
"""Plot filled region between `y1` and `y2`.
@ -51,7 +52,8 @@ def plotNumberFunction(catalogList, figDir="./",
for (iSample,catalog) in enumerate(catalogList):
sample = catalog.sampleInfo
data = catalog.voids[:].radius
data = getVoidArray(catalog, 'radius')
#data = np.fromiter((v.radius for v in catalog.voids[:]), float)
if sample.dataType == "observation":
maskFile = sample.maskFile
@ -68,7 +70,7 @@ def plotNumberFunction(catalogList, figDir="./",
boxVol *= 1.e-9 # Mpc->Gpc
bins = args.xmax/5.
bins = 100./5.
hist, binEdges = np.histogram(data, bins=bins, range=(0., 100.))
binCenters = 0.5*(binEdges[1:] + binEdges[:-1])
@ -86,7 +88,7 @@ def plotNumberFunction(catalogList, figDir="./",
lineColor = colorList[iSample]
lineTitle = sample.fullName
trim = (bounds[0] > .01)
trim = (lowerbound > .01)
mean = mean[trim]
binCentersToUse = binCenters[trim]
lower = lowerbound[trim]