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

a few bug fixes

Browse source
This commit is contained in:
P.M. Sutter 2014-05-29 10:09:32 -05:00
parent e69ebea9e8
commit 701d061172
2 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -344,7 +344,8 @@ def loadVoidCatalog(sampleDir, dataPortion="central", loadParticles=True,
eigenVecs = np.zeros((3,3)), eigenVecs = np.zeros((3,3)),
)) ))
print "Read %d voids" % len(catalog.voids) catalog.numVoids = len(catalog.voids)
print "Read %d voids" % catalog.numVoids
print "Loading barycenters..." print "Loading barycenters..."
iLine = 0 iLine = 0
@ -461,7 +462,7 @@ def getArray(objectList, attr):
attrArr[:,idim] = np.fromiter((np.atleast_1d(getattr(v, attr))[idim] \ attrArr[:,idim] = np.fromiter((np.atleast_1d(getattr(v, attr))[idim] \
for v in objectList), float ) for v in objectList), float )
if ndim == 1: attrArr = attArr[:,0] if ndim == 1: attrArr = attrArr[:,0]
return attrArr return attrArr
else: else:

20
python_tools/void_python_tools/voidUtil/profileUtil.py
View file

@ -190,21 +190,19 @@ def getHSWProfile(density, radius):
}, },
] ]
if not np.any(density == samples[:]['name']): mySample = next((item for item in samples if item['name'] == density), None)
print "Sample", density," not found! Use one of ", samples[:]['name'] if mySample == None:
return -1 print "Sample", density," not found! Use one of ", [item['name'] for item in samples]
return
# interpolate the radii # interpolate the radii
for sample in samples: rsFunc = interp1d( mySample['rv'], mySample['rs'], kind='cubic' )
if not density == sample['name']: continue dcFunc = interp1d( mySample['rv'], mySample['dc'], kind='cubic' )
rsFunc = interp1d( sample['rv'], sample['rs'], kind='cubic' ) rs = rsFunc(radius)
dcFunc = interp1d( sample['rv'], sample['dc'], kind='cubic' ) dc = dcFunc(radius)
rs = rsFunc(radius)
dc = dcFunc(radius)
# return best-fits # return best-fits
rVals = np.linspace(0.0, 3*radius, 100) / radius rVals = np.linspace(0.0, 3*radius, 100) / radius
return (rs,dc), rVals, HSWProfile(rVals,rs,dc) return (rs,dc), rVals*radius, HSWProfile(rVals,rs,dc)