joggling in generateMock now disabled by default

This commit is contained in:
P.M. Sutter 2013-05-07 03:40:58 -05:00
parent 726ad2d01e
commit ae7b69f3ca

View file

@ -189,7 +189,6 @@ def launchGenerate(sample, binPath, workDir=None, inputDataDir=None,
%s %s
%s %s
%s %s
joggleParticles
""" % (dataFileLine, outputFile, """ % (dataFileLine, outputFile,
outputFile+".par", outputFile+".par",
includePecVelString, includePecVelString,
@ -391,14 +390,14 @@ def launchVoidOverlap(sample1, sample2, sample1Dir, sample2Dir,
str(sampleName1) str(sampleName1)
cmd += " --volFile1=" + sample1Dir+"/vol_" + \ cmd += " --volFile1=" + sample1Dir+"/vol_" + \
str(sampleName1)+".dat" str(sampleName1)+".dat"
cmd += " --voidFile1=" + sample1Dir+"/voidDesc_" + \ cmd += " --voidFile1=" + sample1Dir+"/trimmed_nodencut_voidDesc_" + \
thisDataPortion+"_"+str(sampleName1)+".out" thisDataPortion+"_"+str(sampleName1)+".out"
cmd += " --infoFile1=" + sample1Dir+"/zobov_slice_" + \ cmd += " --infoFile1=" + sample1Dir+"/zobov_slice_" + \
str(sampleName1)+".par" str(sampleName1)+".par"
cmd += " --centerFile1=" + sample1Dir + \ cmd += " --centerFile1=" + sample1Dir + \
"/barycenters_"+thisDataPortion+"_"+str(sampleName1)+".out" "/trimmed_nodencut_barycenters_"+thisDataPortion+"_"+str(sampleName1)+".out"
cmd += " --shapeFile1=" + sample1Dir + \ cmd += " --shapeFile1=" + sample1Dir + \
"/shapes_"+thisDataPortion+"_"+str(sampleName1)+".out" "/trimmed_nodencut_shapes_"+thisDataPortion+"_"+str(sampleName1)+".out"
cmd += " --zoneFile1=" + sample1Dir+"/voidZone_" + \ cmd += " --zoneFile1=" + sample1Dir+"/voidZone_" + \
str(sampleName1)+".dat" str(sampleName1)+".dat"
cmd += " --zonePartFile1=" + sample1Dir+"/voidPart_" + \ cmd += " --zonePartFile1=" + sample1Dir+"/voidPart_" + \
@ -408,14 +407,14 @@ def launchVoidOverlap(sample1, sample2, sample1Dir, sample2Dir,
str(sampleName2) str(sampleName2)
cmd += " --volFile2=" + sample2Dir+"/vol_" + \ cmd += " --volFile2=" + sample2Dir+"/vol_" + \
str(sampleName2)+".dat" str(sampleName2)+".dat"
cmd += " --voidFile2=" + sample2Dir+"/voidDesc_" + \ cmd += " --voidFile2=" + sample2Dir+"/trimmed_nodencut_voidDesc_" + \
thisDataPortion+"_"+str(sampleName2)+".out" thisDataPortion+"_"+str(sampleName2)+".out"
cmd += " --infoFile2=" + sample2Dir+"/zobov_slice_" + \ cmd += " --infoFile2=" + sample2Dir+"/zobov_slice_" + \
str(sampleName2)+".par" str(sampleName2)+".par"
cmd += " --centerFile2=" + sample2Dir + \ cmd += " --centerFile2=" + sample2Dir + \
"/barycenters_"+thisDataPortion+"_"+str(sampleName2)+".out" "/trimmed_nodencut_barycenters_"+thisDataPortion+"_"+str(sampleName2)+".out"
cmd += " --shapeFile2=" + sample1Dir + \ cmd += " --shapeFile2=" + sample1Dir + \
"/shapes_"+thisDataPortion+"_"+str(sampleName1)+".out" "/trimmed_nodencut_shapes_"+thisDataPortion+"_"+str(sampleName1)+".out"
cmd += " --zoneFile2=" + sample2Dir+"/voidZone_" + \ cmd += " --zoneFile2=" + sample2Dir+"/voidZone_" + \
str(sampleName2)+".dat" str(sampleName2)+".dat"
cmd += " --zonePartFile2=" + sample2Dir+"/voidPart_" + \ cmd += " --zonePartFile2=" + sample2Dir+"/voidPart_" + \