fixing bug when passing errs

j-faria · Jun 4, 2020 · 158fbdd · 158fbdd
1 parent dc6c648
commit 158fbdd
Showing 1 changed file with 16 additions and 7 deletions.
diff --git a/pykima/analysis.py b/pykima/analysis.py
@@ -36,9 +36,18 @@ def planet_parameters(results, star_mass=1.0, sample=None, printit=True):
     if sample is None:
         sample = results.maximum_likelihood_sample(printit=printit)
 
+    mass_errs = False 
+    if isinstance(star_mass, (tuple, list)):
+        mass_errs = True
+
+    format_tuples = lambda data: '{:10.5f} \pm {:.5f}'.format(data[0], data[1]) if mass_errs else '{:12.5f}'.format(data)
+
     if printit:
         print()
-        print('Calculating planet masses with Mstar = %.3f Msun' % star_mass)
+        final_string = star_mass if not mass_errs else '{} \pm {}'.format(star_mass[0], star_mass[1])
+        print('Calculating planet masses with Mstar = {} Msun'.format(final_string))
+
+
     indices = results.indices
     mc = results.max_components
 
@@ -48,7 +57,8 @@ def planet_parameters(results, star_mass=1.0, sample=None, printit=True):
     nplanets = (pars[:mc] != 0).sum()
 
     if printit:
-        print(20* ' ' + ('%12s' % 'Mp [Mearth]') + ('%12s' % 'Mp [Mjup]'))
+        extra_padding = 12*' ' if mass_errs else ''
+        print(20* ' ' + ('%12s' % 'Mp [Mearth]') + extra_padding + ('%12s' % 'Mp [Mjup]'))
 
     masses = []
     for j in range(int(nplanets)):
@@ -63,12 +73,11 @@ def planet_parameters(results, star_mass=1.0, sample=None, printit=True):
         m_mjup, m_mearth = get_planet_mass(P, K, ecc, star_mass=star_mass)
 
         if printit:
-            s = 20 * ' '
-            s += '%12.5f' % m_mearth
-            s += '%12.5f' % m_mjup
-            print(s)
+            s = 18 * ' '
+            s += format_tuples(m_mearth)
+            s += format_tuples(m_mjup)
             masses.append(m_mearth)
-
+            print(s)
     return np.array(masses)