documentation; updated zenodo link for dartmouth.tri

timothydmorton · May 14, 2015 · 9fedbec · 9fedbec
1 parent 0ac9223
commit 9fedbec
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/docs/index.rst b/docs/index.rst
@@ -23,7 +23,7 @@ I welcome community feedback to help improve this tool.  The code is
 hosted at `GitHub <http://github.com/timothydmorton/isochrones>`_;
 please feel free to contribute. 
 
-.. note
+.. note::
 
   New in v0.9, fitting is now done by default using MultiNest, if 
   available on your system via PyMultiNest.  If you wish to take 
@@ -32,6 +32,10 @@ please feel free to contribute.
   instructions for installing MultiNest and PyMultinest.  If you do 
   not have MultiNest available, the fits should still work using ``emcee``.
 
+.. warning::
+
+  Also note that there was a bug in the 
+
 Installation
 ------------
 
@@ -84,7 +88,7 @@ the following:
     dar = Dartmouth_Isochrone()
 
     model  = StarModel(dar, Teff=Teff, logg=logg, feh=feh)
-    model.fit_mcmc()
+    model.fit()
 
 The model now has a ``samples`` property that contains all of the
 samples generated by the MultiNest/MCMC chain in a :class:`pandas.DataFrame`
@@ -106,13 +110,15 @@ errors) may also be included among the keyword arguments.
 
 If apparent magnitudes are included among the properties, then a call
 to :func:`isochrones.StarModel.fit` will fit for distance and extinction as
-well as mass, age, and [Fe/H].  In this case, it is encouraged to set
-the ``maxAV`` and ``max_distance`` arguments to appropriate values. 
+well as mass, age, and [Fe/H].  In this case, you may also set
+the ``maxAV`` argument to an appropriate value (1 is default), or the ``min_logg``
+argument, if you would like to rule out giant-star fits, for example.
 
-.. note
+.. note::
 
   New in v0.9, when doing a MultiNest fit, you always will be fitting
-  for distance and extinction; you don't have the option not to.
+  for distance and extinction, so you should always provide at least
+  one apparent magnitude.
 
 After running the MultiNest/MCMC chain, you can save the results::
 

diff --git a/isochrones/dartmouth.py b/isochrones/dartmouth.py
@@ -44,7 +44,8 @@ def _download_tri():
     Downloads pre-computed triangulation for Dartmouth grids from Zenodo.
     """
     #url = 'http://zenodo.org/record/12800/files/dartmouth.tri'
-    url = 'http://zenodo.org/record/15843/files/dartmouth.tri'
+    #url = 'http://zenodo.org/record/15843/files/dartmouth.tri'
+    url = 'http://zenodo.org/record/17627/files/dartmouth.tri'
     import urllib
     print('Downloading Dartmouth isochrone pre-computed triangulation (should happen only once...)')
     if os.path.exists(TRI_FILE):