From 30655fedafc9eace02977c7c49035be86e3d91be Mon Sep 17 00:00:00 2001 From: "P.M. Sutter" Date: Tue, 7 May 2013 13:43:45 -0500 Subject: [PATCH] fixed some bugs in halo handling --- python_tools/pipeline_source/prepareCatalogs.in.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/python_tools/pipeline_source/prepareCatalogs.in.py b/python_tools/pipeline_source/prepareCatalogs.in.py index 25045d3..57cfe6b 100644 --- a/python_tools/pipeline_source/prepareCatalogs.in.py +++ b/python_tools/pipeline_source/prepareCatalogs.in.py @@ -536,9 +536,12 @@ if (args.script or args.all) and haloFileBase != "": #inFile.close() #minRadius = 2*int(np.ceil(lbox/numPart**(1./3.))) - minRadies = 10 - - strMinHaloMass = "%.2e" % minHaloMass + minRadius = 10 + + if minHaloMass != "none": + strMinHaloMass = "%.2e" % minHaloMass + else: + strMinHaloMass = "none" setName = prefix+"halos_min"+strMinHaloMass fileList = [] @@ -594,7 +597,10 @@ if (args.halos or args.all) and haloFileBase != "": numPart += 1 inFile.close() - strMinHaloMass = "%.2e" % minHaloMass + if minHaloMass != "none": + strMinHaloMass = "%.2e" % minHaloMass + else: + strMinHaloMass = "none" sampleName = prefix+"halos_min"+strMinHaloMass+"_z"+redshifts[iRedshift] outFileName = catalogDir+"/"+sampleName+".dat"