can now select gadget units in preparation script

This commit is contained in:
P.M. Sutter 2012-11-08 16:06:06 -06:00
parent 95db063b7b
commit ed3f18f6d0
2 changed files with 5 additions and 3 deletions

View file

@ -110,7 +110,6 @@ def launchGenerate(sample, binPath, workDir=None, inputDataDir=None,
dataFileLine = "multidark " + datafile
elif sample.dataFormat == "gadget":
dataFileLine = "gadget " + datafile
useGadgetUnit = "gadgetUnit=1"
iX = float(sample.mySubvolume[0])
iY = float(sample.mySubvolume[1])
@ -126,7 +125,7 @@ def launchGenerate(sample, binPath, workDir=None, inputDataDir=None,
outputParameter %s
%s
%s
%s
gadgetUnit %g
rangeX_min %g
rangeX_max %g
rangeY_min %g
@ -138,7 +137,7 @@ def launchGenerate(sample, binPath, workDir=None, inputDataDir=None,
zobovDir+"/zobov_slice_"+sampleName+".par",
includePecVelString,
useLightConeString,
useGadgetUnit,
sample.gadgetUnit,
xMin, xMax, yMin, yMax,
sample.zBoundaryMpc[0], sample.zBoundaryMpc[1],
sample.subsample)