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 parameter for stackdensityfield to produce normalized output. Extended interpolation range for generateMock

Browse source
This commit is contained in:
Guilhem Lavaux 2011-06-06 13:30:15 -05:00
parent ed5c99b5d5
commit 0fdf881efa
1 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
mytools/generateMock.cpp
View file

@ -193,9 +193,9 @@ void metricTransform(SimuData *data, int axis, bool reshift, bool pecvel, double
abort(); abort();
} }
Interpolate z_vs_D = make_cosmological_redshift(data->Omega_M, data->Omega_Lambda, 0., 2.0); // Redshift 2 should be sufficient ?
double z0 = 1/data->time - 1; double z0 = 1/data->time - 1;
Interpolate z_vs_D = make_cosmological_redshift(data->Omega_M, data->Omega_Lambda, 0., 2*z0); // Redshift 2*z0 should be sufficient ?
double z_base = reshift ? z0 : 0; double z_base = reshift ? z0 : 0;
TotalExpansion e_computer; TotalExpansion e_computer;
double baseComovingDistance; double baseComovingDistance;
@ -300,6 +300,7 @@ void makeBox(SimuData *simu, double *efac, SimuData *&boxed, generateMock_info&
{ args_info.rangeZ_min_arg, args_info.rangeZ_max_arg } { args_info.rangeZ_min_arg, args_info.rangeZ_max_arg }
}; };
double mul[3]; double mul[3];
float minmax[2][3];
int *particle_id; int *particle_id;
boxed = new SimuData; boxed = new SimuData;
@ -309,20 +310,28 @@ void makeBox(SimuData *simu, double *efac, SimuData *&boxed, generateMock_info&
boxed->time = simu->time; boxed->time = simu->time;
boxed->BoxSize = simu->BoxSize; boxed->BoxSize = simu->BoxSize;
for (int j = 0; j < 3; j++) minmax[1][j] = minmax[0][j] = simu->Pos[j][0];
for (uint32_t i = 0; i < simu->NumPart; i++) for (uint32_t i = 0; i < simu->NumPart; i++)
{ {
bool acceptance = true; bool acceptance = true;
for (int j = 0; j < 3; j++) for (int j = 0; j < 3; j++) {
acceptance = acceptance =
acceptance && acceptance &&
(simu->Pos[j][i] > ranges[j][0]) && (simu->Pos[j][i] > ranges[j][0]) &&
(simu->Pos[j][i] < ranges[j][1]); (simu->Pos[j][i] < ranges[j][1]);
minmax[0][j] = min(simu->Pos[j][i], minmax[0][j]);
minmax[1][j] = max(simu->Pos[j][i], minmax[1][j]);
}
if (acceptance) if (acceptance)
goodParticles++; goodParticles++;
} }
cout << "Min position = " << minmax[0][0] << " " << minmax[0][1] << " " << minmax[0][2] << endl;
cout << "Max position = " << minmax[1][0] << " " << minmax[1][1] << " " << minmax[1][2] << endl;
for (int j = 0; j < 3; j++) for (int j = 0; j < 3; j++)
{ {
boxed->Pos[j] = new float[goodParticles]; boxed->Pos[j] = new float[goodParticles];