bug fixed related to different boundary handling procedure. no guarantee that it's correct (yet) but it runs

This commit is contained in:
Paul M. Sutter 2024-06-06 00:49:53 +02:00
parent 03c8f773b6
commit dd181da42a
6 changed files with 40 additions and 36 deletions

View file

@ -75,11 +75,11 @@ for sample in dataSampleList:
sampleName = sample.fullName
print(" Working with data set", sampleName, "...")
zobovDir = workDir+"/sample_"+sampleName+"/"
sample.zobovDir = zobovDir
outputDir = workDir+"/sample_"+sampleName+"/"
sample.outputDir = outputDir
if not os.access(zobovDir, os.F_OK):
os.makedirs(zobovDir)
if not os.access(outputDir, os.F_OK):
os.makedirs(outputDir)
# ---------------------------------------------------------------------------
if (startCatalogStage <= 1) and (endCatalogStage >= 1) and not sample.isCombo:
@ -94,7 +94,7 @@ for sample in dataSampleList:
GENERATE_PATH = CTOOLS_PATH+"/prepSimulation"
launchPrep(sample, GENERATE_PATH, workDir=workDir,
inputDataDir=inputDataDir, zobovDir=zobovDir,
inputDataDir=inputDataDir, outputDir=outputDir,
figDir=figDir, logFile=logFile, useComoving=sample.useComoving,
continueRun=continueRun, regenerate=regenerateFlag)
@ -103,7 +103,7 @@ for sample in dataSampleList:
print(" Extracting voids with ZOBOV...", end=' ')
sys.stdout.flush()
launchZobov(sample, ZOBOV_PATH, zobovDir=zobovDir, logDir=logDir,
launchZobov(sample, ZOBOV_PATH, outputDir=outputDir, logDir=logDir,
continueRun=continueRun, numZobovDivisions=numZobovDivisions,
numZobovThreads=numZobovThreads,
mergingThreshold=mergingThreshold)
@ -119,7 +119,7 @@ for sample in dataSampleList:
PRUNE_PATH = CTOOLS_PATH+"/pruneVoids"
launchPrune(sample, PRUNE_PATH,
logFile=logFile, zobovDir=zobovDir,
logFile=logFile, outputDir=outputDir,
useComoving=sample.useComoving, continueRun=continueRun,
mergingThreshold=mergingThreshold,
boundaryTolerance=boundaryTolerance)