Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add EBSD Hough indexing with a thin wrapper around PyEBSDIndex #590

Merged
merged 21 commits into from
Jan 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
1fa5d2d
List PyEBSDIndex as an optional dependency, add kikuchipy[all]
hakonanes Jan 11, 2023
39d5c1c
Add wrappers for PyEBSDIndex HI functionality in private module
hakonanes Jan 11, 2023
0da351a
Simplify listing of optional dependencies in installation guide
hakonanes Jan 11, 2023
266830d
List new convenience method in public API
hakonanes Jan 11, 2023
2208a11
Add method to get PyEBSDIndex EBSDIndexer from an EBSDDetector
hakonanes Jan 11, 2023
b0f1703
Add Hough indexing from PyEBSDIndex to EBSD class
hakonanes Jan 11, 2023
11da40c
Update Hough indexing tutorial with new functionality
hakonanes Jan 11, 2023
ced3fef
Add IPF color key to map in pattern matching tutorial
hakonanes Jan 11, 2023
a4142ec
Use new Hough indexing functionality in PC moving screen tutorial
hakonanes Jan 11, 2023
721cbb2
Use new Hough indexing functionality in ori/PC sloppy opt. tutorial
hakonanes Jan 11, 2023
1a1dc20
Use new Hough indexing functionality in PC extrapolate tutorial
hakonanes Jan 11, 2023
827cee7
Use new Hough indexing functionality in PC plane fit tutorial
hakonanes Jan 11, 2023
568ffb1
Test EBSDDetector.get_indexer() and start to test hough_indexing()
hakonanes Jan 11, 2023
78599de
Clarify that optional dependencies can be installed manually
hakonanes Jan 12, 2023
c8a672e
Require pyopencl for Hough indexing of lazy patterns
hakonanes Jan 12, 2023
4f5095b
Complete tests of Hough indexing functionality
hakonanes Jan 12, 2023
1d53349
Make PC optimization with PSO deterministic in test
hakonanes Jan 12, 2023
a9ab522
Skip some doctest lines in set_log_level()
hakonanes Jan 12, 2023
fb1dbc5
Do not call temp. dir. clean up in doctest fixture
hakonanes Jan 12, 2023
af8f26b
Remove blank cell in PC fit plane tutorial notebook
hakonanes Jan 12, 2023
74d0a46
Change wording in data module doc following SHA256 -> MD5 change
hakonanes Jan 12, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ jobs:
- name: Install optional dependencies
shell: bash
run: |
pip install -e .'[opt,viz]'
pip install -e .'[all]'

- name: Display Python, pip and package versions
run: |
Expand Down
11 changes: 11 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,13 @@ Unreleased

Added
-----
- Method to get a PyEBSDIndex ``EBSDIndexer`` instance from an ``EBSDDetector``,
convenient for either indexing with PyEBSDIndex or for use with kikuchipy.
(`#590 <https://github.com/pyxem/kikuchipy/pull/590>`_)
- Convenience function to get a ``CrystalMap`` from a PyEBSDIndex Hough indexing result
array. (`#590 <https://github.com/pyxem/kikuchipy/pull/590>`_)
- PyEBSDIndex as an optional dependency.
(`#590 <https://github.com/pyxem/kikuchipy/pull/590>`_)
- Two tutorials showing projection center (PC) fitting and extrapolation to obtain a
plane of PCs to index a full dataset.
(`#588 <https://github.com/pyxem/kikuchipy/pull/588>`_)
Expand Down Expand Up @@ -94,6 +101,10 @@ Changed

Deprecated
----------
- The PyPI selector ``viz`` is replaced by ``all``, which installs all optional
dependencies. ``viz`` will be removed in version 0.9. Install optional dependencies
manually or via ``pip install kikuchipy[all]``.
(`#590 <https://github.com/pyxem/kikuchipy/pull/590>`_)
- ``projections`` module with classes ``GnomonicProjection``, ``HesseNormalForm``,
``LambertProjection`` and ``SphericalProjection``. These will be removed in version
0.9.0, as they are unused internally. If you depend on this module, please open an
Expand Down
26 changes: 13 additions & 13 deletions doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,11 @@
# packages
intersphinx_mapping = {
# Package
"black": ("https://black.readthedocs.io/en/stable", None),
"conda": ("https://conda.io/projects/conda/en/latest", None),
"coverage": ("https://coverage.readthedocs.io/en/latest", None),
"dask": ("https://docs.dask.org/en/stable", None),
"defdap": ("https://defdap.readthedocs.io/en/latest", None),
"diffpy.structure": ("https://www.diffpy.org/diffpy.structure", None),
"diffsims": ("https://diffsims.readthedocs.io/en/latest", None),
"hyperspy": ("https://hyperspy.org/hyperspy-doc/current", None),
Expand All @@ -63,27 +67,23 @@
"matplotlib": ("https://matplotlib.org/stable", None),
"numba": ("https://numba.pydata.org/numba-doc/latest", None),
"numpy": ("https://numpy.org/doc/stable", None),
"nbsphinx": ("https://nbsphinx.readthedocs.io/en/latest", None),
"nbval": ("https://nbval.readthedocs.io/en/latest", None),
"numpydoc": ("https://numpydoc.readthedocs.io/en/latest", None),
"orix": ("https://orix.readthedocs.io/en/stable", None),
"panel": ("https://panel.holoviz.org", None),
"pooch": ("https://www.fatiando.org/pooch/latest", None),
"pyebsdindex": ("https://pyebsdindex.readthedocs.io/en/stable", None),
"pyopencl": ("https://documen.tician.de/pyopencl/", None),
"pytest": ("https://docs.pytest.org/en/stable", None),
# "pythreejs": ("https://pythreejs.readthedocs.io/en/stable", None),
"python": ("https://docs.python.org/3", None),
"pyvista": ("https://docs.pyvista.org", None),
"pyxem": ("https://pyxem.readthedocs.io/en/latest", None),
"readthedocs": ("https://docs.readthedocs.io/en/stable", None),
"scipy": ("https://docs.scipy.org/doc/scipy", None),
"skimage": ("https://scikit-image.org/docs/stable", None),
"sklearn": ("https://scikit-learn.org/stable", None),
# Docs
"black": ("https://black.readthedocs.io/en/stable", None),
"conda": ("https://conda.io/projects/conda/en/latest", None),
"coverage": ("https://coverage.readthedocs.io/en/latest", None),
"defdap": ("https://defdap.readthedocs.io/en/latest", None),
"nbsphinx": ("https://nbsphinx.readthedocs.io/en/latest", None),
"nbval": ("https://nbval.readthedocs.io/en/latest", None),
"numpydoc": ("https://numpydoc.readthedocs.io/en/latest", None),
"panel": ("https://panel.holoviz.org", None),
# "pythreejs": ("https://pythreejs.readthedocs.io/en/stable", None),
"pytest": ("https://docs.pytest.org/en/stable", None),
"pyxem": ("https://pyxem.readthedocs.io/en/latest", None),
"readthedocs": ("https://docs.readthedocs.io/en/stable", None),
"sphinx": ("https://www.sphinx-doc.org/en/master", None),
"sphinx-gallery": ("https://sphinx-gallery.github.io/stable", None),
"xcdskd": ("https://xcdskd.readthedocs.io/en/latest", None),
Expand Down
8 changes: 4 additions & 4 deletions doc/dev/adding_to_data_module.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ Adding data to the data module
Example datasets used in the documentation and tests are included in the
:mod:`kikuchipy.data` module via the `pooch <https://www.fatiando.org/pooch/latest/>`__
Python library. These are listed in a file registry (``kikuchipy.data._registry.py``)
with their file verification string (hash, SHA256, obtain with e.g.
``sha256sum <file>``) and location, the latter potentially not within the package but
from the `kikuchipy-data <https://github.com/pyxem/kikuchipy-data>`__ repository or
elsewhere, since some files are considered too large to include in the package.
with their file verification string (hash, MD5, obtain with e.g. ``md5sum <file>``) and
location, the latter potentially not within the package but from the `kikuchipy-data
<https://github.com/pyxem/kikuchipy-data>`__ repository or elsewhere, since some files
are considered too large to include in the package.

If a required dataset isn't in the package, but is in the registry, it can be downloaded
from the repository when the user passes ``allow_download=True`` to e.g.
Expand Down
Loading