returned gadgetunit

This commit is contained in:
P.M. Sutter 2014-06-03 14:29:22 -04:00
parent 5ac3586683
commit 07eec58be6

View file

@ -197,6 +197,7 @@ def launchGenerate(sample, binPath, workDir=None, inputDataDir=None,
outputParameter %s outputParameter %s
%s %s
%s %s
gadgetUnit %g
%s %s
rangeX_min %g rangeX_min %g
rangeX_max %g rangeX_max %g
@ -208,10 +209,12 @@ def launchGenerate(sample, binPath, workDir=None, inputDataDir=None,
%s %s
%s %s
%s %s
""" % ((dataFileLine + "/"), outputFile, """ % ((dataFileLine + "/"),
outputFile,
outputFile+".par", outputFile+".par",
includePecVelString, includePecVelString,
useLightConeString, useLightConeString,
sample.dataUnit,
ramsesIdLine, ramsesIdLine,
xMin, xMax, yMin, yMax, xMin, xMax, yMin, yMax,
sample.zBoundaryMpc[0], sample.zBoundaryMpc[1], sample.zBoundaryMpc[0], sample.zBoundaryMpc[1],
@ -322,8 +325,6 @@ def launchZobov(sample, binPath, zobovDir=None, logDir=None, continueRun=None,
datafile = zobovDir+"zobov_slice_"+sampleName datafile = zobovDir+"zobov_slice_"+sampleName
print "zobovDir ", zobovDir
logFile = logDir+"/zobov_"+sampleName+".out" logFile = logDir+"/zobov_"+sampleName+".out"
vozScript = "./scr_"+sampleName vozScript = "./scr_"+sampleName