passing ellipticity file to voidOverlap

This commit is contained in:
P.M. Sutter 2013-04-28 14:20:19 -05:00
parent 01c5940293
commit 9c26996591

View file

@ -327,7 +327,7 @@ def launchPrune(sample, binPath,
# periodicLine += "z"
#periodicLine += "' "
periodicLine = " --periodic='" + getPeriodic + "'"
periodicLine = " --periodic='" + getPeriodic(sample) + "'"
if not (continueRun and (jobSuccessful(logFile, "NetCDF: Not a valid ID\n") \
or jobSuccessful(logFile, "Done!\n"))):
@ -395,7 +395,9 @@ def launchVoidOverlap(sample1, sample2, sample1Dir, sample2Dir,
cmd += " --infoFile1=" + sample1Dir+"/zobov_slice_" + \
str(sampleName1)+".par"
cmd += " --centerFile1=" + sample1Dir + \
"/untrimmed_centers_"+thisDataPortion+"_"+str(sampleName1)+".out"
"/barycenters_"+thisDataPortion+"_"+str(sampleName1)+".out"
cmd += " --shapeFile1=" + sample1Dir + \
"/shapes_"+thisDataPortion+"_"+str(sampleName1)+".out"
cmd += " --zoneFile1=" + sample1Dir+"/voidZone_" + \
str(sampleName1)+".dat"
cmd += " --zonePartFile1=" + sample1Dir+"/voidPart_" + \
@ -410,7 +412,9 @@ def launchVoidOverlap(sample1, sample2, sample1Dir, sample2Dir,
cmd += " --infoFile2=" + sample2Dir+"/zobov_slice_" + \
str(sampleName2)+".par"
cmd += " --centerFile2=" + sample2Dir + \
"/untrimmed_centers_"+thisDataPortion+"_"+str(sampleName2)+".out"
"/untrimmed_barycenters_"+thisDataPortion+"_"+str(sampleName2)+".out"
cmd += " --shapeFile2=" + sample1Dir + \
"/untrimmed_shapes_"+thisDataPortion+"_"+str(sampleName1)+".out"
cmd += " --zoneFile2=" + sample2Dir+"/voidZone_" + \
str(sampleName2)+".dat"
cmd += " --zonePartFile2=" + sample2Dir+"/voidPart_" + \