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

manual merge of ben's pull request

Browse source
This commit is contained in:
P.M. Sutter 2014-06-04 00:11:05 -04:00
parent 42a934e0f1
commit 276a551914
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -4,6 +4,8 @@
.mydepend
./pipeline/miscTools/*.out
output_*
pipeline/ramses_simulation.py
external/libsdf/libsw/Malloc.c
c_tools/hod/hod
c_tools/zobov2/jozov2/jozov2

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

@ -170,7 +170,7 @@ def launchGenerate(sample, binPath, workDir=None, inputDataDir=None,
elif sample.dataFormat == "sdf":
dataFileLine = "sdf " + datafile
elif sample.dataFormat == "ramses":
dataFileLine = "ramses " + os.path.split(datafile)[0] # just want the output directory
dataFileLine = "ramses " + os.path.split(datafile)[0] + '/' # just want the output directory
else:
raise ValueError("unknown dataFormat '%s'" % sample.dataFormat)