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

28
c_tools/analysis/voidOverlap.cpp
View file

@ -71,7 +71,7 @@ typedef struct voidStruct {
int voidID, numPart, numZones, coreParticle, zoneNumPart; int voidID, numPart, numZones, coreParticle, zoneNumPart;
float maxRadius, nearestMock, centralDen, redshift, redshiftInMpc; float maxRadius, nearestMock, centralDen, redshift, redshiftInMpc;
float nearestEdge; float nearestEdge;
float barycenter[3]; float macrocenter[3];
float ellipticity; float ellipticity;
float eigv1[3], eigv2[3], eigv3[3], eig[3]; float eigv1[3], eigv2[3], eigv3[3], eig[3];
std::vector<MATCHPROPS> matches; std::vector<MATCHPROPS> matches;
@ -194,11 +194,11 @@ int main(int argc, char **argv) {
partID1 = catalog1.zones2Parts[zoneID1].partIDs[p1]; partID1 = catalog1.zones2Parts[zoneID1].partIDs[p1];
dist[0] = fabs(catalog1.part[partID1].x - dist[0] = fabs(catalog1.part[partID1].x -
catalog2.voids[iVoid2].barycenter[0]); catalog2.voids[iVoid2].macrocenter[0]);
dist[1] = fabs(catalog1.part[partID1].y - dist[1] = fabs(catalog1.part[partID1].y -
catalog2.voids[iVoid2].barycenter[1]); catalog2.voids[iVoid2].macrocenter[1]);
dist[2] = fabs(catalog1.part[partID1].z - dist[2] = fabs(catalog1.part[partID1].z -
catalog2.voids[iVoid2].barycenter[2]); catalog2.voids[iVoid2].macrocenter[2]);
if (periodicX) dist[0] = fmin(dist[0], 1.0 - dist[0]); if (periodicX) dist[0] = fmin(dist[0], 1.0 - dist[0]);
if (periodicY) dist[1] = fmin(dist[1], 1.0 - dist[1]); if (periodicY) dist[1] = fmin(dist[1], 1.0 - dist[1]);
@ -659,7 +659,7 @@ void loadCatalog(const char *partFile, const char *volFile,
catalog.voids.resize(catalog.numVoids); catalog.voids.resize(catalog.numVoids);
printf(" Read %d voids.\n", catalog.numVoids); printf(" Read %d voids.\n", catalog.numVoids);
printf(" Loading barycenters\n"); printf(" Loading macrocenters\n");
fp = fopen(centerFile, "r"); fp = fopen(centerFile, "r");
float tempBary[3]; float tempBary[3];
float tempFloat; float tempFloat;
@ -678,9 +678,9 @@ void loadCatalog(const char *partFile, const char *volFile,
tempBary[0] = (tempBary[0] - ranges[0][0])/catalog.boxLen[0]; tempBary[0] = (tempBary[0] - ranges[0][0])/catalog.boxLen[0];
tempBary[1] = (tempBary[1] - ranges[1][0])/catalog.boxLen[1]; tempBary[1] = (tempBary[1] - ranges[1][0])/catalog.boxLen[1];
tempBary[2] = (tempBary[2] - ranges[2][0])/catalog.boxLen[2]; tempBary[2] = (tempBary[2] - ranges[2][0])/catalog.boxLen[2];
catalog.voids[iVoid].barycenter[0] = tempBary[0]; catalog.voids[iVoid].macrocenter[0] = tempBary[0];
catalog.voids[iVoid].barycenter[1] = tempBary[1]; catalog.voids[iVoid].macrocenter[1] = tempBary[1];
catalog.voids[iVoid].barycenter[2] = tempBary[2]; catalog.voids[iVoid].macrocenter[2] = tempBary[2];
iVoid++; iVoid++;
} }
fclose(fp); fclose(fp);
@ -764,12 +764,12 @@ float getDist(CATALOG& catalog1, CATALOG& catalog2, int& iVoid1, int& iVoid2,
float rdist, dist[3]; float rdist, dist[3];
dist[0] = fabs(catalog1.voids[iVoid1].barycenter[0] - dist[0] = fabs(catalog1.voids[iVoid1].macrocenter[0] -
catalog2.voids[iVoid2].barycenter[0]); catalog2.voids[iVoid2].macrocenter[0]);
dist[1] = fabs(catalog1.voids[iVoid1].barycenter[1] - dist[1] = fabs(catalog1.voids[iVoid1].macrocenter[1] -
catalog2.voids[iVoid2].barycenter[1]); catalog2.voids[iVoid2].macrocenter[1]);
dist[2] = fabs(catalog1.voids[iVoid1].barycenter[2] - dist[2] = fabs(catalog1.voids[iVoid1].macrocenter[2] -
catalog2.voids[iVoid2].barycenter[2]); catalog2.voids[iVoid2].macrocenter[2]);
if (periodicX) dist[0] = fmin(dist[0], 1.0 - dist[0]); if (periodicX) dist[0] = fmin(dist[0], 1.0 - dist[0]);
if (periodicY) dist[1] = fmin(dist[1], 1.0 - dist[1]); if (periodicY) dist[1] = fmin(dist[1], 1.0 - dist[1]);

126
c_tools/stacking/pruneVoids.cpp
View file

@ -78,7 +78,7 @@ typedef struct voidStruct {
float maxRadius, nearestMock, centralDen, redshift, redshiftInMpc; float maxRadius, nearestMock, centralDen, redshift, redshiftInMpc;
float nearestMockFromCore, nearestGalFromCore; float nearestMockFromCore, nearestGalFromCore;
float nearestEdge; float nearestEdge;
float center[3], barycenter[3]; float center[3], macrocenter[3];
int accepted; int accepted;
int voidType; int voidType;
int parentID, numChildren, level; int parentID, numChildren, level;
@ -555,12 +555,12 @@ int main(int argc, char **argv) {
interval = 1.*(clock4 - clock3)/CLOCKS_PER_SEC; interval = 1.*(clock4 - clock3)/CLOCKS_PER_SEC;
//printf(" %.2f for buffer\n", interval); //printf(" %.2f for buffer\n", interval);
// compute barycenters // compute macrocenters
clock3 = clock(); clock3 = clock();
double weight = 0.; double weight = 0.;
voids[iVoid].barycenter[0] = 0.; voids[iVoid].macrocenter[0] = 0.;
voids[iVoid].barycenter[1] = 0.; voids[iVoid].macrocenter[1] = 0.;
voids[iVoid].barycenter[2] = 0.; voids[iVoid].macrocenter[2] = 0.;
for (p = 0; p < voids[iVoid].numPart; p++) { for (p = 0; p < voids[iVoid].numPart; p++) {
dist[0] = voidPart[p].x - voids[iVoid].center[0]; dist[0] = voidPart[p].x - voids[iVoid].center[0];
@ -574,39 +574,39 @@ int main(int argc, char **argv) {
if (periodicZ && fabs(dist[2]) > boxLen[2]/2.) if (periodicZ && fabs(dist[2]) > boxLen[2]/2.)
dist[2] = dist[2] - copysign(boxLen[2], dist[2]); dist[2] = dist[2] - copysign(boxLen[2], dist[2]);
voids[iVoid].barycenter[0] += voidPart[p].vol*(dist[0]); voids[iVoid].macrocenter[0] += voidPart[p].vol*(dist[0]);
voids[iVoid].barycenter[1] += voidPart[p].vol*(dist[1]); voids[iVoid].macrocenter[1] += voidPart[p].vol*(dist[1]);
voids[iVoid].barycenter[2] += voidPart[p].vol*(dist[2]); voids[iVoid].macrocenter[2] += voidPart[p].vol*(dist[2]);
weight += voidPart[p].vol; weight += voidPart[p].vol;
} }
voids[iVoid].barycenter[0] /= weight; voids[iVoid].macrocenter[0] /= weight;
voids[iVoid].barycenter[1] /= weight; voids[iVoid].macrocenter[1] /= weight;
voids[iVoid].barycenter[2] /= weight; voids[iVoid].macrocenter[2] /= weight;
voids[iVoid].barycenter[0] += voids[iVoid].center[0]; voids[iVoid].macrocenter[0] += voids[iVoid].center[0];
voids[iVoid].barycenter[1] += voids[iVoid].center[1]; voids[iVoid].macrocenter[1] += voids[iVoid].center[1];
voids[iVoid].barycenter[2] += voids[iVoid].center[2]; voids[iVoid].macrocenter[2] += voids[iVoid].center[2];
if (periodicX) { if (periodicX) {
if (voids[iVoid].barycenter[0] > ranges[0][1]) if (voids[iVoid].macrocenter[0] > ranges[0][1])
voids[iVoid].barycenter[0] = voids[iVoid].barycenter[0] - boxLen[0]; voids[iVoid].macrocenter[0] = voids[iVoid].macrocenter[0] - boxLen[0];
if (voids[iVoid].barycenter[0] < ranges[0][0]) if (voids[iVoid].macrocenter[0] < ranges[0][0])
voids[iVoid].barycenter[0] = boxLen[0] + voids[iVoid].barycenter[0]; voids[iVoid].macrocenter[0] = boxLen[0] + voids[iVoid].macrocenter[0];
} }
if (periodicY) { if (periodicY) {
if (voids[iVoid].barycenter[1] > ranges[1][1]) if (voids[iVoid].macrocenter[1] > ranges[1][1])
voids[iVoid].barycenter[1] = voids[iVoid].barycenter[1] - boxLen[1]; voids[iVoid].macrocenter[1] = voids[iVoid].macrocenter[1] - boxLen[1];
if (voids[iVoid].barycenter[1] < ranges[1][0]) if (voids[iVoid].macrocenter[1] < ranges[1][0])
voids[iVoid].barycenter[1] = boxLen[1] + voids[iVoid].barycenter[1]; voids[iVoid].macrocenter[1] = boxLen[1] + voids[iVoid].macrocenter[1];
} }
if (periodicZ) { if (periodicZ) {
if (voids[iVoid].barycenter[2] > ranges[2][1]) if (voids[iVoid].macrocenter[2] > ranges[2][1])
voids[iVoid].barycenter[2] = voids[iVoid].barycenter[2] - boxLen[2]; voids[iVoid].macrocenter[2] = voids[iVoid].macrocenter[2] - boxLen[2];
if (voids[iVoid].barycenter[2] < ranges[2][0]) if (voids[iVoid].macrocenter[2] < ranges[2][0])
voids[iVoid].barycenter[2] = boxLen[2] + voids[iVoid].barycenter[2]; voids[iVoid].macrocenter[2] = boxLen[2] + voids[iVoid].macrocenter[2];
} }
clock4 = clock(); clock4 = clock();
interval = 1.*(clock4 - clock3)/CLOCKS_PER_SEC; interval = 1.*(clock4 - clock3)/CLOCKS_PER_SEC;
//printf(" %.2f for barycenter\n", interval); //printf(" %.2f for macrocenter\n", interval);
// compute central density // compute central density
clock3 = clock(); clock3 = clock();
@ -614,9 +614,9 @@ int main(int argc, char **argv) {
centralDen = 0.; centralDen = 0.;
int numCentral = 0; int numCentral = 0;
for (p = 0; p < voids[iVoid].numPart; p++) { for (p = 0; p < voids[iVoid].numPart; p++) {
dist[0] = fabs(voidPart[p].x - voids[iVoid].barycenter[0]); dist[0] = fabs(voidPart[p].x - voids[iVoid].macrocenter[0]);
dist[1] = fabs(voidPart[p].y - voids[iVoid].barycenter[1]); dist[1] = fabs(voidPart[p].y - voids[iVoid].macrocenter[1]);
dist[2] = fabs(voidPart[p].z - voids[iVoid].barycenter[2]); dist[2] = fabs(voidPart[p].z - voids[iVoid].macrocenter[2]);
if (periodicX) dist[0] = fmin(dist[0], boxLen[0]-dist[0]); if (periodicX) dist[0] = fmin(dist[0], boxLen[0]-dist[0]);
if (periodicY) dist[1] = fmin(dist[1], boxLen[1]-dist[1]); if (periodicY) dist[1] = fmin(dist[1], boxLen[1]-dist[1]);
@ -681,9 +681,9 @@ int main(int argc, char **argv) {
maxDist = 0.; maxDist = 0.;
for (p = 0; p < voids[iVoid].numPart; p++) { for (p = 0; p < voids[iVoid].numPart; p++) {
dist[0] = fabs(voidPart[p].x - voids[iVoid].barycenter[0]); dist[0] = fabs(voidPart[p].x - voids[iVoid].macrocenter[0]);
dist[1] = fabs(voidPart[p].y - voids[iVoid].barycenter[1]); dist[1] = fabs(voidPart[p].y - voids[iVoid].macrocenter[1]);
dist[2] = fabs(voidPart[p].z - voids[iVoid].barycenter[2]); dist[2] = fabs(voidPart[p].z - voids[iVoid].macrocenter[2]);
if (periodicX) dist[0] = fmin(dist[0], boxLen[0]-dist[0]); if (periodicX) dist[0] = fmin(dist[0], boxLen[0]-dist[0]);
if (periodicY) dist[1] = fmin(dist[1], boxLen[1]-dist[1]); if (periodicY) dist[1] = fmin(dist[1], boxLen[1]-dist[1]);
@ -703,9 +703,9 @@ int main(int argc, char **argv) {
// compute distance from center to nearest mock // compute distance from center to nearest mock
minDist = 1.e99; minDist = 1.e99;
for (p = mockIndex; p < numPartTot; p++) { for (p = mockIndex; p < numPartTot; p++) {
dist[0] = voids[iVoid].barycenter[0] - part[p].x; dist[0] = voids[iVoid].macrocenter[0] - part[p].x;
dist[1] = voids[iVoid].barycenter[1] - part[p].y; dist[1] = voids[iVoid].macrocenter[1] - part[p].y;
dist[2] = voids[iVoid].barycenter[2] - part[p].z; dist[2] = voids[iVoid].macrocenter[2] - part[p].z;
dist2 = pow(dist[0],2) + pow(dist[1],2) + pow(dist[2],2); dist2 = pow(dist[0],2) + pow(dist[1],2) + pow(dist[2],2);
if (dist2 < minDist) minDist = dist2; if (dist2 < minDist) minDist = dist2;
@ -718,9 +718,9 @@ int main(int argc, char **argv) {
if (args.isObservation_flag) { if (args.isObservation_flag) {
voids[iVoid].redshiftInMpc = voids[iVoid].redshiftInMpc =
sqrt(pow(voids[iVoid].barycenter[0] - boxLen[0]/2.,2) + sqrt(pow(voids[iVoid].macrocenter[0] - boxLen[0]/2.,2) +
pow(voids[iVoid].barycenter[1] - boxLen[1]/2.,2) + pow(voids[iVoid].macrocenter[1] - boxLen[1]/2.,2) +
pow(voids[iVoid].barycenter[2] - boxLen[2]/2.,2)); pow(voids[iVoid].macrocenter[2] - boxLen[2]/2.,2));
voids[iVoid].redshiftInMpc = voids[iVoid].redshiftInMpc; voids[iVoid].redshiftInMpc = voids[iVoid].redshiftInMpc;
@ -740,33 +740,33 @@ int main(int argc, char **argv) {
} else { } else {
voids[iVoid].redshiftInMpc = voids[iVoid].barycenter[2]; voids[iVoid].redshiftInMpc = voids[iVoid].macrocenter[2];
if (args.useComoving_flag) { if (args.useComoving_flag) {
voids[iVoid].redshift = gsl_interp_eval(interp, dL, redshifts, voids[iVoid].redshift = gsl_interp_eval(interp, dL, redshifts,
voids[iVoid].redshiftInMpc, acc); voids[iVoid].redshiftInMpc, acc);
} else { } else {
voids[iVoid].redshift = voids[iVoid].barycenter[2]/LIGHT_SPEED*100.; voids[iVoid].redshift = voids[iVoid].macrocenter[2]/LIGHT_SPEED*100.;
} }
nearestEdge = 1.e99; nearestEdge = 1.e99;
if (!periodicX) { if (!periodicX) {
nearestEdge = fmin(nearestEdge, nearestEdge = fmin(nearestEdge,
fabs(voids[iVoid].barycenter[0] - ranges[0][0])); fabs(voids[iVoid].macrocenter[0] - ranges[0][0]));
nearestEdge = fmin(nearestEdge, nearestEdge = fmin(nearestEdge,
fabs(voids[iVoid].barycenter[0] - ranges[0][1])); fabs(voids[iVoid].macrocenter[0] - ranges[0][1]));
} }
if (!periodicY) { if (!periodicY) {
nearestEdge = fmin(nearestEdge, nearestEdge = fmin(nearestEdge,
fabs(voids[iVoid].barycenter[1] - ranges[1][0])); fabs(voids[iVoid].macrocenter[1] - ranges[1][0]));
nearestEdge = fmin(nearestEdge, nearestEdge = fmin(nearestEdge,
fabs(voids[iVoid].barycenter[1] - ranges[1][1])); fabs(voids[iVoid].macrocenter[1] - ranges[1][1]));
} }
if (!periodicZ) { if (!periodicZ) {
nearestEdge = fmin(nearestEdge, nearestEdge = fmin(nearestEdge,
fabs(voids[iVoid].barycenter[2] - ranges[2][0])); fabs(voids[iVoid].macrocenter[2] - ranges[2][0]));
nearestEdge = fmin(nearestEdge, nearestEdge = fmin(nearestEdge,
fabs(voids[iVoid].barycenter[2] - ranges[2][1])); fabs(voids[iVoid].macrocenter[2] - ranges[2][1]));
} }
} }
@ -782,9 +782,9 @@ int main(int argc, char **argv) {
for (int i = 0; i < 9; i++) inertia[i] = 0.; for (int i = 0; i < 9; i++) inertia[i] = 0.;
for (int p = 0; p < voids[iVoid].numPart; p++) { for (int p = 0; p < voids[iVoid].numPart; p++) {
dist[0] = voidPart[p].x - voids[iVoid].barycenter[0]; dist[0] = voidPart[p].x - voids[iVoid].macrocenter[0];
dist[1] = voidPart[p].y - voids[iVoid].barycenter[1]; dist[1] = voidPart[p].y - voids[iVoid].macrocenter[1];
dist[2] = voidPart[p].z - voids[iVoid].barycenter[2]; dist[2] = voidPart[p].z - voids[iVoid].macrocenter[2];
if (periodicX && fabs(dist[0]) > boxLen[0]/2.) if (periodicX && fabs(dist[0]) > boxLen[0]/2.)
dist[0] = dist[0] - copysign(boxLen[0], dist[0]); dist[0] = dist[0] - copysign(boxLen[0], dist[0]);
@ -1037,7 +1037,7 @@ void openFiles(string outputDir, string sampleName,
fprintf(*fpZobov, "%d particles, %d voids.\n", mockIndex, numKept); fprintf(*fpZobov, "%d particles, %d voids.\n", mockIndex, numKept);
fprintf(*fpZobov, "Void# FileVoid# CoreParticle CoreDens ZoneVol Zone#Part Void#Zones VoidVol Void#Part VoidDensContrast VoidProb\n"); fprintf(*fpZobov, "Void# FileVoid# CoreParticle CoreDens ZoneVol Zone#Part Void#Zones VoidVol Void#Part VoidDensContrast VoidProb\n");
*fpBarycenter = fopen((outputDir+"/"+prefix+"barycenters_"+dataPortion+"_"+sampleName).c_str(), "w"); *fpBarycenter = fopen((outputDir+"/"+prefix+"macrocenters_"+dataPortion+"_"+sampleName).c_str(), "w");
*fpCenters = fopen((outputDir+"/"+prefix+"centers_"+dataPortion+"_"+sampleName).c_str(), "w"); *fpCenters = fopen((outputDir+"/"+prefix+"centers_"+dataPortion+"_"+sampleName).c_str(), "w");
fprintf(*fpCenters, "# center x,y,z (Mpc/h), volume (normalized), radius (Mpc/h), redshift, volume (Mpc/h^3), void ID, density contrast, num part, parent ID, tree level, number of children, central density\n"); fprintf(*fpCenters, "# center x,y,z (Mpc/h), volume (normalized), radius (Mpc/h), redshift, volume (Mpc/h^3), void ID, density contrast, num part, parent ID, tree level, number of children, central density\n");
@ -1103,14 +1103,14 @@ void outputVoids(string outputDir, string sampleName, string prefix,
} }
double outCenter[3]; double outCenter[3];
outCenter[0] = outVoid.barycenter[0]; outCenter[0] = outVoid.macrocenter[0];
outCenter[1] = outVoid.barycenter[1]; outCenter[1] = outVoid.macrocenter[1];
outCenter[2] = outVoid.barycenter[2]; outCenter[2] = outVoid.macrocenter[2];
//if (isObservation) { //if (isObservation) {
// outCenter[0] = (outVoid.barycenter[0]-boxLen[0]/2.)*100.; // outCenter[0] = (outVoid.macrocenter[0]-boxLen[0]/2.)*100.;
// outCenter[1] = (outVoid.barycenter[1]-boxLen[1]/2.)*100.; // outCenter[1] = (outVoid.macrocenter[1]-boxLen[1]/2.)*100.;
// outCenter[2] = (outVoid.barycenter[2]-boxLen[2]/2.)*100.; // outCenter[2] = (outVoid.macrocenter[2]-boxLen[2]/2.)*100.;
//} //}
fprintf(fpZobov, "%d %d %d %f %f %d %d %f %d %f %f\n", fprintf(fpZobov, "%d %d %d %f %f %d %d %f %d %f %f\n",
@ -1128,9 +1128,9 @@ void outputVoids(string outputDir, string sampleName, string prefix,
fprintf(fpBarycenter, "%d %e %e %e\n", fprintf(fpBarycenter, "%d %e %e %e\n",
outVoid.voidID, outVoid.voidID,
outVoid.barycenter[0], outVoid.macrocenter[0],
outVoid.barycenter[1], outVoid.macrocenter[1],
outVoid.barycenter[2]); outVoid.macrocenter[2]);
fprintf(fpDistances, "%d %e %e %e %e %e\n", fprintf(fpDistances, "%d %e %e %e %e %e\n",
outVoid.voidID, outVoid.voidID,
@ -1157,9 +1157,9 @@ void outputVoids(string outputDir, string sampleName, string prefix,
outVoid.centralDen); outVoid.centralDen);
fprintf(fpSkyPositions, "%.2f %.2f %.5f %.2f %d\n", fprintf(fpSkyPositions, "%.2f %.2f %.5f %.2f %d\n",
atan((outVoid.barycenter[1]-boxLen[1]/2.) / atan((outVoid.macrocenter[1]-boxLen[1]/2.) /
(outVoid.barycenter[0]-boxLen[0]/2.)) * 180/M_PI + 180, (outVoid.macrocenter[0]-boxLen[0]/2.)) * 180/M_PI + 180,
asin((outVoid.barycenter[2]-boxLen[2]/2.) / asin((outVoid.macrocenter[2]-boxLen[2]/2.) /
outVoid.redshiftInMpc) * 180/M_PI, outVoid.redshiftInMpc) * 180/M_PI,
outVoid.redshift, outVoid.redshift,
outVoid.radius, outVoid.radius,

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_" + \ cmd += " --infoFile1=" + sample1Dir+"/zobov_slice_" + \
str(sampleName1)+".par" str(sampleName1)+".par"
cmd += " --centerFile1=" + sample1Dir + \ cmd += " --centerFile1=" + sample1Dir + \
"/barycenters_"+thisDataPortion+"_"+str(sampleName1)+".out" "/macrocenters_"+thisDataPortion+"_"+str(sampleName1)+".out"
cmd += " --shapeFile1=" + sample1Dir + \ cmd += " --shapeFile1=" + sample1Dir + \
"/shapes_"+thisDataPortion+"_"+str(sampleName1)+".out" "/shapes_"+thisDataPortion+"_"+str(sampleName1)+".out"
cmd += " --zoneFile1=" + sample1Dir+"/voidZone_" + \ cmd += " --zoneFile1=" + sample1Dir+"/voidZone_" + \
@ -567,7 +567,7 @@ def launchVoidOverlap(sample1, sample2, sample1Dir, sample2Dir,
cmd += " --infoFile2=" + sample2Dir+"/zobov_slice_" + \ cmd += " --infoFile2=" + sample2Dir+"/zobov_slice_" + \
str(sampleName2)+".par" str(sampleName2)+".par"
cmd += " --centerFile2=" + sample2Dir + \ cmd += " --centerFile2=" + sample2Dir + \
"/"+matchPrefix+"barycenters_"+thisDataPortion+"_"+str(sampleName2)+".out" "/"+matchPrefix+"macrocenters_"+thisDataPortion+"_"+str(sampleName2)+".out"
cmd += " --shapeFile2=" + sample2Dir + \ cmd += " --shapeFile2=" + sample2Dir + \
"/"+matchPrefix+"shapes_"+thisDataPortion+"_"+str(sampleName2)+".out" "/"+matchPrefix+"shapes_"+thisDataPortion+"_"+str(sampleName2)+".out"
cmd += " --zoneFile2=" + sample2Dir+"/voidZone_" + \ 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], densCon = line[9],
voidProb = line[10], voidProb = line[10],
radius = pow(line[7]/volNorm*3./4./np.pi, 1./3.), radius = pow(line[7]/volNorm*3./4./np.pi, 1./3.),
barycenter = np.zeros((3)), macrocenter = np.zeros((3)),
RA = 0, RA = 0,
Dec = 0, Dec = 0,
parentID = 0, parentID = 0,
@ -373,13 +373,13 @@ def loadVoidCatalog(sampleDir, dataPortion="central", loadParticles=True,
catalog.numVoids = len(catalog.voids) catalog.numVoids = len(catalog.voids)
print "Read %d voids" % catalog.numVoids print "Read %d voids" % catalog.numVoids
print "Loading barycenters..." print "Loading macrocenters..."
iLine = 0 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() line = line.split()
catalog.voids[iLine].barycenter[0] = float(line[1]) catalog.voids[iLine].macrocenter[0] = float(line[1])
catalog.voids[iLine].barycenter[1] = float(line[2]) catalog.voids[iLine].macrocenter[1] = float(line[2])
catalog.voids[iLine].barycenter[2] = float(line[3]) catalog.voids[iLine].macrocenter[2] = float(line[3])
iLine += 1 iLine += 1
iLine = 0 iLine = 0
@ -570,7 +570,7 @@ def stackVoids(catalog, stackMode = "ball"):
stackedPart = [] stackedPart = []
for void in catalog.voids: for void in catalog.voids:
center = void.barycenter center = void.macrocenter
if stackMode == "ball": if stackMode == "ball":
localPart = catalog.partPos[ getBall(partTree, center, rMax) ] 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 print "Void ID %d not found!" % voidID
return return
sliceCenter = catalog.voids[iVoid].barycenter sliceCenter = catalog.voids[iVoid].macrocenter
xwidth = sliceWidth xwidth = sliceWidth
ywidth = 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..." print " Stacking voids..."
allProfiles = [] allProfiles = []
for void in voidsToStack: for void in voidsToStack:
center = void.barycenter center = void.macrocenter
localPart = catalog.partPos[ getBall(partTree, center, rMaxProfile) ] localPart = catalog.partPos[ getBall(partTree, center, rMaxProfile) ]
shiftedPart = shiftPart(localPart, center, periodicLine, catalog.ranges) 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) # Input particle arrays of shape (N,3)
xm = catalog.partPos # Halos / Galaxies / Dark matter xm = catalog.partPos # Halos / Galaxies / Dark matter
xv = getArray(catalog.voids, 'barycenter') xv = getArray(catalog.voids, 'macrocenter')
# Interpolate to mesh # Interpolate to mesh