Skip to content

Commit

Permalink
Merge pull request #153 from pycroscopy/use_dict3
Browse files Browse the repository at this point in the history
Use dict3
  • Loading branch information
gduscher authored Feb 4, 2024
2 parents 55c31e6 + 8a3019e commit 297210b
Show file tree
Hide file tree
Showing 12 changed files with 6,850 additions and 76 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -220,3 +220,4 @@ notebooks/Imaging/DMReader_EELS_STO.dm3
notebooks/Imaging/EMDReader_Spectrum_FEI (1).emd
notebooks/Imaging/NionReader_ImageStack_STO_HAADF.h5
example_data/p1-3-hr3-1.hf5
notebooks/Spectroscopy/EDS-Copy1.ipynb
2 changes: 1 addition & 1 deletion _toc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ chapters:
- file: notebooks/2_Image_Tools
sections:
- file: notebooks/Imaging/Adaptive_Fourier_Filter
- file: notebooks/3_EELS_Tools
- file: notebooks/3_Spectroscopy_Tools
8 changes: 5 additions & 3 deletions installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,14 @@ such as numpy, h5py etc.
To simplify the installation process, we recommend the installation of
[anaconda](https://www.anaconda.com/distribution/) which contains most of the prerequisite packages,
[conda](https://conda.io/docs/) - a package / environment manager,
as well as an [interactive development environment](https://en.wikipedia.org/wiki/Integrated_development_environment>`_ - `Spyder <https://www.coursera.org/learn/python-programming-introduction/lecture/ywcuv/introduction-to-the-spyder-ide)
as well as an [interactive development environment](https://en.wikipedia.org/wiki/Integrated_development_environment) -
[Spyder](https://www.coursera.org/learn/python-programming-introduction/lecture/ywcuv/introduction-to-the-spyder-ide)


Please note that any other python installation will work too and that pypi will install all missing packages.

Compatibility
~~~~~~~~~~~~~

* pyTEMlib is compatible with python 3.8 onwards. Please raise an issue if you find a bug.
* We do not support 32 bit architectures
* We only support text that is UTF-8 compliant due to restrictions posed by HDF5
Expand Down Expand Up @@ -87,4 +89,4 @@ If it does not work try reinstalling the package:
pip install pyTEMlib

## Other software
We recommend [HDF View](https://support.hdfgroup.org/products/java/hdfview/)_ for exploring HDF5 files generated by and used in pyTEMlib.
We recommend [HDF View](https://support.hdfgroup.org/products/java/hdfview/) for exploring HDF5 files generated by and used in pyTEMlib.
Binary file modified logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"<hr style=\"height:1px;border-top:4px solid #FF8200\" />\n",
"\n",
"\n",
"# EELS Tools\n",
"# Spectroscopy Tools\n",
"\n",
"\n",
"part of \n",
Expand All @@ -29,10 +29,13 @@
"\n",
"Usage of the Image Tools of [pyTEMlib](_pyTEMlib.ipynb)\n",
"\n",
"## [Low-Loss Spectra](EELS/Analyse_Low_Loss.ipynb)\n",
"## [Core-Loss Spectra](EELS/Analysis_Core_Loss.ipynb)\n",
"## [Low-Loss Spectral Images](Analyse_Low-Loss_Spectral_Images.ipynb)\n",
"## [Core-Loss Spectral Images](Analyse_Core-Loss_Spectral_Images.ipynb)\n"
"## [Low-Loss Spectra](Spectroscopy/Analyse_Low_Loss.ipynb)\n",
"## [Core-Loss Spectra](Spectroscopy/Analysis_Core_Loss.ipynb)\n",
"## [Low-Loss Spectral Images](Spectroscopy/Analyse_Low-Loss_Spectral_Images.ipynb)\n",
"## [Core-Loss Spectral Images](Spectroscopy/Analyse_Core-Loss_Spectral_Images.ipynb)\n",
"\n",
"## [EDS Spectra](Spectroscopy/Analyse_EDS_Spectra.ipynb)\n",
"## [EDS Spectral Images](Spectroscopy/Analyse_EDS_Spectral_Images.ipynb)\n"
]
},
{
Expand All @@ -57,7 +60,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.10.11"
"version": "3.10.12"
},
"toc": {
"base_numbering": "3",
Expand Down
Loading

0 comments on commit 297210b

Please sign in to comment.