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

correctly loading RA, Dec, etc.

Browse source
This commit is contained in:
P.M. Sutter 2014-05-30 15:52:50 -04:00
parent b2d5c05286
commit 1bbe348400
1 changed files with 30 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

36
python_tools/void_python_tools/voidUtil/catalogUtil.py
View file

@ -84,15 +84,39 @@ def loadPart(sampleDir):
if isObservation != 1: if isObservation != 1:
z += ranges[2][0] z += ranges[2][0]
chk = np.fromfile(File, dtype=np.int32,count=1) chk = np.fromfile(File, dtype=np.int32,count=1)
chk = np.fromfile(File, dtype=np.int32,count=1)
RA = np.fromfile(File, dtype=np.float32,count=Np)
chk = np.fromfile(File, dtype=np.int32,count=1)
chk = np.fromfile(File, dtype=np.int32,count=1)
Dec = np.fromfile(File, dtype=np.float32,count=Np)
chk = np.fromfile(File, dtype=np.int32,count=1)
chk = np.fromfile(File, dtype=np.int32,count=1)
redshift = np.fromfile(File, dtype=np.float32,count=Np)
chk = np.fromfile(File, dtype=np.int32,count=1)
chk = np.fromfile(File, dtype=np.int32,count=1)
uniqueID = np.fromfile(File, dtype=np.int64,count=Np)
chk = np.fromfile(File, dtype=np.int32,count=1)
File.close() File.close()
if isObservation == 1: if isObservation == 1:
x = x[0:maskIndex]# * 100/300000 x = x[0:maskIndex]# * 100/300000
y = y[0:maskIndex]# * 100/300000 y = y[0:maskIndex]# * 100/300000
z = z[0:maskIndex]# * 100/300000 z = z[0:maskIndex]# * 100/300000
RA = RA[0:maskIndex]
Dec = Dec[0:maskIndex]
redshift = redshift[0:maskIndex]
uniqueID = uniqueID[0:maskIndex]
partData = np.column_stack((x,y,z)) partData = np.column_stack((x,y,z))
extraData = np.column_stack((RA,Dec,redshift,uniqueID))
boxLen = mul boxLen = mul
if isObservation == 1: if isObservation == 1:
@ -116,7 +140,7 @@ def loadPart(sampleDir):
isObservationData = isObservation == 1 isObservationData = isObservation == 1
return partData, boxLen, volNorm, isObservationData, ranges return partData, boxLen, volNorm, isObservationData, ranges, extraData
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
def getVolNorm(sampleDir): def getVolNorm(sampleDir):
@ -392,7 +416,7 @@ def loadVoidCatalog(sampleDir, dataPortion="central", loadParticles=True,
if loadParticles: if loadParticles:
print "Loading all particles..." print "Loading all particles..."
partData, boxLen, volNorm, isObservationData, ranges = loadPart(sampleDir) partData, boxLen, volNorm, isObservationData, ranges, extraData = loadPart(sampleDir)
numPartTot = len(partData) numPartTot = len(partData)
catalog.numPartTot = numPartTot catalog.numPartTot = numPartTot
catalog.partPos = partData catalog.partPos = partData
@ -402,10 +426,10 @@ def loadVoidCatalog(sampleDir, dataPortion="central", loadParticles=True,
y = partData[i][1], y = partData[i][1],
z = partData[i][2], z = partData[i][2],
volume = 0, volume = 0,
ra = 0, ra = extraData[i][0],
dec = 0, dec = extraData[i][1],
redshift = 0, redshift = extraData[i][2],
uniqueID = 0)) uniqueID = extraData[i][3]))
print "Loading volumes..." print "Loading volumes..."