placed mergingThreshold parameter in defaults file

This commit is contained in:
Paul M. Sutter 2024-06-04 11:19:07 +02:00
parent d48d740b78
commit ddcb971eae
5 changed files with 30 additions and 15 deletions

View file

@ -53,7 +53,7 @@ parser.add_argument('--parm', dest='parm',
args = parser.parse_args()
defaultsFile = "@CMAKE_SOURCE_DIR@/python_source/pipeline/defaults.py"
defaultsFile = "@CMAKE_SOURCE_DIR@/python_source/vide_pipeline/defaults.py"
parms = imp.load_source("name", defaultsFile)
globals().update(vars(parms))
@ -148,7 +148,7 @@ def getNickName(setName, sampleName):
#------------------------------------------------------------------------------
# for given dataset parameters, outputs a script for use with analyzeVoids
# for given dataset parameters, outputs a script for use with VIDE pipeline
def writeScript(setName, dataFileNameBase, dataFormat,
scriptDir, catalogDir, fileNums, redshifts, numSubvolumes,
numSlices, useVel, lbox, minRadius, omegaM, subsample=1.0,
@ -167,10 +167,6 @@ from backend.classes import *
continueRun = {continueRun} # set to True to enable restarting aborted jobs
startCatalogStage = {startCatalogStage}
endCatalogStage = {endCatalogStage}
regenerateFlag = False
mergingThreshold = 1e-9
dataSampleList = []
"""
@ -190,12 +186,14 @@ logDir = "{logDir}/{setName}/"
numZobovDivisions = {numZobovDivisions}
numZobovThreads = {numZobovThreads}
mergingThreshold = {mergingThreshold}
"""
scriptFile.write(dataInfo.format(setName=setName, figDir=figDir,
logDir=logDir, voidOutputDir=voidOutputDir,
inputDataDir=catalogDir,
numZobovDivisions=numZobovDivisions,
numZobovThreads=numZobovThreads))
numZobovThreads=numZobovThreads,
mergingThreshold=mergingThreshold))
sampleInfo = """