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

fixed naming issue with unshifted boxes

Browse source
This commit is contained in:
P.M. Sutter 2014-05-29 14:26:01 -05:00
parent 3fa193958b
commit 88dfc4209b
1 changed files with 11 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -299,12 +299,20 @@ dataSampleList.append(newSample)
if shiftSimZ: if shiftSimZ:
sliceMinMpc = zBoxMpc + iSlice*lbox/numSlices sliceMinMpc = zBoxMpc + iSlice*lbox/numSlices
sliceMaxMpc = zBoxMpc + (iSlice+1)*lbox/numSlices sliceMaxMpc = zBoxMpc + (iSlice+1)*lbox/numSlices
sliceMin = np.interp(sliceMinMpc*100./LIGHT_SPEED, zVsDX, zVsDY)
sliceMax = np.interp(sliceMaxMpc*100./LIGHT_SPEED, zVsDX, zVsDY)
sliceMinForName = sliceMin
else: else:
sliceMinMpc = iSlice*lbox/numSlices sliceMinMpc = iSlice*lbox/numSlices
sliceMaxMpc = (iSlice+1)*lbox/numSlices sliceMaxMpc = (iSlice+1)*lbox/numSlices
sliceMin = np.interp(sliceMinMpc*100./LIGHT_SPEED, zVsDX, zVsDY) sliceMin = np.interp(sliceMinMpc*100./LIGHT_SPEED, zVsDX, zVsDY)
sliceMax = np.interp(sliceMaxMpc*100./LIGHT_SPEED, zVsDX, zVsDY) sliceMax = np.interp(sliceMaxMpc*100./LIGHT_SPEED, zVsDX, zVsDY)
sliceMinMpcForName = zBoxMpc + iSlice*lbox/numSlices
sliceMinForName = np.interp(sliceMinMpcForName*100./LIGHT_SPEED, \
zVsDX, zVsDY)
sliceMinForName = "%0.2f" % sliceMinForName
sliceMin = "%0.2f" % sliceMin sliceMin = "%0.2f" % sliceMin
sliceMax = "%0.2f" % sliceMax sliceMax = "%0.2f" % sliceMax
sliceMinMpc = "%0.2f" % sliceMinMpc sliceMinMpc = "%0.2f" % sliceMinMpc
@ -320,7 +328,7 @@ dataSampleList.append(newSample)
mySubvolume = "%d%d" % (iX, iY) mySubvolume = "%d%d" % (iX, iY)
sampleName = getSampleName(setName, sliceMin, useVel, sampleName = getSampleName(setName, sliceMinForName, useVel,
iSlice=iSlice, iVol=mySubvolume) iSlice=iSlice, iVol=mySubvolume)
nickName = getNickName(setName, sampleName) nickName = getNickName(setName, sampleName)
@ -348,21 +356,6 @@ dataSampleList.append(newSample)
useLightCone=useLightCone, useLightCone=useLightCone,
subsample=str(subsample).strip('[]'))) subsample=str(subsample).strip('[]')))
#for iAPSlice in xrange(numAPSlices):
# sliceWidth = float(sliceMax) - float(sliceMin)
# sliceAPMin = float(sliceMin) + iAPSlice*sliceWidth/numAPSlices
# sliceAPMax = float(sliceMin) + (iAPSlice+1)*sliceWidth/numAPSlices
# sliceAPMin = "%0.2f" % sliceAPMin
# sliceAPMax = "%0.2f" % sliceAPMax
# scriptFile.write(stackInfo.format(zMin=sliceAPMin,
# zMax=sliceAPMax,
# minRadius=minRadius,
# rescaleMode=stackRescaleMode,
# maxVoids=maxVoidsInStack,
# fittingMode=fittingMode
# ))
scriptFile.close() scriptFile.close()
return return