# HG changeset patch
# User Puneeth Chaganti <punchagan@fossee.in>
# Date 1285225317 -19800
# Node ID 680a0692529f6bc937e32135313c47575934d9ae
# Parent  e1b4d3199d945d5468fed6e8c6a60f0073e32a4c
Incorporated changes from review into loading-data-from-files.rst.

diff -r e1b4d3199d94 -r 680a0692529f loading-data-from-files.rst
--- a/loading-data-from-files.rst	Thu Sep 23 12:15:27 2010 +0530
+++ b/loading-data-from-files.rst	Thu Sep 23 12:31:57 2010 +0530
@@ -6,28 +6,15 @@
 
 {{{ Screen shows welcome slide }}}
 
-Until now, all the plots we have made use analytic functions. We have
-been using analytic functions to generate a sequence of points and
-plotting them, against another sequence of points. But, this is not
-what we do most often. We often require to plot points obtained from
-experimental observations.
-
-.. #[punch: the initial part of the paragraph may be removed, to make
-    this a more generic LO?]
-
-.. #[Nishanth]: The paragraph can be removed.
-
-In this tutorial we shall learn to read data from files and save it
-into sequences that can later be used to plot.
+We often require to plot points obtained from experimental
+observations. In this tutorial we shall learn to read data from files
+and save it into sequences that can later be used to plot.
 
 {{{ Show the outline for this tutorial }}} 
 
 We shall use the ``loadtxt`` command to load data from files. We will
-be looking at how to get multiple columns of data into multiple
-sequences.
-
-.. #[Nishanth]: can be "How to read a file with multiple columns of
-                data and load each column of data into a sequence."
+be looking at how to read a file with multiple columns of data and
+load each column of data into a sequence. 
 
 {{{ switch back to the terminal }}}
 
@@ -38,16 +25,18 @@
 
 Now, Let us begin with reading the file primes.txt, which contains
 just a list of primes listed in a column, using the loadtxt command.
-The file, in our case, is present in ``/home/fossee/primes.txt``.
+The file, in our case, is present in ``/home/fossee/primes.txt``. 
+
+{{{ Navigate to the path in the OS, open the file and show it }}}
 
 .. #[punch: do we need a slide for showing the path?]
 
-We use the ``cat`` command to see the contents of this file. 
+.. We use the ``cat`` command to see the contents of this file. 
 
-#[punch: should we show the cat command here? seems like a good place
-to do it] ::
+.. #[punch: should we show the cat command here? seems like a good place
+   to do it] ::
 
-  cat /home/fossee/primes.txt
+     cat /home/fossee/primes.txt
 
 .. #[Nishanth]: A problem for windows users.
                 Should we simply open the file and show them the data
@@ -118,7 +107,8 @@
 
 Notice, that L and T now contain the first and second columns of data
 from the data file, ``pendulum.txt``, and they are both simple
-sequences.
+sequences. ``unpack=True`` has given us the two columns in to two
+separate sequences instead of one complex sequence. 
 
 {{{ show the slide with loadtxt --- other features }}}
 
@@ -135,14 +125,12 @@
 {{{ switch back to the terminal }}}
 ::
 
-  L, T = loadtxt('/home/fossee/pendulum.txt', unpack=True, delimiter=';')
+  L, T = loadtxt('/home/fossee/pendulum_semicolon.txt', unpack=True, delimiter=';')
 
   print L
 
   print T
 
-.. #[Nishanth]: L, T = loadtxt('/home/fossee/pendulum_semicolon.txt', ...)
-
 This brings us to the end of this tutorial. 
 
 {{{ show the summary slide }}}
@@ -156,4 +144,3 @@
 
 Thank you!   
 
-