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

Implemented correctly getMasses

Browse Source
This commit is contained in:
Guilhem Lavaux 2015-05-05 14:21:21 +02:00
parent 38e3e61237
commit bb94130bcd
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
python/cosmotool/simu.py
View File

@ -1,3 +1,4 @@
import warnings
from _cosmotool import * from _cosmotool import *
class SimulationBare(PySimulationBase): class SimulationBare(PySimulationBase):
@ -18,6 +19,10 @@ class SimulationBare(PySimulationBase):
self.Hubble = s.getHubble() self.Hubble = s.getHubble()
self.Omega_M = s.getOmega_M() self.Omega_M = s.getOmega_M()
self.Omega_Lambda = s.getOmega_Lambda() self.Omega_Lambda = s.getOmega_Lambda()
try:
self.masses = s.getMasses().copy() if s.getMasses() is not None else None
except Exception as e:
warnings.warn("Unexpected exception: " + repr(e))
def merge(self, other): def merge(self, other):
@ -48,6 +53,11 @@ class SimulationBare(PySimulationBase):
self.positions = _safe_merge(self.positions, other.getPositions()) self.positions = _safe_merge(self.positions, other.getPositions())
self.velocities = _safe_merge(self.velocities, other.getVelocities()) self.velocities = _safe_merge(self.velocities, other.getVelocities())
self.identifiers = _safe_merge0(self.identifiers, other.getIdentifiers()) self.identifiers = _safe_merge0(self.identifiers, other.getIdentifiers())
try:
self.masses = _safe_merge0(self.masses, other.getMasses())
except Exception as e:
warnings.warn("Unexpected exception: " + repr(e));
self.masses = None
def getPositions(self): def getPositions(self):
return self.positions return self.positions
@ -58,6 +68,9 @@ class SimulationBare(PySimulationBase):
def getIdentifiers(self): def getIdentifiers(self):
return self.identifiers return self.identifiers
def getMasses(self):
return self.masses
def getTime(self): def getTime(self):
return self.time return self.time