Skip to content

Commit

Permalink
Merge pull request #90 from ericpre/fix_import
Browse files Browse the repository at this point in the history
Fix import
  • Loading branch information
ericpre authored Oct 15, 2024
2 parents 62a32a3 + 1f65ac5 commit 1dffbe2
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion exspy/_misc/eels/hartree_slater_gos.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import numpy as np
from scipy import constants

from hyperspy.defaults_parser import preferences
from exspy._defaults_parser import preferences
from exspy._misc.eels.base_gos import TabulatedGOS


Expand Down
7 changes: 4 additions & 3 deletions exspy/misc/elements.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@

from exspy._misc.elements import elements_db

# atomap still using elements
elements = elements_db

__all__ = [
"elements_db",
]

__all__ = ["elements_db", "elements"]


def __dir__():
Expand Down
1 change: 1 addition & 0 deletions upcoming_changes/90.bugfix.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix preferences import when using Hartree-Slater GOS and re-introduce undocumented import used by ``atomap``.

0 comments on commit 1dffbe2

Please sign in to comment.