changed name in headers

This commit is contained in:
P.M. Sutter 2013-12-01 20:59:00 -06:00
parent 586496601f
commit 842c2beaaa
39 changed files with 173 additions and 64 deletions

View file

@ -1,5 +1,5 @@
/*+
VIDE -- Void IDEntification pipeline -- ./c_tools/libzobov/contour_pixels.cpp
VIDE -- Void IDentification and Examination -- ./c_tools/libzobov/contour_pixels.cpp
Copyright (C) 2010-2013 Guilhem Lavaux
Copyright (C) 2011-2013 P. M. Sutter

View file

@ -1,5 +1,5 @@
/*+
VIDE -- Void IDEntification pipeline -- ./c_tools/libzobov/loadZobov.cpp
VIDE -- Void IDentification and Examination -- ./c_tools/libzobov/loadZobov.cpp
Copyright (C) 2010-2013 Guilhem Lavaux
Copyright (C) 2011-2013 P. M. Sutter
@ -167,7 +167,14 @@ bool loadZobov(const char *descName, const char *adjName, const char *voidsName,
cerr << "Error in text stream at line " << lineid << endl;
abort();
}
/*
sscanf(line.c_str(), "%d %d %d %f %f %d %d %f %d %f %f\n", &orderId, &volId,
&coreParticle, &coreDensity, &volumeZone, &numParticlesInZone,
&numZonesInVoid,
&volumeVoid, &numInVoid, &densityContrast, &probability);
*/
z.allVoids[volId].proba = probability;
z.allVoids[volId].volume = volumeVoid;
z.allVoids[volId].numParticles = numInVoid;

View file

@ -1,5 +1,5 @@
/*+
VIDE -- Void IDEntification pipeline -- ./c_tools/libzobov/particleInfo.cpp
VIDE -- Void IDentification and Examination -- ./c_tools/libzobov/particleInfo.cpp
Copyright (C) 2010-2013 Guilhem Lavaux
Copyright (C) 2011-2013 P. M. Sutter
@ -93,21 +93,25 @@ bool loadParticleInfo(ParticleInfo& info,
info.particles.resize(numpart);
offset = info.ranges[0][0];
mul = info.ranges[0][1] - info.ranges[0][0];
// TEST PMS NON-COBIC BOXES
mul = 1.0;
//mul = info.ranges[0][1] - info.ranges[0][0];
f.beginCheckpoint();
for (int i = 0; i < numpart; i++)
info.particles[i].x = mul*f.readReal32();
f.endCheckpoint();
offset = info.ranges[1][0];
mul = info.ranges[1][1] - info.ranges[1][0];
mul = 1.0;
//mul = info.ranges[1][1] - info.ranges[1][0];
f.beginCheckpoint();
for (int i = 0; i < numpart; i++)
info.particles[i].y = mul*f.readReal32();
f.endCheckpoint();
offset = info.ranges[2][0];
mul = info.ranges[2][1] - info.ranges[2][0];
mul = 1.0;
//mul = info.ranges[2][1] - info.ranges[2][0];
f.beginCheckpoint();
for (int i = 0; i < numpart; i++)
info.particles[i].z = mul*f.readReal32();