guilhem_lavaux/vide_public
0
0
Fork 0
mirror of https://bitbucket.org/cosmicvoids/vide_public.git synced 2025-07-05 07:41:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

multiple levels of subsampling now correctly handled

Browse source
This commit is contained in:
P.M. Sutter 2013-03-21 21:54:56 -05:00
parent cb2b0de143
commit 60965e1fa4
1 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -132,7 +132,7 @@ def launchGenerate(sample, binPath, workDir=None, inputDataDir=None,
return return
prevSubSample = -1 prevSubSample = -1
prevKeepFraction = -1 firstSubSample = -1
for thisSubSample in sample.subsample.split(', '): for thisSubSample in sample.subsample.split(', '):
if prevSubSample == -1: if prevSubSample == -1:
@ -142,13 +142,14 @@ def launchGenerate(sample, binPath, workDir=None, inputDataDir=None,
keepFraction = float(thisSubSample) keepFraction = float(thisSubSample)
subSampleLine = "subsample %g" % keepFraction subSampleLine = "subsample %g" % keepFraction
resubSampleLine = "" resubSampleLine = ""
firstSubSample = keepFraction
else: else:
inputParameterFlag = "inputParameter " + zobovDir+"/zobov_slice_"+\ inputParameterFlag = "inputParameter " + zobovDir+"/zobov_slice_"+\
sampleName+"_ss"+prevSubSample+".par" sampleName+"_ss"+prevSubSample+".par"
outputFile = zobovDir+"/zobov_slice_" + sampleName + "_ss" + \ outputFile = zobovDir+"/zobov_slice_" + sampleName + "_ss" + \
thisSubSample thisSubSample
keepFraction = float(thisSubSample)/float(prevSubSample) keepFraction = float(thisSubSample)/float(prevSubSample)
subSampleLine = "subsample %s" % prevSubSample subSampleLine = "subsample %s" % firstSubSample
resubSampleLine = "resubsample %g" % keepFraction resubSampleLine = "resubsample %g" % keepFraction
includePecVelString = "" includePecVelString = ""
@ -210,10 +211,9 @@ def launchGenerate(sample, binPath, workDir=None, inputDataDir=None,
os.system(cmd) os.system(cmd)
# remove intermediate files # remove intermediate files
# TEMP if (prevSubSample != -1):
#if (prevSubSample != -1): os.unlink(zobovDir+"/zobov_slice_"+sampleName+"_ss"+prevSubSample+".par")
# os.unlink(zobovDir+"/zobov_slice_"+sampleName+"_ss"+prevSubSample+".par") os.unlink(zobovDir+"/zobov_slice_"+sampleName+"_ss"+prevSubSample)
# os.unlink(zobovDir+"/zobov_slice_"+sampleName+"_ss"+prevSubSample)
doneLine = "Done! %5.2e\n" % keepFraction doneLine = "Done! %5.2e\n" % keepFraction
if not jobSuccessful(logFile, doneLine): if not jobSuccessful(logFile, doneLine):
@ -221,7 +221,6 @@ def launchGenerate(sample, binPath, workDir=None, inputDataDir=None,
exit(-1) exit(-1)
prevSubSample = thisSubSample prevSubSample = thisSubSample
prevKeepFraction = keepFraction
if jobSuccessful(logFile, doneLine): print "done" if jobSuccessful(logFile, doneLine): print "done"