added new data type for inputs, more flexible handling of halo catalog file names

This commit is contained in:
P.M. Sutter 2013-01-24 05:24:18 -06:00
parent 3cb739a6d2
commit 2584645520

View file

@ -342,7 +342,11 @@ if (args.script or args.all) and haloFileBase != "":
print " Doing halo script", minHaloMass print " Doing halo script", minHaloMass
# estimate number of halos to get density # estimate number of halos to get density
if haloFileDummy == '':
dataFile = catalogDir+haloFileBase+fileNums[0] dataFile = catalogDir+haloFileBase+fileNums[0]
else:
dataFile = catalogDir+haloFileBase.replace(haloFileDummy, fileNums[0])
inFile = open(dataFile, 'r') inFile = open(dataFile, 'r')
numPart = 0 numPart = 0
for (iLine, line) in enumerate(inFile): for (iLine, line) in enumerate(inFile):
@ -373,7 +377,11 @@ if (args.halos or args.all) and haloFileBase != "":
for (iRedshift, redshift) in enumerate(redshifts): for (iRedshift, redshift) in enumerate(redshifts):
print " z = ", redshift print " z = ", redshift
if haloFileDummy == '':
dataFile = catalogDir+haloFileBase+fileNums[iRedshift] dataFile = catalogDir+haloFileBase+fileNums[iRedshift]
else:
dataFile = catalogDir+haloFileBase.replace(haloFileDummy,
fileNums[iRedshift])
inFile = open(dataFile, 'r') inFile = open(dataFile, 'r')
numPart = 0 numPart = 0
for (iLine, line) in enumerate(inFile): for (iLine, line) in enumerate(inFile):
@ -452,24 +460,31 @@ BOX_SIZE {boxSize}
root_filename {workDir}/hod root_filename {workDir}/hod
""" """
if (args.script or args.all) and haloFileBase != "": ## TEMP: TURN OFF DR7
if 1 == 0:
#if (args.script or args.all) and haloFileBase != "":
print " Doing DR7 HOD scripts" print " Doing DR7 HOD scripts"
setName = prefix+"hod_dr72dim2" setName = prefix+"hod_dr72dim2"
writeScript(setName, prefix+"hod_dr72dim2_z", dataFormat, writeScript(setName, prefix+"hod_dr72dim2_z", "multidark",
scriptDir, catalogDir, fileNums, redshifts, scriptDir, catalogDir, fileNums, redshifts,
numSubvolumes, numSlices, False, lbox, 5, omegaM) numSubvolumes, numSlices, False, lbox, 5, omegaM)
writeScript(setName, prefix+"hod_dr72dim2_z", dataFormat, writeScript(setName, prefix+"hod_dr72dim2_z", "multidark",
scriptDir, catalogDir, fileNums, redshifts, scriptDir, catalogDir, fileNums, redshifts,
numSubvolumes, numSlices, True, lbox, 5, omegaM) numSubvolumes, numSlices, True, lbox, 5, omegaM)
if (args.hod or args.all) and haloFileBase != "": if 1 == 0:
#if (args.hod or args.all) and haloFileBase != "":
print " Doing DR7 HOD" print " Doing DR7 HOD"
for (iRedshift, redshift) in enumerate(redshifts): for (iRedshift, redshift) in enumerate(redshifts):
print " z = ", redshift print " z = ", redshift
parFileName = "./hod.par" parFileName = "./hod.par"
parFile = open(parFileName, 'w') parFile = open(parFileName, 'w')
if haloFileDummy == '':
haloFile = catalogDir+haloFileBase+fileNums[iRedshift] haloFile = catalogDir+haloFileBase+fileNums[iRedshift]
else:
haloFile = catalogDir+haloFileBase.replace(haloFileDummy,
fileNums[iRedshift])
parFile.write(parFileText.format(omegaM=omegaM, parFile.write(parFileText.format(omegaM=omegaM,
hubble=hubble, hubble=hubble,
redshift=redshift, redshift=redshift,
@ -499,10 +514,10 @@ if (args.hod or args.all) and haloFileBase != "":
if (args.script or args.all) and haloFileBase != "": if (args.script or args.all) and haloFileBase != "":
print " Doing DR9 HOD scripts" print " Doing DR9 HOD scripts"
setName = prefix+"hod_dr9mid" setName = prefix+"hod_dr9mid"
writeScript(setName, prefix+"hod_dr9mid_z", dataFormat, writeScript(setName, prefix+"hod_dr9mid_z", "multidark",
scriptDir, catalogDir, fileNums, redshifts, scriptDir, catalogDir, fileNums, redshifts,
numSubvolumes, numSlices, False, lbox, 15, omegaM) numSubvolumes, numSlices, False, lbox, 15, omegaM)
writeScript(setName, prefix+"hod_dr9mid_z", dataFormat, writeScript(setName, prefix+"hod_dr9mid_z", "multidark",
scriptDir, catalogDir, fileNums, redshifts, scriptDir, catalogDir, fileNums, redshifts,
numSubvolumes, numSlices, True, lbox, 15, omegaM) numSubvolumes, numSlices, True, lbox, 15, omegaM)
@ -515,7 +530,11 @@ if (args.hod or args.all) and haloFileBase != "":
# modified to match the observed galaxy density # modified to match the observed galaxy density
parFileName = "./hod.par" parFileName = "./hod.par"
parFile = open(parFileName, 'w') parFile = open(parFileName, 'w')
if haloFileDummy == '':
haloFile = catalogDir+haloFileBase+fileNums[iRedshift] haloFile = catalogDir+haloFileBase+fileNums[iRedshift]
else:
haloFile = catalogDir+haloFileBase.replace(haloFileDummy,
fileNums[iRedshift])
parFile.write(parFileText.format(omegaM=omegaM, parFile.write(parFileText.format(omegaM=omegaM,
hubble=hubble, hubble=hubble,
redshift=redshift, redshift=redshift,