Skip to content

Commit

Permalink
Fix some SDSS-III to SDSS-IV links
Browse files Browse the repository at this point in the history
  • Loading branch information
Benjamin Alan Weaver committed May 1, 2016
1 parent e73424a commit 3ec7c23
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 9 deletions.
9 changes: 5 additions & 4 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ There are four astronomical libraries targeted:

* idlutils_ : a general suite of tools heavily used by SDSS_.
* `Goddard utilities`_ : The `IDL®`_ Astronomy User's Libary, maintained by Wayne Landsman and distributed with idlutils_.
* idlspec2d_ : tools for working with SDSS_ and BOSS_ spectroscopic data.
* idlspec2d_ : tools for working with SDSS_, BOSS_ and eBOSS_ spectroscopic data.
* photoop_ : tools for working with SDSS_ imaging data.

This package affiliated with the astropy_ project and is registered with PyPI_.
Expand Down Expand Up @@ -87,9 +87,10 @@ Legal
.. _idlutils: http://www.sdss.org/dr12/software/idlutils/
.. _SDSS: http://www.sdss.org
.. _`Goddard utilities`: http://idlastro.gsfc.nasa.gov/
.. _idlspec2d: http://www.sdss3.org/svn/repo/idlspec2d/trunk/
.. _BOSS: http://www.sdss3.org/surveys/boss.php
.. _photoop: http://www.sdss3.org/svn/repo/photoop/trunk/
.. _idlspec2d: https://svn.sdss.org/public/repo/eboss/idlspec2d/trunk/
.. _BOSS: http://www.sdss.org/surveys/boss/
.. _eBOSS: http://www.sdss.org/surveys/eboss/
.. _photoop: https://svn.sdss.org/public/repo/sdss/photoop/trunk/
.. _astropy: http://www.astropy.org
.. _PyPI: https://pypi.python.org/pypi/pydl/
.. _`PyDL on Read the Docs`: http://pydl.readthedocs.org/en/latest/
Expand Down
1 change: 1 addition & 0 deletions docs/pydl/changes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ PyDL Changelog
* Removed unnecessary ``from __future__`` import in
:mod:`pydl.pydlspec2d.spec1d`.
* Ongoing documentation upgrades.
* Update some links that needed to be transitioned from SDSS-III to SDSS-IV.

0.5.0 (2016-05-01)
------------------
Expand Down
10 changes: 5 additions & 5 deletions pydl/pydlutils/sdss.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def sdss_astrombad(run, camcol, field, photolog_version='dr10'):
all must have the same length.
photolog_version : :class:`str`, optional
Use this version of photolog to obtain the obBadfields.par file,
if $PHOTOLOG_DIR is not set.
if :envvar:`PHOTOLOG_DIR` is not set.
Returns
-------
Expand Down Expand Up @@ -114,7 +114,7 @@ def sdss_astrombad(run, camcol, field, photolog_version='dr10'):
iversion = photolog_version
else:
iversion = 'tags/'+photolog_version
baseurl = ('http://www.sdss3.org/svn/repo/photolog/' +
baseurl = ('https://svn.sdss.org/public/data/sdss/photolog/' +
'{0}/opfiles/opBadfields.par').format(iversion)
filename = download_file(baseurl, cache=True)
else:
Expand Down Expand Up @@ -531,7 +531,7 @@ def sdss_sweep_circle(ra, dec, radius, stype='star', allobj=False):
return None


def set_maskbits(idlutils_version='v5_5_8', maskbits_file=None):
def set_maskbits(idlutils_version='v5_5_24', maskbits_file=None):
"""Populate the maskbits cache.
Parameters
Expand Down Expand Up @@ -560,8 +560,8 @@ def set_maskbits(idlutils_version='v5_5_8', maskbits_file=None):
iversion = idlutils_version
else:
iversion = 'tags/'+idlutils_version
baseurl = ('http://www.sdss3.org/svn/repo/idlutils/' +
'{0}/data/sdss/sdssMaskbits.par').format(iversion)
baseurl = ('https://svn.sdss.org/public/repo/sdss/idlutils/' +
'{0}/data/sdss/sdssMaskbits.par').format(iversion)
filename = download_file(baseurl, cache=True, show_progress=False)
else:
filename = maskbits_file
Expand Down

0 comments on commit 3ec7c23

Please sign in to comment.