From 81eae0218b6f04b063d6ab1238c1bf64afc77327 Mon Sep 17 00:00:00 2001
From: Jacob Golomb <jacob.golomb@ligo.org>
Date: Thu, 15 Sep 2022 09:43:17 +0000
Subject: [PATCH] Update bilby/gw/conversion.py

---
 bilby/gw/conversion.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/bilby/gw/conversion.py b/bilby/gw/conversion.py
index 0a2c7039b..9a5e79208 100644
--- a/bilby/gw/conversion.py
+++ b/bilby/gw/conversion.py
@@ -192,14 +192,14 @@ def convert_to_lal_binary_black_hole_parameters(parameters):
 
     converted_parameters = parameters.copy()
     original_keys = list(converted_parameters.keys())
-
-    if 'redshift' in converted_parameters.keys():
-        converted_parameters['luminosity_distance'] = \
-            redshift_to_luminosity_distance(parameters['redshift'])
-    elif 'comoving_distance' in converted_parameters.keys():
-        converted_parameters['luminosity_distance'] = \
-            comoving_distance_to_luminosity_distance(
-                parameters['comoving_distance'])
+    if 'luminosity_distance' not in converted_parameters.keys():
+        if 'redshift' in converted_parameters.keys():
+            converted_parameters['luminosity_distance'] = \
+                redshift_to_luminosity_distance(parameters['redshift'])
+        elif 'comoving_distance' in converted_parameters.keys():
+            converted_parameters['luminosity_distance'] = \
+                comoving_distance_to_luminosity_distance(
+                    parameters['comoving_distance'])
 
     for key in original_keys:
         if key[-7:] == '_source':
-- 
GitLab