From 5564a3f2212d109d57439ab7459ed83da38bf86c Mon Sep 17 00:00:00 2001
From: Colm Talbot <colm.talbot@ligo.org>
Date: Fri, 18 May 2018 11:59:52 +1000
Subject: [PATCH] make sure conversion function is only used if given

---
 tupak/sampler.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tupak/sampler.py b/tupak/sampler.py
index 5b431b896..805cd87bf 100644
--- a/tupak/sampler.py
+++ b/tupak/sampler.py
@@ -466,7 +466,8 @@ def run_sampler(likelihood, priors=None, label='label', outdir='outdir',
             result.log_bayes_factor = result.logz - result.noise_logz
         if injection_parameters is not None:
             result.injection_parameters = injection_parameters
-            tupak.conversion.generate_all_bbh_parameters(result.injection_parameters)
+            if conversion_function is not None:
+                conversion_function(result.injection_parameters)
         result.fixed_parameter_keys = [key for key in priors if isinstance(key, prior.DeltaFunction)]
         # result.prior = prior  # Removed as this breaks the saving of the data
         result.samples_to_data_frame(likelihood=likelihood, priors=priors, conversion_function=conversion_function)
-- 
GitLab