guilhem_lavaux/vide_public
0
0
Fork 0
mirror of https://bitbucket.org/cosmicvoids/vide_public.git synced 2025-07-05 15:51:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

renamed 'generateMock' routines to 'prep' routines to accurately reflect what they do

Browse source
This commit is contained in:
Paul M. Sutter 2024-05-22 15:46:04 -04:00
parent b1962100a8
commit 50ad2d6d73
21 changed files with 69 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

6
python_tools/vide/backend/launchers.py
View file

@ -46,9 +46,9 @@ ncFloat = 'f8' # Double precision
LIGHT_SPEED = 299792.458
# -----------------------------------------------------------------------------
def launchGenerate(sample, binPath, workDir=None, inputDataDir=None,
zobovDir=None, figDir=None, logFile=None, useComoving=False,
continueRun=None,regenerate=False):
def launchPrep(sample, binPath, workDir=None, inputDataDir=None,
zobovDir=None, figDir=None, logFile=None, useComoving=False,
continueRun=None,regenerate=False):
if sample.dataType == "observation":
sampleName = sample.fullName

16
python_tools/void_pipeline/__main__.py
View file

@ -19,7 +19,7 @@
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#+
# Stage 1 : generate particles
# Stage 1 : prepare particles for void finding
# Stage 2 : find voids
# Stage 3 : prune catalog
@ -89,14 +89,14 @@ for sample in dataSampleList:
logFile = logDir+"/generate_"+sampleName+".out"
if sample.dataType == "observation":
GENERATE_PATH = CTOOLS_PATH+"/generateFromCatalog"
GENERATE_PATH = CTOOLS_PATH+"/prepObservation"
else:
GENERATE_PATH = CTOOLS_PATH+"/generateMock"
GENERATE_PATH = CTOOLS_PATH+"/prepSimulation"
launchGenerate(sample, GENERATE_PATH, workDir=workDir,
inputDataDir=inputDataDir, zobovDir=zobovDir,
figDir=figDir, logFile=logFile, useComoving=sample.useComoving,
continueRun=continueRun, regenerate=regenerateFlag)
launchPrep(sample, GENERATE_PATH, workDir=workDir,
inputDataDir=inputDataDir, zobovDir=zobovDir,
figDir=figDir, logFile=logFile, useComoving=sample.useComoving,
continueRun=continueRun, regenerate=regenerateFlag)
# --------------------------------------------------------------------------
if (startCatalogStage <= 2) and (endCatalogStage >= 2) and not sample.isCombo:
@ -110,7 +110,7 @@ for sample in dataSampleList:
# -------------------------------------------------------------------------
if (startCatalogStage <= 3) and (endCatalogStage >= 3) and not sample.isCombo:
print(" Taking data portions", "...", end=' ')
print(" Pruning void catalogs", "...", end=' ')
sys.stdout.flush()
logFile = logDir+"/pruneVoids_"+sampleName+".out"