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

Implemented (yet another) new boundary handling scheme, whereby we scan radially along survey edge while flagging nearest galaxies. The prepObservation routine was significantly cleaned up to accommodate this, but it was ultimately implemented in python (surveyTools.py) for ease of prototyping, with the intent to move it back into C later.

Browse source 
Some general housekeeping, making sure some new parameters are passed around correctly, and removing the storage of some unused files.

This update is considered HIGHLY UNSTABLE. It will almost certainly break somewhere for simulations.

Still under active development.
This commit is contained in:
Paul M. Sutter 2025-01-07 20:04:29 +08:00
parent 62dd66be79
commit 3dce2593d9
9 changed files with 348 additions and 454 deletions
Download patch file Download diff file Expand all files Collapse all files

23
python_source/vide_pipeline/__main__.py
View file

@ -36,6 +36,7 @@ if (len(sys.argv) == 1):
exit(-1)
if (len(sys.argv) > 1):
print("\n\n Welcome to VIDE!\n")
filename = sys.argv[1]
print(" Loading parameters from", filename)
if not os.access(filename, os.F_OK):
@ -63,8 +64,8 @@ if not os.access(figDir, os.F_OK):
if not continueRun:
print(" Cleaning out log files...")
if startCatalogStage <= 1 and glob.glob(logDir+"/generate*") != []:
os.system("rm %s/generate*" % logDir)
if startCatalogStage <= 1 and glob.glob(logDir+"/prepare*") != []:
os.system("rm %s/prepare*" % logDir)
if startCatalogStage <= 2 and glob.glob(logDir+"/zobov*") != []:
os.system("rm %s/zobov*" % logDir)
if startCatalogStage <= 3 and glob.glob(logDir+"/prune*") != []:
@ -83,24 +84,24 @@ for sample in dataSampleList:
# ---------------------------------------------------------------------------
if (startCatalogStage <= 1) and (endCatalogStage >= 1) and not sample.isCombo:
print(" Extracting tracers from catalog...", end=' ')
print(" Preparing tracers from catalog...", end='')
sys.stdout.flush()
logFile = logDir+"/generate_"+sampleName+".out"
logFile = logDir+"/prepare_"+sampleName+".out"
if sample.dataType == "observation":
GENERATE_PATH = CTOOLS_PATH+"/prepObservation"
PREPARE_PATH = CTOOLS_PATH+"/prepObservation"
else:
GENERATE_PATH = CTOOLS_PATH+"/prepSimulation"
PREPARE_PATH = CTOOLS_PATH+"/prepSimulation"
launchPrep(sample, GENERATE_PATH, workDir=workDir,
launchPrep(sample, PREPARE_PATH, workDir=workDir,
inputDataDir=inputDataDir, outputDir=outputDir,
figDir=figDir, logFile=logFile, useComoving=sample.useComoving,
continueRun=continueRun, regenerate=regenerateFlag)
# --------------------------------------------------------------------------
if (startCatalogStage <= 2) and (endCatalogStage >= 2) and not sample.isCombo:
print(" Extracting voids with ZOBOV...", end=' ')
print(" Finding voids...", end='')
sys.stdout.flush()
launchZobov(sample, ZOBOV_PATH, outputDir=outputDir, logDir=logDir,
@ -111,7 +112,7 @@ for sample in dataSampleList:
# -------------------------------------------------------------------------
if (startCatalogStage <= 3) and (endCatalogStage >= 3) and not sample.isCombo:
print(" Pruning void catalogs", "...", end=' ')
print(" Pruning void catalogs", "...", end='')
sys.stdout.flush()
logFile = logDir+"/pruneVoids_"+sampleName+".out"
@ -126,7 +127,7 @@ for sample in dataSampleList:
# -------------------------------------------------------------------------
if (startCatalogStage <= 4) and (endCatalogStage >= 4):
print(" Plotting...", end=' ')
print(" Plotting...", end='')
sys.stdout.flush()
#for thisDataPortion in dataPortions:
@ -139,4 +140,4 @@ if (startCatalogStage <= 4) and (endCatalogStage >= 4):
#plotVoidDistribution(workDir, dataSampleList, figDir, showPlot=False,
# dataPortion=thisDataPortion, setName=setName)
print("\n Done!")
print("\n VIDE finished!")