diff --git a/examples/example_observation/example_observation.py b/examples/example_observation/example_observation.py index 310c894..3ae972a 100644 --- a/examples/example_observation/example_observation.py +++ b/examples/example_observation/example_observation.py @@ -45,8 +45,6 @@ workDir = basePath logDir = os.path.join(workDir,"logs","example_observation") # output directory for figures -figDir = os.path.join(workDir,"figs","example_observation") - # optimization: maximum number of parallel threads to use numZobovThreads = 8 diff --git a/examples/example_simulation/example_simulation.py b/examples/example_simulation/example_simulation.py index bcdecc5..121aaf7 100644 --- a/examples/example_simulation/example_simulation.py +++ b/examples/example_simulation/example_simulation.py @@ -44,9 +44,6 @@ voidOutputDir = PWD+"/outputs/" # output directory for log files logDir = PWD+"/logs/example_simulation/" -# output directory for figures -figDir = PWD+"/figs/example_simulation/" - # where to place the pipeline scripts scriptDir = PWD+"/example_simulation/" diff --git a/python_source/backend/launchers.py b/python_source/backend/launchers.py index 2e3a010..71fa22f 100644 --- a/python_source/backend/launchers.py +++ b/python_source/backend/launchers.py @@ -51,7 +51,7 @@ class Bunch: # ----------------------------------------------------------------------------- def launchPrep(sample, binPath, workDir=None, inputDataDir=None, - outputDir=None, figDir=None, logFile=None, useComoving=False, + outputDir=None, logFile=None, useComoving=False, continueRun=None): startTime = time.time() diff --git a/python_source/backend/surveyTools.py b/python_source/backend/surveyTools.py index af1928c..df63f79 100644 --- a/python_source/backend/surveyTools.py +++ b/python_source/backend/surveyTools.py @@ -275,7 +275,6 @@ def findEdgeGalaxies(galFile, maskFile, edgeGalFile, contourFile, flagList[nearest] = 1 # flag galaxies near redsfhit boundaries - # TODO - save time by only covering portion of sphere that has data log.write(" Flagging galaxies near redshift bounds...\n") sphereIndices = np.arange(len(contourMap)) diff --git a/python_source/vide_pipeline/__main__.py b/python_source/vide_pipeline/__main__.py index 23411c4..2c98e54 100644 --- a/python_source/vide_pipeline/__main__.py +++ b/python_source/vide_pipeline/__main__.py @@ -55,9 +55,6 @@ else: if not os.access(logDir, os.F_OK): os.makedirs(logDir) -if not os.access(figDir, os.F_OK): - os.makedirs(figDir) - if not continueRun: print(" Cleaning out log files...") @@ -93,7 +90,7 @@ for sample in dataSampleList: launchPrep(sample, PREPARE_PATH, workDir=workDir, inputDataDir=inputDataDir, outputDir=outputDir, - figDir=figDir, logFile=logFile, useComoving=sample.useComoving, + logFile=logFile, useComoving=sample.useComoving, continueRun=continueRun) # -------------------------------------------------------------------------- diff --git a/python_source/vide_pipeline/vide_prepare_simulation.py b/python_source/vide_pipeline/vide_prepare_simulation.py index 1652870..773cfb8 100644 --- a/python_source/vide_pipeline/vide_prepare_simulation.py +++ b/python_source/vide_pipeline/vide_prepare_simulation.py @@ -181,14 +181,13 @@ setName = "{setName}" workDir = "{voidOutputDir}/{setName}/" inputDataDir = "{inputDataDir}" -figDir = "{figDir}/{setName}/" logDir = "{logDir}/{setName}/" numZobovDivisions = {numZobovDivisions} numZobovThreads = {numZobovThreads} mergingThreshold = {mergingThreshold} """ - scriptFile.write(dataInfo.format(setName=setName, figDir=figDir, + scriptFile.write(dataInfo.format(setName=setName, logDir=logDir, voidOutputDir=voidOutputDir, inputDataDir=catalogDir, numZobovDivisions=numZobovDivisions,