Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

make stellar mass profiles not count black holes #109

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

make stellar mass profiles not count black holes #109

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
365024f
make stellar mass profiles not count black holes (particles with tfor…
Jul 11, 2019
6e5dd43
remove import pynbody within _get_profile since it is now global
Jul 11, 2019
e4d3ced
move import of pynbody in profile functions
Jul 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tangos/properties/pynbody/profile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ def plot_ylabel(self):

def _get_profile(self, halo, maxrad):
import pynbody

delta = self.plot_xdelta()
nbins = int(maxrad / delta)
maxrad = delta * (nbins + 1)
Expand Down Expand Up @@ -50,6 +49,7 @@ class BaryonicHaloDensityProfile(HaloDensityProfile):

@centred_calculation
def calculate(self, data, existing_properties):
import pynbody
gas_a, gas_b = self._get_profile(data.gas, existing_properties["max_radius"])
star_a, star_b = self._get_profile(data.star, existing_properties["max_radius"])
star_a, star_b = self._get_profile(data.star[pynbody.filt.HighPass('tform',0)], existing_properties["max_radius"])
return gas_a, gas_b, star_a, star_b