now includes automatic detection and handling of periodic boxes; all logic for dealing with this moved to pruneVoids

This commit is contained in:
P.M. Sutter 2012-11-14 06:31:53 -06:00
parent 390fb2f4e2
commit 292afacaf5
3 changed files with 87 additions and 47 deletions

View file

@ -244,11 +244,18 @@ def launchPrune(sample, binPath, thisDataPortion=None,
totalPart = open(zobovDir+"/total_particles.txt", "r").read()
maxDen = 0.2*float(mockIndex)/float(totalPart)
observationLine = " --isObservation"
periodicLine = "--periodic=''"
else:
mockIndex = -1
maxDen = 0.2
observationLine = ""
periodicLine = " --periodic='"
if sample.numSubvolumes == 1: periodicLine += "xy"
if sample.zBoundaryMpc[0] == 0 and \
sample.zBoundaryMpc[1] == sample.boxLen : periodicLine += "z"
periodicLine += "' "
if not (continueRun and jobSuccessful(logFile, "NetCDF: Not a valid ID\n")):
cmd = binPath
cmd += " --partFile=" + zobovDir+"/zobov_slice_"+str(sampleName)
@ -267,6 +274,7 @@ def launchPrune(sample, binPath, thisDataPortion=None,
cmd += " --rMin=" + str(sample.minVoidRadius)
cmd += " --numVoids=" + str(numVoids)
cmd += observationLine
cmd += periodicLine
cmd += " --output=" + zobovDir+"/voidDesc_"+\
str(thisDataPortion)+"_"+\
str(sampleName)+".out"