From ae7b69f3ca41b61ff8059f478b6e8347086939e5 Mon Sep 17 00:00:00 2001 From: "P.M. Sutter" Date: Tue, 7 May 2013 03:40:58 -0500 Subject: [PATCH] joggling in generateMock now disabled by default --- python_tools/void_python_tools/backend/launchers.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/python_tools/void_python_tools/backend/launchers.py b/python_tools/void_python_tools/backend/launchers.py index efc082c..a4599f6 100644 --- a/python_tools/void_python_tools/backend/launchers.py +++ b/python_tools/void_python_tools/backend/launchers.py @@ -189,7 +189,6 @@ def launchGenerate(sample, binPath, workDir=None, inputDataDir=None, %s %s %s - joggleParticles """ % (dataFileLine, outputFile, outputFile+".par", includePecVelString, @@ -391,14 +390,14 @@ def launchVoidOverlap(sample1, sample2, sample1Dir, sample2Dir, str(sampleName1) cmd += " --volFile1=" + sample1Dir+"/vol_" + \ str(sampleName1)+".dat" - cmd += " --voidFile1=" + sample1Dir+"/voidDesc_" + \ + cmd += " --voidFile1=" + sample1Dir+"/trimmed_nodencut_voidDesc_" + \ thisDataPortion+"_"+str(sampleName1)+".out" cmd += " --infoFile1=" + sample1Dir+"/zobov_slice_" + \ str(sampleName1)+".par" cmd += " --centerFile1=" + sample1Dir + \ - "/barycenters_"+thisDataPortion+"_"+str(sampleName1)+".out" + "/trimmed_nodencut_barycenters_"+thisDataPortion+"_"+str(sampleName1)+".out" cmd += " --shapeFile1=" + sample1Dir + \ - "/shapes_"+thisDataPortion+"_"+str(sampleName1)+".out" + "/trimmed_nodencut_shapes_"+thisDataPortion+"_"+str(sampleName1)+".out" cmd += " --zoneFile1=" + sample1Dir+"/voidZone_" + \ str(sampleName1)+".dat" cmd += " --zonePartFile1=" + sample1Dir+"/voidPart_" + \ @@ -408,14 +407,14 @@ def launchVoidOverlap(sample1, sample2, sample1Dir, sample2Dir, str(sampleName2) cmd += " --volFile2=" + sample2Dir+"/vol_" + \ str(sampleName2)+".dat" - cmd += " --voidFile2=" + sample2Dir+"/voidDesc_" + \ + cmd += " --voidFile2=" + sample2Dir+"/trimmed_nodencut_voidDesc_" + \ thisDataPortion+"_"+str(sampleName2)+".out" cmd += " --infoFile2=" + sample2Dir+"/zobov_slice_" + \ str(sampleName2)+".par" cmd += " --centerFile2=" + sample2Dir + \ - "/barycenters_"+thisDataPortion+"_"+str(sampleName2)+".out" + "/trimmed_nodencut_barycenters_"+thisDataPortion+"_"+str(sampleName2)+".out" cmd += " --shapeFile2=" + sample1Dir + \ - "/shapes_"+thisDataPortion+"_"+str(sampleName1)+".out" + "/trimmed_nodencut_shapes_"+thisDataPortion+"_"+str(sampleName1)+".out" cmd += " --zoneFile2=" + sample2Dir+"/voidZone_" + \ str(sampleName2)+".dat" cmd += " --zonePartFile2=" + sample2Dir+"/voidPart_" + \