redback 1.0.1__py3-none-any.whl → 1.0.2__py3-none-any.whl

redback/transient_models/afterglow_models.py

@@ -2092,6 +2092,48 @@ def tophat(time, redshift, thv, loge0, thc, logn0, p, logepse, logepsb, ksin, g0
     elif kwargs['output_format'] == 'magnitude':
         return calc_ABmag_from_flux_density(flux_density).value
 
+
+def tophat_from_emulator(time, redshift, thv, loge0, thc, logn0, p, logepse, logepsb, g0, **kwargs):
+    """
+    Evaluate a tophat afterglow model using an mpl regressor. Note that this model predicts for a fixed redshift = 0.01 and fixed ksin = 1.
+    This tophat model does not include all of the ususal kwargs
+
+    :param time: time in days in observer frame, should be in range 0.1 to 300
+    :param redshift: source redshift
+    :param thv: viewing angle in radians
+    :param loge0: log10 on axis isotropic equivalent energy
+    :param thc: half width of jet core/jet opening angle in radians
+    :param logn0: log10 number density of ISM in cm^-3
+    :param p: electron distribution power law index. Must be greater than 2.
+    :param logepse: log10 fraction of thermal energy in electrons
+    :param logepsb: log10 fraction of thermal energy in magnetic field
+    :param g0: initial lorentz factor
+    :param kwargs: Additional keyword arguments
+    :param frequency: frequency of the band to view in- single number or same length as time array
+    :param output_format: Whether to output flux density or AB mag, specified by 'flux_density' or 'magnitude'
+    :return: flux density or AB mag predicted by emulator. Note this is going to give the monochromatic magnitude at the effective frequency for the band.
+        For a proper calculation of the magntitude use the sed variant models
+    """
+
+    from redback_surrogates.afterglowmodels import tophat_emulator
+    
+    z1=0.01
+    z2= redshift
+    frequency= np.log10(kwargs['frequency'])    
+    flux_density = tophat_emulator(new_time=time/(1+z2), thv=thv, loge0=loge0, thc=thc, logn0=logn0, p=p,
+                                            logepse=logepse, logepsb=logepsb, g0=g0,frequency=frequency)
+        
+    #scaling flux density with redshift
+    dl1 = cosmo.luminosity_distance(z1)
+    dl2 = cosmo.luminosity_distance(z2)
+    scale_factor = ((dl1**2)*(1+z1)) / (dl2**2)
+    flux_density=flux_density*scale_factor
+    
+    if kwargs['output_format'] == 'flux_density':
+        return flux_density
+    elif kwargs['output_format'] == 'magnitude':
+        return calc_ABmag_from_flux_density(flux_density).value
+
 @citation_wrapper('https://ui.adsabs.harvard.edu/abs/2020ApJ...896..166R/abstract')
 def afterglow_models_with_energy_injection(time, **kwargs):
     """

redback/transient_models/combined_models.py

@@ -1,5 +1,9 @@
-import redback.transient_models.extinction_models
-def tophat_and_twolayerstratified(time, redshift, av, thv, loge0, thc, logn0, p, logepse, logepsb, ksin, g0, mej, vej_1, vej_2, kappa, beta, **kwargs):
+import redback.transient_models.extinction_models as em
+from redback.utils import citation_wrapper
+
+@citation_wrapper('https://ui.adsabs.harvard.edu/abs/2020ApJ...896..166R/abstract, https://ui.adsabs.harvard.edu/abs/2020ApJ...891..152H/abstract')
+def tophat_and_twolayerstratified(time, redshift, av, thv, loge0, thc, logn0, p, logepse,
+                                  logepsb, ksin, g0, mej, vej_1, vej_2, kappa, beta, **kwargs):
     
     """
     function to combine the flux density signals of a tophat afterglow and a two layer stratified kilonova with extinction
@@ -36,18 +40,20 @@ def tophat_and_twolayerstratified(time, redshift, av, thv, loge0, thc, logn0, p,
     """
     kwargs['output_format']='flux_density'
     kwargs['base_model']='tophat'
-    afterglow = redback.transient_models.extinction_models.extinction_with_afterglow_base_model(time=time, redshift=redshift, av=av,
+    afterglow = em.extinction_with_afterglow_base_model(time=time, redshift=redshift, av=av,
          thv=thv, loge0=loge0 , thc= thc, logn0=logn0, p=p, logepse=logepse, logepsb=logepsb, ksin=ksin, g0=g0,
         **kwargs)
     kwargs['base_model']='two_layer_stratified_kilonova'
-    kilonova = redback.transient_models.extinction_models.extinction_with_kilonova_base_model(time=time, redshift=redshift, av=av,
+    kilonova = em.extinction_with_kilonova_base_model(time=time, redshift=redshift, av=av,
           mej=mej, vej_1=vej_1, vej_2=vej_2, kappa=kappa, beta=beta, **kwargs)
     
     combined = afterglow+kilonova
     return combined
 
-
-def tophat_and_twocomponent(time, redshift, av, thv, loge0, thc, logn0, p, logepse, logepsb, ksin, g0, mej_1, vej_1, temperature_floor_1, kappa_1, mej_2, vej_2, temperature_floor_2, kappa_2, **kwargs):
+@citation_wrapper('https://ui.adsabs.harvard.edu/abs/2020ApJ...896..166R/abstract, redback')
+def tophat_and_twocomponent(time, redshift, av, thv, loge0, thc, logn0,
+                            p, logepse, logepsb, ksin, g0, mej_1, vej_1,
+                            temperature_floor_1, kappa_1, mej_2, vej_2, temperature_floor_2, kappa_2, **kwargs):
     
     """
     function to combine the flux density signals of a tophat afterglow and a two component kilonova with extinction added
@@ -85,19 +91,21 @@ def tophat_and_twocomponent(time, redshift, av, thv, loge0, thc, logn0, p, logep
     :return: flux density signal with extinction added
     """
     
-    kwargs['output_format']='flux_density'
-    kwargs['base_model']='tophat'
-    afterglow = redback.transient_models.extinction_models.extinction_with_afterglow_base_model(time=time, redshift=redshift, av=av,
-          thv=thv, loge0=loge0 , thc= thc, logn0=logn0, p=p, logepse=logepse, logepsb=logepsb, ksin=ksin, g0=g0,
-        **kwargs)
-    kwargs['base_model']='two_component_kilonova_model'
-    kilonova = redback.transient_models.extinction_models.extinction_with_kilonova_base_model(time=time, redshift=redshift, av=av,
-          mej_1=mej_1, vej_1=vej_2, temperature_floor_1=temperature_floor_1, kappa_1=kappa_1,             mej_2=mej_2, vej_2=vej_2, temperature_floor_2=temperature_floor_2, kappa_2=kappa_2, **kwargs)
+    kwargs['output_format'] = 'flux_density'
+    kwargs['base_model'] = 'tophat'
+    afterglow = em.extinction_with_afterglow_base_model(time=time, redshift=redshift, av=av,
+          thv=thv, loge0=loge0, thc=thc, logn0=logn0, p=p, logepse=logepse, logepsb=logepsb, ksin=ksin, g0=g0,**kwargs)
+
+    kwargs['base_model'] = 'two_component_kilonova_model'
+    kilonova = em.extinction_with_kilonova_base_model(time=time, redshift=redshift, av=av,
+                                                      mej_1=mej_1, vej_1=vej_1, temperature_floor_1=temperature_floor_1,
+                                                      kappa_1=kappa_1, mej_2=mej_2, vej_2=vej_2,
+                                                      temperature_floor_2=temperature_floor_2, kappa_2=kappa_2, **kwargs)
     
     combined = afterglow + kilonova
     return combined
 
-
+@citation_wrapper('https://ui.adsabs.harvard.edu/abs/2020ApJ...896..166R/abstract, https://ui.adsabs.harvard.edu/abs/1982ApJ...253..785A/abstract')
 def tophat_and_arnett(time, av, redshift, thv, loge0, thc, logn0, p, logepse, logepsb, ksin, g0, f_nickel, mej, **kwargs):
     
     """
@@ -137,19 +145,20 @@ def tophat_and_arnett(time, av, redshift, thv, loge0, thc, logn0, p, logepse, lo
     :return: flux density with extinction added
     """
     
-    kwargs['output_format']='flux_density'
-    kwargs['base_model']='tophat'
-    afterglow = redback.transient_models.extinction_models.extinction_with_afterglow_base_model(time=time, redshift=redshift, av=av,
-         thv=thv, loge0=loge0 , thc= thc, logn0=logn0, p=p, logepse=logepse, logepsb=logepsb, ksin=ksin, g0=g0,
+    kwargs['output_format'] = 'flux_density'
+    kwargs['base_model'] = 'tophat'
+    afterglow = em.extinction_with_afterglow_base_model(time=time, redshift=redshift, av=av,
+         thv=thv, loge0=loge0, thc=thc, logn0=logn0, p=p, logepse=logepse, logepsb=logepsb, ksin=ksin, g0=g0,
         **kwargs)
-    kwargs['base_model']='arnett'
-    supernova = redback.transient_models.extinction_models.extinction_with_supernova_base_model(time=time, redshift=redshift, av=av,
+    kwargs['base_model'] = 'arnett'
+    supernova = em.extinction_with_supernova_base_model(time=time, redshift=redshift, av=av,
          f_nickel=f_nickel, mej=mej, **kwargs)
     
     combined = afterglow + supernova
     return combined
 
-def afterglow_and_optical(time, redshift, av, model_type, afterglow_kwargs, optical_kwargs, **shared_kwargs):
+@citation_wrapper('redback, and any citations for the specific model you use')
+def afterglow_and_optical(time, redshift, av, **model_kwargs):
     
     """
     function to combine the signals of any afterglow and any other optical transient with extinction added
@@ -157,26 +166,32 @@ def afterglow_and_optical(time, redshift, av, model_type, afterglow_kwargs, opti
     :param time: time in days in observer frame
     :param redshift: source redshift
     :param av: absolute mag extinction
+    :param model_kwargs: kwargs shared by models e.g. output_format, frequency, bands, r_v (extinction paramater defaults to 3.1)
     :param model_type: specify type of optical transient model- 'supernova', 'tde', 'kilonova', 'magnetar_driven', 'shock_powered'
     :param afterglow_kwargs: dictionary of  parameters required by the afterglow transient model specified by 'base_model'
         and any additional keyword arguments. Refer to model documentation for details.
     :param optical_kwargs: dictionary of parameters required by the optical transient model specifed by 'base_model'
         and any additional keyword arguments. Note the base model must correspond to the given model type. Refer to model documentation
         for details.
-    :param shared_kwargs: kwargs shared by models e.g. output_format, frequency, bands, r_v (extinction paramater defaults to 3.1)
     :return: set by shared_kwargs output format - 'flux_density' or 'magnitude' with extinction added
         note that only afterglow_models_sed allow for magnitude outputs
     """
+
+    optical_kwargs = model_kwargs['optical_kwargs']
+    afterglow_kwargs = model_kwargs['afterglow_kwargs']
+
+    _afterglow_kwargs = afterglow_kwargs.copy()
+    _afterglow_kwargs.update(model_kwargs)
+    _afterglow_kwargs.pop('model_type')
+
+    _optical_kwargs = optical_kwargs.copy()
+    _optical_kwargs.update(model_kwargs)
+
+    afterglow = em._evaluate_extinction_model(time=time, redshift=redshift, av=av,model_type='afterglow',
+                                              **_afterglow_kwargs)
     
-    afterglow_kwargs.update(shared_kwargs)
-    optical_kwargs.update(shared_kwargs)
-   
-    afterglow = redback.transient_models.extinction_models._evaluate_extinction_model(time=time, redshift=redshift, av=av,
-                                                                                   model_type='afterglow', **afterglow_kwargs)
-    
-    optical= redback.transient_models.extinction_models._evaluate_extinction_model(time=time, redshift=redshift, av=av,
-                                                                   model_type=model_type, **optical_kwargs)
-  
+    optical = em._evaluate_extinction_model(time=time, redshift=redshift, av=av, **_optical_kwargs)
+
     combined= afterglow + optical
     return combined
     

redback/transient_models/extinction_models.py

@@ -1,6 +1,5 @@
 from inspect import isfunction
 import numpy as np
-
 import redback.utils
 from redback.transient_models.fireball_models import predeceleration
 from redback.utils import logger, calc_ABmag_from_flux_density, citation_wrapper, lambda_to_nu
@@ -12,12 +11,14 @@ extinction_afterglow_base_models = ['tophat', 'cocoon', 'gaussian',
                                     'kn_afterglow', 'cone_afterglow',
                                     'gaussiancore', 'gaussian',
                                     'smoothpowerlaw', 'powerlawcore',
+                                    'tophat','tophat_from_emulator',
                                     'kilonova_afterglow_redback', 'kilonova_afterglow_nakarpiran',
                                     'tophat_redback', 'gaussian_redback', 'twocomponent_redback',
                                     'powerlaw_redback', 'alternativepowerlaw_redback', 'doublegaussian_redback',
                                     'tophat_redback_refreshed', 'gaussian_redback_refreshed',
                                     'twocomponent_redback_refreshed','powerlaw_redback_refreshed',
                                     'alternativepowerlaw_redback_refreshed', 'doublegaussian_redback_refreshed']
+
 extinction_integrated_flux_afterglow_models = extinction_afterglow_base_models
 extinction_supernova_base_models = ['sn_exponential_powerlaw', 'arnett', 'shock_cooling_and_arnett',
                                     'basic_magnetar_powered', 'slsn', 'magnetar_nickel',
@@ -25,17 +26,17 @@ extinction_supernova_base_models = ['sn_exponential_powerlaw', 'arnett', 'shock_
                                     'general_magnetar_slsn','general_magnetar_driven_supernova']
 extinction_kilonova_base_models = ['nicholl_bns', 'mosfit_rprocess', 'mosfit_kilonova',
                                    'power_law_stratified_kilonova','bulla_bns_kilonova',
-                                   'bulla_nsbh_kilonova', 'kasen_nsbh_kilonova','two_layer_stratified_kilonova',
+                                   'bulla_nsbh_kilonova', 'kasen_bns_kilonova','two_layer_stratified_kilonova',
                                    'three_component_kilonova_model', 'two_component_kilonova_model',
                                    'one_component_kilonova_model', 'one_component_ejecta_relation',
                                    'one_component_ejecta_relation_projection', 'two_component_bns_ejecta_relation',
                                    'polytrope_eos_two_component_bns', 'one_component_nsbh_ejecta_relation',
                                    'two_component_nsbh_ejecta_relation','metzger_kilonova_model']
 extinction_tde_base_models = ['tde_analytical', 'tde_semianalytical', 'gaussianrise_cooling_envelope',
-                              'cooling_envelope']
+                              'cooling_envelope', 'bpl_cooling_envelope']
 extinction_magnetar_driven_base_models = ['basic_mergernova', 'general_mergernova', 'general_mergernova_thermalisation',
                                           'general_mergernova_evolution', 'metzger_magnetar_driven_kilonova_model',
-                                          'general_metzger_magnetar_driven', 'general_magnetar_driven_thermalisation',
+                                          'general_metzger_magnetar_driven', 'general_metzger_magnetar_driven_thermalisation',
                                           'general_metzger_magnetar_driven_evolution']
 extinction_shock_powered_base_models = ['shocked_cocoon', 'shock_cooling']
 

redback/transient_models/kilonova_models.py

@@ -10,7 +10,7 @@ from redback.photosphere import TemperatureFloor, CocoonPhotosphere
 from redback.interaction_processes import Diffusion, AsphericalDiffusion
 
 from redback.utils import calc_kcorrected_properties, interpolated_barnes_and_kasen_thermalisation_efficiency, \
-    electron_fraction_from_kappa, citation_wrapper, lambda_to_nu
+    electron_fraction_from_kappa, citation_wrapper, lambda_to_nu, get_heating_terms, kappa_from_electron_fraction
 from redback.eos import PiecewisePolytrope
 from redback.sed import blackbody_to_flux_density, get_correct_output_format_from_spectra, Blackbody
 from redback.constants import *
@@ -476,7 +476,7 @@ def mosfit_rprocess(time, redshift, mej, vej, kappa, kappa_gamma, temperature_fl
     cosmology = kwargs.get('cosmology', cosmo)
     dl = cosmology.luminosity_distance(redshift).cgs.value
     dense_resolution = kwargs.get('dense_resolution', 300)
-    time_temp = np.geomspace(1e-2, 5e6, dense_resolution) # in source frame
+    time_temp = np.geomspace(1e-2, 7e6, dense_resolution) # in source frame
     time_obs = time
     lbols = _mosfit_kilonova_one_component_lbol(time=time_temp,
                                                 mej=mej, vej=vej)
@@ -555,7 +555,7 @@ def mosfit_kilonova(time, redshift, mej_1, vej_1, temperature_floor_1, kappa_1,
     cosmology = kwargs.get('cosmology', cosmo)
     dl = cosmology.luminosity_distance(redshift).cgs.value
     dense_resolution = kwargs.get('dense_resolution', 300)
-    time_temp = np.geomspace(1e-2, 5e6, dense_resolution)  # in source frame
+    time_temp = np.geomspace(1e-2, 7e6, dense_resolution)  # in source frame
     time_obs = time
     mej = [mej_1, mej_2, mej_3]
     vej = [vej_1, vej_2, vej_3]
@@ -817,7 +817,7 @@ def kasen_bns_kilonova(time, redshift, mej, vej, chi, **kwargs):
         fmjy = spectra.to(uu.mJy, equivalencies=uu.spectral_density(wav=output.lambdas * uu.Angstrom)).value
         nu_array = lambda_to_nu(output.lambdas)
         fmjy_func = RegularGridInterpolator((np.unique(time), nu_array), fmjy, bounds_error=False)
-        if type(frequency) == float:
+        if type(frequency) == float or type(frequency) == np.float64:
             frequency = np.ones(len(time)) * frequency
         points = np.array([time, frequency]).T
         return fmjy_func(points)
@@ -890,6 +890,11 @@ def _kilonova_hr(time, redshift, mej, velocity_array, kappa_array, beta, **kwarg
         time = time * day_to_s
         # convert to source frame time and frequency
         frequency, time = calc_kcorrected_properties(frequency=frequency, redshift=redshift, time=time)
+        if (isinstance(frequency, (float, int)) == False):
+            radio_mask = frequency < 10e10
+            frequency[radio_mask]=10e50
+        elif frequency < 10e10:
+            frequency =10e50
 
         _, temperature, r_photosphere = _kilonova_hr_sourceframe(time, mej, velocity_array, kappa_array, beta)
 
@@ -974,7 +979,7 @@ def three_component_kilonova_model(time, redshift, mej_1, vej_1, temperature_flo
     """
     cosmology = kwargs.get('cosmology', cosmo)
     dl = cosmology.luminosity_distance(redshift).cgs.value
-    time_temp = np.geomspace(1e-2, 5e6, 300) # in source frame
+    time_temp = np.geomspace(1e-2, 7e6, 300) # in source frame
     time_obs = time
 
     mej = [mej_1, mej_2, mej_3]
@@ -1063,7 +1068,7 @@ def two_component_kilonova_model(time, redshift, mej_1, vej_1, temperature_floor
     """
     cosmology = kwargs.get('cosmology', cosmo)
     dl = cosmology.luminosity_distance(redshift).cgs.value
-    time_temp = np.geomspace(1e-2, 5e6, 300) # in source frame
+    time_temp = np.geomspace(1e-2, 7e6, 300) # in source frame
     time_obs = time
 
     mej = [mej_1, mej_2]
@@ -1376,7 +1381,7 @@ def one_component_kilonova_model(time, redshift, mej, vej, kappa, **kwargs):
     """
     cosmology = kwargs.get('cosmology', cosmo)
     dl = cosmology.luminosity_distance(redshift).cgs.value
-    time_temp = np.geomspace(1e-3, 5e6, 300) # in source frame
+    time_temp = np.geomspace(1e-3, 7e6, 300) # in source frame
     time_obs = time
     _, temperature, r_photosphere = _one_component_kilonova_model(time_temp, mej, vej, kappa, **kwargs)
 
@@ -1416,6 +1421,234 @@ def one_component_kilonova_model(time, redshift, mej, vej, kappa, **kwargs):
                                                           spectra=spectra, lambda_array=lambda_observer_frame,
                                                           **kwargs)
 
+
+def _calc_new_heating_rate(time, mej, electron_fraction, ejecta_velocity, **kwargs):
+    """
+    Heating rate prescription following Rosswog and Korobkin 2022
+
+    :param time: time in seconds
+    :param mej: ejecta mass in solar masses
+    :param electron_fraction: electron fraction
+    :param ejecta_velocity: ejecta velocity in c
+    :param kwargs: Additional keyword arguments
+    :param heating_rate_perturbation: A fudge factor for heating rate to account for uncertainties in the heating rate. Default is 1.0 i.e., no perturbation.
+    :param heating_rate_fudge: A fudge factor for each of the terms in the heating rate. Default to 1. i.e., no uncertainty
+    Default is 1.0 i.e., no perturbation.
+    :return: heating rate in erg/s
+    """
+    heating_terms = get_heating_terms(electron_fraction, ejecta_velocity, **kwargs)
+    heating_rate_perturbation = kwargs.get('heating_rate_perturbation', 1.0)
+    # rescale
+    m0 = mej * solar_mass
+    c1 = np.exp(heating_terms.c1)
+    c2 = np.exp(heating_terms.c2)
+    c3 = np.exp(heating_terms.c3)
+    tau1 = 1e3*heating_terms.tau1
+    tau2 = 1e5*heating_terms.tau2
+    tau3 = 1e5*heating_terms.tau3
+    term1 = 10.**(heating_terms.e0+18) * (0.5 - np.arctan((time - heating_terms.t0) / heating_terms.sig) / np.pi)**heating_terms.alp
+    term2 = (0.5 + np.arctan((time - heating_terms.t1)/heating_terms.sig1) / np.pi )**heating_terms.alp1
+    term3 = c1 * np.exp(-time/tau1)
+    term4 = c2 * np.exp(-time/tau2)
+    term5 = c3 * np.exp(-time/tau3)
+    lum_in = term1*term2 + term3 + term4 + term5
+    return lum_in*m0 * heating_rate_perturbation
+
+def _one_component_kilonova_rosswog_heatingrate(time, mej, vej, electron_fraction, **kwargs):
+    tdays = time/day_to_s
+    # set up kilonova physics
+    av, bv, dv = interpolated_barnes_and_kasen_thermalisation_efficiency(mej, vej)
+    # thermalisation from Barnes+16
+    e_th = 0.36 * (np.exp(-av * tdays) + np.log1p(2.0 * bv * tdays ** dv) / (2.0 * bv * tdays ** dv))
+    temperature_floor = kwargs.get('temperature_floor', 4000)  # kelvin
+    beta = 13.7
+
+    v0 = vej * speed_of_light
+    m0 = mej * solar_mass
+    kappa = kappa_from_electron_fraction(electron_fraction)
+    tdiff = np.sqrt(2.0 * kappa * (m0) / (beta * v0 * speed_of_light))
+
+    lum_in = _calc_new_heating_rate(time, mej, electron_fraction, vej, **kwargs)
+    integrand = lum_in * e_th * (time / tdiff) * np.exp(time ** 2 / tdiff ** 2)
+
+    bolometric_luminosity = np.zeros(len(time))
+    bolometric_luminosity[1:] = cumtrapz(integrand, time)
+    bolometric_luminosity[0] = bolometric_luminosity[1]
+    bolometric_luminosity = bolometric_luminosity * np.exp(-time ** 2 / tdiff ** 2) / tdiff
+
+    temperature = (bolometric_luminosity / (4.0 * np.pi * sigma_sb * v0 ** 2 * time ** 2)) ** 0.25
+    r_photosphere = (bolometric_luminosity / (4.0 * np.pi * sigma_sb * temperature_floor ** 4)) ** 0.5
+
+    # check temperature floor conditions
+    mask = temperature <= temperature_floor
+    temperature[mask] = temperature_floor
+    mask = np.logical_not(mask)
+    r_photosphere[mask] = v0 * time[mask]
+    return bolometric_luminosity, temperature, r_photosphere
+
+@citation_wrapper('https://ui.adsabs.harvard.edu/abs/2024arXiv240407271S/abstract, https://ui.adsabs.harvard.edu/abs/2024AnP...53600306R/abstract')
+def one_comp_kne_rosswog_heatingrate(time, redshift, mej, vej, ye, **kwargs):
+    """
+    :param time: observer frame time in days
+    :param redshift: redshift
+    :param mej: ejecta mass in solar masses
+    :param vej: minimum initial velocity
+    :param kappa: gray opacity
+    :param kwargs: Additional keyword arguments
+    :param temperature_floor: Temperature floor in K (default 4000)
+    :param heating_rate_perturbation: A fudge factor for heating rate to account for uncertainties in the heating rate.
+    Default is 1.0 i.e., no perturbation.
+    :param heating_rate_fudge: A fudge factor for each of the terms in the heating rate. Default to 1. i.e., no uncertainty
+    :param frequency: Required if output_format is 'flux_density'.
+        frequency to calculate - Must be same length as time array or a single number).
+    :param bands: Required if output_format is 'magnitude' or 'flux'.
+    :param output_format: 'flux_density', 'magnitude', 'spectra', 'flux', 'sncosmo_source'
+    :param lambda_array: Optional argument to set your desired wavelength array (in Angstroms) to evaluate the SED on.
+    :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'
+    """
+    cosmology = kwargs.get('cosmology', cosmo)
+    dl = cosmology.luminosity_distance(redshift).cgs.value
+    time_temp = np.geomspace(1e-3, 7e6, 300) # in source frame
+    time_obs = time
+    _, temperature, r_photosphere = _one_component_kilonova_rosswog_heatingrate(time_temp, mej, vej, ye, **kwargs)
+
+    if kwargs['output_format'] == 'flux_density':
+        time = time_obs * day_to_s
+        frequency = kwargs['frequency']
+        # interpolate properties onto observation times
+        temp_func = interp1d(time_temp, y=temperature)
+        rad_func = interp1d(time_temp, y=r_photosphere)
+        # convert to source frame time and frequency
+        frequency, time = calc_kcorrected_properties(frequency=frequency, redshift=redshift, time=time)
+
+        temp = temp_func(time)
+        photosphere = rad_func(time)
+
+        flux_density = blackbody_to_flux_density(temperature=temp, r_photosphere=photosphere,
+                                                 dl=dl, frequency=frequency)
+
+        return flux_density.to(uu.mJy).value
+
+    else:
+        lambda_observer_frame = kwargs.get('lambda_array', np.geomspace(100, 60000, 200))
+        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)
+        fmjy = blackbody_to_flux_density(temperature=temperature,
+                                         r_photosphere=r_photosphere, frequency=frequency[:, None], dl=dl)
+        fmjy = fmjy.T
+        spectra = fmjy.to(uu.mJy).to(uu.erg / uu.cm ** 2 / uu.s / uu.Angstrom,
+                                     equivalencies=uu.spectral_density(wav=lambda_observer_frame * uu.Angstrom))
+        if kwargs['output_format'] == 'spectra':
+            return namedtuple('output', ['time', 'lambdas', 'spectra'])(time=time_observer_frame,
+                                                                           lambdas=lambda_observer_frame,
+                                                                           spectra=spectra)
+        else:
+            return get_correct_output_format_from_spectra(time=time_obs, time_eval=time_observer_frame/day_to_s,
+                                                          spectra=spectra, lambda_array=lambda_observer_frame,
+                                                          **kwargs)
+
+@citation_wrapper('https://ui.adsabs.harvard.edu/abs/2024arXiv240407271S/abstract, https://ui.adsabs.harvard.edu/abs/2024AnP...53600306R/abstract')
+def two_comp_kne_rosswog_heatingrate(time, redshift, mej_1, vej_1, temperature_floor_1, ye_1,
+                                 mej_2, vej_2, temperature_floor_2, ye_2, **kwargs):
+    """
+    :param time: observer frame time in days
+    :param redshift: redshift
+    :param mej_1: ejecta mass in solar masses of first component
+    :param vej_1: minimum initial velocity of first component
+    :param kappa_1: gray opacity of first component
+    :param temperature_floor_1: floor temperature of first component
+    :param mej_2: ejecta mass in solar masses of second component
+    :param vej_2: minimum initial velocity of second component
+    :param temperature_floor_2: floor temperature of second component
+    :param kappa_2: gray opacity of second component
+    :param kwargs: Additional keyword arguments
+    :param heating_rate_perturbation: A fudge factor for heating rate to account for uncertainties in the heating rate.
+    Default is 1.0 i.e., no perturbation.
+    :param heating_rate_fudge: A fudge factor for each of the terms in the heating rate. Default to 1. i.e., no uncertainty
+    :param frequency: Required if output_format is 'flux_density'.
+        frequency to calculate - Must be same length as time array or a single number).
+    :param bands: Required if output_format is 'magnitude' or 'flux'.
+    :param output_format: 'flux_density', 'magnitude', 'spectra', 'flux', 'sncosmo_source'
+    :param lambda_array: Optional argument to set your desired wavelength array (in Angstroms) to evaluate the SED on.
+    :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'
+    """
+    cosmology = kwargs.get('cosmology', cosmo)
+    dl = cosmology.luminosity_distance(redshift).cgs.value
+    time_temp = np.geomspace(1e-2, 7e6, 300) # in source frame
+    time_obs = time
+
+    mej = [mej_1, mej_2]
+    vej = [vej_1, vej_2]
+    temperature_floor = [temperature_floor_1, temperature_floor_2]
+    ye = [ye_1, ye_2]
+
+    if kwargs['output_format'] == 'flux_density':
+        time = time * day_to_s
+        frequency = kwargs['frequency']
+
+        # convert to source frame time and frequency
+        frequency, time = calc_kcorrected_properties(frequency=frequency, redshift=redshift, time=time)
+
+        ff = np.zeros(len(time))
+        for x in range(2):
+            temp_kwargs = {}
+            if 'heating_rate_fudge' in kwargs:
+                temp_kwargs['heating_rate_fudge'] = kwargs['heating_rate_fudge']
+            if 'heating_rate_perturbation' in kwargs:
+                temp_kwargs['heating_rate_perturbation'] = kwargs['heating_rate_perturbation']
+            temp_kwargs['temperature_floor'] = temperature_floor[x]
+            _, temperature, r_photosphere = _one_component_kilonova_rosswog_heatingrate(time_temp, mej[x], vej[x], ye[x],
+                                                                          **temp_kwargs)
+            # interpolate properties onto observation times
+            temp_func = interp1d(time_temp, y=temperature)
+            rad_func = interp1d(time_temp, y=r_photosphere)
+            temp = temp_func(time)
+            photosphere = rad_func(time)
+            flux_density = blackbody_to_flux_density(temperature=temp, r_photosphere=photosphere,
+                                                     dl=dl, frequency=frequency)
+            units = flux_density.unit
+            ff += flux_density.value
+
+        ff = ff * units
+        return ff.to(uu.mJy).value
+
+    else:
+        lambda_observer_frame = kwargs.get('lambda_array', np.geomspace(100, 60000, 200))
+        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)
+        full_spec = np.zeros((len(time), len(frequency)))
+
+        for x in range(2):
+            temp_kwargs = {}
+            if 'heating_rate_fudge' in kwargs:
+                temp_kwargs['heating_rate_fudge'] = kwargs['heating_rate_fudge']
+            if 'heating_rate_perturbation' in kwargs:
+                temp_kwargs['heating_rate_perturbation'] = kwargs['heating_rate_perturbation']
+            temp_kwargs['temperature_floor'] = temperature_floor[x]
+            _, temperature, r_photosphere = _one_component_kilonova_rosswog_heatingrate(time_temp, mej[x], vej[x], ye[x],
+                                                                          **temp_kwargs)
+            fmjy = blackbody_to_flux_density(temperature=temperature,
+                                             r_photosphere=r_photosphere, frequency=frequency[:, None], dl=dl)
+            fmjy = fmjy.T
+            spectra = fmjy.to(uu.mJy).to(uu.erg / uu.cm ** 2 / uu.s / uu.Angstrom,
+                                         equivalencies=uu.spectral_density(wav=lambda_observer_frame * uu.Angstrom))
+            units = spectra.unit
+            full_spec += spectra.value
+
+        full_spec = full_spec * units
+        if kwargs['output_format'] == 'spectra':
+            return namedtuple('output', ['time', 'lambdas', 'spectra'])(time=time_observer_frame,
+                                                                           lambdas=lambda_observer_frame,
+                                                                           spectra=full_spec)
+        else:
+            return get_correct_output_format_from_spectra(time=time_obs, time_eval=time_observer_frame/day_to_s,
+                                                          spectra=full_spec, lambda_array=lambda_observer_frame,
+                                                          **kwargs)
+
 def _one_component_kilonova_model(time, mej, vej, kappa, **kwargs):
     """
     :param time: source frame time in seconds
@@ -1479,7 +1712,7 @@ def metzger_kilonova_model(time, redshift, mej, vej, beta, kappa, **kwargs):
     """
     cosmology = kwargs.get('cosmology', cosmo)
     dl = cosmology.luminosity_distance(redshift).cgs.value
-    time_temp = np.geomspace(1e-4, 1e7, 300) # in source frame
+    time_temp = np.geomspace(1e-4, 7e6, 300) # in source frame
     time_obs = time
     bolometric_luminosity, temperature, r_photosphere = _metzger_kilonova_model(time_temp, mej, vej, beta,
                                                                                 kappa, **kwargs)

redback/transient_models/magnetar_driven_ejecta_models.py

@@ -58,8 +58,8 @@ def _ejecta_dynamics_and_interaction(time, mej, beta, ejecta_radius, kappa, n_is
     
     ni56_lum = 6.45e43
     co56_lum = 1.45e43
-    ni56_life = 8.8  # days
-    co56_life = 111.3  # days    
+    ni56_life = 8.8*86400  # days
+    co56_life = 111.3*86400  # days    
 
     for i in range(len(time)):
         beta = np.sqrt(1 - 1 / gamma ** 2)

redback/transient_models/phenomenological_models.py

@@ -1,5 +1,18 @@
 import numpy as np
 
+def line_spectrum(wavelength, line_amp, cont_amp, x0):
+    """
+    A gaussian to add or subtract from a continuum spectrum to mimic absorption or emission lines
+
+    :param wavelength: wavelength array in whatever units
+    :param line_amp: line amplitude scale
+    :param cont_amp: Continuum amplitude scale
+    :param x0: Position of emission line
+    :return: spectrum in whatever units set by line_amp
+    """
+    spectrum = line_amp / cont_amp * np.exp(-(wavelength - x0) ** 2. / (2 * cont_amp ** 2) )
+    return spectrum
+
 def gaussian_rise(time, a_1, peak_time, sigma_t):
     """
     :param time: time array in whatver time units