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

now outputs mass into particle and halo files

Browse source
This commit is contained in:
P.M. Sutter 2013-04-25 09:35:32 -05:00
parent 7c6463ff8d
commit c81fd8913b
2 changed files with 16 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
c_tools/mock/loaders/multidark_loader.cpp
View file

@ -98,7 +98,7 @@ public:
SingleParticle p;
fp >> p.ID >> p.Pos[0] >> p.Pos[1]
>> p.Pos[2] >> p.Vel[2] >> tempData >> tempData;
>> p.Pos[2] >> p.Vel[2] >> tempData >> tempData >> tempData;
if (p.ID == -99 &&
p.Pos[0] == -99 && p.Pos[1] == -99 &&

26
python_tools/pipeline_source/prepareCatalogs.in.py
View file

@ -259,8 +259,8 @@ newSample.addStack({zMin}, {zMax}, 2*{minRadius}+18, 2*{minRadius}+24, True, Fal
sliceMin = "%0.2f" % sliceMin
sliceMax = "%0.2f" % sliceMax
sliceMinMpc = "%0.1f" % sliceMinMpc
sliceMaxMpc = "%0.1f" % sliceMaxMpc
sliceMinMpc = "%0.2f" % sliceMinMpc
sliceMaxMpc = "%0.2f" % sliceMaxMpc
if (dataFileNameList != None):
dataFileName = dataFileNameList[iFile]
@ -422,7 +422,7 @@ for iSubSample in xrange(len(subSamples)):
rescale_position = hubble/1000./scale
shift = lbox/2.
rescale_velocity = 3.08567802e16/3.1558149984e16
command = "%s %s x y z vz vy vx | awk '{print $1*%g+%g, $2*%g+%g, $3*%g+%g, $4*%g, $5*%g, $6*%g}' > %s" % (SDFcvt_PATH, dataFile,
command = "%s %s x y z vz vy vx mass | awk '{print $1*%g+%g, $2*%g+%g, $3*%g+%g, $4*%g, $5*%g, $6*%g, $7}' > %s" % (SDFcvt_PATH, dataFile,
rescale_position,
shift,
rescale_position,
@ -470,12 +470,14 @@ for iSubSample in xrange(len(subSamples)):
vz = float(line[3])
vy = float(line[4])
vx = float(line[5])
mass = float(line[6])
uniqueID = i
outFile.write("%d %e %e %e %e %e %e\n" %(uniqueID,x,y,z,vz,vy,vx))
outFile.write("%d %e %e %e %e %e %e %e\n" %(uniqueID,x,y,z,
vz,vy,vx,mass))
else:
outFile.write(line)
outFile.write("-99 -99 -99 -99 -99 -99 -99\n")
outFile.write("-99 -99 -99 -99 -99 -99 -99 -99\n")
inFile.close()
outFile.close()
@ -497,9 +499,9 @@ for iSubSample in xrange(len(subSamples)):
y = np.random.uniform()*lbox
z = np.random.uniform()*lbox
outFile.write("%d %e %e %e 0. 0. 0.\n" % (i, x,y,z))
outFile.write("%d %e %e %e 0. 0. 0. 0.\n" % (i, x,y,z))
outFile.write("-99 -99 -99 -99 -99 -99 -99\n")
outFile.write("-99 -99 -99 -99 -99 -99 -99 -99\n")
outFile.close()
prevSubSample = thisSubSample
@ -597,10 +599,10 @@ if (args.halos or args.all) and haloFileBase != "":
if dataFormat == "sdf":
SDFcvt_PATH = "@CMAKE_BINARY_DIR@/external/libsdf/apps/SDFcvt/SDFcvt.x86_64"
if minHaloMass == "none": minHaloMass = 0.0
command = "%s %s mass id x y z vz vy vx | awk '{if ($1>%g) print $2, $3, $4, $5, $6, $7, $8}'>>%s" % (SDFcvt_PATH, dataFile, minHaloMass, outFileName )
command = "%s %s mass id x y z vz vy vx | awk '{if ($1>%g) print $2, $3, $4, $5, $6, $7, $8, $1}'>>%s" % (SDFcvt_PATH, dataFile, minHaloMass, outFileName )
os.system(command)
outFile = open(outFileName, 'a')
outFile.write("-99 -99 -99 -99 -99 -99 -99\n")
outFile.write("-99 -99 -99 -99 -99 -99 -99 -99\n")
outFile.close()
else:
outFile = open(outFileName, 'a')
@ -615,11 +617,13 @@ if (args.halos or args.all) and haloFileBase != "":
vz = float(line[haloFileVZCol])
vy = float(line[haloFileVYCol])
vx = float(line[haloFileVXCol])
mass = float(line[haloFileMCol])
# write to output file
outFile.write("%d %e %e %e %e %e %e\n" %(iHalo,x,y,z,vz,vy,vx))
outFile.write("%d %e %e %e %e %e %e %e\n" %(iHalo,x,y,z,
vz,vy,vx,mass))
outFile.write("-99 -99 -99 -99 -99 -99 -99\n")
outFile.write("-99 -99 -99 -99 -99 -99 -99 -99\n")
outFile.close()
inFile.close()