halo files now have regularized names

This commit is contained in:
P.M. Sutter 2013-05-07 03:56:38 -05:00
parent ae7b69f3ca
commit 195f19806a

View file

@ -428,7 +428,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 mass | awk '{print $1*%g+%g, $2*%g+%g, $3*%g+%g, $4*%g, $5*%g, $6*%g, $7}' > %s" % (SDFcvt_PATH, dataFile,
command = "%s -a 200000 %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,
@ -537,22 +537,24 @@ if (args.script or args.all) and haloFileBase != "":
#minRadius = 2*int(np.ceil(lbox/numPart**(1./3.)))
minRadies = 10
setName = prefix+"halos_min"+str(minHaloMass)
strMinHaloMass = "%.2e" % minHaloMass
setName = prefix+"halos_min"+strMinHaloMass
fileList = []
for (iRedshift, redshift) in enumerate(redshifts):
sampleName = getSampleName(setName, redshift, False)
outFileName = sampleName+".dat"
fileList.append(outFileName)
writeScript(setName, prefix+"halos_min"+str(minHaloMass)+"_z", "multidark",
writeScript(setName, prefix+"halos_min"+strMinHaloMass+"_z", "multidark",
scriptDir, catalogDir, fileNums,
redshifts,
numSubvolumes, numSlices, False, lbox, minRadius, omegaM,
dataFileNameList = fileList)
if doPecVel:
writeScript(setName, prefix+"halos_min"+str(minHaloMass)+"_z",
writeScript(setName, prefix+"halos_min"+strMinHaloMass+"_z",
"multidark",
scriptDir, catalogDir, fileNums,
redshifts,
@ -592,7 +594,9 @@ if (args.halos or args.all) and haloFileBase != "":
numPart += 1
inFile.close()
sampleName = prefix+"halos_min"+str(minHaloMass)+"_z"+redshifts[iRedshift]
strMinHaloMass = "%.2e" % minHaloMass
sampleName = prefix+"halos_min"+strMinHaloMass+"_z"+redshifts[iRedshift]
outFileName = catalogDir+"/"+sampleName+".dat"
outFile = open(outFileName, 'w')
outFile.write("%f\n" %(lbox))
@ -605,7 +609,7 @@ 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, $1}'>>%s" % (SDFcvt_PATH, dataFile, minHaloMass, outFileName )
command = "%s -a 200000 %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 -99\n")
@ -716,7 +720,7 @@ if (args.hod or args.all) and haloFileBase != "":
inFile = haloFile
outFile = haloFile+"_temp"
SDFcvt_PATH = "@CMAKE_BINARY_DIR@/external/libsdf/apps/SDFcvt/SDFcvt.x86_64"
command = "%s %s mass x y z vx vy vz>>%s" % (SDFcvt_PATH, inFile, outFile)
command = "%s -a 200000 %s mass x y z vx vy vz>>%s" % (SDFcvt_PATH, inFile, outFile)
os.system(command)
haloFile = outFile
@ -730,13 +734,11 @@ if (args.hod or args.all) and haloFileBase != "":
hubble=hubble,
redshift=redshift,
Mmin=thisHod['Mmin'],
#Mmin=1.23e13,
M1=thisHod['M1'],
sigma_logM=thisHod['sigma_logM'],
alpha=thisHod['alpha'],
Mcut=thisHod['Mcut'],
galden=thisHod['galDens'],
#galden=0.000225,
haloFile=haloFile,
haloFileFormat=dataFormat,
numPartPerSide=numPart**(1/3.),
@ -744,7 +746,13 @@ if (args.hod or args.all) and haloFileBase != "":
workDir=catalogDir))
parFile.close()
os.system(hodPath+" "+parFileName+">& /dev/null")
tempFile = "./hod.out"
os.system(hodPath+" "+parFileName+">& " + tempFile)
for line in open(tempFile):
if "MLO" in line:
print " (minimum halo mass = ", line.split()[1], ")"
break
os.unlink(tempFile)
sampleName = getSampleName(prefix+"hod_"+thisHod['name'], redshift, False)
outFileName = catalogDir+"/"+sampleName+".dat"