big fix in loading catalog

This commit is contained in:
P.M. Sutter 2014-05-09 16:28:34 -04:00
parent c3d68b0275
commit 16909e8e78

View file

@ -342,9 +342,9 @@ def loadVoidCatalog(sampleDir, dataPortion="central", loadPart=True):
iLine += 1 iLine += 1
print "Loading derived void information..." print "Loading derived void information..."
iLine = 0 fileName = sampleDir+"/untrimmed_centers_"+dataPortion+"_"+sample.fullName+".out"
for line in open(sampleDir+"/untrimmed_centers_"+dataPortion+"_"+sample.fullName+".out"): catData = np.loadtxt(fileName, comments="#")
line = line.split() for (iLine,line) in enumerate(catData):
catalog.voids[iLine].volume = float(line[6]) catalog.voids[iLine].volume = float(line[6])
catalog.voids[iLine].radius = float(line[4]) catalog.voids[iLine].radius = float(line[4])
catalog.voids[iLine].parentID = float(line[10]) catalog.voids[iLine].parentID = float(line[10])
@ -353,10 +353,9 @@ def loadVoidCatalog(sampleDir, dataPortion="central", loadPart=True):
catalog.voids[iLine].centralDen = float(line[13]) catalog.voids[iLine].centralDen = float(line[13])
iLine += 1 iLine += 1
print "Loading shapes..." fileName = sampleDir+"/untrimmed_shapes_"+dataPortion+"_"+sample.fullName+".out"
iLine = 0 catData = np.loadtxt(fileName, comments="#")
for line in open(sampleDir+"/untrimmed_shapes_"+dataPortion+"_"+sample.fullName+".out"): for (iLine,line) in enumerate(catData):
line = line.split()
catalog.voids[iLine].eigenVals[0] = float(line[1]) catalog.voids[iLine].eigenVals[0] = float(line[1])
catalog.voids[iLine].eigenVals[1] = float(line[2]) catalog.voids[iLine].eigenVals[1] = float(line[2])
catalog.voids[iLine].eigenVals[2] = float(line[3]) catalog.voids[iLine].eigenVals[2] = float(line[3])