fixed merge

This commit is contained in:
P.M. Sutter 2012-11-29 11:22:15 -06:00
commit ba2abd1bd6
15 changed files with 822 additions and 11287 deletions

View file

@ -9,8 +9,8 @@ import pickle
# ------------------------------------------------------------------------------
if (len(sys.argv) == 0):
print "Usage: ./anylyzeVoids.py parameter_file.py"
if (len(sys.argv) == 1):
print "Usage: ./analyzeVoids.py parameter_file.py"
exit(-1)
if (len(sys.argv) > 1):

View file

@ -81,8 +81,8 @@ endCatalogStage = 4
startAPStage = 1
endAPStage = 7
ZOBOV_PATH = os.getenv("PWD")+"/../zobov/"
CTOOLS_PATH = os.getenv("PWD")+"/../c_tools/"
ZOBOV_PATH = "@CMAKE_BINARY_DIR@/zobov/"
CTOOLS_PATH = "@CMAKE_BINARY_DIR@/c_tools/"
freshStack = True
errorBars = "CALCULATED"
numIncoherentRuns = 100