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

Use proper interface to reset the preselector

Browse source
This commit is contained in:
Guilhem Lavaux 2013-02-27 14:08:49 -05:00
parent 393b6e756e
commit 91901c0186
1 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

24
c_tools/mock/generateMock.cpp
View file

@ -255,16 +255,28 @@ class PreselectParticles: public SimulationPreprocessor
private:
gsl_rng *rng;
double subsample;
int seed;
public:
PreselectParticles(gsl_rng *r, double s)
: subsample(s), rng(r)
PreselectParticles(double s, int seed_value)
: subsample(s), seed(seed_value), rng(gsl_rng_alloc(gsl_rng_default))
{
gsl_rng_set(rng, seed);
}
virtual ~PreselectParticles()
{
gsl_rng_free(rng);
}
bool accept(const SingleParticle& p)
{
return gsl_rng_uniform(rng) < subsample;
}
void reset()
{
gsl_rng_set(rng, seed);
}
};
void createBox(SimuData *simu, vector<long>& targets, vector<long>& snapshot_split, SimuData *& boxed, generateMock_info& args_info)
@ -504,7 +516,6 @@ int main(int argc, char **argv)
generateMock_conf_params args_params;
SimuData *simu, *simuOut;
SimulationLoader *loader;
gsl_rng *rng = gsl_rng_alloc(gsl_rng_default);
generateMock_conf_init(&args_info);
generateMock_conf_params_init(&args_params);
@ -530,8 +541,7 @@ int main(int argc, char **argv)
generateMock_conf_print_version();
gsl_rng_set(rng, args_info.subsample_seed_arg);
SimulationPreprocessor *preselector = new PreselectParticles(rng, args_info.subsample_arg);
SimulationPreprocessor *preselector = new PreselectParticles(args_info.subsample_arg, args_info.subsample_seed_arg);
if (args_info.ramsesBase_given || args_info.ramsesId_given)
{
@ -593,7 +603,7 @@ int main(int argc, char **argv)
makeBoxFromSimulation(loader, simuOut, metricOperation, args_info);
// Reset the random number generator
gsl_rng_set(rng, args_info.subsample_seed_arg);
preselector->reset();
long loaded = 0;
for (int nf = 0; nf < loader->num_files(); nf++)
@ -625,8 +635,6 @@ int main(int argc, char **argv)
args_info.output_arg);
delete preselector;
gsl_rng_free(rng);
printf("Done!\n");
return 0;
}