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

added logarithmic binning for profiles

Browse source
This commit is contained in:
P.M. Sutter 2013-11-18 08:00:19 -06:00
parent 3dda3677bb
commit cde70952c4
1 changed files with 37 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

46
python_tools/pipeline_source/prepareCatalogs.in.py
View file

@ -143,6 +143,7 @@ startAPStage = {startAPStage}
endAPStage = {endAPStage} endAPStage = {endAPStage}
regenerateFlag = False regenerateFlag = False
#ZOBOV_PATH = "@CMAKE_BINARY_DIR@/c_tools/zobov2/"
ZOBOV_PATH = "@CMAKE_BINARY_DIR@/zobov/" ZOBOV_PATH = "@CMAKE_BINARY_DIR@/zobov/"
CTOOLS_PATH = "@CMAKE_BINARY_DIR@/c_tools/" CTOOLS_PATH = "@CMAKE_BINARY_DIR@/c_tools/"
freshStack = True freshStack = True
@ -180,6 +181,7 @@ numZobovThreads = {numZobovThreads}
numZobovDivisions=numZobovDivisions, numZobovDivisions=numZobovDivisions,
numZobovThreads=numZobovThreads)) numZobovThreads=numZobovThreads))
sampleInfo = """ sampleInfo = """
newSample = Sample(dataFile = "{dataFile}", newSample = Sample(dataFile = "{dataFile}",
dataFormat = "{dataFormat}", dataFormat = "{dataFormat}",
@ -195,6 +197,7 @@ newSample = Sample(dataFile = "{dataFile}",
profileBinSize = "auto", profileBinSize = "auto",
includeInHubble = True, includeInHubble = True,
partOfCombo = False, partOfCombo = False,
{autoStack}
isCombo = False, isCombo = False,
boxLen = {boxLen}, boxLen = {boxLen},
usePecVel = {usePecVel}, usePecVel = {usePecVel},
@ -212,24 +215,46 @@ newSample.addStack(0.0, 5.0, 5 , 10, False, False, rescaleMode="rv")
newSample.addStack(0.0, 5.0, 10, 15, False, False, rescaleMode="rv") newSample.addStack(0.0, 5.0, 10, 15, False, False, rescaleMode="rv")
newSample.addStack(0.0, 5.0, 15, 20, False, False, rescaleMode="rv") newSample.addStack(0.0, 5.0, 15, 20, False, False, rescaleMode="rv")
newSample.addStack(0.0, 5.0, 20, 25, False, False, rescaleMode="rv") newSample.addStack(0.0, 5.0, 20, 25, False, False, rescaleMode="rv")
newSample.addStack(0.0, 5.0, 25, 30, False, False, rescaleMode="rv")
newSample.addStack(0.0, 5.0, 30, 35, False, False, rescaleMode="rv") newSample.addStack(0.0, 5.0, 30, 35, False, False, rescaleMode="rv")
newSample.addStack(0.0, 5.0, 35, 40, False, False, rescaleMode="rv")
newSample.addStack(0.0, 5.0, 40, 45, False, False, rescaleMode="rv") newSample.addStack(0.0, 5.0, 40, 45, False, False, rescaleMode="rv")
newSample.addStack(0.0, 5.0, 45, 50, False, False, rescaleMode="rv")
newSample.addStack(0.0, 5.0, 50, 55, False, False, rescaleMode="rv") newSample.addStack(0.0, 5.0, 50, 55, False, False, rescaleMode="rv")
newSample.addStack(0.0, 5.0, 55, 60, False, False, rescaleMode="rv")
newSample.addStack(0.0, 5.0, 60, 65, False, False, rescaleMode="rv") newSample.addStack(0.0, 5.0, 60, 65, False, False, rescaleMode="rv")
newSample.addStack(0.0, 5.0, 65, 70, False, False, rescaleMode="rv")
newSample.addStack(0.0, 5.0, 70, 75, False, False, rescaleMode="rv") newSample.addStack(0.0, 5.0, 70, 75, False, False, rescaleMode="rv")
newSample.addStack(0.0, 5.0, 75, 80, False, False, rescaleMode="rv")
newSample.addStack(0.0, 5.0, 80, 85, False, False, rescaleMode="rv") newSample.addStack(0.0, 5.0, 80, 85, False, False, rescaleMode="rv")
newSample.addStack(0.0, 5.0, 85, 90, False, False, rescaleMode="rv")
newSample.addStack(0.0, 5.0, 90, 95, False, False, rescaleMode="rv") newSample.addStack(0.0, 5.0, 90, 95, False, False, rescaleMode="rv")
newSample.addStack(0.0, 5.0, 95, 100, False, False, rescaleMode="rv")
""" """
elif stackMode == "auto": elif stackMode == "log":
stackInfo = """ stackInfo = ""
newSample.addStack({zMin}, {zMax}, 2*{minRadius} , 2*{minRadius}+2, True, False, rescaleMode="rv") rMin = 10
newSample.addStack({zMin}, {zMax}, 2*{minRadius} , 2*{minRadius}+4, True, False, rescaleMode="rv") rMax = 100
newSample.addStack({zMin}, {zMax}, 2*{minRadius}+2, 2*{minRadius}+6, True, False, rescaleMode="rv") rStart = rMin
newSample.addStack({zMin}, {zMax}, 2*{minRadius}+6, 2*{minRadius}+10, True, False, rescaleMode="rv") rEnd = rMin
newSample.addStack({zMin}, {zMax}, 2*{minRadius}+10, 2*{minRadius}+18, True, False, rescaleMode="rv") dlogR = 0.25
newSample.addStack({zMin}, {zMax}, 2*{minRadius}+18, 2*{minRadius}+24, True, False, rescaleMode="rv") while rEnd < rMax:
""" rEnd = (1+0.5*dlogR)*rStart/(1-0.5*dlogR)
stackInfo += """newSample.addStack({zMin}, {zMax}"""+ ", %g, %g, True, False, rescaleMode='rv')" % (rStart, rEnd)
rStart = rEnd
# elif stackMode == "auto":
# stackInfo = """
#newSample.addStack({zMin}, {zMax}, 2*{minRadius} , 2*{minRadius}+2, True, False, rescaleMode="rv")
#newSample.addStack({zMin}, {zMax}, 2*{minRadius} , 2*{minRadius}+4, True, False, rescaleMode="rv")
#newSample.addStack({zMin}, {zMax}, 2*{minRadius}+2, 2*{minRadius}+6, True, False, rescaleMode="rv")
#newSample.addStack({zMin}, {zMax}, 2*{minRadius}+6, 2*{minRadius}+10, True, False, rescaleMode="rv")
#newSample.addStack({zMin}, {zMax}, 2*{minRadius}+10, 2*{minRadius}+18, True, False, rescaleMode="rv")
#newSample.addStack({zMin}, {zMax}, 2*{minRadius}+18, 2*{minRadius}+24, True, False, rescaleMode="rv")
# """
else: else:
stackInfo = """ stackInfo = """
# {zMin}, {zMax}, {minRadius} # {zMin}, {zMax}, {minRadius}
@ -286,6 +311,8 @@ newSample.addStack({zMin}, {zMax}, 2*{minRadius}+18, 2*{minRadius}+24, True, Fal
nickName = getNickName(setName, sampleName) nickName = getNickName(setName, sampleName)
autoStack = ""
if stackMode == "auto": autoStack = "autoNumInStack = 400,"
scriptFile.write(sampleInfo.format(dataFile=dataFileName, scriptFile.write(sampleInfo.format(dataFile=dataFileName,
dataFormat=dataFormat, dataFormat=dataFormat,
dataUnit=dataUnit, dataUnit=dataUnit,
@ -297,6 +324,7 @@ newSample.addStack({zMin}, {zMax}, 2*{minRadius}+18, 2*{minRadius}+24, True, Fal
zMaxMpc=sliceMaxMpc, zMaxMpc=sliceMaxMpc,
omegaM=Om, omegaM=Om,
boxLen=lbox, boxLen=lbox,
autoStack=autoStack,
usePecVel=useVel, usePecVel=useVel,
minRadius=minRadius, minRadius=minRadius,
numSubvolumes=numSubvolumes, numSubvolumes=numSubvolumes,