Cleaned imports

Author: Marcraven

setup.cfg

@@ -11,10 +11,10 @@ project_urls =
     Documentation = https://fable-3dxrd.github.io/xrd_simulator/
 classifiers =
     Programming Language :: Python :: 3.10
-    Programming Language :: Python :: 3.11
+    Programming Language :: Python :: 3.13
     License :: OSI Approved :: MIT License
     Operating System :: OS Independent
 
 [options]
 packages = find:
-python_requires = >=3.10
+python_requires = >=3.13

setup.py

@@ -21,7 +21,7 @@
         "Operating System :: OS Independent",
     ],
     packages=setuptools.find_packages(),
-    python_requires=">=3.9",
+    python_requires=">=3.13",
     install_requires=[
         # Core numeric/scientific
         "numpy>=1.24.0",
@@ -37,6 +37,8 @@
 
         # Visualization
         "matplotlib",
+        "Pillow>=9.0.0",
+        "scikit-image",
 
         # Scientific computing
         "numba",

xrd_simulator/beam.py

@@ -13,7 +13,6 @@
 from scipy.spatial import ConvexHull, HalfspaceIntersection
 from scipy.optimize import linprog
 import torch
-from xrd_simulator import cuda
 
 torch.set_default_dtype(torch.float64)
 from xrd_simulator.utils import ensure_torch, ensure_numpy

xrd_simulator/detector.py

@@ -19,12 +19,10 @@
 import numpy as np
 import torch
 import torch.nn.functional as F
-from scipy.spatial import ConvexHull
-from skimage.draw import polygon
 
 from xrd_simulator import utils
 from xrd_simulator.utils import ensure_torch, ensure_numpy
-from xrd_simulator import cuda
+
 
 torch.set_default_dtype(torch.float64)
 

xrd_simulator/laue.py

@@ -4,7 +4,7 @@
 """
 import numpy as np
 import torch
-from xrd_simulator import utils,cuda
+
 torch.set_default_dtype(torch.float64)
 
 def get_G(U, B, G_hkl):
@@ -30,8 +30,6 @@ def get_G(U, B, G_hkl):
 
     return torch.matmul(torch.matmul(U, B), G_hkl.T)
 
-
-
 def get_bragg_angle(G, wavelength):
     """Compute a Bragg angle given a diffraction (scattering) vector.
 
@@ -45,7 +43,6 @@ def get_bragg_angle(G, wavelength):
     """
     return np.arcsin(np.linalg.norm(G, axis=0) * wavelength / (4 * np.pi))
 
-
 def get_sin_theta_and_norm_G(G, wavelength):
     """Compute a Bragg angle given a diffraction (scattering) vector.
 

xrd_simulator/mesh.py

@@ -21,7 +21,6 @@
 import meshio
 import torch
 from xrd_simulator import utils, motion
-from xrd_simulator.utils import ensure_torch, ensure_numpy
 
 
 class TetraMesh(object):

xrd_simulator/motion.py

@@ -16,7 +16,6 @@
 import dill
 import torch
 from xrd_simulator.utils import ensure_torch
-from xrd_simulator import cuda
 
 torch.set_default_dtype(torch.float64)
 

xrd_simulator/polycrystal.py

@@ -24,7 +24,6 @@
 from xrd_simulator.motion import RigidBodyMotion
 from xrd_simulator.mesh import TetraMesh
 from xrd_simulator.phase import Phase
-from xrd_simulator import cuda
 
 torch.set_default_dtype(torch.float64)
 

xrd_simulator/utils.py

@@ -68,7 +68,6 @@
         )
 
 import pandas as pd
-from xrd_simulator.cuda import device
 
 
 def set_device(use_gpu=None, verbose=True):