Skip to content

Commit

Permalink
Merge def86c4 into 9805df4
Browse files Browse the repository at this point in the history
  • Loading branch information
hakonanes committed Sep 8, 2020
2 parents 9805df4 + def86c4 commit dd8aa4c
Show file tree
Hide file tree
Showing 15 changed files with 1,506 additions and 12 deletions.
7 changes: 3 additions & 4 deletions diffsims/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@
# along with diffsims. If not, see <http://www.gnu.org/licenses/>.

import logging
import os
import warnings

import numpy as np

from .generators.diffraction_generator import (
DiffractionGenerator,
Expand All @@ -31,6 +27,9 @@

from .sims.diffraction_simulation import DiffractionSimulation

from .crystallography import * # What's imported is specified in the modules' init
from .structure_factor import * # What's imported is specified in the modules' init

from . import release_info

__version__ = release_info.version
Expand Down
35 changes: 35 additions & 0 deletions diffsims/crystallography/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# -*- coding: utf-8 -*-
# Copyright 2017-2020 The diffsims developers
#
# This file is part of diffsims.
#
# diffsims is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# diffsims is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with diffsims. If not, see <http://www.gnu.org/licenses/>.

"""Generation of reciprocal lattice points (crystal plane, reflector, g,
hkl) for a crystal structure.
"""

from diffsims.crystallography.reciprocal_lattice_point import (
ReciprocalLatticePoint,
get_equivalent_hkl,
get_highest_hkl,
get_hkl,
)

__all__ = [
"ReciprocalLatticePoint",
"get_equivalent_hkl",
"get_highest_hkl",
"get_hkl",
]
Loading

0 comments on commit dd8aa4c

Please sign in to comment.