guilhem_lavaux/vide_public
0
0
Fork 0
mirror of https://bitbucket.org/cosmicvoids/vide_public.git synced 2025-07-05 07:41:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

some bugs fixed related to gadget unit handling

Browse source
This commit is contained in:
P.M. Sutter 2012-11-09 08:06:27 -06:00
parent 9c10c3714f
commit 9cdc037946
3 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
pipeline/prepareCatalogs.py
View file

@ -19,11 +19,12 @@ figDir = os.getenv("PWD")+"/../figs/multidark/"
logDir = os.getenv("PWD")+"/../logs/multidark/" logDir = os.getenv("PWD")+"/../logs/multidark/"
dataFormat = "multidark" dataFormat = "multidark"
dataUnit = 1
dataType = "simulation" dataType = "simulation"
useLightCone = True useLightCone = True
redshifts = (("0.0", "0.53", "1.0"))
redshiftFileBase = "mdr1_particles_z" redshiftFileBase = "mdr1_particles_z"
redshifts = (("0.0", "0.53", "1.0"))
numSlices = 4 numSlices = 4
numSubvolumes = 1 numSubvolumes = 1
@ -128,6 +129,7 @@ logDir = "{logDir}/{sampleName}/"
sampleInfo = """ sampleInfo = """
newSample = Sample(dataFile = "{dataFile}", newSample = Sample(dataFile = "{dataFile}",
dataFormat = "{dataFormat}", dataFormat = "{dataFormat}",
dataUnit = {dataUnit},
fullName = "{sampleName}", fullName = "{sampleName}",
nickName = "{sampleName}", nickName = "{sampleName}",
dataType = "simulation", dataType = "simulation",
@ -202,6 +204,7 @@ newSample.addStack({zMin}, {zMax}, {minRadius}+18, {minRadius}+24, True, False)
scriptFile.write(sampleInfo.format(dataFile=dataFileName, scriptFile.write(sampleInfo.format(dataFile=dataFileName,
dataFormat=dataFormat, dataFormat=dataFormat,
dataUnit=dataUnit,
sampleName=sampleName, sampleName=sampleName,
zMin=sliceMin, zMin=sliceMin,
zMax=sliceMax, zMax=sliceMax,

2
python_tools/void_python_tools/backend/classes.py
View file

@ -78,7 +78,7 @@ class Sample:
dataType="observation", numSubDivisions=2, dataType="observation", numSubDivisions=2,
boxLen=1024, usePecVel=False, omegaM=0.27, boxLen=1024, usePecVel=False, omegaM=0.27,
numSubvolumes=1, mySubvolume=1, dataFormat="sdss", numSubvolumes=1, mySubvolume=1, dataFormat="sdss",
subsample="1.0", useLightCone=True): subsample=1.0, useLightCone=True):
self.dataFile = dataFile self.dataFile = dataFile
self.fullName = fullName self.fullName = fullName
self.nickName = nickName self.nickName = nickName

4
python_tools/void_python_tools/backend/launchers.py
View file

@ -132,12 +132,12 @@ def launchGenerate(sample, binPath, workDir=None, inputDataDir=None,
rangeY_max %g rangeY_max %g
rangeZ_min %g rangeZ_min %g
rangeZ_max %g rangeZ_max %g
subsample %g subsample %s
""" % (dataFileLine, zobovDir+"/zobov_slice_"+sampleName, """ % (dataFileLine, zobovDir+"/zobov_slice_"+sampleName,
zobovDir+"/zobov_slice_"+sampleName+".par", zobovDir+"/zobov_slice_"+sampleName+".par",
includePecVelString, includePecVelString,
useLightConeString, useLightConeString,
sample.gadgetUnit, sample.dataUnit,
xMin, xMax, yMin, yMax, xMin, xMax, yMin, yMax,
sample.zBoundaryMpc[0], sample.zBoundaryMpc[1], sample.zBoundaryMpc[0], sample.zBoundaryMpc[1],
sample.subsample) sample.subsample)