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

default to improved jovoz

Browse source
This commit is contained in:
P.M. Sutter 2013-12-19 22:32:47 -06:00
parent 5483cae9e9
commit d8108d3a8e
3 changed files with 4 additions and 5 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','void_python_tools.backend','void_python_tools.apTools', 'void_python_tools.xcor', 'void_python_tools.partUtil',
'void_python_tools.apTools.profiles','void_python_tools.apTools.chi2', 'void_python_tools.plotting'], 'void_python_tools.apTools.profiles','void_python_tools.apTools.chi2', 'void_python_tools.plotting'],
#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/apTools/chi2/cosmologyTools.py
View file

@ -34,7 +34,7 @@ def expansion(z, Om = 0.27, Ot = 1.0, w0 = -1.0, wa = 0.0):
# returns DE value at redshift z # returns DE value at redshift z
def eosDE(z, w0 = -1.0, wa = 0.0): def eosDE(z, w0 = -1.0, wa = 0.0):
return = w0 + wa*z/(1+z) return w0 + wa*z/(1+z)
# returns D_A(z) for the given cosmology # returns D_A(z) for the given cosmology
def angularDiameter(z, Om = 0.27, Ot = 1.0, w0 = -1.0, wa = 0.0): def angularDiameter(z, Om = 0.27, Ot = 1.0, w0 = -1.0, wa = 0.0):

5
python_tools/void_python_tools/backend/launchers.py
View file

@ -330,9 +330,8 @@ def launchZobov(sample, binPath, zobovDir=None, logDir=None, continueRun=None,
cmd = "./%s >> %s 2>&1" % (vozScript, logFile) cmd = "./%s >> %s 2>&1" % (vozScript, logFile)
os.system(cmd) os.system(cmd)
#cmd = "%s/../c_tools/zobov2/jozov2/jozov2 %s %s %s %s %s %g %s >> %s 2>&1" % \ # cmd = "%s/jozov %s %s %s %s %s %g %s >> %s 2>&1" % \
cmd = "%s/../c_tools/zobov2/jozov2/jozov2 %s %s %s %s %s %g %s >> %s 2>&1" % \
cmd = "%s/jozov %s %s %s %s %s %g %s >> %s 2>&1" % \
(binPath, \ (binPath, \
zobovDir+"/adj_"+sampleName+".dat", \ zobovDir+"/adj_"+sampleName+".dat", \
zobovDir+"/vol_"+sampleName+".dat", \ zobovDir+"/vol_"+sampleName+".dat", \