some bug fixes to the a-p analysis scripts; fixed major bug in prunevoids; updated catalog release scripts

This commit is contained in:
P.M. Sutter 2012-11-29 11:14:59 -06:00
parent 06c8ddc26e
commit 022eec19bb
13 changed files with 437 additions and 239 deletions

View file

@ -188,12 +188,13 @@ SimuData *doLoadMultidark(const char *multidarkname)
&outd->Pos[0][i], &outd->Pos[1][i],
&outd->Pos[2][i], &outd->Vel[2][i]);
outd->uniqueID[i] = 1.0;
//outd->uniqueID[i] = 1.0 * outd->Id[i];
outd->uniqueID[i] = 1.0 * outd->Id[i];
if (i < 10) printf("TEST %d %d\n", i, outd->Id[i]);
if (outd->Id[i] == -99 &&
outd->Pos[0][i] == -99 && outd->Pos[1][i] == -99 &&
outd->Pos[2][i] == -99 && outd->Vel[2][i] == -99) {
printf("FOUND END\n");
break;
} else {
actualNumPart++;
@ -396,8 +397,6 @@ void generateOutput(SimuData *data, int axis,
f.beginCheckpoint();
for (uint32_t i = 0; i < data->NumPart; i++)
{
//printf("HELLO %d %d\n", i, data->Id[i]);
//f.writeReal32(data->Id[i]);
f.writeReal32(data->uniqueID[i]);
}
f.endCheckpoint();

View file

@ -441,9 +441,6 @@ int main(int argc, char **argv) {
}
voids[iVoid].nearestEdge = nearestEdge;
//if (nearestEdge < voids[iVoid].nearestMock) {
// voids[iVoid].nearestMock = nearestEdge;
//}
} // iVoid
printf(" Picking winners and losers...\n");
@ -453,7 +450,7 @@ int main(int argc, char **argv) {
for (iVoid = 0; iVoid < numVoids; iVoid++) {
if (voids[iVoid].densCon < 1.5) {
//voids[iVoid].accepted = 0;
// voids[iVoid].accepted = -4;
}
if (voids[iVoid].centralDen > args_info.maxCentralDen_arg) {