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

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

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++;