Merge branch 'master' into sweep-for-three

diffsims/__init__.py

@@ -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,
@@ -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

diffsims/crystallography/__init__.py

@@ -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",
+]