Merge branch 'master' of https://github.com/silx-kit/silx-training

Author: t20100

python/io/io_hdf5.ipynb

@@ -634,6 +634,46 @@
     "    return (raw - dark) / (flat - dark)"
    ]
   },
+  {
+   "cell_type": "markdown",
+   "metadata": {
+    "slideshow": {
+     "slide_type": "fragment"
+    }
+   },
+   "source": [
+    "*note: if you like to plot an image you can use the imshow command !!! the %pylab should be called once before calling the imshow function !!!*"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "slideshow": {
+     "slide_type": "fragment"
+    }
+   },
+   "outputs": [],
+   "source": [
+    "%matplotlib inline\n",
+    "\n",
+    "from matplotlib import pyplot as plt"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "slideshow": {
+     "slide_type": "fragment"
+    }
+   },
+   "outputs": [],
+   "source": [
+    "import numpy\n",
+    "plt.imshow(numpy.random.random((20, 60)))"
+   ]
+  },
   {
    "cell_type": "markdown",
    "metadata": {
@@ -702,46 +742,6 @@
     "# ...\n"
    ]
   },
-  {
-   "cell_type": "markdown",
-   "metadata": {
-    "slideshow": {
-     "slide_type": "fragment"
-    }
-   },
-   "source": [
-    "*note: if you like to plot an image you can use the imshow command !!! the %pylab should be called once before calling the imshow function !!!*"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {
-    "slideshow": {
-     "slide_type": "fragment"
-    }
-   },
-   "outputs": [],
-   "source": [
-    "%matplotlib inline\n",
-    "\n",
-    "from matplotlib import pyplot as plt"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {
-    "slideshow": {
-     "slide_type": "fragment"
-    }
-   },
-   "outputs": [],
-   "source": [
-    "import numpy\n",
-    "plt.imshow(numpy.random.random((20, 60)))"
-   ]
-  },
   {
    "cell_type": "markdown",
    "metadata": {
@@ -816,7 +816,7 @@
     "\n",
     "This can be an issue, e.g., during acquisition.\n",
     "\n",
-    "WARNING: With file locking disabled, do not open twice the same file for writing or the file will be corrupted.To disable file locking, open the HDF5 file this way:"
+    "WARNING: With file locking disabled, do not open twice the same file for writing or the file will be corrupted. To disable file locking, open the HDF5 file this way:"
    ]
   },
   {
@@ -875,7 +875,7 @@
    "cell_type": "markdown",
    "metadata": {
     "slideshow": {
-     "slide_type": "subslide"
+     "slide_type": "fragment"
     }
    },
    "source": [
@@ -973,13 +973,6 @@
     "* an example on [how to store tomography raw data](http://download.nexusformat.org/doc/html/classes/applications/NXtomo.html?highlight=tomography)\n",
     "* an example to store [tomoraphy application (3D reconstruction)](http://download.nexusformat.org/doc/html/classes/applications/NXtomoproc.html?highlight=tomography)\n"
    ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": []
   }
  ],
  "metadata": {

training_notes/connection.ipynb

@@ -1,6 +1,7 @@
 {
  "cells": [
   {
+   "attachments": {},
    "cell_type": "markdown",
    "metadata": {
     "collapsed": true,
@@ -86,7 +87,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.5.2"
+   "version": "3.7.3"
   }
  },
  "nbformat": 4,