merged conflict

This commit is contained in:
P.M. Sutter 2014-05-20 19:04:10 -05:00
commit dbd1a1eeb0

View file

@ -75,7 +75,7 @@ def buildProfile(catalog, rMin, rMax):
allProfiles.append(thisProfile)
binCenters = 0.5*(radii[1:] + radii[:-1])
nVoid = len(voidsToStack)
nVoids = len(voidsToStack)
stackedProfile = np.mean(allProfiles, axis=0)
sigmas = np.std(allProfiles, axis=0) / np.sqrt(nVoids)