diff --git a/python_tools/setup.py b/python_tools/setup.py index 23f5e79..7b8174a 100644 --- a/python_tools/setup.py +++ b/python_tools/setup.py @@ -33,10 +33,4 @@ setup( packages= ['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',], - #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"]) - #] ) diff --git a/python_tools/void_python_tools/backend/launchers.py b/python_tools/void_python_tools/backend/launchers.py index 4b38260..8676989 100644 --- a/python_tools/void_python_tools/backend/launchers.py +++ b/python_tools/void_python_tools/backend/launchers.py @@ -343,9 +343,17 @@ def launchZobov(sample, binPath, zobovDir=None, logDir=None, continueRun=None, subprocess.call(cmd, stdout=log, stderr=log) 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", \ zobovDir+"/adj_"+sampleName+".dat", \ - zobovDir+"/vol_"+sampleName+".dat", \ + zobovDir+"/vol_weighted_"+sampleName+".dat", \ + #zobovDir+"/vol_"+sampleName+".dat", \ zobovDir+"/voidPart_"+sampleName+".dat", \ zobovDir+"/voidZone_"+sampleName+".dat", \ zobovDir+"/voidDesc_"+sampleName+".out", \