diff --git a/pipeline/prepareCatalogs.py b/pipeline/prepareCatalogs.py index bbddc2d..d331d85 100755 --- a/pipeline/prepareCatalogs.py +++ b/pipeline/prepareCatalogs.py @@ -19,11 +19,12 @@ figDir = os.getenv("PWD")+"/../figs/multidark/" logDir = os.getenv("PWD")+"/../logs/multidark/" dataFormat = "multidark" +dataUnit = 1 dataType = "simulation" useLightCone = True -redshifts = (("0.0", "0.53", "1.0")) redshiftFileBase = "mdr1_particles_z" +redshifts = (("0.0", "0.53", "1.0")) numSlices = 4 numSubvolumes = 1 @@ -128,6 +129,7 @@ logDir = "{logDir}/{sampleName}/" sampleInfo = """ newSample = Sample(dataFile = "{dataFile}", dataFormat = "{dataFormat}", + dataUnit = {dataUnit}, fullName = "{sampleName}", nickName = "{sampleName}", dataType = "simulation", @@ -202,6 +204,7 @@ newSample.addStack({zMin}, {zMax}, {minRadius}+18, {minRadius}+24, True, False) 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/classes.py b/python_tools/void_python_tools/backend/classes.py index 60de62f..572e543 100755 --- a/python_tools/void_python_tools/backend/classes.py +++ b/python_tools/void_python_tools/backend/classes.py @@ -78,7 +78,7 @@ class Sample: dataType="observation", numSubDivisions=2, boxLen=1024, usePecVel=False, omegaM=0.27, numSubvolumes=1, mySubvolume=1, dataFormat="sdss", - subsample="1.0", useLightCone=True): + subsample=1.0, useLightCone=True): self.dataFile = dataFile self.fullName = fullName self.nickName = nickName diff --git a/python_tools/void_python_tools/backend/launchers.py b/python_tools/void_python_tools/backend/launchers.py index 71d6ea3..b8cb57f 100755 --- a/python_tools/void_python_tools/backend/launchers.py +++ b/python_tools/void_python_tools/backend/launchers.py @@ -132,12 +132,12 @@ def launchGenerate(sample, binPath, workDir=None, inputDataDir=None, rangeY_max %g rangeZ_min %g rangeZ_max %g - subsample %g + subsample %s """ % (dataFileLine, zobovDir+"/zobov_slice_"+sampleName, zobovDir+"/zobov_slice_"+sampleName+".par", includePecVelString, useLightConeString, - sample.gadgetUnit, + sample.dataUnit, xMin, xMax, yMin, yMax, sample.zBoundaryMpc[0], sample.zBoundaryMpc[1], sample.subsample)