From 0fb3a39b1c67e46109c30583f59cd96fde3a03be Mon Sep 17 00:00:00 2001 From: "P.M. Sutter" Date: Tue, 8 Oct 2013 20:57:58 -0500 Subject: [PATCH] fixed wrongly-placed closefile --- python_tools/pipeline_source/prepareCatalogs.in.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/python_tools/pipeline_source/prepareCatalogs.in.py b/python_tools/pipeline_source/prepareCatalogs.in.py index 7aaa442..a210e7e 100644 --- a/python_tools/pipeline_source/prepareCatalogs.in.py +++ b/python_tools/pipeline_source/prepareCatalogs.in.py @@ -551,7 +551,7 @@ if (args.script or args.all) and haloFileBase != "": line = line.split(haloFileColSep) if minHaloMass == "none" or float(line[haloFileMCol]) > minHaloMass: numPart += 1 - inFile.close() + inFile.close() meanDen = lbox/numPart**(1./3.) if meanDen < 1: @@ -731,8 +731,8 @@ if (args.script or args.all) and haloFileBase != "": else: dataFile = catalogDir+haloFileBase.replace(haloFileDummy, fileNums[0]) - numPart = 0 if dataFormat == "sdf": + numPart = 0 SDFcvt_PATH = "@CMAKE_BINARY_DIR@/external/libsdf/apps/SDFcvt/SDFcvt.x86_64" command = "%s -a 200000 %s mass parent_id | awk '{if ($1>%g && $2==-1) print $1}' | wc" % (SDFcvt_PATH, dataFile, thisHod['Mcut']) numPart = subprocess.check_output(command, shell=True) @@ -743,9 +743,9 @@ if (args.script or args.all) and haloFileBase != "": if iHalo < haloFileNumComLines: continue line = line.split(haloFileColSep) if float(line[haloFileMCol]) > thisHod['Mcut']: numPart += 1 - inFile.close() + inFile.close() - minRadius = int(np.ceil(lbox/numPart**(1./3.))) + minRadius = int(np.ceil(float(lbox)/numPart**(1./3.))) setName = prefix+"hod_"+thisHod['name'] writeScript(setName, prefix+"hod_"+thisHod['name']+"_z", "multidark",