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

removed the maxkeep criterion in subsampling

Browse source
This commit is contained in:
P.M. Sutter 2013-02-18 07:11:27 -06:00
parent 3a12e32f2c
commit 1a62f691ef
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -299,7 +299,7 @@ for thisSubSample in sorted(subSamples, reverse=True):
if np.random.uniform() > keepFraction: continue if np.random.uniform() > keepFraction: continue
numKept += 1 numKept += 1
if numKept > maxKeep: break #if numKept > maxKeep: break
if (prevSubSample == -1): if (prevSubSample == -1):
line = line.split(',') line = line.split(',')
@ -307,8 +307,10 @@ for thisSubSample in sorted(subSamples, reverse=True):
y = float(line[1]) y = float(line[1])
z = float(line[2]) z = float(line[2])
vz = float(line[3]) vz = float(line[3])
vy = float(line[4])
vx = float(line[5])
uniqueID = i uniqueID = i
outFile.write("%d %e %e %e %e\n" %(uniqueID,x,y,z,vz)) outFile.write("%d %e %e %e %e %e %e\n" %(uniqueID,x,y,z,vz,vy,vx))
else: else:
outFile.write(line) outFile.write(line)
@ -331,7 +333,7 @@ for thisSubSample in sorted(subSamples, reverse=True):
y = np.random.uniform()*lbox y = np.random.uniform()*lbox
z = np.random.uniform()*lbox z = np.random.uniform()*lbox
outFile.write("%d %e %e %e %e\n" % (i, x,y,z, 0.)) outFile.write("%d %e %e %e 0. 0. 0.\n" % (i, x,y,z))
outFile.write("-99 -99 -99 -99 -99\n") outFile.write("-99 -99 -99 -99 -99\n")
outFile.close() outFile.close()
@ -417,9 +419,11 @@ if (args.halos or args.all) and haloFileBase != "":
y = float(line[haloFileYCol]) y = float(line[haloFileYCol])
z = float(line[haloFileZCol]) z = float(line[haloFileZCol])
vz = float(line[haloFileVZCol]) vz = float(line[haloFileVZCol])
vy = float(line[haloFileVYCol])
vx = float(line[haloFileVXCol])
# write to output file # write to output file
outFile.write("%d %e %e %e %e\n" %(iHalo,x,y,z,vz)) outFile.write("%d %e %e %e %e %e %e\n" %(iHalo,x,y,z,vz,vy,vx))
outFile.write("-99 -99 -99 -99 -99\n") outFile.write("-99 -99 -99 -99 -99\n")
inFile.close() inFile.close()