noe/pipeline
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[galaxy] deal with simulation without epoch field

Browse Source
This commit is contained in:
Noe Brucy
2021-05-21 16:14:04 +02:00
parent f12fd7348d
commit befe134abf
1 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
galaxy.py
+18 -12
View File
@@ -133,23 +133,29 @@ def ring_analysis(pp, r=4, dr=0.5, dphi=0.125, z=0, dz=0.5, do_mean=True):
def get_time_from_relax(pp): def get_time_from_relax(pp):
pp.load_parts() pp.load_parts()
epoch = pp.parts["epoch"].copy() try:
epoch *= pp.info["unit_time"].express(U.Myr) epoch = pp.parts["epoch"].copy()
trelax = np.min(epoch[epoch > 0]) epoch *= pp.info["unit_time"].express(U.Myr)
tfromrelax = np.max(epoch - trelax) trelax = np.min(epoch[epoch > 0])
tfromrelax = np.max(epoch - trelax)
except KeyError:
tfromrelax = 0.0
return tfromrelax return tfromrelax
def get_last_sfr(pp): def get_last_sfr(pp):
pp.load_parts() pp.load_parts()
epoch = pp.parts["epoch"].copy() try:
epoch *= pp.info["unit_time"].express(U.year) epoch = pp.parts["epoch"].copy()
mass = pp.parts["mass"].copy() epoch *= pp.info["unit_time"].express(U.year)
mass *= pp.info["unit_mass"].express(U.Msun) mass = pp.parts["mass"].copy()
mask = epoch > 0 mass *= pp.info["unit_mass"].express(U.Msun)
masstot, time = np.histogram(epoch[mask], weights=mass[mask], bins=100) mask = epoch > 0
dtime = np.diff(time) masstot, time = np.histogram(epoch[mask], weights=mass[mask], bins=100)
sfr = masstot[-1] / dtime[-1] dtime = np.diff(time)
sfr = masstot[-1] / dtime[-1]
except KeyError:
sfr = 0.0
return sfr return sfr