diff --git a/pipeline/prepareGadgetCatalog.py b/pipeline/prepareGadgetCatalog.py index 0d4ac57..51f67cc 100755 --- a/pipeline/prepareGadgetCatalog.py +++ b/pipeline/prepareGadgetCatalog.py @@ -28,6 +28,7 @@ dataType = "simulation" # available formats for simulation: gadget, multidark dataFormat = "gadget" +dataUnit = 1 # as multiple of Mpc/h # place particles on the lightcone? useLightCone = False @@ -131,6 +132,7 @@ logDir = "{logDir}/{setName}/" sampleInfo = """ newSample = Sample(dataFile = "{dataFile}", dataFormat = "{dataFormat}", + dataUnit = {dataUnit}, fullName = "{sampleName}", nickName = "{sampleName}", dataType = "simulation", @@ -197,6 +199,7 @@ dataSampleList.append(newSample) scriptFile.write(sampleInfo.format(dataFile=dataFileName, dataFormat=dataFormat, + dataUnit=dataUnit, sampleName=sampleName, zMin=sliceMin, zMax=sliceMax, diff --git a/python_tools/void_python_tools/backend/launchers.py b/python_tools/void_python_tools/backend/launchers.py index 6a094c8..52beefb 100755 --- a/python_tools/void_python_tools/backend/launchers.py +++ b/python_tools/void_python_tools/backend/launchers.py @@ -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)