From 2e832dd4152db7b35b481b0cb8acf14693742f8b Mon Sep 17 00:00:00 2001 From: "P.M. Sutter" Date: Sun, 31 Mar 2013 22:04:27 -0500 Subject: [PATCH] void overlap now gets barycenters from center_ file rather than barycenter_ file --- c_tools/analysis/voidOverlap.cpp | 26 ++++++++++++------- c_tools/analysis/voidOverlap.ggo | 4 +-- .../void_python_tools/backend/launchers.py | 8 +++--- 3 files changed, 22 insertions(+), 16 deletions(-) diff --git a/c_tools/analysis/voidOverlap.cpp b/c_tools/analysis/voidOverlap.cpp index f746e39..6c09216 100644 --- a/c_tools/analysis/voidOverlap.cpp +++ b/c_tools/analysis/voidOverlap.cpp @@ -88,7 +88,7 @@ typedef struct catalog { void loadCatalog(const char *partFile, const char *volFile, const char *voidFile, const char *zoneFile, - const char *infoFile, const char *barycenterFile, + const char *infoFile, const char *centerFile, const char *zonePartFile, CATALOG& catalog); float getDist(CATALOG& catalog1, CATALOG& catalog2, int& iVoid1, int& iVoid2, @@ -110,7 +110,7 @@ int main(int argc, char **argv) { float closestMatchDist; float commonVolRatio; MATCHPROPS newMatch; - int MAX_MATCHES = 20; + int MAX_MATCHES = 10; CATALOG catalog1, catalog2; @@ -136,11 +136,11 @@ int main(int argc, char **argv) { } loadCatalog(args.partFile1_arg, args.volFile1_arg, args.voidFile1_arg, - args.zoneFile1_arg, args.infoFile1_arg, args.barycenterFile1_arg, + args.zoneFile1_arg, args.infoFile1_arg, args.centerFile1_arg, args.zonePartFile1_arg, catalog1); loadCatalog(args.partFile2_arg, args.volFile2_arg, args.voidFile2_arg, - args.zoneFile2_arg, args.infoFile2_arg, args.barycenterFile2_arg, + args.zoneFile2_arg, args.infoFile2_arg, args.centerFile2_arg, args.zonePartFile2_arg, catalog2); // check for periodic box @@ -164,7 +164,6 @@ int main(int argc, char **argv) { rdist = getDist(catalog1, catalog2, iVoid1, iVoid2, periodicX, periodicY, periodicZ); - newMatch.matchID = iVoid2; newMatch.commonVol = 0; newMatch.dist = rdist; @@ -319,7 +318,7 @@ int main(int argc, char **argv) { //catalog1.voids[iVoid1].numPart; catalog1.voids[iVoid1].vol; - fprintf(fp, "%.3f ", catalog1.voids[iVoid1].matches[iMatch].dist); + fprintf(fp, "%.3f %.2f ", catalog1.voids[iVoid1].matches[iMatch].dist, commonVolRatio); //fprintf(fp, "%.2f ", commonVolRatio); } else { fprintf(fp, "0.00 "); @@ -339,7 +338,7 @@ int main(int argc, char **argv) { // ---------------------------------------------------------------------------- void loadCatalog(const char *partFile, const char *volFile, const char *voidFile, const char *zoneFile, - const char *infoFile, const char *barycenterFile, + const char *infoFile, const char *centerFile, const char *zonePartFile, CATALOG& catalog) { int i, p, numPartTot, numZonesTot, dummy, iVoid, iZ, numVolTot; @@ -465,15 +464,22 @@ void loadCatalog(const char *partFile, const char *volFile, } fclose(fp); + catalog.numVoids = i - 1; + catalog.voids.resize(catalog.numVoids); printf(" Read %d voids.\n", catalog.numVoids); printf(" Loading barycenters\n"); - fp = fopen(barycenterFile, "r"); + fp = fopen(centerFile, "r"); float tempBary[3]; + float tempFloat; + int tempInt; iVoid = 0; while (fgets(line, sizeof(line), fp) != NULL) { - sscanf(line, "%d %f %f %f\n", &voidID, &tempBary[0], &tempBary[1], - &tempBary[2]); + sscanf(line, "%f %f %f %f %f %f %f %d %f %d %d %d\n", + &tempBary[0], &tempBary[1], &tempBary[2], + &tempFloat, &tempFloat, &tempFloat, &tempFloat, &tempInt, + &tempFloat, &tempInt, &tempInt); + tempBary[0] = (tempBary[0] - ranges[0][0])/catalog.boxLen[0]; tempBary[1] = (tempBary[1] - ranges[1][0])/catalog.boxLen[1]; tempBary[2] = (tempBary[2] - ranges[2][0])/catalog.boxLen[2]; diff --git a/c_tools/analysis/voidOverlap.ggo b/c_tools/analysis/voidOverlap.ggo index 9f4ca1d..9311556 100644 --- a/c_tools/analysis/voidOverlap.ggo +++ b/c_tools/analysis/voidOverlap.ggo @@ -10,7 +10,7 @@ option "voidFile1" - "Void info file for catalog 1" string yes option "infoFile1" - "Extra info file for catalog 1" string yes option "zoneFile1" - "Zone file for catalog 1" string yes option "zonePartFile1" - "Zone-particle file for catalog 1" string yes -option "barycenterFile1" - "Barycenter file for catalog 1" string yes +option "centerFile1" - "Barycenter file for catalog 1" string yes # void data for file 2 option "partFile2" - "Particle file for catalog 2" string yes @@ -19,7 +19,7 @@ option "voidFile2" - "Void info file for catalog 2" string yes option "infoFile2" - "Extra info file for catalog 2" string yes option "zoneFile2" - "Zone file for catalog 2" string yes option "zonePartFile2" - "Zone-particle file for catalog 2" string yes -option "barycenterFile2" - "Barycenter file for catalog 2" string yes +option "centerFile2" - "Barycenter file for catalog 2" string yes # options option "outfile" - "Output file" string yes diff --git a/python_tools/void_python_tools/backend/launchers.py b/python_tools/void_python_tools/backend/launchers.py index 3011ec7..a750f13 100644 --- a/python_tools/void_python_tools/backend/launchers.py +++ b/python_tools/void_python_tools/backend/launchers.py @@ -394,8 +394,8 @@ def launchVoidOverlap(sample1, sample2, sample1Dir, sample2Dir, thisDataPortion+"_"+str(sampleName1)+".out" cmd += " --infoFile1=" + sample1Dir+"/zobov_slice_" + \ str(sampleName1)+".par" - cmd += " --barycenterFile1=" + sample1Dir + \ - "/barycenters_"+thisDataPortion+"_"+str(sampleName1)+".out" + cmd += " --centerFile1=" + sample1Dir + \ + "/centers_"+thisDataPortion+"_"+str(sampleName1)+".out" cmd += " --zoneFile1=" + sample1Dir+"/voidZone_" + \ str(sampleName1)+".dat" cmd += " --zonePartFile1=" + sample1Dir+"/voidPart_" + \ @@ -409,8 +409,8 @@ def launchVoidOverlap(sample1, sample2, sample1Dir, sample2Dir, thisDataPortion+"_"+str(sampleName2)+".out" cmd += " --infoFile2=" + sample2Dir+"/zobov_slice_" + \ str(sampleName2)+".par" - cmd += " --barycenterFile2=" + sample2Dir + \ - "/barycenters_"+thisDataPortion+"_"+str(sampleName2)+".out" + cmd += " --centerFile2=" + sample2Dir + \ + "/centers_"+thisDataPortion+"_"+str(sampleName2)+".out" cmd += " --zoneFile2=" + sample2Dir+"/voidZone_" + \ str(sampleName2)+".dat" cmd += " --zonePartFile2=" + sample2Dir+"/voidPart_" + \