redback 1.12.0__py3-none-any.whl → 1.12.1__py3-none-any.whl

redback/priors/gaussianrise_cooling_envelope.prior

@@ -5,8 +5,4 @@ mbh_6 = LogUniform(0.01, 20, name='mbh_6', latex_label = r'$M_{\mathrm{BH}}~(10^
 stellar_mass = LogUniform(0.1, 10, name='stellar_mass', latex_label = r'$M_{\mathrm{star}}~(M_\odot)$')
 eta = LogUniform(1e-4, 0.1, name='eta', latex_label=r'$\\eta$')
 alpha = LogUniform(0.1, 1, name='alpha', latex_label=r'$\\alpha$')
-beta = Uniform(1, 5, name='beta', latex_label=r'$\\beta$')
-beta = 0.9
-eta = 0.1
-alpha = 0.1
-mbh_6 = 1
+beta = Uniform(1, 5, name='beta', latex_label=r'$\\beta$')

redback/priors/gaussianrise_cooling_envelope_bolometric.prior

@@ -4,8 +4,4 @@ mbh_6 = LogUniform(0.01, 20, name='mbh_6', latex_label = r'$M_{\mathrm{BH}}~(10^
 stellar_mass = LogUniform(0.1, 10, name='stellar_mass', latex_label = r'$M_{\mathrm{star}}~(M_\odot)$')
 eta = LogUniform(1e-4, 0.1, name='eta', latex_label=r'$\\eta$')
 alpha = LogUniform(0.1, 1, name='alpha', latex_label=r'$\\alpha$')
-beta = Uniform(1, 5, name='beta', latex_label=r'$\\beta$')
-beta = 0.9
-eta = 0.1
-alpha = 0.1
-mbh_6 = 1
+beta = Uniform(1, 5, name='beta', latex_label=r'$\\beta$')

redback/priors/powerlaw_plus_blackbody.prior

@@ -0,0 +1,12 @@
+redshift = Uniform(0.01, 1.0, 'redshift', latex_label = r'$z$')
+pl_amplitude = LogUniform(1e-20, 1e-12, 'pl_amplitude', latex_label = r'$A_{\mathrm{pl}}~(\mathrm{erg~s^{-1}~cm^{-2}~\AA^{-1}})$')
+pl_slope = Uniform(-2.0, 3.0, 'pl_slope', latex_label = r'$\\alpha_{\mathrm{pl}}$')
+pl_evolution_index = Uniform(0.3, 3.0, 'pl_evolution_index', latex_label = r'$\\beta_{\mathrm{pl}}$')
+temperature_0 = Uniform(3000, 20000, 'temperature_0', latex_label = r'$T_0~(\mathrm{K})$')
+radius_0 = LogUniform(1e13, 1e17, 'radius_0', latex_label = r'$R_0~(\mathrm{cm})$')
+temp_rise_index = Uniform(0.0, 2.0, 'temp_rise_index', latex_label = r'$\\alpha_{T,\mathrm{rise}}$')
+temp_decline_index = Uniform(0.0, 3.0, 'temp_decline_index', latex_label = r'$\\alpha_{T,\mathrm{dec}}$')
+temp_peak_time = LogUniform(0.1, 10.0, 'temp_peak_time', latex_label = r'$t_{T,\mathrm{peak}}~(\mathrm{days})$')
+radius_rise_index = Uniform(0.0, 2.0, 'radius_rise_index', latex_label = r'$\\alpha_{R,\mathrm{rise}}$')
+radius_decline_index = Uniform(0.0, 2.0, 'radius_decline_index', latex_label = r'$\\alpha_{R,\mathrm{dec}}$')
+radius_peak_time = LogUniform(0.1, 10.0, 'radius_peak_time', latex_label = r'$t_{R,\mathrm{peak}}~(\mathrm{days})$')

redback/priors/powerlaw_plus_blackbody_spectrum_at_z.prior

@@ -0,0 +1,13 @@
+redshift = Uniform(0.01, 1.0, 'redshift', latex_label = r'$z$')
+pl_amplitude = LogUniform(1e-20, 1e-12, 'pl_amplitude', latex_label = r'$A_{\mathrm{pl}}~(\mathrm{erg~s^{-1}~cm^{-2}~\AA^{-1}})$')
+pl_slope = Uniform(-2.0, 3.0, 'pl_slope', latex_label = r'$\\alpha_{\mathrm{pl}}$')
+pl_evolution_index = Uniform(0.3, 3.0, 'pl_evolution_index', latex_label = r'$\\beta_{\mathrm{pl}}$')
+temperature_0 = Uniform(3000, 20000, 'temperature_0', latex_label = r'$T_0~(\mathrm{K})$')
+radius_0 = LogUniform(1e13, 1e17, 'radius_0', latex_label = r'$R_0~(\mathrm{cm})$')
+temp_rise_index = Uniform(0.0, 2.0, 'temp_rise_index', latex_label = r'$\\alpha_{T,\mathrm{rise}}$')
+temp_decline_index = Uniform(0.0, 3.0, 'temp_decline_index', latex_label = r'$\\alpha_{T,\mathrm{dec}}$')
+temp_peak_time = LogUniform(0.1, 10.0, 'temp_peak_time', latex_label = r'$t_{T,\mathrm{peak}}~(\mathrm{days})$')
+radius_rise_index = Uniform(0.0, 2.0, 'radius_rise_index', latex_label = r'$\\alpha_{R,\mathrm{rise}}$')
+radius_decline_index = Uniform(0.0, 2.0, 'radius_decline_index', latex_label = r'$\\alpha_{R,\mathrm{dec}}$')
+radius_peak_time = LogUniform(0.1, 10.0, 'radius_peak_time', latex_label = r'$t_{R,\mathrm{peak}}~(\mathrm{days})$')
+time = Uniform(0.5, 10.0, 'time', latex_label = r'$t~(\mathrm{days})$')

redback/priors/smooth_exponential_powerlaw_cooling_envelope_bolometric.prior

@@ -0,0 +1,9 @@
+peak_time = LogUniform(0.1,60, name='peak_time', latex_label = r'$t_{\mathrm{peak}}~(\mathrm{day})$')
+alpha_1 = Uniform(0.5, 3, name='alpha_1', latex_label=r'$\\alpha_{1}$')
+alpha_2 = Uniform(-3, -0.5, name='alpha_2', latex_label=r'$\\alpha_{2}$')
+smoothing_factor = Uniform(0.5, 2.0, name='smoothing_factor', latex_label=r'$s_{\mathrm{smooth}}$')
+mbh_6 = LogUniform(0.01, 20, name='mbh_6', latex_label = r'$M_{\mathrm{BH}}~(10^{6}~M_\odot)$')
+stellar_mass = LogUniform(0.1, 10, name='stellar_mass', latex_label = r'$M_{\mathrm{star}}~(M_\odot)$')
+eta = LogUniform(1e-4, 0.1, name='eta', latex_label=r'$\\eta$')
+alpha = LogUniform(0.1, 1, name='alpha', latex_label=r'$\\alpha$')
+beta = Uniform(1, 5, name='beta', latex_label=r'$\\beta$')

redback/priors/sn_nickel_fallback.prior

@@ -0,0 +1,9 @@
+redshift = Uniform(1e-3,3,name='redshift', latex_label = r'$z$')
+logl1 = Uniform(51, 57, name='logl1', latex_label=r'$\log_{10}L_{1} [erg~s^{-1}]$')
+tr = LogUniform(1e-4, 100, name='tr', latex_label=r'T_{r} [day]')
+mej = LogUniform(1e-4, 100, 'mej', latex_label = r'$M_{\mathrm{ej}}~(M_\odot)$')
+f_nickel = LogUniform(1e-3,1,name='f_nickel', latex_label = r'$f_{\mathrm{Ni}}$')
+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/priors/wr_bh_merger.prior

@@ -0,0 +1,10 @@
+redshift = Uniform(1e-3,3,name='redshift', latex_label = r'$z$')
+M_star = Uniform(5, 50, name='M_star', latex_label = r'$M_{\mathrm{*}}~[M_{\odot}]$')
+M_bh = Uniform(5, 50, name='M_star', latex_label = r'$M_{\mathrm{BH}}~[M_{\odot}]$')
+M_fast = Uniform(0.01, 1, name='M_fast', latex_label = r'$M_{\mathrm{fast}}~[M_{\odot}]$')
+M_pre = Uniform(0.1, 5, name='M_pre', latex_label = r'$M_{\mathrm{pre-SN}}~[M_{\odot}]$')
+v_fast = Uniform(0.05, 0.3, name='v_fast', latex_label = r'$v_{\mathrm{fast}}~[c]$')
+v_slow = LogUniform(1e3, 1e4, 'v_slow', latex_label = r'$v_{\mathrm{slow}}~[\mathrm{km}/\mathrm{s}]$')
+eta = LogUniform(1e-4, 0.1, name='eta', latex_label=r'$\\eta$')
+alpha = LogUniform(0.1, 1, name='alpha', latex_label=r'$\\alpha$')
+temperature_floor = LogUniform(1e3,1e4,name = 'temperature_floor', latex_label = r'$T_{\mathrm{floor}}~(\mathrm{K})$')

redback/priors/wr_bh_merger_bolometric.prior

@@ -0,0 +1,8 @@
+M_star = Uniform(5, 50, name='M_star', latex_label = r'$M_{\mathrm{*}}~[M_{\odot}]$')
+M_bh = Uniform(5, 50, name='M_star', latex_label = r'$M_{\mathrm{BH}}~[M_{\odot}]$')
+M_fast = Uniform(0.01, 1, name='M_fast', latex_label = r'$M_{\mathrm{fast}}~[M_{\odot}]$')
+M_pre = Uniform(0.1, 5, name='M_pre', latex_label = r'$M_{\mathrm{pre-SN}}~[M_{\odot}]$')
+v_fast = Uniform(0.05, 0.3, name='v_fast', latex_label = r'$v_{\mathrm{fast}}~[c]$')
+v_slow = LogUniform(1e3, 1e4, 'v_slow', latex_label = r'$v_{\mathrm{slow}}~[\mathrm{km}/\mathrm{s}]$')
+eta = LogUniform(1e-4, 0.1, name='eta', latex_label=r'$\\eta$')
+alpha = LogUniform(0.1, 1, name='alpha', latex_label=r'$\\alpha$')

redback/priors.py

@@ -45,14 +45,25 @@ def get_priors(model, times=None, y=None, yerr=None, dt=None, **kwargs):
         logger.info(f'Setting up prior for base model {model}.')
         logger.info(f'You will need to explicitly set a prior on t0 and or extinction if relevant')
 
+    # Try loading from main priors folder first
     try:
         filename = os.path.join(os.path.dirname(__file__), 'priors', f'{model}.prior')
         priors.from_file(filename)
+        return priors
     except FileNotFoundError:
-        logger.warning(f'No prior file found for model {model}. '
-                    f'Perhaps you also want to set up the prior for the base model? '
-                    f'Or you may need to set up your prior explicitly.')
+        pass  # Continue to try the non_default_priors folder
+
+    # Try loading from non_default_priors subfolder
+    try:
+        filename = os.path.join(os.path.dirname(__file__), 'priors', 'non_default_priors', f'{model}.prior')
+        priors.from_file(filename)
+        return priors
+    except FileNotFoundError:
+        logger.warning(f'No prior file found for model {model} in either priors or non_default_priors folders. '
+                       f'Perhaps you also want to set up the prior for the base model? '
+                       f'Or you may need to set up your prior explicitly.')
         logger.info('Returning Empty PriorDict.')
+
     return priors
 
 

redback/sed.py

@@ -6,6 +6,7 @@ from sncosmo import TimeSeriesSource
 from redback.constants import *
 from redback.utils import nu_to_lambda, bandpass_magnitude_to_flux
 
+
 def _bandflux_single_redback(model, band, time_or_phase):
     """
 
@@ -338,8 +339,10 @@ class CutoffBlackbody(_SED):
     @property
     def wavelength(self):
         if len(self.frequency) == 1:
-            self.frequency = np.ones(len(self.time)) * self.frequency
+            self.frequency = np.ones(len(self.time)) * self.frequency              
         wavelength = nu_to_lambda(self.frequency) * angstrom_cgs
+        if len(wavelength) != len(self.time):
+            wavelength = np.tile(wavelength.T, (len(self.time), 1)).T
         return wavelength
 
     @property
@@ -351,15 +354,28 @@ class CutoffBlackbody(_SED):
         return self.X_CONST * np.array(range(1, 11))
 
     def _set_sed(self):
-        self.sed[self.mask] = \
-            self.FLUX_CONST * (self.r_photosphere[self.mask]**2 / self.cutoff_wavelength /
-                               self.wavelength[self.mask] ** 4) \
-            / np.expm1(self.X_CONST / self.wavelength[self.mask] / self.temperature[self.mask])
-        self.sed[~self.mask] = \
-            self.FLUX_CONST * (self.r_photosphere[~self.mask]**2 / self.wavelength[~self.mask]**5) \
-            / np.expm1(self.X_CONST / self.wavelength[~self.mask] / self.temperature[~self.mask])
-        # Apply renormalisation
-        self.sed *= self.norms[np.searchsorted(self.unique_times, self.time)]
+        if np.size(self.wavelength) != np.size(self.time):
+            self.sed = np.zeros((len(self.frequency), len(self.time)))
+            self.r_photosphere = np.tile(self.r_photosphere, (len(self.frequency), 1))
+            self.temperature = np.tile(self.temperature, (len(self.frequency), 1))
+            self.sed[self.mask] = \
+                self.FLUX_CONST * (self.r_photosphere[self.mask]**2 / self.cutoff_wavelength /
+                                self.wavelength[self.mask] ** 4) \
+                / np.expm1(self.X_CONST / self.wavelength[self.mask] / self.temperature[self.mask])
+            self.sed[~self.mask] = \
+                self.FLUX_CONST * (self.r_photosphere[~self.mask]**2 / self.wavelength[~self.mask]**5) \
+                / np.expm1(self.X_CONST / self.wavelength[~self.mask] / self.temperature[~self.mask])
+            self.sed *= self.norms[np.searchsorted(self.unique_times, self.time)]
+        else:    
+            self.sed[self.mask] = \
+                self.FLUX_CONST * (self.r_photosphere[self.mask]**2 / self.cutoff_wavelength /
+                            self.wavelength[self.mask] ** 4) \
+                / np.expm1(self.X_CONST / self.wavelength[self.mask] / self.temperature[self.mask])
+            self.sed[~self.mask] = \
+                self.FLUX_CONST * (self.r_photosphere[~self.mask]**2 / self.wavelength[~self.mask]**5) \
+                / np.expm1(self.X_CONST / self.wavelength[~self.mask] / self.temperature[~self.mask])
+            # Apply renormalisation
+            self.sed *= self.norms[np.searchsorted(self.unique_times, self.time)]
 
     def _set_norm(self):
         self.norms = self.luminosity[self.uniq_is] / \
@@ -389,6 +405,52 @@ class CutoffBlackbody(_SED):
         return self.flux_density
 
 
+class PowerlawPlusBlackbody:
+    """SED class for power law + blackbody combination with time-evolving power law"""
+
+    def __init__(self, temperature, r_photosphere, pl_amplitude, pl_slope, pl_evolution_index, time,
+                 reference_wavelength, frequency, luminosity_distance):
+        self.temperature = temperature
+        self.r_photosphere = r_photosphere
+        self.pl_amplitude = pl_amplitude
+        self.pl_slope = pl_slope
+        self.pl_evolution_index = pl_evolution_index
+        self.time = time
+        self.reference_wavelength = reference_wavelength
+        self.frequency = frequency
+        self.luminosity_distance = luminosity_distance
+
+        # Calculate combined flux density
+        self._calculate_flux_density()
+
+    def _calculate_flux_density(self):
+        """Calculate power law + blackbody flux density with time-evolving power law"""
+
+        # Blackbody component using the provided function
+        bb_flux_density = blackbody_to_flux_density(temperature=self.temperature,
+                                                    r_photosphere=self.r_photosphere,
+                                                    dl=self.luminosity_distance,
+                                                    frequency=self.frequency)
+
+        # Time-evolving power law component
+        # Convert frequency to wavelength for power law calculation
+        wavelength = (speed_of_light * 1e8) / self.frequency  # Angstroms
+
+        # Calculate time-evolved power law amplitude
+        pl_amplitude_evolved = self.pl_amplitude * (self.time / 1.0) ** (-self.pl_evolution_index)
+
+        # Calculate power law in F_lambda
+        pl_flux_lambda = pl_amplitude_evolved * (wavelength / self.reference_wavelength) ** self.pl_slope
+
+        # Convert power law from F_lambda to F_nu
+        pl_flux_density = pl_flux_lambda * wavelength ** 2 / (speed_of_light * 1e8)
+        pl_flux_density = pl_flux_density * uu.erg / uu.s / uu.cm ** 2 / uu.Hz
+
+        # Combine components
+        total_flux_density = bb_flux_density + pl_flux_density
+
+        self.flux_density = total_flux_density
+
 class Blackbody(object):
 
     reference = "It is a blackbody - Do you really need a reference for this?"
@@ -471,59 +533,140 @@ class Synchrotron(_SED):
 
 
 class Line(_SED):
+    """
+    A class that modifies an input SED by incorporating a time‐dependent absorption line feature.
+
+    Reference:
+      https://ui.adsabs.harvard.edu/abs/2018ApJS..236....6G/abstract
+    """
 
     reference = "https://ui.adsabs.harvard.edu/abs/2018ApJS..236....6G/abstract"
 
-    def __init__(self, time: np.ndarray, luminosity: np.ndarray, frequency: Union[np.ndarray, float],
-                 sed: Union[_SED, Blackbody], luminosity_distance: float, line_wavelength: float = 7.5e3,
-                 line_width: float = 500, line_time: float = 50, line_duration: float = 25,
-                 line_amplitude: float = 0.3, **kwargs: None) -> None:
+    def __init__(self,
+                 time: np.ndarray,
+                 luminosity: np.ndarray,
+                 frequency: Union[np.ndarray, float],
+                 sed: Union[_SED, Blackbody],
+                 luminosity_distance: float,
+                 line_wavelength: float = 7.5e3,
+                 line_width: float = 500,
+                 line_time: float = 50,
+                 line_duration: float = 25,
+                 line_amplitude: float = 0.3,
+                 **kwargs) -> None:
         """
-        Modifies the input SED by accounting for absorption lines
-
-        :param time: time in source frame
-        :param luminosity: luminosity in cgs
-        :param frequency: frequency to calculate in Hz - Must be same length as time array or a single number.
-                          In source frame.
-        :param sed: instantiated SED class object.
-        :param luminosity_distance: luminosity_distance in cm
-        :param line_wavelength: line wavelength in angstrom
-        :param line_width: line width in angstrom
-        :param line_time: line time
-        :param line_duration: line duration
-        :param line_amplitude: line amplitude
-        :param kwargs: None
+        Modifies the input SED by imposing a time-dependent absorption line.
+
+        Parameters
+        ----------
+        time : np.ndarray
+            1D array of times (in source frame).
+        luminosity : np.ndarray
+            1D array of luminosities (in cgs units) corresponding to each time.
+        frequency : Union[np.ndarray, float]
+            Frequency (in Hz, source frame) at which to calculate the flux.
+            If an array is provided, its shape must be broadcastable with time.
+        sed : Union[_SED, Blackbody]
+            An instantiated SED object (e.g. a CutoffBlackbody).
+        luminosity_distance : float
+            Luminosity distance in cm.
+        line_wavelength : float, optional
+            Central wavelength of the line in angstrom (default 7500 Å).
+        line_width : float, optional
+            Line width (sigma) in angstrom (default 500 Å).
+        line_time : float, optional
+            The time when the line is strongest (default 50).
+        line_duration : float, optional
+            The characteristic duration of the line (default 25).
+        line_amplitude : float, optional
+            The maximum amplitude of the line absorption (default 0.3).
+        kwargs : dict, optional
+            Other keyword arguments.
         """
-        super(Line, self).__init__(frequency=frequency, luminosity_distance=luminosity_distance, length=len(time))
-        self.time = time
-        self.luminosity = luminosity
+        # Reshape time and luminosity to column vectors (n_time, 1).
+        self.time = np.atleast_1d(time).reshape(-1, 1)
+        self.luminosity = np.atleast_1d(luminosity).reshape(-1, 1)
+
+        # Convert frequency to a row vector (1, n_freq)
+        freq_arr = np.atleast_1d(frequency)
+        if freq_arr.ndim == 1:
+            freq_arr = freq_arr.reshape(1, -1)
+        self.frequency = freq_arr  # shape (1, n_freq)
+
+        # Call the parent initializer.
+        super().__init__(frequency=self.frequency,
+                         luminosity_distance=luminosity_distance,
+                         length=self.time.shape[0])
+
+        # Keep a reference to the SED to modify.
         self.SED = sed
-        self.sed = None
+        self.sed = None  # This will be computed in _set_sed().
+
+        # Save the line parameters.
         self.line_wavelength = line_wavelength
         self.line_width = line_width
         self.line_time = line_time
         self.line_duration = line_duration
         self.line_amplitude = line_amplitude
 
+        # Use an internal attribute to store the computed flux density.
+        self._flux_density = None
+
+        # Calculate the flux density.
         self.calculate_flux_density()
 
+    @property
+    def flux_density(self):
+        """
+        Returns the computed flux density; this property wraps an internal attribute.
+        """
+        return self._flux_density
+
     @property
     def wavelength(self):
+        """
+        Returns the wavelength corresponding to self.frequency (using nu_to_lambda),
+        while preserving broadcasting.
+        """
         return nu_to_lambda(self.frequency)
 
     def calculate_flux_density(self):
-        # Mostly from Mosfit/SEDs
+        """
+        Compute the modified SED with the absorption line and store the result internally.
+        """
         self._set_sed()
-        return self.flux_density
+        return self._flux_density
 
     def _set_sed(self):
-        amplitude = self.line_amplitude * np.exp(-0.5 * ((self.time - self.line_time) / self.line_duration) ** 2)
-        self.sed = self.SED.sed * (1 - amplitude)
+        """
+        Compute and set the modified SED (flux density) with proper units.
+        Assumes:
+          - self.SED.sed has shape (n_freq, n_time) (e.g., (100,300))
+          - self.time and self.luminosity are processed so that the time‐axis is the second axis.
+        """
+        # Transpose time and luminosity to have time along the second axis
+        time_vals = self.time.T  # Shape (1, n_time)
+        lum_vals = self.luminosity.T  # Shape (1, n_time)
+
+        # Compute a time-dependent amplitude (expected shape (1, n_time))
+        amplitude_time = self.line_amplitude * np.exp(
+            -0.5 * ((time_vals - self.line_time) / self.line_duration) ** 2
+        )
 
-        amplitude *= self.luminosity / (self.line_width * (2 * np.pi) ** 0.5)
+        # Get the baseline SED (shape (n_freq, n_time))
+        sed_base = self.SED.sed
 
-        amp_new = np.exp(-0.5 * ((self.wavelength - self.line_wavelength) / self.line_width) ** 2)
-        self.sed += amplitude * amp_new
+        # Modify the SED by attenuating with the time-dependent factor
+        sed_modified = sed_base * (1 - amplitude_time)
+
+        # Compute additional scaling factors as needed (example below)
+        amplitude_scaled = amplitude_time * lum_vals / (self.line_width * np.sqrt(2 * np.pi))
+        line_profile = np.exp(-0.5 * ((self.wavelength - self.line_wavelength) / self.line_width) ** 2)
+        sed_modified += amplitude_scaled * line_profile
+
+        # IMPORTANT: Convert sed_modified (a numpy array) to an astropy Quantity.
+        # Here, we assume the flux density is in units of erg/s/cm^2/Hz.
+        self._flux_density = sed_modified * uu.erg / uu.s / uu.cm ** 2 / uu.Hz
 
 def get_correct_output_format_from_spectra(time, time_eval, spectra, lambda_array, **kwargs):
     """
@@ -542,8 +685,9 @@ def get_correct_output_format_from_spectra(time, time_eval, spectra, lambda_arra
     spectra = np.nan_to_num(spectra)
     spectra[spectra.value == np.nan_to_num(np.inf)] = 1e-30 * np.mean(spectra[5])
     spectra[spectra.value == 0.] = 1e-30 * np.mean(spectra[5])
-
-    source = RedbackTimeSeriesSource(phase=time_eval, wave=lambda_array, flux=spectra)
+    time_spline_degree = kwargs.get('time_spline_degree', 3)
+    source = RedbackTimeSeriesSource(phase=time_eval, wave=lambda_array, flux=spectra,
+                                     time_spline_degree=time_spline_degree)
     if kwargs['output_format'] == 'flux':
         bands = kwargs['bands']
         magnitude = source.bandmag(phase=time, band=bands, magsys='ab')

redback/simulate_transients.py

@@ -1,5 +1,5 @@
 import numpy as np
-from sncosmo import TimeSeriesSource, Model, get_bandpass
+from redback.sed import RedbackTimeSeriesSource
 import redback
 import pandas as pd
 from redback.utils import logger, calc_flux_density_error_from_monochromatic_magnitude, calc_flux_density_from_ABmag
@@ -191,8 +191,16 @@ class SimulateOpticalTransient(object):
                 self.sncosmo_model = self.model(_time_array, **parameters, **model_kwargs)
         elif callable(model):
             self.model = model
-            logger.info('Using custom model. Making a SNCosmo wrapper for this model')
-            self.sncosmo_model = self._make_sncosmo_wrapper_for_user_model()
+            if kwargs['redback_compatible_model']:
+                model_kwargs['output_format'] = 'sncosmo_source'
+                logger.info("Model is consistent with redback model format. Using simplified model wrapper.")
+                model_end_time = model_kwargs.get('end_time', 400.0)
+                _time_array = np.linspace(0.1, model_end_time, 1000)
+                sncosmomodel = self.model(_time_array, **parameters, **model_kwargs)
+                self.sncosmo_model = sncosmomodel
+            else:
+                logger.info('Model is inconsistent with redback model format. Making a custom wrapper for this model')
+                self.sncosmo_model = self._make_sncosmo_wrapper_for_user_model()
         else:
             raise ValueError("The user needs to specify model as either a string or function.")
 
@@ -649,6 +657,8 @@ class SimulateOpticalTransient(object):
         detected[mask_snr] = 0
         observation_dataframe['detected'] = detected
         observation_dataframe['limiting_magnitude'] = overlapping_database['fiveSigmaDepth'].values
+        observation_dataframe['flux_limit'] = redback.utils.bandpass_magnitude_to_flux(
+            overlapping_database['fiveSigmaDepth'].values, filters)
         return observation_dataframe
 
     def _make_observations(self):