diff --git a/python_tools/setup.py b/python_tools/setup.py index aa7286d..482837d 100644 --- a/python_tools/setup.py +++ b/python_tools/setup.py @@ -31,7 +31,7 @@ setup( cmdclass = {'build_ext': build_ext}, include_dirs = [np.get_include()], 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'], #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 = [ diff --git a/python_tools/void_python_tools/apTools/chi2/cosmologyTools.py b/python_tools/void_python_tools/apTools/chi2/cosmologyTools.py index a966858..e1c432c 100644 --- a/python_tools/void_python_tools/apTools/chi2/cosmologyTools.py +++ b/python_tools/void_python_tools/apTools/chi2/cosmologyTools.py @@ -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 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 def angularDiameter(z, Om = 0.27, Ot = 1.0, w0 = -1.0, wa = 0.0): diff --git a/python_tools/void_python_tools/backend/launchers.py b/python_tools/void_python_tools/backend/launchers.py index 1df4543..a615416 100644 --- a/python_tools/void_python_tools/backend/launchers.py +++ b/python_tools/void_python_tools/backend/launchers.py @@ -330,9 +330,8 @@ def launchZobov(sample, binPath, zobovDir=None, logDir=None, continueRun=None, cmd = "./%s >> %s 2>&1" % (vozScript, logFile) 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/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" % \ (binPath, \ zobovDir+"/adj_"+sampleName+".dat", \ zobovDir+"/vol_"+sampleName+".dat", \