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

renamed tolerance parameter to better reflect its function

Browse source
This commit is contained in:
Paul M. Sutter 2024-06-04 15:46:23 +02:00
parent 4f78bb445b
commit 99a441013d
5 changed files with 12 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

6
c_source/pruning/pruneVoids.cpp
View file

@ -718,9 +718,9 @@ int main(int argc, char **argv) {
if (args.isObservation_flag) { if (args.isObservation_flag) {
voids[iVoid].redshiftInMpc = voids[iVoid].redshiftInMpc =
sqrt(pow(voids[iVoid].macrocenter[0] - boxLen[0]/2.,2) + sqrt(pow(voids[iVoid].macrocenter[0] - boxLen[0]/2.,2) +
pow(voids[iVoid].macrocenter[1] - boxLen[1]/2.,2) + pow(voids[iVoid].macrocenter[1] - boxLen[1]/2.,2) +
pow(voids[iVoid].macrocenter[2] - boxLen[2]/2.,2)); pow(voids[iVoid].macrocenter[2] - boxLen[2]/2.,2));
voids[iVoid].redshiftInMpc = voids[iVoid].redshiftInMpc; voids[iVoid].redshiftInMpc = voids[iVoid].redshiftInMpc;

9
examples/example_observation/example_observation.py
View file

@ -58,12 +58,9 @@ numZobovDivisions = 2
# 1e-9 (or smaller != 0) -> Do not merge anything # 1e-9 (or smaller != 0) -> Do not merge anything
mergingThreshold = 1e-9 mergingThreshold = 1e-9
# for observations, when cutting voids at the high-z boundary, what multiple # when trimming away voids near the bounaries, what multiple of the radius to
# of the radius to cut # use for safety
# 0: all voids with centers less than z_max will be allowed boundaryTolerance = 1.0
# 1: all voids at least 1*radius away from z_max will be allowed
# Any other nummber: aall voids at least tolerance*radius will be allowed
highRedshiftTolerance = 1.0
# don't change this # don't change this
dataSampleList = [] dataSampleList = []

4
python_source/backend/launchers.py
View file

@ -468,7 +468,7 @@ def launchZobov(sample, binPath, zobovDir=None, logDir=None, continueRun=None,
def launchPrune(sample, binPath, def launchPrune(sample, binPath,
summaryFile=None, logFile=None, zobovDir=None, summaryFile=None, logFile=None, zobovDir=None,
continueRun=None, useComoving=False, mergingThreshold=0.2, continueRun=None, useComoving=False, mergingThreshold=0.2,
highRedshiftTolerance=1.0): boundaryTolerance=1.0):
sampleName = sample.fullName sampleName = sample.fullName
@ -517,7 +517,7 @@ def launchPrune(sample, binPath,
cmd += " --partAdj=" + zobovDir+"/adj_"+str(sampleName)+".dat" cmd += " --partAdj=" + zobovDir+"/adj_"+str(sampleName)+".dat"
cmd += " --extraInfo=" + zobovDir+"/zobov_slice_"+str(sampleName)+\ cmd += " --extraInfo=" + zobovDir+"/zobov_slice_"+str(sampleName)+\
".par" ".par"
cmd += " --tolerance=" + str(highRedshiftTolerance) cmd += " --tolerance=" + str(boundaryTolerance)
cmd += " --mockIndex=" + str(mockIndex) cmd += " --mockIndex=" + str(mockIndex)
cmd += " --maxCentralDen=" + str(maxDen) cmd += " --maxCentralDen=" + str(maxDen)
cmd += " --zMin=" + str(sample.zRange[0]) cmd += " --zMin=" + str(sample.zRange[0])

2
python_source/vide_pipeline/__main__.py
View file

@ -122,7 +122,7 @@ for sample in dataSampleList:
logFile=logFile, zobovDir=zobovDir, logFile=logFile, zobovDir=zobovDir,
useComoving=sample.useComoving, continueRun=continueRun, useComoving=sample.useComoving, continueRun=continueRun,
mergingThreshold=mergingThreshold, mergingThreshold=mergingThreshold,
highRedshiftTolerance=highRedshiftTolerance) boundaryTolerance=boundaryTolerance)
# ------------------------------------------------------------------------- # -------------------------------------------------------------------------
if (startCatalogStage <= 4) and (endCatalogStage >= 4): if (startCatalogStage <= 4) and (endCatalogStage >= 4):

9
python_source/vide_pipeline/defaults.py
View file

@ -143,12 +143,9 @@ numZobovThreads = 2
# 1e-9 (or smaller != 0) -> Do not merge anything # 1e-9 (or smaller != 0) -> Do not merge anything
mergingThreshold = 1.e-9 mergingThreshold = 1.e-9
# for observations, when cutting voids at the high-z boundary, what multiple # when trimming away voids near the bounaries, what multiple of the radius to
# of the radius to cut # use for safety
# 0: all voids with centers less than z_max will be allowed boundaryTolerance = 1.0
# 1: all voids at least 1*radius away from z_max will be allowed
# Any other nummber: aall voids at least tolerance*radius will be allowed
highRedshiftTolerance = 1.0
# simulation information # simulation information
numPart = 512*512*512 numPart = 512*512*512