Merge pull request #80 from California-Planet-Search/next-release

Version 0.9.8
California-Planet-Search · Sep 29, 2017 · 32baecd · 32baecd
2 parents f797034 + 267ee02
commit 32baecd
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 4 deletions.
diff --git a/radvel/__init__.py b/radvel/__init__.py
@@ -11,7 +11,7 @@
 import os 
 import sys
 
-__version__ = '0.9.7'
+__version__ = '0.9.8'
 
 MODULEDIR, filename = os.path.split(__file__)
 DATADIR = os.path.join(sys.prefix,'radvel_example_data')
diff --git a/radvel/plotting.py b/radvel/plotting.py
@@ -485,6 +485,7 @@ def corner_plot_derived_pars(chains, P, saveplot=None):
     # Determine which columns to include in corner plot
     labels = []
     texlabels = []
+    title_fmts = []
     for i in np.arange(1, P.nplanets +1, 1):
         letter = planet_letters[i]
 
@@ -495,12 +496,31 @@ def corner_plot_derived_pars(chains, P, saveplot=None):
             if not is_column:
                 break
 
-            null_column = chains.isnull().any().ix[label]
+            null_column = chains.isnull().any().loc[label]
             if null_column:
                 break
+
+            tl = texlabel(label,letter)
+
+            # add units to label
+            if key == 'mpsini':
+                unit = "M$_{\oplus}$"
+                if np.median(chains[label]) > 100:
+                    unit = "M$_{\\rm Jup}$"
+                    chains[label] *= 0.00315
+                if np.median(chains[label]) > 100:
+                    unit = "M$_{\odot}$"
+                    chains[label] *= 0.000954265748
+
+                tl += " (%s)" % unit
+            else:
+                tl += " (g cm$^{-3}$)"
+
 
             labels.append(label)
-            texlabels.append(texlabel(label,letter))
+            texlabels.append(tl)
+
+
 
     f = rcParams['font.size']
     rcParams['font.size'] = 12

diff --git a/radvel/prior.py b/radvel/prior.py
@@ -78,11 +78,13 @@ def __init__(self, num_planets, upperlims=0.99):
 
         if type(num_planets) == int:
             self.planet_list = range(1,num_planets+1)
+            npl = len(self.planet_list)
         else:
             self.planet_list = num_planets
+            npl = num_planets
 
         if type(upperlims) == float:
-            self.upperlims = [upperlims] * len(self.planet_list)
+            self.upperlims = [upperlims] * npl
         else:
             assert len(upperlims) == len(self.planet_list), "Number of eccentricity \
 upper limits must match number of planets."