diff --git a/c_tools/mock/generateFromCatalog.cpp b/c_tools/mock/generateFromCatalog.cpp index febc6d3..f0816b0 100644 --- a/c_tools/mock/generateFromCatalog.cpp +++ b/c_tools/mock/generateFromCatalog.cpp @@ -451,6 +451,19 @@ if (i < 10) printf("TEST WRITE %d %e\n", (pdata.pos[i].xyz[j]+Lmax)/(2*Lmax)); //v2->put(expansion_fac, pdata.pos.size()); //delete[] expansion_fac; + + FILE *infoFile = fopen("sample_info.txt", "w"); + fprintf(infoFile, "x_min = %f\n", -Lmax/100.); + fprintf(infoFile, "x_max = %f\n", Lmax/100.); + fprintf(infoFile, "y_min = %f\n", -Lmax/100.); + fprintf(infoFile, "y_max = %f\n", Lmax/100.); + fprintf(infoFile, "z_min = %f\n", -Lmax/100.); + fprintf(infoFile, "z_max = %f\n", Lmax/100.); + fprintf(infoFile, "mask_index = %d\n", pdata.mask_index); + fprintf(infoFile, "total_particles = %d\n", pdata.pos.size()); + fclose(infoFile); + + } int main(int argc, char **argv) @@ -517,12 +530,6 @@ int main(int argc, char **argv) fprintf(fp, "%d", output_data.mask_index); fclose(fp); - fp = fopen("sample_info.txt", "w"); - fprintf(fp, "Lmax = %f\n", output_data.Lmax); - fprintf(fp, "mask_index = %d\n", output_data.mask_index); - fprintf(fp, "total_particles = %d\n", output_data.pos.size()); - fclose(fp); - fp = fopen("total_particles.txt", "w"); fprintf(fp, "%d", output_data.pos.size()); fclose(fp); diff --git a/c_tools/mock/generateMock.cpp b/c_tools/mock/generateMock.cpp index bfdf82f..dcf1acb 100644 --- a/c_tools/mock/generateMock.cpp +++ b/c_tools/mock/generateMock.cpp @@ -360,6 +360,7 @@ void generateOutput(SimuData *data, int axis, f.writeReal32(data->Pos[x2][i]); } f.endCheckpoint(); + } void makeBox(SimuData *simu, double *efac, SimuData *&boxed, generateMock_info& args_info) @@ -466,6 +467,18 @@ void makeBox(SimuData *simu, double *efac, SimuData *&boxed, generateMock_info& delete[] particle_id; delete[] expansion_fac; + + + FILE *fp = fopen("sample_info.txt", "w"); + fprintf(fp, "x_min = %f\n", ranges[0][0]); + fprintf(fp, "x_max = %f\n", ranges[0][1]); + fprintf(fp, "y_min = %f\n", ranges[1][0]); + fprintf(fp, "y_max = %f\n", ranges[1][1]); + fprintf(fp, "z_min = %f\n", ranges[2][0]); + fprintf(fp, "z_max = %f\n", ranges[2][1]); + fprintf(fp, "mask_index = -1\n"); + fprintf(fp, "total_particles = %d\n", boxed->NumPart); + fclose(fp); } void makeBoxFromParameter(SimuData *simu, double *efac, SimuData* &boxed, generateMock_info& args_info) diff --git a/python_tools/void_python_tools/backend/launchers.py b/python_tools/void_python_tools/backend/launchers.py index b8cb57f..2686c5b 100755 --- a/python_tools/void_python_tools/backend/launchers.py +++ b/python_tools/void_python_tools/backend/launchers.py @@ -160,6 +160,7 @@ def launchGenerate(sample, binPath, workDir=None, inputDataDir=None, if os.access("comoving_distance.txt", os.F_OK): os.system("mv %s %s" % ("comoving_distance.txt", zobovDir)) + os.system("mv %s %s" % ("sample_info.txt", zobovDir)) if os.access(parmFile, os.F_OK): os.unlink(parmFile)