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

Merge branch 'master' of bitbucket.org:glavaux/cosmotool

Browse source
This commit is contained in:
Guilhem Lavaux 2015-02-10 14:20:32 +01:00
commit 5395097fa7
7 changed files with 135 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

8
python/cosmotool/simu.py
View file

@ -23,16 +23,16 @@ class SimulationBare(PySimulationBase):
def merge(self, other):
def _safe_merge(a, b):
if b:
if a:
if b is not None:
if a is not None:
a = [np.append(q, r) for q,r in zip(a,b)]
else:
a = b
return a
def _safe_merge0(a, b):
if b:
if a:
if b is not None:
if a is not None:
a = np.append(a, b)
else:
a = b