guilhem_lavaux/cosmotool
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed yorick_nc3, and necdf4 building (C++4). Fixed borg reading routines

Browse source
This commit is contained in:
Guilhem Lavaux 2015-02-06 14:04:51 +01:00
parent 48900328d4
commit beb651c79a
4 changed files with 21 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

30
python/cosmotool/borg.py
View file

@ -217,7 +217,9 @@ def get_mean_density_fdir(fdir,init,steps):
fname0=fname0[init::steps]
fname1=fname1[init::steps]
MEAN0,ranges=read_borg_vol(fname0[0])
borg=read_borg_vol(fname0[0])
MEAN0 = borg.density
RANGES0 = borg.ranges
MEAN0=MEAN0*0.;
VAR0=copy(MEAN0)
MEAN1=copy(MEAN0)
@ -226,20 +228,22 @@ def get_mean_density_fdir(fdir,init,steps):
norm1=0.
for fn in fname0:
auxdata0,auxranges0=read_borg_vol(fn)
MEAN0+=auxdata0
VAR0+=auxdata0**2.
norm0+=1.
del auxranges0
del auxdata0
auxborg=read_borg_vol(fn)
auxdata0 = auxborg.density
MEAN0+=auxdata0
VAR0+=auxdata0**2.
norm0+=1.
del auxdata0
del auxborg
for fn in fname1:
auxdata1,auxranges1=read_borg_vol(fn)
MEAN1+=auxdata1
VAR1+=auxdata1**2.
norm1+=1.
del auxranges1
del auxdata1
auxborg1=read_borg_vol(fn)
auxdata1 = auxborg1.density
MEAN1+=auxdata1
VAR1+=auxdata1**2.
norm1+=1.
del auxdata1
del auxborg1
MEAN0/=norm0
VAR0/=norm0