Merge remote-tracking branch 'origin/dev' into strain_take_2

py4dstem · Oct 16, 2023 · e457af6 · e457af6
2 parents 73b4fe7 + ce351d8
commit e457af6
Show file tree

Hide file tree

Showing 16 changed files with 31 additions and 31 deletions.
diff --git a/py4DSTEM/braggvectors/diskdetection_aiml_cuda.py b/py4DSTEM/braggvectors/diskdetection_aiml_cuda.py
@@ -17,8 +17,8 @@
 
 try:
     import cupy as cp
-except:
-    raise ImportError("Import Error: Please install cupy before proceeding")
+except ModuleNotFoundError:
+    raise ImportError("AIML CUDA Requires cupy")
 
 try:
     import tensorflow as tf

diff --git a/py4DSTEM/preprocess/utils.py b/py4DSTEM/preprocess/utils.py
@@ -5,8 +5,8 @@
 
 try:
     import cupy as cp
-except ImportError:
-    cp = None
+except ModuleNotFoundError:
+    cp = np
 
 
 def bin2D(array, factor, dtype=np.float64):

diff --git a/py4DSTEM/process/diffraction/crystal_viz.py b/py4DSTEM/process/diffraction/crystal_viz.py
@@ -149,7 +149,7 @@ def plot_structure(
             zs=xyz[sub, 2],  # + d[2],
             s=size_marker,
             linewidth=2,
-            color=atomic_colors(ID_plot),
+            facecolors=atomic_colors(ID_plot),
             edgecolor=[0, 0, 0],
         )
 

diff --git a/py4DSTEM/process/phase/iterative_base_class.py b/py4DSTEM/process/phase/iterative_base_class.py
@@ -13,8 +13,8 @@
 
 try:
     import cupy as cp
-except ImportError:
-    cp = None
+except ModuleNotFoundError:
+    cp = np
 
 from emdfile import Array, Custom, Metadata, _read_metadata, tqdmnd
 from py4DSTEM.data import Calibration

diff --git a/py4DSTEM/process/phase/iterative_dpc.py b/py4DSTEM/process/phase/iterative_dpc.py
@@ -13,8 +13,8 @@
 
 try:
     import cupy as cp
-except ImportError:
-    cp = None
+except ModuleNotFoundError:
+    cp = np
 
 from emdfile import Array, Custom, Metadata, _read_metadata, tqdmnd
 from py4DSTEM.data import Calibration

diff --git a/py4DSTEM/process/phase/iterative_mixedstate_ptychography.py b/py4DSTEM/process/phase/iterative_mixedstate_ptychography.py
@@ -14,8 +14,8 @@
 
 try:
     import cupy as cp
-except ImportError:
-    cp = None
+except ModuleNotFoundError:
+    cp = np
 
 from emdfile import Custom, tqdmnd
 from py4DSTEM import DataCube

diff --git a/py4DSTEM/process/phase/iterative_multislice_ptychography.py b/py4DSTEM/process/phase/iterative_multislice_ptychography.py
@@ -14,8 +14,8 @@
 
 try:
     import cupy as cp
-except ImportError:
-    cp = None
+except ModuleNotFoundError:
+    cp = np
 
 from emdfile import Custom, tqdmnd
 from py4DSTEM import DataCube

diff --git a/py4DSTEM/process/phase/iterative_overlap_magnetic_tomography.py b/py4DSTEM/process/phase/iterative_overlap_magnetic_tomography.py
@@ -16,8 +16,8 @@
 
 try:
     import cupy as cp
-except ImportError:
-    cp = None
+except ModuleNotFoundError:
+    cp = np
 
 from emdfile import Custom, tqdmnd
 from py4DSTEM import DataCube

diff --git a/py4DSTEM/process/phase/iterative_overlap_tomography.py b/py4DSTEM/process/phase/iterative_overlap_tomography.py
@@ -16,8 +16,8 @@
 
 try:
     import cupy as cp
-except ImportError:
-    cp = None
+except ModuleNotFoundError:
+    cp = np
 
 from emdfile import Custom, tqdmnd
 from py4DSTEM import DataCube

diff --git a/py4DSTEM/process/phase/iterative_parallax.py b/py4DSTEM/process/phase/iterative_parallax.py
@@ -19,8 +19,8 @@
 
 try:
     import cupy as cp
-except ImportError:
-    cp = None
+except ModuleNotFoundError:
+    cp = np
 
 warnings.simplefilter(action="always", category=UserWarning)
 

diff --git a/py4DSTEM/process/phase/iterative_simultaneous_ptychography.py b/py4DSTEM/process/phase/iterative_simultaneous_ptychography.py
@@ -14,8 +14,8 @@
 
 try:
     import cupy as cp
-except ImportError:
-    cp = None
+except ModuleNotFoundError:
+    cp = np
 
 from emdfile import Custom, tqdmnd
 from py4DSTEM import DataCube

diff --git a/py4DSTEM/process/phase/iterative_singleslice_ptychography.py b/py4DSTEM/process/phase/iterative_singleslice_ptychography.py
@@ -14,8 +14,8 @@
 
 try:
     import cupy as cp
-except ImportError:
-    cp = None
+except ModuleNotFoundError:
+    cp = np
 
 from emdfile import Custom, tqdmnd
 from py4DSTEM.datacube import DataCube

diff --git a/py4DSTEM/process/utils/cross_correlate.py b/py4DSTEM/process/utils/cross_correlate.py
@@ -6,8 +6,8 @@
 
 try:
     import cupy as cp
-except ImportError:
-    cp = None
+except ModuleNotFoundError:
+    cp = np
 
 
 def get_cross_correlation(ar, template, corrPower=1, _returnval="real"):

diff --git a/py4DSTEM/process/utils/multicorr.py b/py4DSTEM/process/utils/multicorr.py
@@ -15,8 +15,8 @@
 
 try:
     import cupy as cp
-except ImportError:
-    cp = None
+except ModuleNotFoundError:
+    cp = np
 
 
 def upsampled_correlation(imageCorr, upsampleFactor, xyShift, device="cpu"):

diff --git a/py4DSTEM/process/utils/utils.py b/py4DSTEM/process/utils/utils.py
@@ -24,8 +24,8 @@ def clear_output(wait=True):
 
 try:
     import cupy as cp
-except ImportError:
-    cp = None
+except ModuleNotFoundError:
+    cp = np
 
 
 def radial_reduction(ar, x0, y0, binsize=1, fn=np.mean, coords=None):

diff --git a/setup.py b/setup.py
@@ -57,8 +57,8 @@
     package_data={
         "py4DSTEM": [
             "process/utils/scattering_factors.txt",
-            "process/diskdetection/multicorr_row_kernel.cu",
-            "process/diskdetection/multicorr_col_kernel.cu",
+            "braggvectors/multicorr_row_kernel.cu",
+            "braggvectors/multicorr_col_kernel.cu",
         ]
     },
 )