From 8e6c9d3bed9d5072441ece6bd824a10fa2934f70 Mon Sep 17 00:00:00 2001 From: "Paul M. Sutter" Date: Tue, 20 May 2025 18:06:05 -0400 Subject: [PATCH] bug fixes for consolidation of catalog output --- c_source/pruning/pruneVoids.cpp | 2 +- python_source/voidUtil/catalogUtil.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/c_source/pruning/pruneVoids.cpp b/c_source/pruning/pruneVoids.cpp index 2371043..1e2570f 100644 --- a/c_source/pruning/pruneVoids.cpp +++ b/c_source/pruning/pruneVoids.cpp @@ -946,7 +946,7 @@ void openFiles(string outputDir, string sampleName, *fpOutput = fopen((outputDir+"/voidDatabase_"+sampleName).c_str(), "w"); //fprintf(*fpZobov, "%d particles, %d voids.\n", numPartTot, numKept); - fprintf(*fpOutput, "Void ID, void type, center (x,y,z) (Mpc/h), volume (normalized), volume(Mpc/h^3), radius (Mpc/h), redshift, RA, Dec, density contrast, max extent, nearest edge, num part, parent ID, tree level, num children, central density, core particle, core density, zone vol, zone num part, num zones, void probability, ellipticity, eig(1), eig(2), eig(3), eigv(1)-x, eiv(1)-y, eigv(1)-z, eigv(2)-x, eigv(2)-y, eigv(2)-z, eigv(3)-x, eigv(3)-y, eigv(3)-z\n"); + fprintf(*fpOutput, "# Void ID, void type, center (x,y,z) (Mpc/h), volume (normalized), volume(Mpc/h^3), radius (Mpc/h), redshift, RA, Dec, density contrast, max extent, nearest edge, num part, parent ID, tree level, num children, central density, core particle, core density, zone vol, zone num part, num zones, void probability, ellipticity, eig(1), eig(2), eig(3), eigv(1)-x, eiv(1)-y, eigv(1)-z, eigv(2)-x, eigv(2)-y, eigv(2)-z, eigv(3)-x, eigv(3)-y, eigv(3)-z\n"); } // end openFiles diff --git a/python_source/voidUtil/catalogUtil.py b/python_source/voidUtil/catalogUtil.py index e8cb0d9..f3f77b9 100644 --- a/python_source/voidUtil/catalogUtil.py +++ b/python_source/voidUtil/catalogUtil.py @@ -345,6 +345,7 @@ def loadVoidCatalog(sampleDir, densCon = line[9], voidProb = line[10], # below values to be read in or computed later + macrocenter = np.zeros((3)), radius = 0., redshift = 0, RA = 0, @@ -421,8 +422,9 @@ def loadVoidCatalog(sampleDir, else: print("Loading version-2 voids...") - fileName = sampleDir+"/"+prefix+"voidDatabase_"+sample.fullName+".out" + fileName = sampleDir+"/voidDatabase_"+sample.fullName+".out" + catData = np.loadtxt(fileName, comments="#") catalog.voids = [] for line in catData: