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

fixed bug in shifting z-axis

Browse source
This commit is contained in:
P.M. Sutter 2014-05-29 15:41:37 -05:00
parent 8e13e317da
commit 466dfd8576
3 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
python_tools/pipeline_source/prepareInputs.in.py
View file

@ -253,6 +253,7 @@ newSample = Sample(dataFile = "{dataFile}",
zBoundary = ({zMin}, {zMax}), zBoundary = ({zMin}, {zMax}),
zRange = ({zMin}, {zMax}), zRange = ({zMin}, {zMax}),
zBoundaryMpc = ({zMinMpc}, {zMaxMpc}), zBoundaryMpc = ({zMinMpc}, {zMaxMpc}),
shiftSimZ = {shiftSimZ},
omegaM = {omegaM}, omegaM = {omegaM},
minVoidRadius = {minRadius}, minVoidRadius = {minRadius},
profileBinSize = "auto", profileBinSize = "auto",
@ -345,6 +346,7 @@ dataSampleList.append(newSample)
zMax=sliceMax, zMax=sliceMax,
zMinMpc=sliceMinMpc, zMinMpc=sliceMinMpc,
zMaxMpc=sliceMaxMpc, zMaxMpc=sliceMaxMpc,
shiftSimZ=shiftSimZ,
omegaM=Om, omegaM=Om,
boxLen=lbox, boxLen=lbox,
autoStack=autoStack, autoStack=autoStack,

4
python_tools/void_python_tools/backend/classes.py
View file

@ -70,6 +70,7 @@ class Sample:
selFunFile = "czselfunc.all.dr72dim.dat" selFunFile = "czselfunc.all.dr72dim.dat"
zBoundary = (0.0, 0.1) zBoundary = (0.0, 0.1)
zBoundaryMpc = (0., 300) zBoundaryMpc = (0., 300)
shiftSimZ = False
zRange = (0.0, 0.1) zRange = (0.0, 0.1)
omegaM = 0.27 omegaM = 0.27
minVoidRadius = -1 minVoidRadius = -1
@ -96,7 +97,7 @@ class Sample:
def __init__(self, dataFile="", fullName="", dataUnit=1, def __init__(self, dataFile="", fullName="", dataUnit=1,
nickName="", maskFile="", selFunFile="", nickName="", maskFile="", selFunFile="",
zBoundary=(), zRange=(), zBoundaryMpc=(), zBoundary=(), zRange=(), zBoundaryMpc=(), shiftSimZ=False,
minVoidRadius=-1, fakeDensity=0.01, volumeLimited=True, minVoidRadius=-1, fakeDensity=0.01, volumeLimited=True,
numAPSlices=1, numAPSlices=1,
includeInHubble=True, partOfCombo=False, isCombo=False, includeInHubble=True, partOfCombo=False, isCombo=False,
@ -114,6 +115,7 @@ class Sample:
self.selFunFile = selFunFile self.selFunFile = selFunFile
self.zBoundary = zBoundary self.zBoundary = zBoundary
self.zBoundaryMpc = zBoundaryMpc self.zBoundaryMpc = zBoundaryMpc
self.shiftSimZ = shiftSimZ
self.zRange = zRange self.zRange = zRange
self.minVoidRadius = minVoidRadius self.minVoidRadius = minVoidRadius
self.fakeDensity = fakeDensity self.fakeDensity = fakeDensity

6
python_tools/void_python_tools/backend/launchers.py
View file

@ -180,6 +180,9 @@ def launchGenerate(sample, binPath, workDir=None, inputDataDir=None,
xMax = (iX+1)/sample.numSubvolumes * sample.boxLen xMax = (iX+1)/sample.numSubvolumes * sample.boxLen
yMax = (iY+1)/sample.numSubvolumes * sample.boxLen yMax = (iY+1)/sample.numSubvolumes * sample.boxLen
reshiftFlag = ""
if not sample.shiftSimZ: reshiftFlag = "preReShift"
conf=""" conf="""
%s %s
output %s output %s
@ -196,6 +199,7 @@ def launchGenerate(sample, binPath, workDir=None, inputDataDir=None,
%s %s
%s %s
%s %s
%s
""" % (dataFileLine, outputFile, """ % (dataFileLine, outputFile,
outputFile+".par", outputFile+".par",
includePecVelString, includePecVelString,
@ -203,7 +207,7 @@ def launchGenerate(sample, binPath, workDir=None, inputDataDir=None,
sample.dataUnit, sample.dataUnit,
xMin, xMax, yMin, yMax, xMin, xMax, yMin, yMax,
sample.zBoundaryMpc[0], sample.zBoundaryMpc[1], sample.zBoundaryMpc[0], sample.zBoundaryMpc[1],
subSampleLine,resubSampleLine,inputParameterFlag) subSampleLine,resubSampleLine,inputParameterFlag,reshiftFlag)
parmFile = os.getcwd()+"/generate_"+sample.fullName+".par" parmFile = os.getcwd()+"/generate_"+sample.fullName+".par"