Reorganize files with better names.

Add a little more content to the mlab slides.

9 files changed, 98 insertions, 7 deletions

diff --git a/scipy/basic/Makefile b/scipy/basic/Makefile
index bd43507..94a29fe 100644
--- a/scipy/basic/Makefile
+++ b/scipy/basic/Makefile
@@ -4,12 +4,12 @@
 	pdflatex $*.tex
 	pdflatex $*.tex
 
-SLIDES= intro.pdf prelims.pdf session1a.pdf \
-	session1b.pdf \
-	session2a.pdf \
-	session2b.pdf \
-	session3.pdf \
-	session4.pdf \
+SLIDES= intro.pdf prelims.pdf ipython_plotting.pdf \
+  saving_scripts.pdf \
+	lists_arrays.pdf \
+	numpy.pdf \
+	more_numpy.pdf \
+	basic_scipy.pdf \
 	exercises.pdf \
   mlab.pdf \
   notebook.pdf
diff --git a/scipy/basic/README.txt b/scipy/basic/README.txt
index 35d9c22..9495118 100644
--- a/scipy/basic/README.txt
+++ b/scipy/basic/README.txt
@@ -38,6 +38,7 @@ Basic Tutorial:
   introduce the Python language in the context of these common tasks.
   Here is a rough outline of what we propose to cover:
 
+   - Introduction and Preliminaries.
    - Introduction to IPython.
    - Creating basic plots with matplotlib.
    - NumPy array basics: 1D arrays.
@@ -47,6 +48,20 @@ Basic Tutorial:
    - Using SciPy for Linear Algebra, FFT's, root finding and integrating
      ODEs.
 
+Session wise slide breakup:
+
+1. intro.pdf
+2. prelims.pdf
+3. ipython_plotting.pdf
+4. saving_scripts.pdf
+5. lists_arrays.pdf
+6. numpy.pdf
+7. more_numpy.pdf
+8. scipy.pdf
+9. exercises.pdf
+10. notebook.pdf
+11. mlab.pdf
+
 
 * Attendee Requirements:
 
diff --git a/scipy/basic/session4.tex b/scipy/basic/basic_scipy.tex
index 4c65d24..4c65d24 100644
--- a/scipy/basic/session4.tex
+++ b/scipy/basic/basic_scipy.tex
diff --git a/scipy/basic/session1a.tex b/scipy/basic/ipython_plotting.tex
index d0c5bf3..d0c5bf3 100644
--- a/scipy/basic/session1a.tex
+++ b/scipy/basic/ipython_plotting.tex
diff --git a/scipy/basic/session2a.tex b/scipy/basic/lists_arrays.tex
index d5e936f..d5e936f 100644
--- a/scipy/basic/session2a.tex
+++ b/scipy/basic/lists_arrays.tex
diff --git a/scipy/basic/mlab.tex b/scipy/basic/mlab.tex
index 1d7fe45..bb2e4eb 100644
--- a/scipy/basic/mlab.tex
+++ b/scipy/basic/mlab.tex
@@ -80,7 +80,7 @@
 % Title page
 \title[Basic SciPy and Mayavi]{Introductory Scientific Computing with
 Python}
-\subtitle{Simple 3D plots with mlab}
+\subtitle{Simple 3D plots with Mayavi's mlab}
 
 \author[Prabhu] {FOSSEE}
 
@@ -126,6 +126,82 @@ Mumbai
   \maketitle
 \end{frame}
 
+\section{Introduction to Mayavi}
+
+\begin{frame}
+  \frametitle{Mayavi}
+  \begin{itemize}
+  \item 3D visualization library
+  \item Application
+  \item Support for different data formats
+  \item Embeddable, extensible
+  \item Cross-platform
+  \item Fully scriptable
+  \end{itemize}
+\end{frame}
+
+\begin{frame}
+  \frametitle{Installation}
+  \begin{itemize}
+  \item Suggest using a Python distribution
+  \item Canopy's package manager
+  \item \typ{conda}
+  \item \typ{edm}
+  \end{itemize}
+\end{frame}
+
+\section{Getting started with mlab}
+
+\begin{frame}
+  {Overview}
+  \begin{itemize}
+  \item Simple
+  \item Convenient
+  \item Full-featured
+  \end{itemize}
+\end{frame}
+
+\begin{frame}[plain,fragile]
+  \frametitle{Getting started}
+
+ \myemph{With \typ{jupyter}:}
+\begin{lstlisting}[language=bash]
+    $ jupyter console
+    In [1]: %gui qt
+\end{lstlisting} %$
+ \vspace*{0.15in}
+
+  \myemph{Vanilla:}
+\begin{lstlisting}[language=bash]
+    $ ipython --gui=qt
+\end{lstlisting} %$
+ \vspace*{0.15in}
+
+\myemph{Or:}
+\begin{lstlisting}[language=bash]
+    $ ipython
+    In [1]: %gui qt
+\end{lstlisting} %$
+
+\end{frame}
+
+\begin{frame}[fragile,plain]
+  \frametitle{Using notebooks}
+
+  Make sure you have the following code first:
+
+\begin{lstlisting}
+    In [1]: from mayavi import mlab
+    In [2]: mlab.init_notebook()
+\end{lstlisting}
+
+  \begin{itemize}
+    \item Can also use \typ{\%gui qt}
+    \item Plots will pop-up
+  \end{itemize}
+
+\end{frame}
+
 \section{Basic Mayavi: \typ{mlab}}
 
 \begin{frame}[fragile]
diff --git a/scipy/basic/session3.tex b/scipy/basic/more_numpy.tex
index c53cc41..c53cc41 100644
--- a/scipy/basic/session3.tex
+++ b/scipy/basic/more_numpy.tex
diff --git a/scipy/basic/session2b.tex b/scipy/basic/numpy.tex
index 6180ea2..6180ea2 100644
--- a/scipy/basic/session2b.tex
+++ b/scipy/basic/numpy.tex
diff --git a/scipy/basic/session1b.tex b/scipy/basic/saving_scripts.tex
index 04bba5a..04bba5a 100644
--- a/scipy/basic/session1b.tex
+++ b/scipy/basic/saving_scripts.tex