guilhem_lavaux/vide_public
0
0
Fork 0
mirror of https://bitbucket.org/cosmicvoids/vide_public.git synced 2025-07-04 23:31:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Factored out the basic preprocessing code (partially inline subsampling)

Browse source
This commit is contained in:
Guilhem Lavaux 2013-02-26 17:04:13 -05:00
parent c50876d994
commit d291651ff1
3 changed files with 35 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

27
c_tools/mock/loaders/gadget_loader.cpp
View file

@ -71,32 +71,7 @@ public:
d->BoxSize *= unitMpc; d->BoxSize *= unitMpc;
applyTransformations(d); applyTransformations(d);
basicPreprocessing(d, preproc);
long numAccepted = 0;
bool *accepted = new bool[d->NumPart];
for (long i = 0; i < d->NumPart; i++)
{
SingleParticle p;
for (int k = 0; k < 3; k++)
{
p.Pos[k] = (d->Pos[k]) ? 0 : d->Pos[k][i];
p.Vel[k] = (d->Vel[k]) ? 0 : d->Vel[k][i];
}
p.ID = (d->Id) ? 0 : d->Id[i];
accepted[i] = preproc->accept(p);
numAccepted += accepted[i];
}
for (int k = 0; k < 3; k++)
{
filteredCopy(d->Pos[k], accepted, d->NumPart);
filteredCopy(d->Vel[k], accepted, d->NumPart);
}
filteredCopy(d->Id, accepted, d->NumPart);
filteredCopy(d->type, accepted, d->NumPart);
delete[] accepted;
return d; return d;
} }

32
c_tools/mock/loaders/simulation_loader.cpp
View file

@ -39,3 +39,35 @@ void SimulationLoader::applyTransformations(SimuData *s)
redshift_gravity*s->Vel[redshift_axis][i]/100.; redshift_gravity*s->Vel[redshift_axis][i]/100.;
} }
} }
void SimulationLoader::basicPreprocessing(SimuData *d,
SimulationPreprocessor *preproc)
{
long numAccepted = 0;
bool *accepted = new bool[d->NumPart];
for (long i = 0; i < d->NumPart; i++)
{
SingleParticle p;
for (int k = 0; k < 3; k++)
{
p.Pos[k] = (d->Pos[k]) ? 0 : d->Pos[k][i];
p.Vel[k] = (d->Vel[k]) ? 0 : d->Vel[k][i];
}
p.ID = (d->Id) ? 0 : d->Id[i];
accepted[i] = preproc->accept(p);
numAccepted += accepted[i];
}
for (int k = 0; k < 3; k++)
{
filteredCopy(d->Pos[k], accepted, d->NumPart);
filteredCopy(d->Vel[k], accepted, d->NumPart);
}
filteredCopy(d->Id, accepted, d->NumPart);
filteredCopy(d->type, accepted, d->NumPart);
delete[] accepted;
}

2
c_tools/mock/loaders/simulation_loader.hpp
View file

@ -40,6 +40,8 @@ protected:
void reallocSimu(CosmoTool::SimuData *s, long newNumPart); void reallocSimu(CosmoTool::SimuData *s, long newNumPart);
void basicPreprocessor(SimuData *d, SimulationPreprocessor *preproc);
void applyTransformations(CosmoTool::SimuData *s); void applyTransformations(CosmoTool::SimuData *s);
void copyParticleToSimu(const SingleParticle& p, CosmoTool::SimuData *s, long index) void copyParticleToSimu(const SingleParticle& p, CosmoTool::SimuData *s, long index)