From 7c16c9477f0c4bd5965c41b9fdeea7c2898ba73e Mon Sep 17 00:00:00 2001 From: "P.M. Sutter" Date: Wed, 20 Mar 2013 07:19:25 -0500 Subject: [PATCH] more correct handling of multiple subsample levels --- python_tools/void_python_tools/backend/launchers.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/python_tools/void_python_tools/backend/launchers.py b/python_tools/void_python_tools/backend/launchers.py index 1a0fb20..69e5973 100644 --- a/python_tools/void_python_tools/backend/launchers.py +++ b/python_tools/void_python_tools/backend/launchers.py @@ -132,6 +132,7 @@ def launchGenerate(sample, binPath, workDir=None, inputDataDir=None, return prevSubSample = -1 + prevKeepFraction = -1 for thisSubSample in sample.subsample.split(', '): if prevSubSample == -1: @@ -147,7 +148,7 @@ def launchGenerate(sample, binPath, workDir=None, inputDataDir=None, outputFile = zobovDir+"/zobov_slice_" + sampleName + "_ss" + \ thisSubSample keepFraction = float(thisSubSample)/float(prevSubSample) - subSampleLine = "subsample %g" % keepFraction + subSampleLine = "subsample %s" % prevSubSample resubSampleLine = "resubsample %g" % keepFraction includePecVelString = "" @@ -207,9 +208,10 @@ def launchGenerate(sample, binPath, workDir=None, inputDataDir=None, os.system(cmd) # remove intermediate files - if (prevSubSample != -1): - os.unlink(zobovDir+"/zobov_slice_"+sampleName+"_ss"+prevSubSample+".par") - os.unlink(zobovDir+"/zobov_slice_"+sampleName+"_ss"+prevSubSample) +# TEMP + #if (prevSubSample != -1): + # os.unlink(zobovDir+"/zobov_slice_"+sampleName+"_ss"+prevSubSample+".par") + # os.unlink(zobovDir+"/zobov_slice_"+sampleName+"_ss"+prevSubSample) doneLine = "Done! %5.2e\n" % keepFraction if not jobSuccessful(logFile, doneLine): @@ -217,6 +219,7 @@ def launchGenerate(sample, binPath, workDir=None, inputDataDir=None, exit(-1) prevSubSample = thisSubSample + prevKeepFraction = keepFraction if jobSuccessful(logFile, doneLine): print "done"