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

name change barycenter -> macrocenter

Browse source
This commit is contained in:
P.M. Sutter 2014-06-02 10:17:10 -04:00
parent d306b44f44
commit 27344eb1f7
7 changed files with 89 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

4
python_tools/void_python_tools/backend/launchers.py
View file

@ -550,7 +550,7 @@ def launchVoidOverlap(sample1, sample2, sample1Dir, sample2Dir,
cmd += " --infoFile1=" + sample1Dir+"/zobov_slice_" + \
str(sampleName1)+".par"
cmd += " --centerFile1=" + sample1Dir + \
"/barycenters_"+thisDataPortion+"_"+str(sampleName1)+".out"
"/macrocenters_"+thisDataPortion+"_"+str(sampleName1)+".out"
cmd += " --shapeFile1=" + sample1Dir + \
"/shapes_"+thisDataPortion+"_"+str(sampleName1)+".out"
cmd += " --zoneFile1=" + sample1Dir+"/voidZone_" + \
@ -567,7 +567,7 @@ def launchVoidOverlap(sample1, sample2, sample1Dir, sample2Dir,
cmd += " --infoFile2=" + sample2Dir+"/zobov_slice_" + \
str(sampleName2)+".par"
cmd += " --centerFile2=" + sample2Dir + \
"/"+matchPrefix+"barycenters_"+thisDataPortion+"_"+str(sampleName2)+".out"
"/"+matchPrefix+"macrocenters_"+thisDataPortion+"_"+str(sampleName2)+".out"
cmd += " --shapeFile2=" + sample2Dir + \
"/"+matchPrefix+"shapes_"+thisDataPortion+"_"+str(sampleName2)+".out"
cmd += " --zoneFile2=" + sample2Dir+"/voidZone_" + \

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

@ -358,7 +358,7 @@ def loadVoidCatalog(sampleDir, dataPortion="central", loadParticles=True,
densCon = line[9],
voidProb = line[10],
radius = pow(line[7]/volNorm*3./4./np.pi, 1./3.),
barycenter = np.zeros((3)),
macrocenter = np.zeros((3)),
RA = 0,
Dec = 0,
parentID = 0,
@ -373,13 +373,13 @@ def loadVoidCatalog(sampleDir, dataPortion="central", loadParticles=True,
catalog.numVoids = len(catalog.voids)
print "Read %d voids" % catalog.numVoids
print "Loading barycenters..."
print "Loading macrocenters..."
iLine = 0
for line in open(sampleDir+"/"+prefix+"barycenters_"+dataPortion+"_"+sample.fullName+".out"):
for line in open(sampleDir+"/"+prefix+"macrocenters_"+dataPortion+"_"+sample.fullName+".out"):
line = line.split()
catalog.voids[iLine].barycenter[0] = float(line[1])
catalog.voids[iLine].barycenter[1] = float(line[2])
catalog.voids[iLine].barycenter[2] = float(line[3])
catalog.voids[iLine].macrocenter[0] = float(line[1])
catalog.voids[iLine].macrocenter[1] = float(line[2])
catalog.voids[iLine].macrocenter[2] = float(line[3])
iLine += 1
iLine = 0
@ -570,7 +570,7 @@ def stackVoids(catalog, stackMode = "ball"):
stackedPart = []
for void in catalog.voids:
center = void.barycenter
center = void.macrocenter
if stackMode == "ball":
localPart = catalog.partPos[ getBall(partTree, center, rMax) ]

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

@ -217,7 +217,7 @@ def plotVoidCells(catalog,
print "Void ID %d not found!" % voidID
return
sliceCenter = catalog.voids[iVoid].barycenter
sliceCenter = catalog.voids[iVoid].macrocenter
xwidth = sliceWidth
ywidth = sliceWidth

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

@ -61,7 +61,7 @@ def buildProfile(catalog, rMin, rMax):
print " Stacking voids..."
allProfiles = []
for void in voidsToStack:
center = void.barycenter
center = void.macrocenter
localPart = catalog.partPos[ getBall(partTree, center, rMaxProfile) ]
shiftedPart = shiftPart(localPart, center, periodicLine, catalog.ranges)

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

@ -25,7 +25,7 @@ def computeXcor(catalog,
# Input particle arrays of shape (N,3)
xm = catalog.partPos # Halos / Galaxies / Dark matter
xv = getArray(catalog.voids, 'barycenter')
xv = getArray(catalog.voids, 'macrocenter')
# Interpolate to mesh