guilhem_lavaux/vide_public
0
0
Fork 0
mirror of https://bitbucket.org/cosmicvoids/vide_public.git synced 2025-07-04 15:21:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://bitbucket.org/cosmicvoids/vide_public

Browse source
This commit is contained in:
P.M. Sutter 2014-05-30 15:53:17 -04:00
commit 81f25d4ec4
4 changed files with 20 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

11
python_tools/void_python_tools/voidUtil/catalogUtil.py
View file

@ -368,7 +368,8 @@ def loadVoidCatalog(sampleDir, dataPortion="central", loadParticles=True,
eigenVecs = np.zeros((3,3)), eigenVecs = np.zeros((3,3)),
)) ))
print "Read %d voids" % len(catalog.voids) catalog.numVoids = len(catalog.voids)
print "Read %d voids" % catalog.numVoids
print "Loading barycenters..." print "Loading barycenters..."
iLine = 0 iLine = 0
@ -565,10 +566,10 @@ def stackVoids(catalog, stackMode = "ball"):
localPart = catalog.partPos[ getBall(partTree, center, rMax) ] localPart = catalog.partPos[ getBall(partTree, center, rMax) ]
else: else:
voidPart = getVoidPart(catalog, void.voidID) voidPart = getVoidPart(catalog, void.voidID)
localPart = np.zeros((3,len(voidPart))) localPart = np.zeros((len(voidPart),3))
localPart[0,:] = getArray(voidPart, 'x') localPart[:,0] = getArray(voidPart, 'x')
localPart[1,:] = getArray(voidPart, 'y') localPart[:,1] = getArray(voidPart, 'y')
localPart[2,:] = getArray(voidPart, 'z') localPart[:,2] = getArray(voidPart, 'z')
shiftedPart = shiftPart(localPart, center, periodicLine, catalog.ranges) shiftedPart = shiftPart(localPart, center, periodicLine, catalog.ranges)

2
python_tools/void_python_tools/voidUtil/matchUtil.py
View file

@ -71,7 +71,7 @@ def compareCatalogs(baseCatalogDir, compareCatalogDir,
launchVoidOverlap(baseSample, sample, baseCatalogDir, launchVoidOverlap(baseSample, sample, baseCatalogDir,
compareCatalogDir, binPath, compareCatalogDir, binPath,
thisDataPortion=dataPortion, logFile=logFile, thisDataPortion=dataPortion, logFile=logFile,
continueRun=False, workDir=workDir, continueRun=False,
outputFile=stepOutputFileName, outputFile=stepOutputFileName,
matchMethod=matchMethod, matchMethod=matchMethod,
strictMatch=strictMatch) strictMatch=strictMatch)

15
python_tools/void_python_tools/voidUtil/plotUtil.py
View file

@ -58,6 +58,8 @@ def plotNumberFunction(catalogList,
print "Plotting number function" print "Plotting number function"
catalogList = np.atleast_1d(catalogList)
plt.clf() plt.clf()
plt.xlabel("$R_{eff}$ [$h^{-1}Mpc$]", fontsize=14) plt.xlabel("$R_{eff}$ [$h^{-1}Mpc$]", fontsize=14)
@ -160,6 +162,8 @@ def plotEllipDist(catalogList,
ellipDistList = [] ellipDistList = []
catalogList = np.atleast_1d(catalogList)
for (iSample,catalog) in enumerate(catalogList): for (iSample,catalog) in enumerate(catalogList):
sample = catalog.sampleInfo sample = catalog.sampleInfo
data = getArray(catalog.voids, 'ellipticity') data = getArray(catalog.voids, 'ellipticity')
@ -167,8 +171,9 @@ def plotEllipDist(catalogList,
dataWeights = np.ones_like(data)/len(data) dataWeights = np.ones_like(data)/len(data)
dataHist, dataBins = np.histogram(data, bins=10, weights=dataWeights, dataHist, dataBins = np.histogram(data, bins=10, weights=dataWeights,
range=(0.0,0.35)) range=(0.0,0.35))
binCenters = 0.5*(dataBins[1:] + dataBins[:-1])
plt.plot(dataBins, dataHist, label=sample.fullName, plt.plot(binCenters, dataHist, label=sample.fullName,
color=colorList[iSample]) color=colorList[iSample])
ellipDistList.append((dataBins, dataHist,)) ellipDistList.append((dataBins, dataHist,))
@ -252,13 +257,13 @@ def plotVoidCells(catalog,
voidPart = getVoidPart(catalog, voidID) voidPart = getVoidPart(catalog, voidID)
newpart = np.zeros((3,len(voidPart))) newpart = np.zeros((len(voidPart),3))
volume=np.zeros(len(voidPart)) volume=np.zeros(len(voidPart))
radius=np.zeros(len(voidPart)) radius=np.zeros(len(voidPart))
newpart[0,:] = getArray(voidPart, 'x') newpart[:,0] = getArray(voidPart, 'x')
newpart[1,:] = getArray(voidPart, 'y') newpart[:,1] = getArray(voidPart, 'y')
newpart[2,:] = getArray(voidPart, 'z') newpart[:,2] = getArray(voidPart, 'z')
volume = getArray(voidPart, 'volume') volume = getArray(voidPart, 'volume')
radius = (3.*volume/(4.*np.pi))**(1./3.) radius = (3.*volume/(4.*np.pi))**(1./3.)

4
python_tools/void_python_tools/voidUtil/xcorUtil.py
View file

@ -119,7 +119,9 @@ def computeXcor(catalog,
plt.xlim(rmin,rmax) plt.xlim(rmin,rmax)
plt.ylim(min(10**np.floor(np.log10(abs(Xvm).min())),10**np.floor(np.log10(abs(Xmm).min())))/margin, max(10**np.ceil(np.log10(Xmm.max())),10**np.ceil(np.log10(Xvv.max())))*margin) plt.ylim(min(10**np.floor(np.log10(abs(Xvm).min())),10**np.floor(np.log10(abs(Xmm).min())))/margin, max(10**np.ceil(np.log10(Xmm.max())),10**np.ceil(np.log10(Xvv.max())))*margin)
plt.legend([pa, pb, pc],['tt', 'vt', 'vv'],'best',prop={'size':12}) plt.legend([pa, pb, pc],['tt', 'vt', 'vv'],'best',prop={'size':12})
plt.savefig(figDir+'/correlation.eps', format='eps', bbox_inches="tight") plt.savefig(figDir+'/correlation.eps', bbox_inches="tight")
plt.savefig(figDir+'/correlation.pdf', bbox_inches="tight")
plt.savefig(figDir+'/correlation.png', bbox_inches="tight")
plt.clf() plt.clf()