From 393b6e756e728a3c58cc8ad4fe6d7d5b5b938f19 Mon Sep 17 00:00:00 2001 From: Guilhem Lavaux Date: Wed, 27 Feb 2013 12:59:28 -0600 Subject: [PATCH] Fixed duplicated name error in generateFromCatalog. Fixed numPart setup from the exact number of accepted particles --- c_tools/mock/generateFromCatalog.cpp | 4 ++-- c_tools/mock/loaders/simulation_loader.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/c_tools/mock/generateFromCatalog.cpp b/c_tools/mock/generateFromCatalog.cpp index 54cbf87..0a578c0 100644 --- a/c_tools/mock/generateFromCatalog.cpp +++ b/c_tools/mock/generateFromCatalog.cpp @@ -334,9 +334,9 @@ 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 < 0; p++) { + for (int q = 0; q < 0; q++) { //for (int p = 0; p < full_mask_list.size(); p++) { - vec3 v = mask.pix2vec(full_mask_list[p]); + vec3 v = mask.pix2vec(full_mask_list[q]); Position p; double r = args.zMin_arg * LIGHT_SPEED; diff --git a/c_tools/mock/loaders/simulation_loader.cpp b/c_tools/mock/loaders/simulation_loader.cpp index d52c858..7751885 100644 --- a/c_tools/mock/loaders/simulation_loader.cpp +++ b/c_tools/mock/loaders/simulation_loader.cpp @@ -74,7 +74,7 @@ void SimulationLoader::basicPreprocessing(SimuData *d, } filteredCopy(d->Id, accepted, d->NumPart); filteredCopy(d->type, accepted, d->NumPart); - d->NumPart = accepted; + d->NumPart = numAccepted; delete[] accepted; }