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

more bug fixes for the minimum halo mass cuts...sigh

Browse source
This commit is contained in:
P.M. Sutter 2012-11-18 22:47:49 -06:00
parent 9d97522472
commit 80c2b7f603
9 changed files with 41 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

10
c_tools/mock/generateFromCatalog.cpp
View file

@ -295,10 +295,10 @@ void generateSurfaceMask(generateFromCatalog_info& args ,
int nPart = 100;
// TEST
//for (int iDir = 0; iDir < 0; iDir++) {
//for (int iFace = 0; iFace < 0; iFace++) {
for (int iDir = 0; iDir < 3; iDir++) {
for (int iFace = 0; iFace < 2; iFace++) {
for (int iDir = 0; iDir < 0; iDir++) {
for (int iFace = 0; iFace < 0; iFace++) {
//for (int iDir = 0; iDir < 3; iDir++) {
//for (int iFace = 0; iFace < 2; iFace++) {
int iy = (iDir + 1) % 3;
int iz = (iDir + 2) % 3;
@ -334,7 +334,7 @@ void generateSurfaceMask(generateFromCatalog_info& args ,
// TEST - insert mock galaxies along spheres of survey redshift boundaries
fp = fopen("mock_sphere.txt", "w");
for (int p = 0; p < full_mask_list.size(); p++) {
for (int p = 0; p < full_mask_list.size(); p++) {
vec3 v = mask.pix2vec(full_mask_list[p]);
Position p;

21
c_tools/mock/generateMock.cpp
View file

@ -179,14 +179,18 @@ SimuData *doLoadMultidark(const char *multidarkname)
outd->Pos[k] = new float[outd->NumPart];
outd->Vel[2] = new float[outd->NumPart];
outd->Id = new int[outd->NumPart];
outd->uniqueID = new float[outd->NumPart];
cout << "loading multidark particles" << endl;
actualNumPart = 0;
for (int i = 0; i < outd->NumPart; i++) {
fscanf(fp, "%d %d %f %f %f\n", &outd->Id[i],
fscanf(fp, "%d %f %f %f %f\n", &outd->Id[i],
&outd->Pos[0][i], &outd->Pos[1][i],
&outd->Pos[2][i], &outd->Vel[2][i]);
outd->uniqueID[i] = 1.0;
//outd->uniqueID[i] = 1.0 * outd->Id[i];
if (outd->Id[i] == -99 &&
outd->Pos[0][i] == -99 && outd->Pos[1][i] == -99 &&
outd->Pos[2][i] == -99 && outd->Vel[2][i] == -99) {
@ -368,7 +372,7 @@ void generateOutput(SimuData *data, int axis,
f.beginCheckpoint();
for (uint32_t i = 0; i < data->NumPart; i++)
{
f.writeReal32(data->Id[i]);
f.writeReal32(data->Pos[x0][i]);
}
f.endCheckpoint();
@ -376,7 +380,7 @@ void generateOutput(SimuData *data, int axis,
f.beginCheckpoint();
for (uint32_t i = 0; i < data->NumPart; i++)
{
f.writeReal32(data->Id[i]);
f.writeReal32(data->Pos[x1][i]);
}
f.endCheckpoint();
@ -384,7 +388,7 @@ void generateOutput(SimuData *data, int axis,
f.beginCheckpoint();
for (uint32_t i = 0; i < data->NumPart; i++)
{
f.writeReal32(data->Id[i]);
f.writeReal32(data->Pos[x2][i]);
}
f.endCheckpoint();
@ -392,11 +396,11 @@ void generateOutput(SimuData *data, int axis,
f.beginCheckpoint();
for (uint32_t i = 0; i < data->NumPart; i++)
{
f.writeReal32(data->Id[i]);
//printf("HELLO %d %d\n", i, data->Id[i]);
//f.writeReal32(data->Id[i]);
f.writeReal32(data->uniqueID[i]);
}
f.endCheckpoint();
}
void makeBox(SimuData *simu, double *efac, SimuData *&boxed, generateMock_info& args_info)
@ -456,6 +460,7 @@ void makeBox(SimuData *simu, double *efac, SimuData *&boxed, generateMock_info&
boxed->Vel[j] = 0;
mul[j] = 1.0/(ranges[j][1] - ranges[j][0]);
}
boxed->uniqueID = new float[goodParticles];
cout << "Rescaling factors = " << mul[0] << " " << mul[1] << " " << mul[2] << endl;
boxed->NumPart = goodParticles;
@ -476,6 +481,8 @@ void makeBox(SimuData *simu, double *efac, SimuData *&boxed, generateMock_info&
assert(boxed->Pos[j][k] > 0);
assert(boxed->Pos[j][k] < 1);
}
boxed->uniqueID[k] = simu->uniqueID[i];
particle_id[k] = i;
expansion_fac[k] = efac[i];
k++;

17
c_tools/stacking/pruneVoids.cpp
View file

@ -451,28 +451,29 @@ int main(int argc, char **argv) {
//voids[iVoid].accepted = 0;
}
if (voids[iVoid].centralDen > args_info.maxCentralDen_arg) {
voids[iVoid].accepted = -1;
}
// toss out voids that are obviously wrong
if (voids[iVoid].densCon > 1.e3) {
voids[iVoid].accepted = 0;
voids[iVoid].accepted = -4;
}
if (strcmp(args_info.dataPortion_arg, "edge") == 0 &&
tolerance*voids[iVoid].maxRadius < voids[iVoid].nearestMock) {
voids[iVoid].accepted = 0;
voids[iVoid].accepted = -3;
}
if (strcmp(args_info.dataPortion_arg, "central") == 0 &&
tolerance*voids[iVoid].maxRadius > voids[iVoid].nearestMock) {
voids[iVoid].accepted = 0;
voids[iVoid].accepted = -3;
}
if (voids[iVoid].radius < args_info.rMin_arg) {
voids[iVoid].accepted = 0;
voids[iVoid].accepted = -2;
}
if (voids[iVoid].centralDen > args_info.maxCentralDen_arg) {
voids[iVoid].accepted = -1;
}
}
numKept = 0;
@ -559,7 +560,7 @@ int main(int argc, char **argv) {
fprintf(fpInfo, "# center x,y,z (km/s), volume (normalized), radius (Mpc/h), redshift, volume (Mpc/h^3), void ID\n");
for (iVoid = 0; iVoid < numVoids; iVoid++) {
if (voids[iVoid].accepted == 0) continue;
if (voids[iVoid].accepted < -1) continue;
double outCenter[3];
outCenter[0] = voids[iVoid].barycenter[0];