From 276a551914770988ae58aef19ed541c6acd1d1e8 Mon Sep 17 00:00:00 2001 From: "P.M. Sutter" Date: Wed, 4 Jun 2014 00:11:05 -0400 Subject: [PATCH] manual merge of ben's pull request --- .gitignore | 2 ++ python_tools/void_python_tools/backend/launchers.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index c1a1e59..f1a26c1 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/python_tools/void_python_tools/backend/launchers.py b/python_tools/void_python_tools/backend/launchers.py index 6cd4cfa..97b0494 100644 --- a/python_tools/void_python_tools/backend/launchers.py +++ b/python_tools/void_python_tools/backend/launchers.py @@ -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)