redback 1.1__tar.gz → 1.12.0__tar.gz

{redback-1.1 → redback-1.12.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: redback
-Version: 1.1
+Version: 1.12.0
 Summary: A Bayesian inference and modelling pipeline for electromagnetic transients
 Home-page: https://github.com/nikhil-sarin/redback
 Author: Nikhil Sarin, Moritz Huebner

{redback-1.1 → redback-1.12.0}/redback/__init__.py

@@ -5,5 +5,5 @@ from redback.transient import afterglow, kilonova, prompt, supernova, tde
 from redback.sampler import fit_model
 from redback.utils import setup_logger
 
-__version__ = "1.1.0"
+__version__ = "1.12.0"
 setup_logger(log_level='info')

redback-1.12.0/redback/priors/salt2.prior

@@ -0,0 +1,6 @@
+redshift = Uniform(0.1, 0.2, name='redshift', latex_label=r'$z$')
+peak_time = Uniform(10, 20, name='peak_time', latex_label=r'$t_{\mathrm{peak}}~(\mathrm{days})$')
+t0 = Uniform(0, 1, name='t0', latex_label=r'$t_0~(\mathrm{days})$')
+x0 = Uniform(1e-10, 1e-1, name='x0', latex_label=r'$x_0$')
+x1 = Normal(0, 1, name='x1', latex_label=r'$x_1$')
+c = Normal(0, 0.1, name='c', latex_label=r'$c$')

redback-1.12.0/redback/priors/shock_cooling_and_arnett_bolometric.prior

@@ -0,0 +1,11 @@
+log10_mass = Uniform(-2, 3, 'log10_mass', latex_label=r'$\log_{10}~m_{\mathrm{en}} / M_\odot$')
+log10_radius = Uniform(10, 14, 'log10_radius', latex_label=r'$\log_{10}~R_{\mathrm{en}} / {\mathrm{cm}}^{-3}$')
+log10_energy = Uniform(40, 52, 'log10_energy', latex_label=r'$\log_{10}~E_{\mathrm{en}} / {\mathrm{erg}}$')
+nn = Uniform(8, 12, 'nn', latex_label=r'$nn$')
+delta = Uniform(1, 1.5, 'delta', latex_label=r'$\\Delta$')
+f_nickel = LogUniform(1e-3,1,name='f_nickel', latex_label = r'$f_{\mathrm{Ni}}$')
+mej = LogUniform(1e-4, 100, 'mej', latex_label = r'$M_{\mathrm{ej} }~(M_\odot)$')
+vej = LogUniform(1e3, 1e5, 'vej', latex_label = r'$v_{\mathrm{ej}}~(\mathrm{km}/\mathrm{s})$')
+kappa = Uniform(0.05, 2, 'kappa', latex_label = r'$\\kappa~(\mathrm{cm}^{2}/\mathrm{g})$')
+kappa_gamma = LogUniform(1e-4, 1e4, 'kappa_gamma', latex_label = r'$\\kappa_\\gamma~(\mathrm{cm}^{2}/\mathrm{g})$')
+temperature_floor = LogUniform(1e3,1e5,name = 'temperature_floor', latex_label = r'$T_{\mathrm{floor}}~(\mathrm{K})$')

{redback-1.1 → redback-1.12.0}/redback/transient_models/supernova_models.py

@@ -3,7 +3,7 @@ import pandas as pd
 from redback.transient_models.phenomenological_models import exponential_powerlaw, fallback_lbol
 from redback.transient_models.magnetar_models import magnetar_only, basic_magnetar
 from redback.transient_models.magnetar_driven_ejecta_models import _ejecta_dynamics_and_interaction
-from redback.transient_models.shock_powered_models import _shock_cooling, _shocked_cocoon, _csm_shock_breakout
+from redback.transient_models.shock_powered_models import  _shocked_cocoon, _csm_shock_breakout
 import redback.interaction_processes as ip
 import redback.sed as sed
 import redback.photosphere as photosphere
@@ -115,6 +115,36 @@ def sncosmo_models(time, redshift, model_kwargs=None, **kwargs):
     elif kwargs['output_format'] == 'sncosmo_source':
         return model
 
+@citation_wrapper('https://ui.adsabs.harvard.edu/abs/2007A%26A...466...11G/abstract, sncosmo')
+def salt2(time, redshift, x0, x1, c, peak_time, **kwargs):
+    """
+    A wrapper to the salt2 model in sncosmo
+
+    :param time: time in days in observer frame (in mjd days)
+    :param redshift: redshift
+    :param x0: x0
+    :param x1: x1
+    :param c: c
+    :param peak_time: peak time in mjd
+    :param kwargs: Additional keyword arguments
+    :param cosmology: astropy cosmology object by default set to Planck18
+    :param mw_extinction: Boolean for whether there is MW extinction or not. Default True
+    :param host_extinction: Boolean for whether there is host extinction or not. Default True
+            if used adds an extra parameter ebv which must also be in kwargs; host galaxy E(B-V). Set to 0.1 by default
+    :param use_set_peak_magnitude: Boolean for whether to set the peak magnitude or not. Default False,
+        if True the following keyword arguments also apply. Else the brightness is set by the model_kwargs.
+    :param peak_abs_mag: SNe peak absolute magnitude default set to -19
+    :param peak_abs_mag_band: Band corresponding to the peak abs mag limit, default to standard::b. Must be in SNCosmo
+    :param magnitude_system: Mag system; default ab
+    :param output_format: 'flux_density', 'magnitude', 'spectra', 'flux', 'sncosmo_source'
+    :return: set by output format - 'flux_density', 'magnitude', 'flux', 'sncosmo_source'
+    """
+    kwargs['sncosmo_model'] = 'salt2'
+    kwargs['peak_time'] = peak_time
+    model_kwargs = {'x0':x0, 'x1':x1, 'c':c}
+    out = sncosmo_models(time=time, redshift=redshift, model_kwargs=model_kwargs, **kwargs)
+    return out
+
 @citation_wrapper('redback')
 def exponential_powerlaw_bolometric(time, lbol_0, alpha_1, alpha_2, tpeak_d, **kwargs):
     """
@@ -363,10 +393,40 @@ def arnett(time, redshift, f_nickel, mej, **kwargs):
                                                               spectra=spectra, lambda_array=lambda_observer_frame,
                                                               **kwargs)
 
+def shock_cooling_and_arnett_bolometric(time, log10_mass, log10_radius, log10_energy,
+                             f_nickel, mej, vej, kappa, kappa_gamma, temperature_floor, **kwargs):
+    """
+    Bolometric luminosity of shock cooling and arnett model
+
+    :param time: time in days in source frame
+    :param log10_mass: log10 mass of extended material in solar masses
+    :param log10_radius: log10 radius of extended material in cm
+    :param log10_energy: log10 energy of extended material in ergs
+    :param f_nickel: fraction of nickel mass
+    :param mej: total ejecta mass in solar masses
+    :param vej: velocity of ejecta in km/s
+    :param kappa: opacity in cm^2/g
+    :param kappa_gamma: gamma-ray opacity in cm^2/g
+    :param temperature_floor: temperature floor in K
+    :param kwargs: Additional keyword arguments
+    :param nn: density power law slope
+    :param delta: inner density power law slope
+    :return: bolometric luminosity in erg/s
+    """
+    from redback.transient_models.shock_powered_models import shock_cooling_bolometric
+    lbol_1 = shock_cooling_bolometric(time=time * day_to_s, log10_mass=log10_mass, log10_radius=log10_radius,
+                                      log10_energy=log10_energy, **kwargs)
+    lbol_2 = arnett_bolometric(time=time, f_nickel=f_nickel, mej=mej, vej=vej, kappa=kappa,
+                               kappa_gamma=kappa_gamma, temperature_floor=temperature_floor, **kwargs)
+    return lbol_1 + lbol_2
+
+
 @citation_wrapper('https://ui.adsabs.harvard.edu/abs/1982ApJ...253..785A/abstract, Piro+2021')
 def shock_cooling_and_arnett(time, redshift, log10_mass, log10_radius, log10_energy,
-                             f_nickel, mej, **kwargs):
+                             f_nickel, mej, vej, kappa, kappa_gamma, temperature_floor, **kwargs):
     """
+    Photometric light curve of shock cooling and arnett model
+
     :param time: time in days
     :param redshift: source redshift
     :param log10_mass: log10 mass of extended material in solar masses
@@ -374,12 +434,13 @@ def shock_cooling_and_arnett(time, redshift, log10_mass, log10_radius, log10_ene
     :param log10_energy: log10 energy of extended material in ergs
     :param f_nickel: fraction of nickel mass
     :param mej: total ejecta mass in solar masses
-    :param kwargs: Must be all the kwargs required by the specific interaction_process, photosphere, sed methods used
-         e.g., for Diffusion and TemperatureFloor: kappa, kappa_gamma, vej (km/s), temperature_floor
+    :param vej: velocity of ejecta in km/s
+    :param kappa: opacity in cm^2/g
+    :param kappa_gamma: gamma-ray opacity in cm^2/g
+    :param temperature_floor: temperature floor in K
+    :param kwargs: Additional keyword arguments
     :param nn: density power law slope
     :param delta: inner density power law slope
-    :param interaction_process: Default is Diffusion.
-            Can also be None in which case the output is just the raw engine luminosity, or another interaction process.
     :param photosphere: Default is TemperatureFloor.
             kwargs must have vej or relevant parameters if using different photosphere model
     :param sed: Default is blackbody.
@@ -391,33 +452,19 @@ def shock_cooling_and_arnett(time, redshift, log10_mass, log10_radius, log10_ene
     :param cosmology: Cosmology to use for luminosity distance calculation. Defaults to Planck18. Must be a astropy.cosmology object.
     :return: set by output format - 'flux_density', 'magnitude', 'spectra', 'flux', 'sncosmo_source'
     """
-    kwargs['interaction_process'] = kwargs.get("interaction_process", ip.Diffusion)
     kwargs['photosphere'] = kwargs.get("photosphere", photosphere.TemperatureFloor)
     kwargs['sed'] = kwargs.get("sed", sed.Blackbody)
     cosmology = kwargs.get('cosmology', cosmo)
     dl = cosmology.luminosity_distance(redshift).cgs.value
-    mass = 10 ** log10_mass
-    radius = 10 ** log10_radius
-    energy = 10 ** log10_energy
 
     if kwargs['output_format'] == 'flux_density':
         frequency = kwargs['frequency']
         frequency, time = calc_kcorrected_properties(frequency=frequency, redshift=redshift, time=time)
-        output = _shock_cooling(time * day_to_s, mass=mass, radius=radius, energy=energy, **kwargs)
-        lbol_1 = output.lbol
-        lbol_2 = _nickelcobalt_engine(time=time, f_nickel=f_nickel, mej=mej)
-        lbol = lbol_1 + lbol_2
-
-        if kwargs['interaction_process'] is not None:
-            dense_resolution = kwargs.get("dense_resolution", 300)
-            dense_times = np.linspace(0.01, time[-1]+100, dense_resolution)
-            dense_lbols = _nickelcobalt_engine(time=dense_times, f_nickel=f_nickel, mej=mej)
-            shock_cooling = _shock_cooling(dense_times * day_to_s, mass=mass, radius=radius, energy=energy, **kwargs).lbol
-            dense_lbols += shock_cooling
-            interaction_class = kwargs['interaction_process'](time=time, dense_times=dense_times, luminosity=dense_lbols,
-                                                              mej=mej, **kwargs)
-            lbol = interaction_class.new_luminosity
-        photo = kwargs['photosphere'](time=time, luminosity=lbol, **kwargs)
+        lbol = shock_cooling_and_arnett_bolometric(time, log10_mass=log10_mass, log10_radius=log10_radius,
+                                                   log10_energy=log10_energy, f_nickel=f_nickel,
+                                                   mej=mej, vej=vej, kappa=kappa, kappa_gamma=kappa_gamma,
+                                                   temperature_floor=temperature_floor, **kwargs)
+        photo = kwargs['photosphere'](time=time, luminosity=lbol, vej=vej, temperature_floor=temperature_floor, **kwargs)
 
         sed_1 = kwargs['sed'](temperature=photo.photosphere_temperature, r_photosphere=photo.r_photosphere,
                 frequency=frequency, luminosity_distance=dl)
@@ -430,10 +477,11 @@ def shock_cooling_and_arnett(time, redshift, log10_mass, log10_radius, log10_ene
         time_observer_frame = time_temp * (1. + redshift)
         frequency, time = calc_kcorrected_properties(frequency=lambda_to_nu(lambda_observer_frame),
                                                      redshift=redshift, time=time_observer_frame)
-        lbol_1 = _nickelcobalt_engine(time=time, f_nickel=f_nickel, mej=mej)
-        lbol_2 = _shock_cooling(time * day_to_s, mass=mass, radius=radius, energy=energy, **kwargs).lbol
-        lbol = lbol_1 + lbol_2
-        photo = kwargs['photosphere'](time=time, luminosity=lbol, **kwargs)
+        lbol = shock_cooling_and_arnett_bolometric(time, log10_mass=log10_mass, log10_radius=log10_radius,
+                                                   log10_energy=log10_energy, f_nickel=f_nickel,
+                                                   mej=mej, vej=vej, kappa=kappa, kappa_gamma=kappa_gamma,
+                                                   temperature_floor=temperature_floor, **kwargs)
+        photo = kwargs['photosphere'](time=time, luminosity=lbol, vej=vej, temperature_floor=temperature_floor, **kwargs)
         sed_1 = kwargs['sed'](temperature=photo.photosphere_temperature, r_photosphere=photo.r_photosphere,
                               frequency=frequency[:,None], luminosity_distance=dl)
         fmjy = sed_1.flux_density.T

{redback-1.1 → redback-1.12.0}/redback.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: redback
-Version: 1.1
+Version: 1.12.0
 Summary: A Bayesian inference and modelling pipeline for electromagnetic transients
 Home-page: https://github.com/nikhil-sarin/redback
 Author: Nikhil Sarin, Moritz Huebner

{redback-1.1 → redback-1.12.0}/redback.egg-info/SOURCES.txt

@@ -118,8 +118,10 @@ redback/priors/radiative_losses.prior
 redback/priors/radiative_losses_mdr.prior
 redback/priors/radiative_losses_smoothness.prior
 redback/priors/radiative_only.prior
+redback/priors/salt2.prior
 redback/priors/shock_cooling.prior
 redback/priors/shock_cooling_and_arnett.prior
+redback/priors/shock_cooling_and_arnett_bolometric.prior
 redback/priors/shock_cooling_bolometric.prior
 redback/priors/shockcooling_morag.prior
 redback/priors/shockcooling_morag_and_arnett.prior

{redback-1.1 → redback-1.12.0}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setup(
     name='redback',
-    version='1.1',
+    version='1.12.0',
     description='A Bayesian inference and modelling pipeline for electromagnetic transients',
     long_description=long_description,
     long_description_content_type="text/markdown",