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.

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

bug fix and new function in NSBH ejecta fits #381

Merged
Merged
Changes from all commits
Commits
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
19 changes: 11 additions & 8 deletions nmma/joint/conversion.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,13 @@ def chibh2risco(self, chi_bh):

return 3.0 + Z2 - np.sign(chi_bh) * np.sqrt((3.0 - Z1) * (3.0 + Z1 + 2.0 * Z2))

def baryon_mass_NS(self, source_mass, compactness):
"""
equation (7) in https://arxiv.org/abs/2002.07728
"""

return source_mass * (1.0 + 0.6 * compactness / (1.0 - 0.5 * compactness))

def remnant_disk_mass_fitting(
self,
mass_1_source,
Expand All @@ -125,9 +132,7 @@ def remnant_disk_mass_fitting(

# use the BH spin to find the normalized risco
risco = self.chibh2risco(chi_bh)
bayon_mass_2 = (
mass_2_source * (1.0 + 0.6 * compactness_2 / (1.0 - 0.5 * compactness_2))
)
baryon_mass_2 = self.baryon_mass_NS(mass_2_source, compactness_2)

remant_mass = (
a * np.power(symm_mass_ratio, -1.0 / 3.0) * (1.0 - 2.0 * compactness_2)
Expand All @@ -138,7 +143,7 @@ def remnant_disk_mass_fitting(

remant_mass = np.power(remant_mass, 1.0 + d)

remant_mass *= bayon_mass_2
remant_mass *= baryon_mass_2

return remant_mass

Expand All @@ -163,9 +168,7 @@ def dynamic_mass_fitting(

# use the BH spin to find the normalized risco
risco = self.chibh2risco(chi_bh)
bayon_mass_2 = (
mass_2_source * (1.0 + 0.6 * compactness_2 / (1.0 - 0.5 * compactness_2))
)
baryon_mass_2 = self.baryon_mass_NS(mass_2_source, compactness_2)

mdyn = (
a1
Expand All @@ -174,7 +177,7 @@ def dynamic_mass_fitting(
/ compactness_2
)
mdyn += -a2 * np.power(mass_ratio_invert, n2) * risco + a4
mdyn *= bayon_mass_2
mdyn *= baryon_mass_2

mdyn = np.maximum(0.0, mdyn)

Expand Down
Loading