- fixed bug where omegaM was always 0.3 regardless of user input

- wrote out flagging of boundary and edge galaxies
- turned off placing of boundary particles
This commit is contained in:
Paul M. Sutter 2024-06-05 17:28:16 +02:00
parent aded7a7c2c
commit f59fee9bf8
4 changed files with 164 additions and 102 deletions

View file

@ -113,7 +113,7 @@ void loadData(const string& fname, NYU_VData & data)
// Maubert - avoid double counting of last particle in array if EOF is after a blank line
if (!f)
{
continue;
continue;
}
// End Maubert
d.uniqueID = d.index;
@ -273,7 +273,7 @@ void generateSurfaceMask(prepObservation_info& args ,
output_data.Lmax = Rmax;
// PMS - write a small text file with galaxy position
// PMS - write a small text file with galaxy position (for diagnostic purposes)
FILE *fp;
fp = fopen("galaxies.txt", "w");
for (int i = 0; i < data.size(); i++) {
@ -289,6 +289,9 @@ void generateSurfaceMask(prepObservation_info& args ,
cout << format("Rmax is %g, surface volume is %g") % (Rmax/100) % (volume/(4*M_PI)) << endl;
volume *= Rmax*Rmax*Rmax/3/1e6;
numToInsert = (int)floor(volume*args.density_fake_arg);
// TEST NOT USING MOCK PARTICLES
numToIntsert = 0
// END TEST
cout << format("3d volume to fill: %g (Mpc/h)^3") % volume << endl;
cout << format("Will insert %d particles") % numToInsert << endl;
@ -325,7 +328,7 @@ void generateSurfaceMask(prepObservation_info& args ,
}
while (!stop_here);
// PMS : write mock galaxies to a small file for plotting
// PMS : write mock galaxies to a small file for diagnostic purposes
fprintf(fp, "%e %e %e\n",
(p.xyz[0]),
(p.xyz[1]),
@ -344,7 +347,7 @@ void generateSurfaceMask(prepObservation_info& args ,
fclose(fp);
// PMS
// TEST - insert mock galaxies along box edge
// TEST - insert mock galaxies along box edge - this is for tesselation safety
fp = fopen("mock_boundary.txt", "w");
double dx[3];
dx[0] = output_data.box[0][1] - output_data.box[0][0];
@ -410,8 +413,9 @@ void generateSurfaceMask(prepObservation_info& args ,
rmax = args.zMax_arg * LIGHT_SPEED;
}
//for (int q = 0; q < 0; q++) {
for (int q = 0; q < full_mask_list.size(); q++) {
// TEST NOT USING BOUNDARY PARTICLES
for (int q = 0; q < 0; q++) {
//for (int q = 0; q < full_mask_list.size(); q++) {
vec3 v = mask.pix2vec(full_mask_list[q]);
Position p;