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

Merge branch 'master' of https://bitbucket.org/cosmicvoids/vide_public

Browse source
This commit is contained in:
P.M. Sutter 2014-05-09 15:09:39 -04:00
commit c3d68b0275
6 changed files with 103 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

2
python_tools/setup.py
View file

@ -31,7 +31,7 @@ setup(
cmdclass = {'build_ext': build_ext}, cmdclass = {'build_ext': build_ext},
include_dirs = [np.get_include()], include_dirs = [np.get_include()],
packages= packages=
['void_python_tools','void_python_tools.backend','void_python_tools.apTools', 'void_python_tools.xcor', 'void_python_tools.voidUtil', ['void_python_tools','void_python_tools.backend','void_python_tools.apTools', 'void_python_tools.voidUtil',
'void_python_tools.apTools.profiles','void_python_tools.apTools.chi2',], 'void_python_tools.apTools.profiles','void_python_tools.apTools.chi2',],
#ext_modules = [Extension("void_python_tools.chi2.velocityProfileFitNative", ["void_python_tools/chi2/velocityProfileFitNative.pyx"], libraries=["gsl", "gslcblas"]), Extension("void_python_tools.chi2.likelihoo", ["void_python_tools/chi2/likelihood.pyx"], libraries=["gsl", "gslcblas"])] #ext_modules = [Extension("void_python_tools.chi2.velocityProfileFitNative", ["void_python_tools/chi2/velocityProfileFitNative.pyx"], libraries=["gsl", "gslcblas"]), Extension("void_python_tools.chi2.likelihoo", ["void_python_tools/chi2/likelihood.pyx"], libraries=["gsl", "gslcblas"])]
#ext_modules = [ #ext_modules = [

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

@ -321,7 +321,7 @@ def loadVoidCatalog(sampleDir, dataPortion="central", loadPart=True):
densCon = line[9], densCon = line[9],
voidProb = line[10], voidProb = line[10],
radius = pow(line[7]/volNorm*3./4./np.pi, 1./3.), radius = pow(line[7]/volNorm*3./4./np.pi, 1./3.),
barycenter = np.zeros((3)) barycenter = np.zeros((3)),
parentID = 0, parentID = 0,
treeLevel = 0, treeLevel = 0,
numChildren = 0, numChildren = 0,

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

@ -32,7 +32,7 @@ def compareCatalogs(baseCatalogDir, compareCatalogDir,
outputDir="./", logDir="./", outputDir="./", logDir="./",
matchMethod="useID", dataPortion="central", matchMethod="useID", dataPortion="central",
strictMatch=True, strictMatch=True,
pathToCTools="../../../c_tools") pathToCTools="../../../c_tools"):
# reports the overlap between two void catalogs # reports the overlap between two void catalogs
# baseCatalogDir: directory of catalog 1 # baseCatalogDir: directory of catalog 1
@ -77,3 +77,4 @@ launchVoidOverlap(baseSample, sample, baseCatalogDir,
strictMatch=strictMatch) strictMatch=strictMatch)
print " Done!" print " Done!"
return

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

@ -94,7 +94,7 @@ def fitHSWProfile(radii, densities, sigmas):
# pcov: covariance matrix # pcov: covariance matrix
popt, pcov = curve_fit(HamausProfile, radii, densities, popt, pcov = curve_fit(HamausProfile, radii, densities,
sigma=sigmas) sigma=sigmas,
maxfev=10000, xtol=5.e-3, maxfev=10000, xtol=5.e-3,
p0=[1.0,-1.0]) p0=[1.0,-1.0])

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

@ -61,7 +61,7 @@ def computeCrossCor(catalogDir,
outputDir="./", logDir="./", outputDir="./", logDir="./",
matchMethod="useID", dataPortion="central", matchMethod="useID", dataPortion="central",
strictMatch=True, strictMatch=True,
pathToCTools="../../../c_tools") pathToCTools="../../../c_tools"):
# Computes void-void and void-matter(galaxy) correlations # Computes void-void and void-matter(galaxy) correlations
# baseCatalogDir: directory of catalog # baseCatalogDir: directory of catalog