adding else to trys

alex-rakowski · Nov 21, 2023 · 72b4184 · 72b4184
1 parent 78523ab
commit 72b4184
Show file tree

Hide file tree

Showing 19 changed files with 41 additions and 2 deletions.
diff --git a/py4DSTEM/braggvectors/diskdetection_aiml_cuda.py b/py4DSTEM/braggvectors/diskdetection_aiml_cuda.py
@@ -19,6 +19,8 @@
     import cupy as cp
 except (ImportError,ModuleNotFoundError,Exception):
     cp = np
+else:
+    cp = np
 
 try:
     import tensorflow as tf
@@ -32,6 +34,8 @@
     from cupyx.scipy.ndimage import gaussian_filter
 except (ModuleNotFoundError,ImportError,Exception) as e:
     pass
+else:
+    pass
 
 def find_Bragg_disks_aiml_CUDA(
     datacube,

diff --git a/py4DSTEM/braggvectors/diskdetection_cuda.py b/py4DSTEM/braggvectors/diskdetection_cuda.py
@@ -10,6 +10,8 @@
     import cupyx.scipy.fft as cufft
 except (Exception,ModuleNotFoundError,ImportError):
     pass
+else:
+    pass
 from time import time
 import numba
 

diff --git a/py4DSTEM/braggvectors/kernels.py b/py4DSTEM/braggvectors/kernels.py
@@ -2,6 +2,8 @@
     import cupy as cp
 except Exception:
     pass
+else:
+    pass
 
 __all__ = ["kernels"]
 

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

diff --git a/py4DSTEM/process/diffraction/crystal_ACOM.py b/py4DSTEM/process/diffraction/crystal_ACOM.py
@@ -16,6 +16,8 @@
     import cupy as cp
 except (ImportError,ModuleNotFoundError):
     cp = None
+else:
+    cp = None
 
 
 def orientation_plan(

diff --git a/py4DSTEM/process/phase/iterative_base_class.py b/py4DSTEM/process/phase/iterative_base_class.py
@@ -15,6 +15,8 @@
     import cupy as cp
 except (ImportError,ModuleNotFoundError,Exception):
     cp = np
+else:
+    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
@@ -15,6 +15,8 @@
     import cupy as cp
 except (ImportError,ModuleNotFoundError,Exception):
     cp = np
+else:
+    cp = np
 
 from emdfile import Array, Custom, Metadata, _read_metadata, tqdmnd
 from py4DSTEM.data import Calibration

diff --git a/py4DSTEM/process/phase/iterative_mixedstate_multislice_ptychography.py b/py4DSTEM/process/phase/iterative_mixedstate_multislice_ptychography.py
@@ -17,6 +17,8 @@
     import cupy as cp
 except (ImportError,ModuleNotFoundError,Exception):
     cp = np
+else:
+    cp = np
 
 from emdfile import Custom, tqdmnd
 from py4DSTEM import DataCube

diff --git a/py4DSTEM/process/phase/iterative_mixedstate_ptychography.py b/py4DSTEM/process/phase/iterative_mixedstate_ptychography.py
@@ -16,6 +16,8 @@
     import cupy as cp
 except (ImportError,ModuleNotFoundError,Exception):
     cp = np
+else:
+    pass
 
 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
@@ -17,6 +17,8 @@
     import cupy as cp
 except (ImportError,ModuleNotFoundError,Exception):
     cp = np
+else:
+    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
@@ -19,6 +19,8 @@
     import cupy as cp
 except (ImportError,ModuleNotFoundError,Exception):
     cp = np
+else:
+    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
@@ -19,6 +19,8 @@
     import cupy as cp
 except (ImportError,ModuleNotFoundError,Exception):
     cp = np
+else:
+    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
@@ -26,6 +26,8 @@
     import cupy as cp
 except (ImportError,ModuleNotFoundError,Exception):
     cp = np
+else:
+    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
@@ -16,6 +16,8 @@
     import cupy as cp
 except (ImportError,ModuleNotFoundError,Exception):
     cp = np
+else:
+    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
@@ -16,6 +16,8 @@
     import cupy as cp
 except (ImportError,ModuleNotFoundError,Exception):
     cp = np
+else:
+    cp = np
 
 from emdfile import Custom, tqdmnd
 from py4DSTEM.datacube import DataCube

diff --git a/py4DSTEM/process/phase/utils.py b/py4DSTEM/process/phase/utils.py
@@ -11,6 +11,9 @@
 except (ImportError, ModuleNotFoundError,Exception):
     cp = None
     from scipy.fft import dstn, idstn
+else:
+    cp = None
+    from scipy.fft import dstn, idstn
 
 from py4DSTEM.process.utils import get_CoM
 from py4DSTEM.process.utils.cross_correlate import align_and_shift_images

diff --git a/py4DSTEM/process/utils/cross_correlate.py b/py4DSTEM/process/utils/cross_correlate.py
@@ -8,6 +8,8 @@
     import cupy as cp
 except (ImportError,ModuleNotFoundError,Exception):
     cp = np
+else:
+    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
@@ -17,6 +17,8 @@
     import cupy as cp
 except (ImportError,ModuleNotFoundError,Exception):
     cp = np
+else:
+    cp = np
 
 
 def upsampled_correlation(imageCorr, upsampleFactor, xyShift, device="cpu"):

diff --git a/py4DSTEM/process/utils/utils.py b/py4DSTEM/process/utils/utils.py
@@ -26,7 +26,8 @@ def clear_output(wait=True):
     import cupy as cp
 except (ImportError,ModuleNotFoundError,Exception):
     cp = np
-
+else:
+    cp = np
 
 def radial_reduction(ar, x0, y0, binsize=1, fn=np.mean, coords=None):
     """
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,8 @@ @@
         import cupy as cp
     except Exception:
         pass
+    else:
+        pass
     __all__ = ["kernels"]
@@ Expand Down @@