Merge pull request #103 from silx-kit/training_2022_11_21_pierre

Training 2022-11-21: HDF5

Author: pierrepaleo

python/io/io_hdf5.ipynb

@@ -234,19 +234,6 @@
     "[h5py](https://www.h5py.org/) is the python binding for accessing HDF5 files. Originally from [Andrew Collette](http://shop.oreilly.com/product/0636920030249.do)"
    ]
   },
-  {
-   "cell_type": "markdown",
-   "metadata": {
-    "slideshow": {
-     "slide_type": "subslide"
-    }
-   },
-   "source": [
-    "**Warning**: A major version of h5py has been released at the end of 2020 (3.0).\n",
-    "\n",
-    "Some code might not be compatible with it yet (end of Python2 support, [interface for storing & reading strings has changed](https://docs.h5py.org/en/stable/strings.html)...)."
-   ]
-  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -1116,7 +1103,7 @@
  "metadata": {
   "celltoolbar": "Slideshow",
   "kernelspec": {
-   "display_name": "Python 3",
+   "display_name": "Python 3 (ipykernel)",
    "language": "python",
    "name": "python3"
   },
@@ -1130,7 +1117,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.3"
+   "version": "3.9.2"
   },
   "toc": {
    "base_numbering": 1,

python/io/solutions/exercise1.py

@@ -24,13 +24,12 @@ def flatfield_correction(raw, flat, dark):
 def imshowmany(*args, **kwargs):
     """
     Dispaly as image all array provided as argument.
-    
+
     The image title is defined using the argument name.
     """
     from matplotlib import pyplot
     if len(kwargs) == 0:
-        import collections
-        kwargs = collections.OrderedDict()
+        kwargs = {}
     for i, arg in enumerate(args):
         if isinstance(arg, dict):
             kwargs.update(arg)
@@ -66,6 +65,6 @@ def solution():
         saved = h5out["result"][...]
     imshowmany(Before=raw, After=saved)
 
-    
+
 if __name__ == '__main__':
     solution()

python/io/solutions/exercise2.py

@@ -23,13 +23,12 @@ def flatfield_correction(raw, flat, dark):
 def imshowmany(*args, **kwargs):
     """
     Dispaly as image all array provided as argument.
-    
+
     The image title is defined using the argument name.
     """
     from matplotlib import pyplot
     if len(kwargs) == 0:
-        import collections
-        kwargs = collections.OrderedDict()
+        kwargs = {}
     for i, arg in enumerate(args):
         if isinstance(arg, dict):
             kwargs.update(arg)
@@ -69,13 +68,12 @@ def solution():
                 h5out[name] = normalized
 
     # Check the saved result
-    import collections
-    result = collections.OrderedDict()
+    result = {}
     with h5py.File("exercise2.h5", "r") as h5out:
         for name in h5out:
             result[name] = h5out[name][...]
     imshowmany(result)
 
-    
+
 if __name__ == '__main__':
-    solution()
+    solution()

python/io/solutions/exercise3.py

@@ -24,13 +24,12 @@ def flatfield_correction(raw, flat, dark):
 def imshowmany(*args, **kwargs):
     """
     Dispaly as image all array provided as argument.
-    
+
     The image title is defined using the argument name.
     """
     from matplotlib import pyplot
     if len(kwargs) == 0:
-        import collections
-        kwargs = collections.OrderedDict()
+        kwargs = {}
     for i, arg in enumerate(args):
         if isinstance(arg, dict):
             kwargs.update(arg)
@@ -92,13 +91,12 @@ def solution():
                 h5out[name] = normalized
 
     # Check the saved result
-    import collections
-    result = collections.OrderedDict()
+    result = {}
     with h5py.File("exercise3.h5", "r") as h5out:
         for name in h5out:
             result[name] = h5out[name][...]
     imshowmany(result)
 
-    
+
 if __name__ == '__main__':
     solution()