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

bug fixed for filtering catalog

Browse source
This commit is contained in:
P.M. Sutter 2014-05-13 07:13:04 -05:00
parent 9b5961aca4
commit 76ea3567c8
4 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -308,7 +308,7 @@ def loadVoidCatalog(sampleDir, dataPortion="central", loadParticles=True,
volNorm = getVolNorm(sampleDir) volNorm = getVolNorm(sampleDir)
catalog.volNorm = volNorm catalog.volNorm = volNorm
if unfiltered: if untrimmed:
prefix = "untrimmed_" prefix = "untrimmed_"
else: else:
prefix = "" prefix = ""
@ -467,20 +467,21 @@ def getVoidPart(catalog, voidID):
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
def filterVoidsOnSize(catalog, rMin): def filterVoidsOnSize(catalog, rMin):
catalog.voids = catalog.voids[ catalog.voids[:].radius >= rMin ] catalog.voids = [v for v in catalog.voids if v.radius >= rMin]
return catalog return catalog
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
def filterVoidsOnTreeLevel(catalog, level): def filterVoidsOnTreeLevel(catalog, level):
catalog.voids = catalog.voids[ catalog.voids[:].treeLevel == level ] catalog.voids = [v for v in catalog.voids if v.treeLevel == level]
if level == -1: if level == -1:
catalog.voids = catalog.voids[ catalog.voids[:].numChildren == 0 ] catalog.voids = [v for v in catalog.voids if v.numChildren == 0]
return catalog return catalog
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
def filterVoidsOnCentralDen(catalog, maxCentralDen): def filterVoidsOnCentralDen(catalog, maxCentralDen):
catalog.voids = catalog.voids[ catalog.voids[:].centralDen <= maxCentralDen ] catalog.voids = [v for v in catalog.voids if v.centralDen <= maxCentralDen]
return catalog return catalog

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

@ -25,7 +25,7 @@ import numpy as np
import os import os
import pylab as plt import pylab as plt
import void_python_tools.apTools as vp import void_python_tools.apTools as vp
from void_python_tools.voidUtil import getVoidArray from void_python_tools.voidUtil import getArray
def fill_between(x, y1, y2=0, ax=None, **kwargs): def fill_between(x, y1, y2=0, ax=None, **kwargs):
"""Plot filled region between `y1` and `y2`. """Plot filled region between `y1` and `y2`.
@ -52,8 +52,7 @@ def plotNumberFunction(catalogList, figDir="./",
for (iSample,catalog) in enumerate(catalogList): for (iSample,catalog) in enumerate(catalogList):
sample = catalog.sampleInfo sample = catalog.sampleInfo
data = getVoidArray(catalog, 'radius') data = getArray(catalog.voids, 'radius')
#data = np.fromiter((v.radius for v in catalog.voids[:]), float)
if sample.dataType == "observation": if sample.dataType == "observation":
maskFile = sample.maskFile maskFile = sample.maskFile

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

@ -55,8 +55,7 @@ def buildProfile(catalog, rMin, rMax):
partTree = getPartTree(catalog) partTree = getPartTree(catalog)
print " Selecting voids to stack..." print " Selecting voids to stack..."
accepted = (catalog.voids[:].radius > rMin) & (catalog.voids[:].radius < rMax) voidsToStack = [v for v in catalog.voids if (v.radius > rMin and v.radius < rMax)]
voidsToStack = catalog.voids[accepted]
print " Stacking voids..." print " Stacking voids..."
allProfiles = [] allProfiles = []

2
python_tools/void_python_tools/voidUtil/xcorUtil.py
View file

@ -25,7 +25,7 @@ def computeXcor(catalog,
# Input particle arrays of shape (N,3) # Input particle arrays of shape (N,3)
xm = catalog.partPos # Halos / Galaxies / Dark matter xm = catalog.partPos # Halos / Galaxies / Dark matter
xv = catalog.voids[:].barycenter # Voids xv = getArray(catalog.voids, 'barycenter')
# Interpolate to mesh # Interpolate to mesh