Commit d703117e authored by syz's avatar syz
Browse files

Merge remote-tracking branch 'origin/cades_dev' into cades_dev_local

# Conflicts:
#	setup.py
parents 972bc0e5 f314598f
...@@ -9,9 +9,9 @@ Examples using ``pycroscopy.be_sho.SHOestimateGuess`` ...@@ -9,9 +9,9 @@ Examples using ``pycroscopy.be_sho.SHOestimateGuess``
.. only:: html .. only:: html
.. figure:: /auto_examples/images/thumb/sphx_glr_tutorial_05_data_processing_thumb.png .. figure:: /auto_examples/dev_tutorials/images/thumb/sphx_glr_plot_tutorial_05_data_processing_thumb.png
:ref:`sphx_glr_auto_examples_tutorial_05_data_processing.py` :ref:`sphx_glr_auto_examples_dev_tutorials_plot_tutorial_05_data_processing.py`
.. raw:: html .. raw:: html
...@@ -19,4 +19,22 @@ Examples using ``pycroscopy.be_sho.SHOestimateGuess`` ...@@ -19,4 +19,22 @@ Examples using ``pycroscopy.be_sho.SHOestimateGuess``
.. only:: not html .. only:: not html
* :ref:`sphx_glr_auto_examples_tutorial_05_data_processing.py` * :ref:`sphx_glr_auto_examples_dev_tutorials_plot_tutorial_05_data_processing.py`
.. raw:: html
<div class="sphx-glr-thumbcontainer" tooltip="**Suhas Somnath**">
.. only:: html
.. figure:: /auto_tutorials/images/thumb/sphx_glr_plot_tutorial_05_data_processing_thumb.png
:ref:`sphx_glr_auto_tutorials_plot_tutorial_05_data_processing.py`
.. raw:: html
</div>
.. only:: not html
* :ref:`sphx_glr_auto_tutorials_plot_tutorial_05_data_processing.py`
...@@ -9,9 +9,9 @@ Examples using ``pycroscopy.be_sho.SHOfunc`` ...@@ -9,9 +9,9 @@ Examples using ``pycroscopy.be_sho.SHOfunc``
.. only:: html .. only:: html
.. figure:: /auto_examples/images/thumb/sphx_glr_tutorial_05_data_processing_thumb.png .. figure:: /auto_examples/dev_tutorials/images/thumb/sphx_glr_plot_tutorial_05_data_processing_thumb.png
:ref:`sphx_glr_auto_examples_tutorial_05_data_processing.py` :ref:`sphx_glr_auto_examples_dev_tutorials_plot_tutorial_05_data_processing.py`
.. raw:: html .. raw:: html
...@@ -19,4 +19,22 @@ Examples using ``pycroscopy.be_sho.SHOfunc`` ...@@ -19,4 +19,22 @@ Examples using ``pycroscopy.be_sho.SHOfunc``
.. only:: not html .. only:: not html
* :ref:`sphx_glr_auto_examples_tutorial_05_data_processing.py` * :ref:`sphx_glr_auto_examples_dev_tutorials_plot_tutorial_05_data_processing.py`
.. raw:: html
<div class="sphx-glr-thumbcontainer" tooltip="**Suhas Somnath**">
.. only:: html
.. figure:: /auto_tutorials/images/thumb/sphx_glr_plot_tutorial_05_data_processing_thumb.png
:ref:`sphx_glr_auto_tutorials_plot_tutorial_05_data_processing.py`
.. raw:: html
</div>
.. only:: not html
* :ref:`sphx_glr_auto_tutorials_plot_tutorial_05_data_processing.py`
...@@ -9,9 +9,9 @@ Examples using ``pycroscopy.hdf_utils.buildReducedSpec`` ...@@ -9,9 +9,9 @@ Examples using ``pycroscopy.hdf_utils.buildReducedSpec``
.. only:: html .. only:: html
.. figure:: /auto_examples/images/thumb/sphx_glr_tutorial_05_data_processing_thumb.png .. figure:: /auto_examples/dev_tutorials/images/thumb/sphx_glr_plot_tutorial_05_data_processing_thumb.png
:ref:`sphx_glr_auto_examples_tutorial_05_data_processing.py` :ref:`sphx_glr_auto_examples_dev_tutorials_plot_tutorial_05_data_processing.py`
.. raw:: html .. raw:: html
...@@ -19,4 +19,22 @@ Examples using ``pycroscopy.hdf_utils.buildReducedSpec`` ...@@ -19,4 +19,22 @@ Examples using ``pycroscopy.hdf_utils.buildReducedSpec``
.. only:: not html .. only:: not html
* :ref:`sphx_glr_auto_examples_tutorial_05_data_processing.py` * :ref:`sphx_glr_auto_examples_dev_tutorials_plot_tutorial_05_data_processing.py`
.. raw:: html
<div class="sphx-glr-thumbcontainer" tooltip="**Suhas Somnath**">
.. only:: html
.. figure:: /auto_tutorials/images/thumb/sphx_glr_plot_tutorial_05_data_processing_thumb.png
:ref:`sphx_glr_auto_tutorials_plot_tutorial_05_data_processing.py`
.. raw:: html
</div>
.. only:: not html
* :ref:`sphx_glr_auto_tutorials_plot_tutorial_05_data_processing.py`
...@@ -9,9 +9,9 @@ Examples using ``pycroscopy.hdf_utils.checkAndLinkAncillary`` ...@@ -9,9 +9,9 @@ Examples using ``pycroscopy.hdf_utils.checkAndLinkAncillary``
.. only:: html .. only:: html
.. figure:: /auto_examples/images/thumb/sphx_glr_tutorial_02_writing_to_h5_thumb.png .. figure:: /auto_examples/dev_tutorials/images/thumb/sphx_glr_plot_tutorial_02_writing_to_h5_thumb.png
:ref:`sphx_glr_auto_examples_tutorial_02_writing_to_h5.py` :ref:`sphx_glr_auto_examples_dev_tutorials_plot_tutorial_02_writing_to_h5.py`
.. raw:: html .. raw:: html
...@@ -19,4 +19,22 @@ Examples using ``pycroscopy.hdf_utils.checkAndLinkAncillary`` ...@@ -19,4 +19,22 @@ Examples using ``pycroscopy.hdf_utils.checkAndLinkAncillary``
.. only:: not html .. only:: not html
* :ref:`sphx_glr_auto_examples_tutorial_02_writing_to_h5.py` * :ref:`sphx_glr_auto_examples_dev_tutorials_plot_tutorial_02_writing_to_h5.py`
.. raw:: html
<div class="sphx-glr-thumbcontainer" tooltip="**Suhas Somnath** 8/8/2017">
.. only:: html
.. figure:: /auto_tutorials/images/thumb/sphx_glr_plot_tutorial_02_writing_to_h5_thumb.png
:ref:`sphx_glr_auto_tutorials_plot_tutorial_02_writing_to_h5.py`
.. raw:: html
</div>
.. only:: not html
* :ref:`sphx_glr_auto_tutorials_plot_tutorial_02_writing_to_h5.py`
Examples using ``pycroscopy.hdf_utils.checkIfMain``
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
.. raw:: html
<div class="sphx-glr-thumbcontainer" tooltip="11/11/2017">
.. only:: html
.. figure:: /auto_examples/user_tutorials/images/thumb/sphx_glr_plot_tutorial_01_interacting_w_h5_files_thumb.png
:ref:`sphx_glr_auto_examples_user_tutorials_plot_tutorial_01_interacting_w_h5_files.py`
.. raw:: html
</div>
.. only:: not html
* :ref:`sphx_glr_auto_examples_user_tutorials_plot_tutorial_01_interacting_w_h5_files.py`
Examples using ``pycroscopy.hdf_utils.check_for_old``
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
.. raw:: html
<div class="sphx-glr-thumbcontainer" tooltip="11/11/2017">
.. only:: html
.. figure:: /auto_examples/user_tutorials/images/thumb/sphx_glr_plot_tutorial_01_interacting_w_h5_files_thumb.png
:ref:`sphx_glr_auto_examples_user_tutorials_plot_tutorial_01_interacting_w_h5_files.py`
.. raw:: html
</div>
.. only:: not html
* :ref:`sphx_glr_auto_examples_user_tutorials_plot_tutorial_01_interacting_w_h5_files.py`
...@@ -9,9 +9,9 @@ Examples using ``pycroscopy.hdf_utils.copy_main_attributes`` ...@@ -9,9 +9,9 @@ Examples using ``pycroscopy.hdf_utils.copy_main_attributes``
.. only:: html .. only:: html
.. figure:: /auto_examples/images/thumb/sphx_glr_tutorial_02_writing_to_h5_thumb.png .. figure:: /auto_examples/dev_tutorials/images/thumb/sphx_glr_plot_tutorial_02_writing_to_h5_thumb.png
:ref:`sphx_glr_auto_examples_tutorial_02_writing_to_h5.py` :ref:`sphx_glr_auto_examples_dev_tutorials_plot_tutorial_02_writing_to_h5.py`
.. raw:: html .. raw:: html
...@@ -19,4 +19,22 @@ Examples using ``pycroscopy.hdf_utils.copy_main_attributes`` ...@@ -19,4 +19,22 @@ Examples using ``pycroscopy.hdf_utils.copy_main_attributes``
.. only:: not html .. only:: not html
* :ref:`sphx_glr_auto_examples_tutorial_02_writing_to_h5.py` * :ref:`sphx_glr_auto_examples_dev_tutorials_plot_tutorial_02_writing_to_h5.py`
.. raw:: html
<div class="sphx-glr-thumbcontainer" tooltip="**Suhas Somnath** 8/8/2017">
.. only:: html
.. figure:: /auto_tutorials/images/thumb/sphx_glr_plot_tutorial_02_writing_to_h5_thumb.png
:ref:`sphx_glr_auto_tutorials_plot_tutorial_02_writing_to_h5.py`
.. raw:: html
</div>
.. only:: not html
* :ref:`sphx_glr_auto_tutorials_plot_tutorial_02_writing_to_h5.py`
Examples using ``pycroscopy.hdf_utils.findDataset``
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
.. raw:: html
<div class="sphx-glr-thumbcontainer" tooltip="11/11/2017">
.. only:: html
.. figure:: /auto_examples/user_tutorials/images/thumb/sphx_glr_plot_tutorial_01_interacting_w_h5_files_thumb.png
:ref:`sphx_glr_auto_examples_user_tutorials_plot_tutorial_01_interacting_w_h5_files.py`
.. raw:: html
</div>
.. only:: not html
* :ref:`sphx_glr_auto_examples_user_tutorials_plot_tutorial_01_interacting_w_h5_files.py`
Examples using ``pycroscopy.hdf_utils.findH5group``
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
.. raw:: html
<div class="sphx-glr-thumbcontainer" tooltip="11/11/2017">
.. only:: html
.. figure:: /auto_examples/user_tutorials/images/thumb/sphx_glr_plot_tutorial_01_interacting_w_h5_files_thumb.png
:ref:`sphx_glr_auto_examples_user_tutorials_plot_tutorial_01_interacting_w_h5_files.py`
.. raw:: html
</div>
.. only:: not html
* :ref:`sphx_glr_auto_examples_user_tutorials_plot_tutorial_01_interacting_w_h5_files.py`
...@@ -27,9 +27,9 @@ Examples using ``pycroscopy.hdf_utils.getAuxData`` ...@@ -27,9 +27,9 @@ Examples using ``pycroscopy.hdf_utils.getAuxData``
.. only:: html .. only:: html
.. figure:: /auto_examples/images/thumb/sphx_glr_tutorial_02_writing_to_h5_thumb.png .. figure:: /auto_examples/dev_tutorials/images/thumb/sphx_glr_plot_tutorial_02_writing_to_h5_thumb.png
:ref:`sphx_glr_auto_examples_tutorial_02_writing_to_h5.py` :ref:`sphx_glr_auto_examples_dev_tutorials_plot_tutorial_02_writing_to_h5.py`
.. raw:: html .. raw:: html
...@@ -37,7 +37,7 @@ Examples using ``pycroscopy.hdf_utils.getAuxData`` ...@@ -37,7 +37,7 @@ Examples using ``pycroscopy.hdf_utils.getAuxData``
.. only:: not html .. only:: not html
* :ref:`sphx_glr_auto_examples_tutorial_02_writing_to_h5.py` * :ref:`sphx_glr_auto_examples_dev_tutorials_plot_tutorial_02_writing_to_h5.py`
.. raw:: html .. raw:: html
...@@ -45,9 +45,9 @@ Examples using ``pycroscopy.hdf_utils.getAuxData`` ...@@ -45,9 +45,9 @@ Examples using ``pycroscopy.hdf_utils.getAuxData``
.. only:: html .. only:: html
.. figure:: /auto_examples/images/thumb/sphx_glr_tutorial_03_multidimensional_data_thumb.png .. figure:: /auto_examples/dev_tutorials/images/thumb/sphx_glr_plot_tutorial_03_multidimensional_data_thumb.png
:ref:`sphx_glr_auto_examples_tutorial_03_multidimensional_data.py` :ref:`sphx_glr_auto_examples_dev_tutorials_plot_tutorial_03_multidimensional_data.py`
.. raw:: html .. raw:: html
...@@ -55,7 +55,7 @@ Examples using ``pycroscopy.hdf_utils.getAuxData`` ...@@ -55,7 +55,7 @@ Examples using ``pycroscopy.hdf_utils.getAuxData``
.. only:: not html .. only:: not html
* :ref:`sphx_glr_auto_examples_tutorial_03_multidimensional_data.py` * :ref:`sphx_glr_auto_examples_dev_tutorials_plot_tutorial_03_multidimensional_data.py`
.. raw:: html .. raw:: html
...@@ -63,9 +63,9 @@ Examples using ``pycroscopy.hdf_utils.getAuxData`` ...@@ -63,9 +63,9 @@ Examples using ``pycroscopy.hdf_utils.getAuxData``
.. only:: html .. only:: html
.. figure:: /auto_examples/images/thumb/sphx_glr_tutorial_04_parallel_computing_thumb.png .. figure:: /auto_examples/dev_tutorials/images/thumb/sphx_glr_plot_tutorial_04_parallel_computing_thumb.png
:ref:`sphx_glr_auto_examples_tutorial_04_parallel_computing.py` :ref:`sphx_glr_auto_examples_dev_tutorials_plot_tutorial_04_parallel_computing.py`
.. raw:: html .. raw:: html
...@@ -73,7 +73,7 @@ Examples using ``pycroscopy.hdf_utils.getAuxData`` ...@@ -73,7 +73,7 @@ Examples using ``pycroscopy.hdf_utils.getAuxData``
.. only:: not html .. only:: not html
* :ref:`sphx_glr_auto_examples_tutorial_04_parallel_computing.py` * :ref:`sphx_glr_auto_examples_dev_tutorials_plot_tutorial_04_parallel_computing.py`
.. raw:: html .. raw:: html
...@@ -81,9 +81,9 @@ Examples using ``pycroscopy.hdf_utils.getAuxData`` ...@@ -81,9 +81,9 @@ Examples using ``pycroscopy.hdf_utils.getAuxData``
.. only:: html .. only:: html
.. figure:: /auto_examples/images/thumb/sphx_glr_tutorial_05_data_processing_thumb.png .. figure:: /auto_examples/dev_tutorials/images/thumb/sphx_glr_plot_tutorial_05_data_processing_thumb.png
:ref:`sphx_glr_auto_examples_tutorial_05_data_processing.py` :ref:`sphx_glr_auto_examples_dev_tutorials_plot_tutorial_05_data_processing.py`
.. raw:: html .. raw:: html
...@@ -91,4 +91,94 @@ Examples using ``pycroscopy.hdf_utils.getAuxData`` ...@@ -91,4 +91,94 @@ Examples using ``pycroscopy.hdf_utils.getAuxData``
.. only:: not html .. only:: not html
* :ref:`sphx_glr_auto_examples_tutorial_05_data_processing.py` * :ref:`sphx_glr_auto_examples_dev_tutorials_plot_tutorial_05_data_processing.py`
.. raw:: html
<div class="sphx-glr-thumbcontainer" tooltip="11/11/2017">
.. only:: html
.. figure:: /auto_examples/user_tutorials/images/thumb/sphx_glr_plot_tutorial_01_interacting_w_h5_files_thumb.png
:ref:`sphx_glr_auto_examples_user_tutorials_plot_tutorial_01_interacting_w_h5_files.py`
.. raw:: html
</div>
.. only:: not html
* :ref:`sphx_glr_auto_examples_user_tutorials_plot_tutorial_01_interacting_w_h5_files.py`
.. raw:: html
<div class="sphx-glr-thumbcontainer" tooltip="**Suhas Somnath** 8/8/2017">
.. only:: html
.. figure:: /auto_tutorials/images/thumb/sphx_glr_plot_tutorial_02_writing_to_h5_thumb.png
:ref:`sphx_glr_auto_tutorials_plot_tutorial_02_writing_to_h5.py`
.. raw:: html
</div>
.. only:: not html
* :ref:`sphx_glr_auto_tutorials_plot_tutorial_02_writing_to_h5.py`
.. raw:: html
<div class="sphx-glr-thumbcontainer" tooltip="**Suhas Somnath** 8/8/2017">
.. only:: html
.. figure:: /auto_tutorials/images/thumb/sphx_glr_plot_tutorial_03_multidimensional_data_thumb.png
:ref:`sphx_glr_auto_tutorials_plot_tutorial_03_multidimensional_data.py`
.. raw:: html
</div>
.. only:: not html
* :ref:`sphx_glr_auto_tutorials_plot_tutorial_03_multidimensional_data.py`
.. raw:: html
<div class="sphx-glr-thumbcontainer" tooltip="**Suhas Somnath, Chris R. Smith**">
.. only:: html
.. figure:: /auto_tutorials/images/thumb/sphx_glr_plot_tutorial_04_parallel_computing_thumb.png
:ref:`sphx_glr_auto_tutorials_plot_tutorial_04_parallel_computing.py`
.. raw:: html
</div>
.. only:: not html
* :ref:`sphx_glr_auto_tutorials_plot_tutorial_04_parallel_computing.py`
.. raw:: html
<div class="sphx-glr-thumbcontainer" tooltip="**Suhas Somnath**">
.. only:: html
.. figure:: /auto_tutorials/images/thumb/sphx_glr_plot_tutorial_05_data_processing_thumb.png
:ref:`sphx_glr_auto_tutorials_plot_tutorial_05_data_processing.py`
.. raw:: html
</div>
.. only:: not html
* :ref:`sphx_glr_auto_tutorials_plot_tutorial_05_data_processing.py`
...@@ -5,13 +5,13 @@ Examples using ``pycroscopy.hdf_utils.getDataSet`` ...@@ -5,13 +5,13 @@ Examples using ``pycroscopy.hdf_utils.getDataSet``
.. raw:: html .. raw:: html
<div class="sphx-glr-thumbcontainer" tooltip="Conventionally, the h5py package is used to create, read, write, and modify h5 files."> <div class="sphx-glr-thumbcontainer" tooltip="11/11/2017">
.. only:: html .. only:: html
.. figure:: /auto_examples/images/thumb/sphx_glr_load_dataset_example_thumb.png .. figure:: /auto_examples/user_tutorials/images/thumb/sphx_glr_plot_tutorial_01_interacting_w_h5_files_thumb.png
:ref:`sphx_glr_auto_examples_load_dataset_example.py` :ref:`sphx_glr_auto_examples_user_tutorials_plot_tutorial_01_interacting_w_h5_files.py`
.. raw:: html .. raw:: html
...@@ -19,4 +19,4 @@ Examples using ``pycroscopy.hdf_utils.getDataSet`` ...@@ -19,4 +19,4 @@ Examples using ``pycroscopy.hdf_utils.getDataSet``
.. only:: not html .. only:: not html
* :ref:`sphx_glr_auto_examples_load_dataset_example.py` * :ref:`sphx_glr_auto_examples_user_tutorials_plot_tutorial_01_interacting_w_h5_files.py`
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment