various last-minute tweaks, mostly for path that files end up in

Author: eteq

tutorials/UVES/UVES.ipynb

@@ -3,12 +3,12 @@
   "astropy-tutorials": {
    "author": "Hans Moritz G\u00fcnther <hguenther@cfa.harvard.edu>, Miguel de Val-Borro <valborro@princeton.edu>",
    "date": "August 2014",
+   "description": "This tutorial demonstrates the data analysis of MN Lup obtained with the UVES spectrograph on the VLT.",
    "link_name": "Analyzing UVES Spectroscopy with Astropy",
    "name": "",
-   "published": true,
-   "description" : "This tutorial demonstrates the data analysis of MN Lup obtained with the UVES spectrograph on the VLT."
+   "published": true
   },
-  "signature": "sha256:1f74796dfdd5b13d06d2a9bd9913a15fe6aa475e7967f8bd969ddcf17fb1e825"
+  "signature": "sha256:fd9515822031a7a0d16c78263eb9a448fc057188c6f52dc3c59b33c2b20f3354"
  },
  "nbformat": 3,
  "nbformat_minor": 0,
@@ -78,13 +78,7 @@
      "cell_type": "markdown",
      "metadata": {},
      "source": [
-      "Please download the tar file and extract\n",
-      "the content by executing the python code below.\n",
-      "Executing this block will download and extract a tar file with data\n",
-      "necessary for this tutorial. By default it will run in whatever\n",
-      "directory you have placed this notebook. If that's some place\n",
-      "you don't want to fill with data files, change the\n",
-      "location_for_data_file variable."
+      "Please download the tar file and extract the content by executing the python code below. Executing this block will download and extract a tar file with data necessary for this tutorial. By default it will run in whatever directory you have placed this notebook. If that's some place you don't want to fill with data files, change the `working_dir_path` variable."
      ]
     },
     {
@@ -95,13 +89,12 @@
       "from astropy.utils.data import download_file\n",
       "url = 'http://data.astropy.org/tutorials/UVES/data_UVES.tar.gz'\n",
       "f = tarfile.open(download_file(url, cache=True), mode='r|*')\n",
-      "location_for_data_file = '.'  # CHANGE TO WHEREVER YOU WANT THE DATA TO BE EXTRACTED\n",
-      "f.extractall(path=location_for_data_file)"
+      "working_dir_path = '.'  # CHANGE TO WHEREVER YOU WANT THE DATA TO BE EXTRACTED\n",
+      "f.extractall(path=working_dir_path)"
      ],
      "language": "python",
      "metadata": {},
-     "outputs": [],
-     "prompt_number": 1
+     "outputs": []
     },
     {
      "cell_type": "heading",
@@ -153,14 +146,20 @@
      "collapsed": false,
      "input": [
       "from glob import glob\n",
+      "import os\n",
       "\n",
       "import numpy as np\n",
       "\n",
       "from astropy.wcs import WCS\n",
       "from astropy.io import fits\n",
       "\n",
+      "# os.path.join is a platform-independent way to join two directories\n",
+      "globpath = os.path.join(working_dir_path, 'UVES/*.fits')\n",
+      "\n",
+      "print globpath\n",
       "# glob searches through directories similar to the Unix shell\n",
-      "filelist = glob('UVES/*.fits')\n",
+      "filelist = glob(globpath)\n",
+      "\n",
       "# sort alphabetically - given the way the filenames are\n",
       "# this also sorts in time\n",
       "filelist.sort()"
@@ -1055,7 +1054,7 @@
       "ewcol = Column(name = 'EW', data = ew, format = '{:.1f}', unit = '\\\\AA')\n",
       "tab = Table((datecol, pcol, ewcol))\n",
       "# latexdicts['AA'] contains the style specifics for A&A (\\hline etc.)\n",
-      "tab.write('EWtab.tex', latexdict = ascii.latexdicts['AA'])"
+      "tab.write(os.path.join(working_dir, 'EWtab.tex'), latexdict = ascii.latexdicts['AA'])"
      ],
      "language": "python",
      "metadata": {},
@@ -1424,4 +1423,4 @@
    "metadata": {}
   }
  ]
-}
+}