From b84847cc0969aef74d3bb258103ea85c0aac58af Mon Sep 17 00:00:00 2001 From: gvarnavi Date: Thu, 4 Jul 2024 10:03:46 -0700 Subject: [PATCH] one more try, new black --- 24 | 16 ++++++++++++++++ py4DSTEM/process/diffraction/crystal_viz.py | 3 +-- py4DSTEM/process/phase/utils.py | 4 +--- 3 files changed, 18 insertions(+), 5 deletions(-) create mode 100644 24 diff --git a/24 b/24 new file mode 100644 index 000000000..16bdba3c0 --- /dev/null +++ b/24 @@ -0,0 +1,16 @@ +conda-forge/linux-64 Using cache +conda-forge/noarch Using cache +Transaction + + Prefix: /home/george/mambaforge/envs/py4dstem-dev + + All requested packages already installed + + +Looking for: ['black'] + + +Pinned packages: + - python 3.12.* + + diff --git a/py4DSTEM/process/diffraction/crystal_viz.py b/py4DSTEM/process/diffraction/crystal_viz.py index b5a22d609..ecc6fed0e 100644 --- a/py4DSTEM/process/diffraction/crystal_viz.py +++ b/py4DSTEM/process/diffraction/crystal_viz.py @@ -453,8 +453,7 @@ def plot_scattering_intensity( int_sf_plot = calc_1D_profile( k, self.g_vec_leng, - (self.struct_factors_int**int_power_scale) - * (self.g_vec_leng**k_power_scale), + (self.struct_factors_int**int_power_scale) * (self.g_vec_leng**k_power_scale), remove_origin=True, k_broadening=k_broadening, int_scale=int_scale, diff --git a/py4DSTEM/process/phase/utils.py b/py4DSTEM/process/phase/utils.py index 0ed82f703..f932b40b5 100644 --- a/py4DSTEM/process/phase/utils.py +++ b/py4DSTEM/process/phase/utils.py @@ -202,9 +202,7 @@ def evaluate_gaussian_envelope( self, alpha: Union[float, np.ndarray] ) -> Union[float, np.ndarray]: xp = self._xp - return xp.exp( - -0.5 * self._gaussian_spread**2 * alpha**2 / self._wavelength**2 - ) + return xp.exp(-0.5 * self._gaussian_spread**2 * alpha**2 / self._wavelength**2) def evaluate_spatial_envelope( self, alpha: Union[float, np.ndarray], phi: Union[float, np.ndarray]