fixed bug in gadget generation script; prepareGadget now uses separate parameter files; support for random catalogs now enabled

This commit is contained in:
P.M. Sutter 2012-11-15 06:37:59 -06:00
parent 292afacaf5
commit 443b4bdeec
4 changed files with 91 additions and 342 deletions

View file

@ -106,7 +106,7 @@ def launchGenerate(sample, binPath, workDir=None, inputDataDir=None,
else:
useLightConeString = ""
if sample.dataFormat == "multidark":
if sample.dataFormat == "multidark" or sample.dataFormat == "random":
dataFileLine = "multidark " + datafile
elif sample.dataFormat == "gadget":
dataFileLine = "gadget " + datafile
@ -197,8 +197,10 @@ def launchZobov(sample, binPath, zobovDir=None, logDir=None, continueRun=None):
if os.access(zobovDir+"/voidDesc_"+sampleName+".out", os.F_OK):
os.unlink(zobovDir+"/voidDesc_"+sampleName+".out")
cmd = "%s/vozinit %s 0.1 1.0 2 %s %g %s %s %s >& %s" % \
(binPath, datafile, \
numThreads = 2
cmd = "%s/vozinit %s 0.1 1.0 %g %s %g %s %s %s >& %s" % \
(binPath, datafile, numThreads, \
"_"+sampleName, sample.numSubDivisions, \
binPath, zobovDir, maskIndex, logFile)
os.system(cmd)