From 2ff3ff79a427d009942e74eee886fd0944da9f83 Mon Sep 17 00:00:00 2001 From: "P.M. Sutter" Date: Sun, 5 Jan 2014 16:37:23 -0600 Subject: [PATCH] more flexibile catalog matching options --- python_tools/void_python_tools/backend/launchers.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/python_tools/void_python_tools/backend/launchers.py b/python_tools/void_python_tools/backend/launchers.py index 2d72ca8..fddae0f 100644 --- a/python_tools/void_python_tools/backend/launchers.py +++ b/python_tools/void_python_tools/backend/launchers.py @@ -472,7 +472,7 @@ def launchVoidOverlap(sample1, sample2, sample1Dir, sample2Dir, binPath, thisDataPortion=None, logFile=None, workDir=None, continueRun=None, outputFile=None, - matchMethod=None): + matchMethod=None, strictMatch=False): sampleName1 = sample1.fullName sampleName2 = sample2.fullName @@ -484,6 +484,11 @@ def launchVoidOverlap(sample1, sample2, sample1Dir, sample2Dir, # periodicLine += "z" #periodicLine += "' " + if strictMatch: + matchPrefix = "" + else: + matchPrefix = "trimmed_nodencut_" + if not (continueRun and jobSuccessful(logFile, "Done!\n")): cmd = binPath cmd += " --partFile1=" + sample1Dir+"/zobov_slice_" + \ @@ -507,14 +512,14 @@ def launchVoidOverlap(sample1, sample2, sample1Dir, sample2Dir, str(sampleName2) cmd += " --volFile2=" + sample2Dir+"/vol_" + \ str(sampleName2)+".dat" - cmd += " --voidFile2=" + sample2Dir+"/trimmed_nodencut_voidDesc_" + \ + cmd += " --voidFile2=" + sample2Dir+"/"+matchPrefix+"voidDesc_" + \ thisDataPortion+"_"+str(sampleName2)+".out" cmd += " --infoFile2=" + sample2Dir+"/zobov_slice_" + \ str(sampleName2)+".par" cmd += " --centerFile2=" + sample2Dir + \ - "/trimmed_nodencut_barycenters_"+thisDataPortion+"_"+str(sampleName2)+".out" + "/"+matchPrefix+"barycenters_"+thisDataPortion+"_"+str(sampleName2)+".out" cmd += " --shapeFile2=" + sample2Dir + \ - "/trimmed_nodencut_shapes_"+thisDataPortion+"_"+str(sampleName2)+".out" + "/"+matchPrefix+"shapes_"+thisDataPortion+"_"+str(sampleName2)+".out" cmd += " --zoneFile2=" + sample2Dir+"/voidZone_" + \ str(sampleName2)+".dat" cmd += " --zonePartFile2=" + sample2Dir+"/voidPart_" + \