Skip to content

Commit

Permalink
Merge pull request #110 from pllim/doc-ftp
Browse files Browse the repository at this point in the history 
Fix outdated FTP doc
  • Loading branch information
@pllim
pllim authored Feb 13, 2019
2 parents 2b5f1ac + 2aab6ca commit a125ff9
Show file tree
Hide file tree
Showing 4 changed files with 76 additions and 84 deletions.
4 changes: 2 additions & 2 deletions doc/source/appendixa.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ calibration spectra and astronomical catalogs be found at the
which supersedes this documentation in case of conflicting information.
The data files are available at STScI on all science computing clusters in the
``$PYSYN_CDBS`` directory. Off-site users can obtain these data via
anonymous FTP (see :ref:`pysynphot-installation-setup`).
HTTP (see :ref:`pysynphot-installation-setup`).

Stellar models:

Expand Down Expand Up @@ -103,7 +103,7 @@ Considering that the entire atlas occupies close to 70 MB of disk space,
many applications could be satisfied by a copy of the solar metallicity
spectra only (Table 2 of the README file).
See
`Kurucz 1993 atlas README file <ftp://ftp.stsci.edu/cdbs/grid/k93models/AA_README>`_
`Kurucz 1993 atlas README file <http://ssb.stsci.edu/cdbs/grid/k93models/AA_README>`_
for more details.

The models are in ``flam`` *surface* flux units. If the number of counts or the
Expand Down
2 changes: 1 addition & 1 deletion doc/source/how_works.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ they will be able to use **pysynphot**. This can be done in one of two ways:
:ref:`pysynphot-installation-setup`. This method offers the convenience of
automatically creating the necessary directory tree for the data.
* Individual CRDS files: An alternate method is to transfer the
individual tables using anonymous FTP (``ftp.stsci.edu``) to STScI
individual tables using HTTP (``ssb.stsci.edu/cdbs``) to STScI
from the directories given also in :ref:`pysynphot-installation-setup`.

The best method is perhaps a combination of the two: First-time
Expand Down
150 changes: 71 additions & 79 deletions doc/source/index.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,77 +81,77 @@ In csh shell::

setenv PYSYN_CDBS /my/local/dir/cdbs/

These data files [#f1]_ are needed for calculations involving HST bandpasses:

+----------------------------+------------------------------+-------------------------------------------------+
| Description | Directory name | Download |
+============================+==============================+=================================================+
|Master tables | $PYSYN_CDBS/mtab/ |ftp://ftp.stsci.edu/cdbs/tarfiles/synphot1.tar.gz|
+----------------------------+------------------------------+ |
|HST/ACS throughput tables | $PYSYN_CDBS/comp/acs/ | |
+----------------------------+------------------------------+ |
|HST/COS throughput tables | $PYSYN_CDBS/comp/cos/ | |
+----------------------------+------------------------------+ |
|HST/FGS throughput tables | $PYSYN_CDBS/comp/fgs/ | |
+----------------------------+------------------------------+ |
|HST/FOC throughput tables | $PYSYN_CDBS/comp/foc/ | |
+----------------------------+------------------------------+ |
|HST/FOS throughput tables | $PYSYN_CDBS/comp/fos/ | |
+----------------------------+------------------------------+ |
|HST/HRS throughput tables | $PYSYN_CDBS/comp/hrs/ | |
+----------------------------+------------------------------+ |
|HST/HSP throughput tables | $PYSYN_CDBS/comp/hsp/ | |
+----------------------------+------------------------------+ |
|HST/NICMOS throughput tables| $PYSYN_CDBS/comp/nicmos/ | |
+----------------------------+------------------------------+ |
|HST/OTA throughput tables | $PYSYN_CDBS/comp/ota/ | |
+----------------------------+------------------------------+ |
|HST/STIS throughput tables | $PYSYN_CDBS/comp/stis/ | |
+----------------------------+------------------------------+ |
|HST/WFC3 throughput tables | $PYSYN_CDBS/comp/wfc3/ | |
+----------------------------+------------------------------+ |
|HST/WFPC1 throughput tables | $PYSYN_CDBS/comp/wfpc/ | |
+----------------------------+------------------------------+ |
|HST/WFPC2 throughput tables | $PYSYN_CDBS/comp/wfpc2/ | |
+----------------------------+------------------------------+ |
|Non-HST throughput tables | $PYSYN_CDBS/comp/nonhst/ | |
+----------------------------+------------------------------+-------------------------------------------------+

These data files [#f1]_ are needed for calculations involving source spectra:

+------------------------------------------+----------------------------+-------------------------------------------------+
| Description | Directory name | Download |
+==========================================+============================+=================================================+
|Interstellar extinction curves |$PYSYN_CDBS/extinction/ |ftp://ftp.stsci.edu/cdbs/tarfiles/synphot2.tar.gz|
+------------------------------------------+----------------------------+ |
|AGN templates |$PYSYN_CDBS/grid/agn/ | |
+------------------------------------------+----------------------------+ |
|Bruzual-Charlot galaxy spectra |$PYSYN_CDBS/grid/bc95/ | |
+------------------------------------------+----------------------------+ |
|Buser-Kurucz stellar atlas |$PYSYN_CDBS/grid/bkmodels/ | |
+------------------------------------------+----------------------------+ |
|Bruzual-Persson-Gunn-Stryker stellar atlas|$PYSYN_CDBS/grid/bpgs/ | |
+------------------------------------------+----------------------------+ |
|Bruzual stellar atlas |$PYSYN_CDBS/grid/bz77/ | |
+------------------------------------------+----------------------------+ |
|Galactic emission line objects |$PYSYN_CDBS/grid/galactic/ | |
+------------------------------------------+----------------------------+ |
|Gunn-Stryker atlas |$PYSYN_CDBS/grid/gunnstryker| |
+------------------------------------------+----------------------------+ |
|Jacobi-Hunter-Christian stellar atlas |$PYSYN_CDBS/grid/jacobi/ | |
+------------------------------------------+----------------------------+ |
|Kinney-Calzetti galaxy spectra |$PYSYN_CDBS/grid/kc96/ | |
+------------------------------------------+----------------------------+ |
|Pickles stellar atlas |$PYSYN_CDBS/grid/pickles/ | |
+------------------------------------------+----------------------------+-------------------------------------------------+
|Castelli & Kurucz (2004) stellar atlas |$PYSYN_CDBS/grid/ck04models/|ftp://ftp.stsci.edu/cdbs/tarfiles/synphot3.tar.gz|
+------------------------------------------+----------------------------+-------------------------------------------------+
|Kurucz (1993) stellar atlas |$PYSYN_CDBS/grid/k93models/ |ftp://ftp.stsci.edu/cdbs/tarfiles/synphot4.tar.gz|
+------------------------------------------+----------------------------+-------------------------------------------------+
|Phoenix stellar atlas |$PYSYN_CDBS/grid/phoenix/ |ftp://ftp.stsci.edu/cdbs/tarfiles/synphot5.tar.gz|
+------------------------------------------+----------------------------+-------------------------------------------------+
|HST calibration spectra |$PYSYN_CDBS/calspec/ |ftp://ftp.stsci.edu/cdbs/tarfiles/synphot6.tar.gz|
+------------------------------------------+----------------------------+-------------------------------------------------+
These data files are needed for calculations involving HST bandpasses:

+----------------------------+------------------------------+--------------------------------------------------+
| Description | Directory name | Download |
+============================+==============================+==================================================+
|Master tables | $PYSYN_CDBS/mtab/ |http://ssb.stsci.edu/cdbs/tarfiles/synphot1.tar.gz|
+----------------------------+------------------------------+ |
|HST/ACS throughput tables | $PYSYN_CDBS/comp/acs/ | |
+----------------------------+------------------------------+ |
|HST/COS throughput tables | $PYSYN_CDBS/comp/cos/ | |
+----------------------------+------------------------------+ |
|HST/FGS throughput tables | $PYSYN_CDBS/comp/fgs/ | |
+----------------------------+------------------------------+ |
|HST/FOC throughput tables | $PYSYN_CDBS/comp/foc/ | |
+----------------------------+------------------------------+ |
|HST/FOS throughput tables | $PYSYN_CDBS/comp/fos/ | |
+----------------------------+------------------------------+ |
|HST/HRS throughput tables | $PYSYN_CDBS/comp/hrs/ | |
+----------------------------+------------------------------+ |
|HST/HSP throughput tables | $PYSYN_CDBS/comp/hsp/ | |
+----------------------------+------------------------------+ |
|HST/NICMOS throughput tables| $PYSYN_CDBS/comp/nicmos/ | |
+----------------------------+------------------------------+ |
|HST/OTA throughput tables | $PYSYN_CDBS/comp/ota/ | |
+----------------------------+------------------------------+ |
|HST/STIS throughput tables | $PYSYN_CDBS/comp/stis/ | |
+----------------------------+------------------------------+ |
|HST/WFC3 throughput tables | $PYSYN_CDBS/comp/wfc3/ | |
+----------------------------+------------------------------+ |
|HST/WFPC1 throughput tables | $PYSYN_CDBS/comp/wfpc/ | |
+----------------------------+------------------------------+ |
|HST/WFPC2 throughput tables | $PYSYN_CDBS/comp/wfpc2/ | |
+----------------------------+------------------------------+ |
|Non-HST throughput tables | $PYSYN_CDBS/comp/nonhst/ | |
+----------------------------+------------------------------+--------------------------------------------------+

These data files are needed for calculations involving source spectra:

+------------------------------------------+----------------------------+--------------------------------------------------+
| Description | Directory name | Download |
+==========================================+============================+==================================================+
|Interstellar extinction curves |$PYSYN_CDBS/extinction/ |http://ssb.stsci.edu/cdbs/tarfiles/synphot2.tar.gz|
+------------------------------------------+----------------------------+ |
|AGN templates |$PYSYN_CDBS/grid/agn/ | |
+------------------------------------------+----------------------------+ |
|Bruzual-Charlot galaxy spectra |$PYSYN_CDBS/grid/bc95/ | |
+------------------------------------------+----------------------------+ |
|Buser-Kurucz stellar atlas |$PYSYN_CDBS/grid/bkmodels/ | |
+------------------------------------------+----------------------------+ |
|Bruzual-Persson-Gunn-Stryker stellar atlas|$PYSYN_CDBS/grid/bpgs/ | |
+------------------------------------------+----------------------------+ |
|Bruzual stellar atlas |$PYSYN_CDBS/grid/bz77/ | |
+------------------------------------------+----------------------------+ |
|Galactic emission line objects |$PYSYN_CDBS/grid/galactic/ | |
+------------------------------------------+----------------------------+ |
|Gunn-Stryker atlas |$PYSYN_CDBS/grid/gunnstryker| |
+------------------------------------------+----------------------------+ |
|Jacobi-Hunter-Christian stellar atlas |$PYSYN_CDBS/grid/jacobi/ | |
+------------------------------------------+----------------------------+ |
|Kinney-Calzetti galaxy spectra |$PYSYN_CDBS/grid/kc96/ | |
+------------------------------------------+----------------------------+ |
|Pickles stellar atlas |$PYSYN_CDBS/grid/pickles/ | |
+------------------------------------------+----------------------------+--------------------------------------------------+
|Castelli & Kurucz (2004) stellar atlas |$PYSYN_CDBS/grid/ck04models/|http://ssb.stsci.edu/cdbs/tarfiles/synphot3.tar.gz|
+------------------------------------------+----------------------------+--------------------------------------------------+
|Kurucz (1993) stellar atlas |$PYSYN_CDBS/grid/k93models/ |http://ssb.stsci.edu/cdbs/tarfiles/synphot4.tar.gz|
+------------------------------------------+----------------------------+--------------------------------------------------+
|Phoenix stellar atlas |$PYSYN_CDBS/grid/phoenix/ |http://ssb.stsci.edu/cdbs/tarfiles/synphot5.tar.gz|
+------------------------------------------+----------------------------+--------------------------------------------------+
|HST calibration spectra |$PYSYN_CDBS/calspec/ |http://ssb.stsci.edu/cdbs/tarfiles/synphot6.tar.gz|
+------------------------------------------+----------------------------+--------------------------------------------------+

Throughout this document, unless explicitly stated otherwise, the examples
assume that ``PYSYN_CDBS`` points to the correct location, and that the relevant
Expand All @@ -174,14 +174,6 @@ Before drawing a new plot, you must clear the existing plot:
>>> plt.clf()


.. rubric:: Footnotes

.. [#f1] There is a known bug with the FTP service from Safari, so we recommend
to use Firefox to download these files via FTP. If this does not work, use a
standalone application or anonymous FTP; which is more likely to allow you
access to these FTP areas.
.. _pysynphot-tree:

Using **pysynphot**
Expand Down
4 changes: 2 additions & 2 deletions pysynphot/test/test_write.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ def test_write(tmpdir, obj):
@pytest.mark.remote_data
class TestWriteParse(object):
"""
pytest.mark.parametrize gives URLError for FTP connection, so we have
to do it this way instead.
pytest.mark.parametrize gives URLError for HTTP or FTP connection,
so we have to do it this way instead.
"""
def setup_class(self):
self.obj = interpret(parse(scan('ebmvx(0.5,gal1)')))
Expand Down

0 comments on commit a125ff9

Please sign in to comment.