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

Version 1.3.6
California-Planet-Search · Feb 14, 2020 · 261a820 · 261a820
2 parents b512512 + 6b38895
commit 261a820
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 15 deletions.
diff --git a/docs/tutorials/GaussianProcess-tutorial.ipynb b/docs/tutorials/GaussianProcess-tutorial.ipynb
@@ -61,6 +61,7 @@
     "import pandas as pd\n",
     "import os\n",
     "import radvel\n",
+    "import radvel.likelihood\n",
     "from radvel.plot import orbit_plots, mcmc_plots\n",
     "from scipy import optimize\n",
     "\n",

diff --git a/docs/tutorials/K2-24_Fitting+MCMC.ipynb b/docs/tutorials/K2-24_Fitting+MCMC.ipynb
@@ -49,6 +49,7 @@
     "import corner\n",
     "\n",
     "import radvel\n",
+    "import radvel.likelihood\n",
     "from radvel.plot import orbit_plots, mcmc_plots\n",
     "\n",
     "matplotlib.rcParams['font.size'] = 14"

diff --git a/docs/tutorials/SyntheticData.ipynb b/docs/tutorials/SyntheticData.ipynb
@@ -31,6 +31,7 @@
    "source": [
     "%pylab inline\n",
     "import radvel\n",
+    "import radvel.likelihood\n",
     "\n",
     "import corner\n",
     "import copy\n",

diff --git a/docs/tutorials/rawchains.h5 b/docs/tutorials/rawchains.h5
diff --git a/radvel/__init__.py b/radvel/__init__.py
@@ -25,7 +25,7 @@ def _custom_warningfmt(msg, *a, **b):
 __all__ = ['model', 'likelihood', 'posterior', 'mcmc', 'prior', 'utils',
          'fitting', 'report', 'cli', 'driver', 'gp']
 
-__version__ = '1.3.5'
+__version__ = '1.3.6'
 __spec__ = __name__
 __package__ = __path__[0]
 

diff --git a/radvel/plot/orbit_plots.py b/radvel/plot/orbit_plots.py
@@ -358,30 +358,33 @@ def plot_phasefold(self, pltletter, pnum):
             labels = dp.labels
             texlabels = dp.texlabels
             units = dp.units
-            if units == "M$_{\\rm Jup}$":
-                conversion_fac = 0.00315
-            elif units == "M$_{\\odot}$":
-                conversion_fac = 0.000954265748
-            else:
-                conversion_fac = 1
             derived_params = ['mpsini']
             for l, par in enumerate(derived_params):
                 par_label = par + str(pnum)
                 if par_label in self.post.derived.columns:
-                    val = self.post.derived["%s%d" % (derived_params[l], pnum)].loc[0.500]
-                    low = self.post.derived["%s%d" % (derived_params[l], pnum)].loc[0.159]
-                    high = self.post.derived["%s%d" % (derived_params[l], pnum)].loc[0.841]
+                    index = np.where(np.array(labels) == par_label)[0][0]
+
+                    unit = units[index]
+                    if unit == "M$_{\\rm Jup}$":
+                        conversion_fac = 0.00315
+                    elif unit == "M$_{\\odot}$":
+                        conversion_fac = 0.000954265748
+                    else:
+                        conversion_fac = 1
+
+                    val = self.post.derived["%s%d" % (derived_params[l], pnum)].loc[0.500] * conversion_fac
+                    low = self.post.derived["%s%d" % (derived_params[l], pnum)].loc[0.159] * conversion_fac
+                    high = self.post.derived["%s%d" % (derived_params[l], pnum)].loc[0.841] * conversion_fac
                     err_low = val - low
                     err_high = high - val
                     err = np.mean([err_low, err_high])
                     err = radvel.utils.round_sig(err)
-                    index = np.where(np.array(labels) == par_label)[0][0]
                     if err > 1e-15:
                         val, err, errlow = sigfig(val, err)
                         _anotext = r'$\mathregular{%s}$ = %s $\mathregular{\pm}$ %s %s' \
-                                   % (texlabels[index].replace("$", ""), val*conversion_fac, err*conversion_fac, units[index])
+                                   % (texlabels[index].replace("$", ""), val, err, units[index])
                     else:
-                        _anotext = r'$\mathregular{%s}$ = %4.2f %s' % (texlabels[index].replace("$", ""), val*conversion_fac, units[index])
+                        _anotext = r'$\mathregular{%s}$ = %4.2f %s' % (texlabels[index].replace("$", ""), val, units[index])
 
                     anotext += [_anotext]
 

diff --git a/radvel/templates/fig_corner_derived_pars.tex b/radvel/templates/fig_corner_derived_pars.tex
@@ -3,6 +3,5 @@
 \centering
 {# quotes and tildes needed to render the curly braces around infile with nospaces #}
 {{'\includegraphics[height=8.0in,width=6.0in,keepaspectratio]{'~infile~'}'}}
-\caption{Posterior distributions for all derived parameters. $Mp\sin{i}$ is calculated under the assumption that
-$Mp\sin{i}<<M{\star}$}
+\caption{Posterior distributions for all derived parameters.}
 \end{figure*}