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

more bug fixes

Browse source
This commit is contained in:
P.M. Sutter 2012-11-18 18:09:18 -06:00
parent 0b54a31d0c
commit 9d97522472
2 changed files with 28 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

47
c_tools/stacking/pruneVoids.cpp
View file

@ -272,7 +272,7 @@ int main(int argc, char **argv) {
for (iVoid = 0; iVoid < numVoids; iVoid++) { for (iVoid = 0; iVoid < numVoids; iVoid++) {
voidID = voids[iVoid].voidID; voidID = voids[iVoid].voidID;
printf(" DOING %d (of %d) %d %d %f\n", iVoid, numVoids, voidID, printf(" DOING %d (of %d) %d %d %f\n", iVoid, numVoids, voidID,
voids[iVoid].numPart, voids[iVoid].numPart,
voids[iVoid].radius); voids[iVoid].radius);
@ -349,22 +349,22 @@ int main(int argc, char **argv) {
voids[iVoid].centralDen = centralDen / (4./3. * M_PI * pow(centralRad, 3./2.)); voids[iVoid].centralDen = centralDen / (4./3. * M_PI * pow(centralRad, 3./2.));
// compute maximum extent // compute maximum extent
//if (args_info.isObservation_flag) { if (args_info.isObservation_flag) {
// maxDist = 0.; maxDist = 0.;
// for (p = 0; p < voids[iVoid].numPart; p++) { for (p = 0; p < voids[iVoid].numPart; p++) {
// for (p2 = p; p2 < voids[iVoid].numPart; p2++) { for (p2 = p; p2 < voids[iVoid].numPart; p2++) {
// dist[0] = voidPart[p].x - voidPart[p2].x; dist[0] = voidPart[p].x - voidPart[p2].x;
// dist[1] = voidPart[p].y - voidPart[p2].y; dist[1] = voidPart[p].y - voidPart[p2].y;
// dist[2] = voidPart[p].z - voidPart[p2].z; dist[2] = voidPart[p].z - voidPart[p2].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 > maxDist) maxDist = dist2; if (dist2 > maxDist) maxDist = dist2;
// } }
// } }
// voids[iVoid].maxRadius = sqrt(maxDist)/2.; voids[iVoid].maxRadius = sqrt(maxDist)/2.;
// } else { } else {
maxDist = 0.; maxDist = 0.;
for (p = 0; p < voids[iVoid].numPart; p++) { for (p = 0; p < voids[iVoid].numPart; p++) {
dist[0] = voidPart[p].x - voids[iVoid].barycenter[0]; dist[0] = voidPart[p].x - voids[iVoid].barycenter[0];
@ -379,7 +379,7 @@ int main(int argc, char **argv) {
if (dist2 > maxDist) maxDist = dist2; if (dist2 > maxDist) maxDist = dist2;
} }
voids[iVoid].maxRadius = sqrt(maxDist); voids[iVoid].maxRadius = sqrt(maxDist);
// } }
if (args_info.isObservation_flag) { if (args_info.isObservation_flag) {
// compute distance from center to nearest mock // compute distance from center to nearest mock
@ -447,12 +447,14 @@ int main(int argc, char **argv) {
} }
for (iVoid = 0; iVoid < numVoids; iVoid++) { for (iVoid = 0; iVoid < numVoids; iVoid++) {
// TEST if (voids[iVoid].densCon < 1.5) {
//if (voids[iVoid].densCon > 1.5) { //voids[iVoid].accepted = 0;
// voids[iVoid].accepted = 0; }
//}
// END TEST
// toss out voids that are obviously wrong
if (voids[iVoid].densCon > 1.e3) {
voids[iVoid].accepted = 0;
}
if (strcmp(args_info.dataPortion_arg, "edge") == 0 && if (strcmp(args_info.dataPortion_arg, "edge") == 0 &&
tolerance*voids[iVoid].maxRadius < voids[iVoid].nearestMock) { tolerance*voids[iVoid].maxRadius < voids[iVoid].nearestMock) {
@ -471,7 +473,6 @@ int main(int argc, char **argv) {
if (voids[iVoid].centralDen > args_info.maxCentralDen_arg) { if (voids[iVoid].centralDen > args_info.maxCentralDen_arg) {
voids[iVoid].accepted = -1; voids[iVoid].accepted = -1;
} }
} }
numKept = 0; numKept = 0;
@ -489,7 +490,7 @@ int main(int argc, char **argv) {
fpSkyPositions = fopen(args_info.outSkyPositions_arg, "w"); fpSkyPositions = fopen(args_info.outSkyPositions_arg, "w");
fprintf(fp, "%d particles, %d voids.\n", mockIndex, numKept); fprintf(fp, "%d particles, %d voids.\n", mockIndex, numKept);
fprintf(fp, "see column in master void file\n"); fprintf(fp, "see column in master void file\n");
fprintf(fpInfo, "# center x,y,z (Mpc/h), volume (normalized), radius (Mpc/h), redshift, volume (Mpc/h^3), void ID\n"); fprintf(fpInfo, "# center x,y,z (Mpc/h), volume (normalized), radius (Mpc/h), redshift, volume (Mpc/h^3), void ID, density contrast\n");
fprintf(fpSkyPositions, "# RA, dec, redshift, radius (Mpc/h), void ID\n"); fprintf(fpSkyPositions, "# RA, dec, redshift, radius (Mpc/h), void ID\n");
for (iVoid = 0; iVoid < numVoids; iVoid++) { for (iVoid = 0; iVoid < numVoids; iVoid++) {

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

@ -76,6 +76,7 @@ def launchGenerate(sample, binPath, workDir=None, inputDataDir=None,
if os.access("contour_map.fits", os.F_OK): if os.access("contour_map.fits", os.F_OK):
os.system("mv %s %s" % ("contour_map.fits", zobovDir)) os.system("mv %s %s" % ("contour_map.fits", zobovDir))
os.system("mv %s %s" % ("mask_map.fits", zobovDir))
if os.access("comoving_distance.txt", os.F_OK): if os.access("comoving_distance.txt", os.F_OK):
os.system("mv %s %s" % ("comoving_distance.txt", zobovDir)) os.system("mv %s %s" % ("comoving_distance.txt", zobovDir))
@ -378,8 +379,8 @@ def launchStack(sample, stack, binPath, thisDataPortion=None, logDir=None,
%s %s
ranSeed %d ranSeed %d
dataPortion %s dataPortion %s
barycenters %s #barycenters %s
boundaryDistances %s #boundaryDistances %s
%s %s
""" % \ """ % \
(zobovDir+"/voidDesc_"+thisDataPortion+"_"+sampleName+".out", (zobovDir+"/voidDesc_"+thisDataPortion+"_"+sampleName+".out",