more updates to preparation scripts

This commit is contained in:
P.M. Sutter 2012-12-18 12:13:06 -06:00
parent a566c12435
commit 8a4191972b
2 changed files with 14 additions and 13 deletions

View file

@ -478,13 +478,13 @@ if (args.hod or args.all) and haloFileBase != "":
workDir=catalogDir)) workDir=catalogDir))
parFile.close() parFile.close()
# os.system(hodPath+" "+parFileName+">& /dev/null") os.system(hodPath+" "+parFileName+">& /dev/null")
#
# sampleName = getSampleName(prefix+"hod_dr72dim2", redshift, False) sampleName = getSampleName(prefix+"hod_dr72dim2", redshift, False)
# outFileName = catalogDir+"/"+sampleName+".dat" outFileName = catalogDir+"/"+sampleName+".dat"
# os.system("mv %s/hod.mock %s" % (catalogDir, outFileName)) os.system("mv %s/hod.mock %s" % (catalogDir, outFileName))
#
# os.system("rm %s/hod.*" % catalogDir) os.system("rm %s/hod.*" % catalogDir)
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# now the BOSS HOD # now the BOSS HOD

View file

@ -254,8 +254,9 @@ def launchPrune(sample, binPath, thisDataPortion=None,
periodicLine = " --periodic='" periodicLine = " --periodic='"
if sample.numSubvolumes == 1: periodicLine += "xy" if sample.numSubvolumes == 1: periodicLine += "xy"
if sample.zBoundaryMpc[0] == 0 and \ if sample.zBoundaryMpc[1] - sample.zBoundaryMpc[0] - \
sample.zBoundaryMpc[1] == sample.boxLen : periodicLine += "z" sample.boxLen <= 1.e-1:
periodicLine += "z"
periodicLine += "' " periodicLine += "' "
if not (continueRun and jobSuccessful(logFile, "NetCDF: Not a valid ID\n")): if not (continueRun and jobSuccessful(logFile, "NetCDF: Not a valid ID\n")):
@ -321,8 +322,8 @@ def launchVoidOverlap(sample1, sample2, sample1Dir, sample2Dir,
periodicLine = " --periodic='" periodicLine = " --periodic='"
if sample1.dataType != "observation": if sample1.dataType != "observation":
if sample1.numSubvolumes == 1: periodicLine += "xy" if sample1.numSubvolumes == 1: periodicLine += "xy"
if sample1.zBoundaryMpc[0] == 0 and \ if sample1.zBoundaryMpc[1] - sample1.zBoundaryMpc[0] - sample1.boxLen <= 1.e-1:
sample1.zBoundaryMpc[1] == sample1.boxLen : periodicLine += "z" periodicLine += "z"
periodicLine += "' " periodicLine += "' "
if not (continueRun and jobSuccessful(logFile, "Done!\n")): if not (continueRun and jobSuccessful(logFile, "Done!\n")):
@ -357,7 +358,7 @@ def launchVoidOverlap(sample1, sample2, sample1Dir, sample2Dir,
cmd += " --zonePartFile2=" + sample2Dir+"/voidPart_" + \ cmd += " --zonePartFile2=" + sample2Dir+"/voidPart_" + \
str(sampleName2)+".dat" str(sampleName2)+".dat"
#cmd += " --useID" cmd += " --useID"
cmd += periodicLine cmd += periodicLine
cmd += " --outfile=" + outputFile cmd += " --outfile=" + outputFile
cmd += " &> " + logFile cmd += " &> " + logFile