black formatting

Author: bsavitzky

py4DSTEM/braggvectors/probe.py

@@ -367,19 +367,19 @@ def zero_vacuum_sinusoid(self, s=0.1, w=1, p=1, update_inplace=True):
             self.origin is not None
         ), "no probe origin found; try running `Probe.measure_disk`"
         # prepare vars
-        qx0,qy0 = self.origin
+        qx0, qy0 = self.origin
         alpha = self.alpha
         probe = self.probe
-        Q_Nx,Q_Ny = probe.shape
+        Q_Nx, Q_Ny = probe.shape
         # setup mesh
-        qyy,qxx = np.meshgrid(np.arange(Q_Ny),np.arange(Q_Nx))
-        qrr = np.hypot(qxx-qx0,qyy-qy0)
+        qyy, qxx = np.meshgrid(np.arange(Q_Ny), np.arange(Q_Nx))
+        qrr = np.hypot(qxx - qx0, qyy - qy0)
         # find damping curve
-        r = alpha*(1+s)
-        _w = alpha*w
-        f = 1+(r-qrr)/_w
-        f = np.minimum(np.maximum(f,0),1)
-        f = np.sin(f)**p
+        r = alpha * (1 + s)
+        _w = alpha * w
+        f = 1 + (r - qrr) / _w
+        f = np.minimum(np.maximum(f, 0), 1)
+        f = np.sin(f) ** p
         # scale probe
         probe *= f
         # update
@@ -388,7 +388,6 @@ def zero_vacuum_sinusoid(self, s=0.1, w=1, p=1, update_inplace=True):
         # return scaled probe
         return probe
 
-
     # Kernel generation methods
 
     def get_kernel(
@@ -626,6 +625,7 @@ def get_probe_kernel_edge_sigmoid(
         # Get CoM
         if origin is None:
             from py4DSTEM.process.calibration import get_probe_size
+
             _, xCoM, yCoM = get_probe_size(probe)
         else:
             xCoM, yCoM = origin
@@ -639,7 +639,7 @@ def get_probe_kernel_edge_sigmoid(
             np.mod(np.arange(Q_Ny) + Q_Ny // 2, Q_Ny) - Q_Ny // 2,
             np.mod(np.arange(Q_Nx) + Q_Nx // 2, Q_Nx) - Q_Nx // 2,
         )
-        qr = np.hypot(qx,qy)
+        qr = np.hypot(qx, qy)
         # Calculate sigmoid
         if type == "logistic":
             r0 = 0.5 * (ro + ri)

py4DSTEM/datacube/datacube.py

@@ -607,64 +607,62 @@ def get_vacuum_probe(
 
         # show
         if plot:
-            fig,axs = plt.subplots(2,3,figsize=(12,8))
+            fig, axs = plt.subplots(2, 3, figsize=(12, 8))
             show(
                 probe.probe,
-                scaling='log',
-                circle = {
-                  'center':probe.origin,
-                  'R': probe.alpha,
-                  'alpha':0.2,
-                  'fill':True
+                scaling="log",
+                circle={
+                    "center": probe.origin,
+                    "R": probe.alpha,
+                    "alpha": 0.2,
+                    "fill": True,
                 },
-                figax = (fig,axs[0,0])
+                figax=(fig, axs[0, 0]),
             )
             show(
                 probe.probe,
-                scaling='none',
-                intensity_range='minmax',
-                circle = {
-                  'center':probe.origin,
-                  'R': probe.alpha,
-                  'alpha':0.2,
-                  'fill':True
+                scaling="none",
+                intensity_range="minmax",
+                circle={
+                    "center": probe.origin,
+                    "R": probe.alpha,
+                    "alpha": 0.2,
+                    "fill": True,
                 },
-                figax = (fig,axs[0,1])
+                figax=(fig, axs[0, 1]),
             )
             show(
                 probe.probe,
-                scaling='none',
-                intensity_range='absolute',
-                vmin=0,vmax=np.max(probe.probe)*0.1,
-                circle = {
-                  'center':probe.origin,
-                  'R': probe.alpha,
-                  'alpha':0.2,
-                  'fill':True
+                scaling="none",
+                intensity_range="absolute",
+                vmin=0,
+                vmax=np.max(probe.probe) * 0.1,
+                circle={
+                    "center": probe.origin,
+                    "R": probe.alpha,
+                    "alpha": 0.2,
+                    "fill": True,
                 },
-                figax = (fig,axs[0,2])
+                figax=(fig, axs[0, 2]),
             )
+            show(probe.probe, scaling="log", figax=(fig, axs[1, 0]))
             show(
                 probe.probe,
-                scaling='log',
-                figax = (fig,axs[1,0])
+                scaling="none",
+                intensity_range="minmax",
+                figax=(fig, axs[1, 1]),
             )
             show(
                 probe.probe,
-                scaling='none',
-                intensity_range='minmax',
-                figax = (fig,axs[1,1])
+                scaling="none",
+                intensity_range="absolute",
+                vmin=0,
+                vmax=np.max(probe.probe) * 0.1,
+                figax=(fig, axs[1, 2]),
             )
-            show(
-                probe.probe,
-                scaling='none',
-                intensity_range='absolute',
-                vmin=0,vmax=np.max(probe.probe)*0.1,
-                figax = (fig,axs[1,2])
-            )
-            axs[0,0].set_title('log')
-            axs[0,1].set_title('linear | min/max')
-            axs[0,2].set_title('linear | min/0.1*max')
+            axs[0, 0].set_title("log")
+            axs[0, 1].set_title("linear | min/max")
+            axs[0, 2].set_title("linear | min/0.1*max")
             plt.show()
 
         # add probe to tree and return
@@ -765,7 +763,6 @@ def get_probe_size(
         if returncal:
             return x
 
-
     # Bragg disks
 
     def find_Bragg_disks(