From 41abc9eb3595a50ec6456520e2570b4f2c506146 Mon Sep 17 00:00:00 2001
From: "P.M. Sutter" <sutter@iap.fr>
Date: Thu, 7 Aug 2014 16:35:45 -0400
Subject: [PATCH] overlapfrac now user-settable

---
 c_tools/analysis/voidOverlap.cpp                     | 2 ++
 c_tools/analysis/voidOverlap.ggo                     | 1 +
 python_tools/void_python_tools/backend/launchers.py  | 3 +++
 python_tools/void_python_tools/voidUtil/matchUtil.py | 3 +++
 4 files changed, 9 insertions(+)

diff --git a/c_tools/analysis/voidOverlap.cpp b/c_tools/analysis/voidOverlap.cpp
index b21358e..1539b3c 100644
--- a/c_tools/analysis/voidOverlap.cpp
+++ b/c_tools/analysis/voidOverlap.cpp
@@ -143,6 +143,8 @@ int main(int argc, char **argv) {
     return 1;
   }
 
+  matchDist = args.overlapFrac_arg;
+
   loadCatalog(args.partFile1_arg, args.volFile1_arg, args.voidFile1_arg,
               args.zoneFile1_arg, args.infoFile1_arg, args.centerFile1_arg,
               args.shapeFile1_arg,
diff --git a/c_tools/analysis/voidOverlap.ggo b/c_tools/analysis/voidOverlap.ggo
index 090ed29..e5e3f94 100644
--- a/c_tools/analysis/voidOverlap.ggo
+++ b/c_tools/analysis/voidOverlap.ggo
@@ -26,4 +26,5 @@ option "shapeFile2" - "Shape file for catalog 2" string yes
 # options
 option "outfile" - "Output file" string yes
 option "useID" - "Use unique catalog ID to match voids; otherwise use volumes" flag off
+option "overlapFrac" - "threshold fraction of voronoi radius to count as matched" double optional default="0.25"
 option "periodic" - "Set of edges which are periodic" string optional default="xy"
diff --git a/python_tools/void_python_tools/backend/launchers.py b/python_tools/void_python_tools/backend/launchers.py
index fa7cb4c..f1b4a76 100644
--- a/python_tools/void_python_tools/backend/launchers.py
+++ b/python_tools/void_python_tools/backend/launchers.py
@@ -540,6 +540,7 @@ def launchVoidOverlap(sample1, sample2, sample1Dir, sample2Dir,
                       binPath, thisDataPortion=None, 
                       logFile=None, 
                       continueRun=None, outputFile=None, 
+                      overlapFrac=0.25,
                       matchMethod=None, strictMatch=False):
 
   sampleName1 = sample1.fullName
@@ -588,6 +589,8 @@ def launchVoidOverlap(sample1, sample2, sample1Dir, sample2Dir,
     cmd += " --zonePartFile2=" + sample2Dir+"/voidPart_" + \
            str(sampleName2)+".dat"
 
+    cmd += " --overlapFrac=" + str(overlapFrac)
+
     if matchMethod == "useID": cmd += " --useID"
     cmd += periodicLine
     cmd += " --outfile=" + outputFile
diff --git a/python_tools/void_python_tools/voidUtil/matchUtil.py b/python_tools/void_python_tools/voidUtil/matchUtil.py
index 867d149..15c0a0e 100755
--- a/python_tools/void_python_tools/voidUtil/matchUtil.py
+++ b/python_tools/void_python_tools/voidUtil/matchUtil.py
@@ -32,6 +32,7 @@ def compareCatalogs(baseCatalogDir, compareCatalogDir,
                     outputDir="./", logDir="./", 
                     matchMethod="useID", dataPortion="central",
                     strictMatch=True, 
+                    overlapFrac=0.25,
                     pathToCTools="../../../c_tools"):
 
 # reports the overlap between two void catalogs
@@ -42,6 +43,7 @@ def compareCatalogs(baseCatalogDir, compareCatalogDir,
 #  matchMethod: "useID" to use unique IDs, "prox" to use overlap of Voronoi cells
 #  dataPortion: "central" or "all"
 #  strictMatch: if True, only attempt to match to trimmed catalog
+#  overlapFrac: threshold fraction of Voronoi radius to count as matched
 #  pathToCTools: path to location of VIDE c_tools directory
 
   if not os.access(outputDir, os.F_OK):
@@ -74,6 +76,7 @@ def compareCatalogs(baseCatalogDir, compareCatalogDir,
                     continueRun=False, 
                     outputFile=stepOutputFileName,
                     matchMethod=matchMethod,
+                    overlapFrac=overlapFrac,
                     strictMatch=strictMatch)
   
   print " Done!"