KNtimeshift -> timeshift

ninakuni · Aug 26, 2023 · 16f0db3 · 16f0db3
1 parent 107a09b
commit 16f0db3
Show file tree

Hide file tree

Showing 31 changed files with 50 additions and 44 deletions.
diff --git a/doc/combined_analysis.md b/doc/combined_analysis.md
@@ -8,7 +8,7 @@ First of all, you need to create an output directory, this output will host all
 
 	mkdir -p ./output
 
-Running the following command line will generate a json file (injection.json)  with the BILBY processing of compact binary merging events. We take here binaries of type BNS, NSBH is also an option. This injection contents a simulation set of parameters : luminosity_distance, log10_mej_wind, KNphi, inclination_EM, KNtimeshift, geocent_time for the Bu2019lm model. This creates an injection.json file in the ./output directory.
+Running the following command line will generate a json file (injection.json)  with the BILBY processing of compact binary merging events. We take here binaries of type BNS, NSBH is also an option. This injection contents a simulation set of parameters : luminosity_distance, log10_mej_wind, KNphi, inclination_EM, timeshift, geocent_time for the Bu2019lm model. This creates an injection.json file in the ./output directory.
 
 	nmma_create_injection --prior-file ./priors/Bu2019lm.prior --eos-file ./example_files/eos/ALF2.dat --binary-type BNS -f ./output/injection --n-injection 100 --original-parameters --extension json
 

diff --git a/doc/gwemopt_light_curves_detection.md b/doc/gwemopt_light_curves_detection.md
@@ -26,7 +26,7 @@ Click here: **[split_CBC_data_for_nmma.py]**
 
 4 **- Then use ``BNS`` or ``NSBH``**  injections.dat  to create injection file with nmma.
 
-To generate a json file (``injection.json``)  with the BILBY processing of compact binary merging events. This injection contents a simulation set of parameters : luminosity_distance, log10_mej_wind, KNphi, inclination_EM, KNtimeshift, geocent_time for the KNe (`Bu2019lm` - BNS or `Bu2019nsbh` - NSBH) model.
+To generate a json file (``injection.json``)  with the BILBY processing of compact binary merging events. This injection contents a simulation set of parameters : luminosity_distance, log10_mej_wind, KNphi, inclination_EM, timeshift, geocent_time for the KNe (`Bu2019lm` - BNS or `Bu2019nsbh` - NSBH) model.
 
 **`BNS` type**
 

diff --git a/example_files/prior/GW170817_AT2017gfo.prior b/example_files/prior/GW170817_AT2017gfo.prior
@@ -17,7 +17,7 @@ phase = Uniform(name='phase', minimum=0, maximum=2 * np.pi, boundary='periodic')
 lambda_1 = Constraint(name='lambda_1', minimum=0., maximum=np.inf)
 lambda_2 = Constraint(name='lambda_2', minimum=0., maximum=np.inf)
 KNphi = Uniform(name='KNphi', minimum=15., maximum=75., latex_label='$\\Phi$')
-KNtimeshift = 0.
+timeshift = 0.
 alpha = Gaussian(mu=0., sigma=4e-4, name='alpha',latex_label='$\\alpha$')
 ratio_zeta = Uniform(minimum=0., maximum=1.0, name='ratio_zeta',latex_label='$\\zeta$')
 log10_mej_dyn  = Constraint(name='log10_mej_dyn', minimum=-3.5, maximum=-0.5)

diff --git a/example_files/prior/GW170817_AT2017gfo_GRB170817A.prior b/example_files/prior/GW170817_AT2017gfo_GRB170817A.prior
@@ -17,7 +17,7 @@ phase = Uniform(name='phase', minimum=0, maximum=2 * np.pi, boundary='periodic')
 lambda_1 = Constraint(name='lambda_1', minimum=0., maximum=np.inf)
 lambda_2 = Constraint(name='lambda_2', minimum=0., maximum=np.inf)
 KNphi = Uniform(name='KNphi', minimum=15., maximum=75., latex_label='$\\Phi$')
-KNtimeshift = 0.
+timeshift = 0.
 alpha = Gaussian(mu=0., sigma=4e-4, name='alpha',latex_label='$\\alpha$')
 ratio_zeta = Uniform(minimum=0., maximum=1.0, name='ratio_zeta',latex_label='$\\zeta$')
 log10_mej_dyn  = Constraint(name='log10_mej_dyn', minimum=-3.5, maximum=-0.5)

diff --git a/example_files/prior/ZTF_Bu2019lm.prior b/example_files/prior/ZTF_Bu2019lm.prior
@@ -1,6 +1,6 @@
 luminosity_distance = Uniform(minimum=0.0, maximum=200., name='luminosity_distance',latex_label='$D_L$')
 KNphi = Uniform(name='KNphi', minimum=15., maximum=75., latex_label='$\Phi$')
 inclination_EM = Sine(name='inclination_EM', minimum=0., maximum=np.pi/2., latex_label='$\\iota$')
-KNtimeshift = 0.
+timeshift = 0.
 log10_mej_dyn  = Uniform(name='log10_mej_dyn', minimum=-3., maximum=-1., latex_label='$\\log_{10}M^{\\rm{dyn}}_{\\rm{ej}}$')
 log10_mej_wind = Uniform(name='log10_mej_wind', minimum=-3., maximum=-0.5, latex_label='$\\log_{10}M^{\\rm{wind}}_{\\rm{ej}}$')
diff --git a/example_files/tools/gwem_resampling/GRB211211A_NSBH_posterior_samples.dat b/example_files/tools/gwem_resampling/GRB211211A_NSBH_posterior_samples.dat
@@ -1,4 +1,4 @@
-luminosity_distance log10_mej_dyn log10_mej_wind inclination_EM log10_E0 thetaCore thetaWing log10_n0 p log10_epsilon_e log10_epsilon_B KNtimeshift Ebv log_likelihood log_prior
+luminosity_distance log10_mej_dyn log10_mej_wind inclination_EM log10_E0 thetaCore thetaWing log10_n0 p log10_epsilon_e log10_epsilon_B timeshift Ebv log_likelihood log_prior
 545.4925005762316 -1.3297416319412865 -2.3263616908129565 0.31775926479459465 54.05425501788058 0.19277943546729323 0.6091044968494487 -4.98735490239909 2.2606086860252486 -0.33469600968059865 -4.5217891110427715 0.0 0.0 -55.08388764837469 -16.51995676684892
 675.0064754318224 -2.443070871830207 -1.4334788462268382 0.332218662456551 51.84931495806173 0.22785157874752726 0.40734942400478225 -0.2696456275687966 2.1405209686837874 -0.8827212262600499 -2.980885442865384 0.0 0.0 -53.72332678165554 -16.47703498852462
 483.9739699935547 -1.3537097885515295 -0.5967321006978974 0.2520820607202523 51.29221276030751 0.19063805780405707 0.4679526434830833 -3.153327502156941 2.71661322974443 -0.21044816327979543 -2.0775126312809666 0.0 0.0 -53.07626539291866 -16.745224083048715

diff --git a/example_files/tools/gwem_resampling/GRB211211A_posterior_samples.dat b/example_files/tools/gwem_resampling/GRB211211A_posterior_samples.dat
@@ -1,4 +1,4 @@
-KNphi inclination_EM log10_mej_dyn log10_mej_wind luminosity_distance log10_E0 thetaCore thetaWing log10_n0 p log10_epsilon_e log10_epsilon_B KNtimeshift Ebv log_likelihood log_prior
+KNphi inclination_EM log10_mej_dyn log10_mej_wind luminosity_distance log10_E0 thetaCore thetaWing log10_n0 p log10_epsilon_e log10_epsilon_B timeshift Ebv log_likelihood log_prior
 37.655958649457446 0.6165467459042074 -2.364478845267172 -2.0700372550975534 461.58660826344766 54.35052049238537 0.26892606190578283 0.7253206861872036 -3.1295333812224886 2.2117008964199747 -0.44952728657196417 -5.6448437141876155 0.0 0.0 -54.498522187415745 -19.99875345193874
 32.419619801535546 0.40208227413019887 -1.1628064329003682 -1.7219624540223921 581.3951674086828 51.71652416243191 0.22305500573682077 0.6545329219106967 -1.076489736459001 2.202582208230366 -0.06953361673057934 -3.3546270158559954 0.0 0.0 -52.99059269985854 -20.389144910856725
 48.68146568210638 0.21466944790802428 -1.7715409063560597 -2.067602186365784 481.3114570076038 52.72278846894547 0.13283288060259846 0.5242245620971115 -2.4484572803749622 2.42571315472023 -0.3935481318226932 -4.297198574085077 0.0 0.0 -52.98135882295524 -20.99730283348408

diff --git a/nmma/em/analysis.py b/nmma/em/analysis.py
@@ -728,9 +728,9 @@ def main(args=None):
                 )
         mag["bestfit_sample_times"] = sample_times
 
-        if "KNtimeshift" in bestfit_params:
+        if "timeshift" in bestfit_params:
             mag["bestfit_sample_times"] = (
-                mag["bestfit_sample_times"] + bestfit_params["KNtimeshift"]
+                mag["bestfit_sample_times"] + bestfit_params["timeshift"]
             )
 
     if args.bestfit:

diff --git a/nmma/em/injection.py b/nmma/em/injection.py
@@ -88,8 +88,8 @@ def create_light_curve_data(
 
     tc = injection_parameters["kilonova_trigger_time"]
 
-    if "KNtimeshift" in injection_parameters:
-        tc = tc + injection_parameters["KNtimeshift"]
+    if "timeshift" in injection_parameters:
+        tc = tc + injection_parameters["timeshift"]
 
     tmin = args.kilonova_tmin
     tmax = args.kilonova_tmax

diff --git a/nmma/em/likelihood.py b/nmma/em/likelihood.py
@@ -128,7 +128,7 @@ def log_likelihood(self):
             usedIdx = np.where(np.isfinite(mag_app_filt))[0]
             sample_times_used = self.sample_times[usedIdx]
             mag_app_used = mag_app_filt[usedIdx]
-            t0 = self.parameters["KNtimeshift"]
+            t0 = self.parameters["timeshift"]
             if len(mag_app_used) > 0:
                 mag_app_interp[filt] = interp1d(
                     sample_times_used + t0,
@@ -154,7 +154,7 @@ def log_likelihood(self):
             data_sigma = self.light_curve_data[filt][:, 2]
 
             # include the error budget into calculation
-            data_sigma = np.sqrt(data_sigma ** 2 + self.error_budget[filt] ** 2)
+            data_sigma = np.sqrt(data_sigma**2 + self.error_budget[filt] ** 2)
 
             # evaluate the light curve magnitude at the data points
             mag_est = mag_app_interp[filt](data_time)

diff --git a/nmma/em/manual.py b/nmma/em/manual.py
@@ -11,9 +11,14 @@
 
 from ..utils.models import refresh_models_list
 from .injection import create_light_curve_data
-from .model import (GenericCombineLightCurveModel, GRBLightCurveModel,
-                    ShockCoolingLightCurveModel, SimpleKilonovaLightCurveModel,
-                    SupernovaLightCurveModel, SVDLightCurveModel)
+from .model import (
+    GenericCombineLightCurveModel,
+    GRBLightCurveModel,
+    ShockCoolingLightCurveModel,
+    SimpleKilonovaLightCurveModel,
+    SupernovaLightCurveModel,
+    SVDLightCurveModel,
+)
 from .utils import getFilteredMag, loadEvent
 
 matplotlib.use("agg")
@@ -303,7 +308,9 @@ def main(args=None):
     except AttributeError:
         pass
     if refresh:
-        refresh_models_list(models_home=args.svd_path if args.svd_path not in [None, ''] else None)
+        refresh_models_list(
+            models_home=args.svd_path if args.svd_path not in [None, ""] else None
+        )
 
     bilby.core.utils.setup_logger(outdir=args.outdir, label=args.label)
     bilby.core.utils.check_directory_exists_and_if_not_mkdir(args.outdir)
@@ -564,9 +571,9 @@ def main(args=None):
                         params["luminosity_distance"] * 1e6 / 10.0
                     )
             mag["bestfit_sample_times"] = sample_times
-            if "KNtimeshift" in params:
+            if "timeshift" in params:
                 mag["bestfit_sample_times"] = (
-                    mag["bestfit_sample_times"] + params["KNtimeshift"]
+                    mag["bestfit_sample_times"] + params["timeshift"]
                 )
 
             if len(models) > 1:

diff --git a/nmma/eos/create_injection.py b/nmma/eos/create_injection.py
@@ -350,13 +350,13 @@ def main(args=None):
         for index, row in dataframe_from_prior.iterrows():
             timeshift_frame = injection_creator.get_injection_dataframe()
             for ii in range(args.repeated_simulations):
-                timeshifts.append(timeshift_frame["KNtimeshift"][ii])
+                timeshifts.append(timeshift_frame["timeshift"][ii])
                 repeats.append(row)
         dataframe_from_prior = pd.concat(repeats, axis=1).transpose().reset_index()
         dataframe_from_prior.drop(
-            labels=["index", "KNtimeshift"], axis="columns", inplace=True
+            labels=["index", "timeshift"], axis="columns", inplace=True
         )
-        dataframe_from_prior["KNtimeshift"] = timeshifts
+        dataframe_from_prior["timeshift"] = timeshifts
 
     inj_columns = set(dataframe_from_inj.columns.tolist())
     prior_columns = set(dataframe_from_prior.columns.tolist())

diff --git a/nmma/tests/data/injection.json b/nmma/tests/data/injection.json
@@ -410,7 +410,7 @@
         1.90117505503928,
         0.8478324526926984
       ],
-      "KNtimeshift": [
+      "timeshift": [
         -1.879331363590762,
         -1.958337288928376,
         -1.896627121177259,

diff --git a/priors/AnBa2022.prior b/priors/AnBa2022.prior
@@ -1,4 +1,4 @@
-KNtimeshift = Uniform(minimum=-2.0, maximum=1.0, name='trigger_time',latex_label='$t_0$')
+timeshift = Uniform(minimum=-2.0, maximum=1.0, name='trigger_time',latex_label='$t_0$')
 mtot = Uniform(name='mtot', minimum=0, maximum=0.5, latex_label='$m_{\\rm{tot}}$')
 mni = Uniform(name='mni', minimum=0, maximum=0.03, latex_label='$m_{\\rm{ni}}$')
 vej = Uniform(name='vej', minimum=0., maximum=0.5, latex_label='$v_{\\rm{ej}}$')

diff --git a/priors/Bu2019lm.prior b/priors/Bu2019lm.prior
@@ -1,6 +1,6 @@
 luminosity_distance = Uniform(minimum=0.0, maximum=200., name='luminosity_distance',latex_label='$D_L$')
 KNphi = Uniform(name='KNphi', minimum=15., maximum=75., latex_label='$\Phi$')
 inclination_EM = Sine(name='inclination_EM', minimum=0., maximum=np.pi/2., latex_label='$\\iota$')
-KNtimeshift = Uniform(minimum=-2.0, maximum=1.0, name='trigger_time',latex_label='$t_0$')
+timeshift = Uniform(minimum=-2.0, maximum=1.0, name='trigger_time',latex_label='$t_0$')
 log10_mej_dyn  = Uniform(name='log10_mej_dyn', minimum=-3., maximum=-1., latex_label='$\\log_{10}M^{\\rm{dyn}}_{\\rm{ej}}$')
 log10_mej_wind = Uniform(name='log10_mej_wind', minimum=-3., maximum=-0.5, latex_label='$\\log_{10}M^{\\rm{wind}}_{\\rm{ej}}$')
diff --git a/priors/Bu2019lm_TrPi2018GRB211211A.prior b/priors/Bu2019lm_TrPi2018GRB211211A.prior
@@ -2,7 +2,7 @@
 KNphi = Uniform(name='KNphi', minimum=15., maximum=75., latex_label='$\Phi$')
 # incl_EM with i = 60 deg >> pi/3 assumed that it is smaller than inclination of GW170817&GRB170817A
 inclination_EM = Sine(name='inclination_EM', minimum=0., maximum=np.pi/4., latex_label='$\\iota$')
-KNtimeshift = 0.0
+timeshift = 0.0
 log10_mej_dyn  = Uniform(name='log10_mej_dyn', minimum=-3., maximum=-1., latex_label='$\\log_{10}M^{\\rm{dyn}}_{\\rm{ej}}$')
 log10_mej_wind = Uniform(name='log10_mej_wind', minimum=-3., maximum=-0.5, latex_label='$\\log_{10}M^{\\rm{wind}}_{\\rm{ej}}$')
 
@@ -17,4 +17,3 @@ log10_epsilon_B = Uniform(name='log10_epsilon_B', minimum=-10, maximum=0, latex_
 
 alpha = Gaussian(mu=0., sigma=4e-4, name='alpha',latex_label='$\\alpha$')
 zeta = Uniform(minimum=0., maximum=1.0, name='ratio_zeta',latex_label='$\\zeta$')
-
diff --git a/priors/Bu2019nsbh.prior b/priors/Bu2019nsbh.prior
@@ -1,5 +1,5 @@
 luminosity_distance = Uniform(minimum=0.0, maximum=200., name='luminosity_distance',latex_label='$D_L$')
 inclination_EM = Sine(name='inclination_EM', minimum=0., maximum=np.pi/2., latex_label='$\\iota$')
-KNtimeshift = Uniform(minimum=-2.0, maximum=1.0, name='trigger_time',latex_label='$t_0$')
+timeshift = Uniform(minimum=-2.0, maximum=1.0, name='trigger_time',latex_label='$t_0$')
 log10_mej_dyn  = Uniform(name='log10_mej_dyn', minimum=-3., maximum=-1., latex_label='$\\log_{10}M^{\\rm{dyn}}_{\\rm{ej}}$')
 log10_mej_wind = Uniform(name='log10_mej_wind', minimum=-3., maximum=-0.5, latex_label='$\\log_{10}M^{\\rm{wind}}_{\\rm{ej}}$')
diff --git a/priors/Bu2019nsbh_TrPi2018_GRB211211A.prior b/priors/Bu2019nsbh_TrPi2018_GRB211211A.prior
@@ -1,6 +1,6 @@
 luminosity_distance = Uniform(minimum=0, maximum=1000, name='luminosity_distance',latex_label='$D_L$')
 
-KNtimeshift = 0.0
+timeshift = 0.0
 log10_mej_dyn  = Uniform(name='log10_mej_dyn', minimum=-3., maximum=-1., latex_label='$\\log_{10}M^{\\rm{dyn}}_{\\rm{ej}}$')
 log10_mej_wind = Uniform(name='log10_mej_wind', minimum=-3., maximum=-0.5, latex_label='$\\log_{10}M^{\\rm{wind}}_{\\rm{ej}}$')
 

diff --git a/priors/Bu2022Ye.prior b/priors/Bu2022Ye.prior
@@ -5,4 +5,4 @@ log10_mej_wind = Uniform(name='log10_mej_wind', minimum=-3., maximum=-0.5, latex
 vej_wind = Uniform(name='vej_wind', minimum=0., maximum=0.3, latex_label='$V^{\\rm{wind}}_{\\rm{ej}}$')
 inclination_EM = Sine(name='inclination_EM', minimum=0., maximum=np.pi/2., latex_label='$\\iota$')
 luminosity_distance = Uniform(minimum=0.0, maximum=200., name='luminosity_distance',latex_label='$D_L$')
-KNtimeshift = Uniform(minimum=-2.0, maximum=1.0, name='KNtimeshift',latex_label='$t_0$')
+timeshift = Uniform(minimum=-2.0, maximum=1.0, name='timeshift',latex_label='$t_0$')
diff --git a/priors/Ka2017.prior b/priors/Ka2017.prior
@@ -1,5 +1,5 @@
 luminosity_distance = Uniform(minimum=0.0, maximum=200., name='luminosity_distance',latex_label='$D_L$')
-KNtimeshift = Uniform(minimum=-2.0, maximum=1.0, name='trigger_time',latex_label='$t_0$')
+timeshift = Uniform(minimum=-2.0, maximum=1.0, name='trigger_time',latex_label='$t_0$')
 log10_mej  = Uniform(name='log10_mej', minimum=-3., maximum=-1., latex_label='$\\log_{10}M_{\\rm{ej}}$')
 log10_vej = Uniform(name='log10_vej', minimum=-1.52, maximum=-0.53, latex_label='$\\log_{10}v_{\\rm{ej}}$')
 log10_Xlan = Uniform(name='log10_Xlan', minimum=-9, maximum=-1, latex_label='$\\log_{10}X_{\\rm{lan}}$')
diff --git a/priors/LANL2022.prior b/priors/LANL2022.prior
@@ -5,4 +5,4 @@ log10_mej_wind = Uniform(name='log10_mej_wind', minimum=-3., maximum=-0.5, latex
 vej_wind = Uniform(name='vej_wind', minimum=0., maximum=0.3, latex_label='$V^{\\rm{wind}}_{\\rm{ej}}$')
 inclination_EM = Sine(name='inclination_EM', minimum=0., maximum=np.pi/2., latex_label='$\\iota$')
 luminosity_distance = Uniform(minimum=0.0, maximum=200., name='luminosity_distance',latex_label='$D_L$')
-KNtimeshift = Uniform(minimum=-2.0, maximum=1.0, name='trigger_time',latex_label='$t_0$')
+timeshift = Uniform(minimum=-2.0, maximum=1.0, name='trigger_time',latex_label='$t_0$')
diff --git a/priors/Me2017.prior b/priors/Me2017.prior
@@ -1,6 +1,6 @@
 luminosity_distance = Uniform(minimum=0.0, maximum=200., name='luminosity_distance',latex_label='$D_L$')
 beta = Uniform(name='beta', minimum=1., maximum=5., latex_label='$\\beta$')
 log10_kappa_r = Uniform(name='log10_kappa_r', minimum=-1., maximum=2., latex_label='$\\log_{10}\\kappa_r$')
-KNtimeshift = Uniform(minimum=-2.0, maximum=1.0, name='trigger_time',latex_label='$t_0$')
+timeshift = Uniform(minimum=-2.0, maximum=1.0, name='trigger_time',latex_label='$t_0$')
 log10_vej  = Uniform(name='log10_vej', minimum=-2., maximum=-0.5, latex_label='$\\log_{10}v^{\\rm{ej}}$')
 log10_mej = Uniform(name='log10_mej', minimum=-3., maximum=-0.5, latex_label='$\\log_{10}M^{\\rm{ej}}$')
diff --git a/priors/Piro2021.prior b/priors/Piro2021.prior
@@ -1,5 +1,5 @@
 luminosity_distance = Uniform(minimum=0.0, maximum=1000., name='luminosity_distance',latex_label='$D_L$')
-KNtimeshift = Uniform(minimum=-2.0, maximum=1.0, name='trigger_time',latex_label='$t_0$')
+timeshift = Uniform(minimum=-2.0, maximum=1.0, name='trigger_time',latex_label='$t_0$')
 log10_Menv  = Uniform(name='log10_Menv', minimum=-5., maximum=0., latex_label='$\\log_{10}M^{\\rm{env}}$')
 log10_Renv = Uniform(name='log10_Renv', minimum=10., maximum=15, latex_label='$\\log_{10}R^{\\rm{env}}$')
 log10_Ee  = Uniform(name='log10_Eext', minimum=47., maximum=52., latex_label='$\\log_{10}E^{\\rm{e}}$')
diff --git a/priors/TrPi2018.prior b/priors/TrPi2018.prior
@@ -1,5 +1,5 @@
 luminosity_distance = Uniform(minimum=0, maximum=7000, name='luminosity_distance',latex_label='$D_L$')
-KNtimeshift = Uniform(minimum=-2.0, maximum=1.0, name='trigger_time',latex_label='$t_0$')
+timeshift = Uniform(minimum=-2.0, maximum=1.0, name='trigger_time',latex_label='$t_0$')
 inclination_EM = Sine(name='inclination_EM', minimum=0., maximum=np.pi/2., latex_label='$\\iota$')
 log10_E0 =  Uniform(minimum=0, maximum=99, name='log10_E0',latex_label='$\\log_{10}E_0$')
 thetaCore = Uniform(name='theta_core', minimum=0, maximum=np.pi/2., latex_label='$\\theta_c$')

diff --git a/priors/TrPi2018_onaxis.prior b/priors/TrPi2018_onaxis.prior
@@ -1,5 +1,5 @@
 luminosity_distance = Uniform(minimum=1000, maximum=5000, name='luminosity_distance',latex_label='$D_L$')
-KNtimeshift = Uniform(minimum=-2.0, maximum=1.0, name='trigger_time',latex_label='$t_0$')
+timeshift = Uniform(minimum=-2.0, maximum=1.0, name='trigger_time',latex_label='$t_0$')
 inclination_EM = Uniform(name='inclination_EM', minimum=0., maximum=np.pi/16., latex_label='$\\iota$')
 log10_E0 = 53.0
 thetaCore = 0.05

diff --git a/priors/ZTF_lgrb.prior b/priors/ZTF_lgrb.prior
@@ -1,5 +1,5 @@
 luminosity_distance = Uniform(minimum=0, maximum=7000, name='luminosity_distance',latex_label='$D_L$')
-KNtimeshift = 0
+timeshift = 0
 inclination_EM = Uniform(name='inclination_EM', minimum=0., maximum=np.pi/16., latex_label='$\\iota$')
 log10_E0 =  Uniform(minimum=49.5, maximum=56, name='log10_E0',latex_label='$\\log_{10}E_0$')
 thetaCore = Uniform(name='theta_core', minimum=0, maximum=np.pi/12., latex_label='$\\theta_c$')

diff --git a/priors/ZTF_sgrb.prior b/priors/ZTF_sgrb.prior
@@ -1,5 +1,5 @@
 luminosity_distance = Uniform(minimum=0, maximum=7000, name='luminosity_distance',latex_label='$D_L$')
-KNtimeshift = 0
+timeshift = 0
 inclination_EM = Sine(name='inclination_EM', minimum=0., maximum=np.pi/2., latex_label='$\\iota$')
 log10_E0 =  Uniform(minimum=49, maximum=53, name='log10_E0',latex_label='$\\log_{10}E_0$')
 thetaCore = Uniform(name='theta_core', minimum=0, maximum=np.pi/6., latex_label='$\\theta_c$')

diff --git a/priors/nugent-hyper.prior b/priors/nugent-hyper.prior
@@ -1,3 +1,3 @@
 luminosity_distance = Uniform(minimum=0, maximum=7000, name='luminosity_distance',latex_label='$D_L$')
-KNtimeshift = Uniform(minimum=-2.0, maximum=1.0, name='trigger_time',latex_label='$t_0$')
+timeshift = Uniform(minimum=-2.0, maximum=1.0, name='trigger_time',latex_label='$t_0$')
 supernova_mag_boost = Uniform(name='supernova_mag_boost', minimum=-5., maximum=5., latex_label='$\\rm{SNmag}$')
diff --git a/priors/nugent-hyper_TrPi2018.prior b/priors/nugent-hyper_TrPi2018.prior
@@ -1,6 +1,6 @@
 luminosity_distance = Uniform(minimum=0, maximum=7000, name='luminosity_distance',latex_label='$D_L$')
 redshift = Uniform(minimum=0.0, maximum=1.0, name='redshift')
-KNtimeshift = Uniform(minimum=-2.0, maximum=1.0, name='trigger_time',latex_label='$t_0$')
+timeshift = Uniform(minimum=-2.0, maximum=1.0, name='trigger_time',latex_label='$t_0$')
 inclination_EM = Sine(name='inclination_EM', minimum=0, maximum=0.8, latex_label='$\\iota$')
 log10_E0 = Uniform(name='log10_E0', minimum=0, maximum=70, latex_label='$\\log_{10}E_{0}$')
 thetaCore = Uniform(name='thetaCore', minimum=0.01, maximum=np.pi / 2, latex_label='$\\theta_{c}$')

diff --git a/priors/salt2.prior b/priors/salt2.prior
@@ -1,5 +1,5 @@
 luminosity_distance = Uniform(minimum=0, maximum=7000, name='luminosity_distance',latex_label='$D_L$')
-KNtimeshift = Uniform(minimum=-2.0, maximum=1.0, name='trigger_time',latex_label='$t_0$')
+timeshift = Uniform(minimum=-2.0, maximum=1.0, name='trigger_time',latex_label='$t_0$')
 x0 = Uniform(minimum=0.0, maximum=10.0, name='x0',latex_label='$x_0$')
 x1 = Uniform(minimum=-5.0, maximum=5.0, name='x1',latex_label='$x_1$')
 c = Uniform(minimum=-.5, maximum=2.0, name='c',latex_label='$c$')