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

bug fix

Browse source
This commit is contained in:
P.M. Sutter 2014-05-26 08:44:14 -04:00
parent 14dcceb8cd
commit 6f004beded
2 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
python_tools/setup.py
View file

@ -33,10 +33,4 @@ setup(
packages= packages=
['void_python_tools','void_python_tools.backend','void_python_tools.apTools', '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.apTools.chi2.velocityProfileFitNative",
# ["void_python_tools/apTools/chi2/velocityProfileFitNative.pyx"],
# libraries=["gsl", "gslcblas"], library_dirs=[VOID_GSL+"/lib"], include_dirs=[VOID_GSL+"/include"])
#]
) )

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

@ -343,9 +343,17 @@ def launchZobov(sample, binPath, zobovDir=None, logDir=None, continueRun=None,
subprocess.call(cmd, stdout=log, stderr=log) subprocess.call(cmd, stdout=log, stderr=log)
log.close() log.close()
# TODO re-weight the volumes based on selection function
#volFile = zobovDir+"/vol_"+sampleName+".dat"
#File = file(volFile)
#chk = np.fromfile(File, dtype=np.int32,count=1)
#vols = np.fromfile(File, dtype=np.float32,count=numPartTot)
cmd = [binPath+"../c_tools/zobov2/jozov2/jozov2", \ cmd = [binPath+"../c_tools/zobov2/jozov2/jozov2", \
zobovDir+"/adj_"+sampleName+".dat", \ zobovDir+"/adj_"+sampleName+".dat", \
zobovDir+"/vol_"+sampleName+".dat", \ zobovDir+"/vol_weighted_"+sampleName+".dat", \
#zobovDir+"/vol_"+sampleName+".dat", \
zobovDir+"/voidPart_"+sampleName+".dat", \ zobovDir+"/voidPart_"+sampleName+".dat", \
zobovDir+"/voidZone_"+sampleName+".dat", \ zobovDir+"/voidZone_"+sampleName+".dat", \
zobovDir+"/voidDesc_"+sampleName+".out", \ zobovDir+"/voidDesc_"+sampleName+".out", \