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

Merge branch 'master' of bitbucket.org:cosmicvoids/void_identification

Browse source
This commit is contained in:
P.M. Sutter 2013-02-28 22:25:30 -06:00
commit 25e0e8f3ac
2 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
c_tools/mock/generateMock.cpp
View file

@ -240,7 +240,7 @@ void selectBox(SimuData *simu, std::vector<long>& targets, generateMock_info& ar
(simu->Pos[j][i] > ranges[j][0]) && (simu->Pos[j][i] > ranges[j][0]) &&
(simu->Pos[j][i] < ranges[j][1]); (simu->Pos[j][i] < ranges[j][1]);
p.Pos[j] = simu->Pos[j][i]; p.Pos[j] = simu->Pos[j][i];
p.Vel[j] = (simu->Vel != 0) ? simu->Vel[j][i] : 0; p.Vel[j] = (simu->Vel[j] != 0) ? simu->Vel[j][i] : 0;
} }
p.ID = (simu->Id != 0) ? simu->Id[i] : -1; p.ID = (simu->Id != 0) ? simu->Id[i] : -1;

3
c_tools/mock/loaders/multidark_loader.cpp
View file

@ -75,7 +75,7 @@ public:
if (p.ID == -99 && if (p.ID == -99 &&
p.Pos[0] == -99 && p.Pos[1] == -99 && p.Pos[0] == -99 && p.Pos[1] == -99 &&
p.Pos[2] == -99 && p.Vel[2] == -99) { p.Pos[2] == -99 && p.Vel[2] == -99)
break; break;
if (preproc != 0 && !preproc->accept(p)) if (preproc != 0 && !preproc->accept(p))
@ -93,7 +93,6 @@ public:
reallocArray(index, allocated, actualNumPart); reallocArray(index, allocated, actualNumPart);
} }
} }
}
applyTransformations(simu); applyTransformations(simu);
simu->NumPart = actualNumPart; simu->NumPart = actualNumPart;
simu->TotalNumPart = actualNumPart; simu->TotalNumPart = actualNumPart;