modernizing parallax init and aberration fitting

py4dstem · Nov 5, 2024 · 5e71638 · 5e71638
1 parent 054be29
commit 5e71638
Show file tree

Hide file tree

Showing 2 changed files with 567 additions and 482 deletions.
diff --git a/py4DSTEM/process/phase/direct_ptychography.py b/py4DSTEM/process/phase/direct_ptychography.py
@@ -25,6 +25,7 @@
 from emdfile import Array, Custom, Metadata, _read_metadata, tqdmnd
 from py4DSTEM.data import Calibration
 from py4DSTEM.datacube import DataCube
+from py4DSTEM.process.calibration import get_probe_size
 from py4DSTEM.process.phase.phase_base_class import PhaseReconstruction
 from py4DSTEM.process.phase.utils import (
     ComplexProbe,
@@ -38,7 +39,6 @@
     unwrap_phase_2d_skimage,
 )
 from py4DSTEM.process.utils import electron_wavelength_angstrom, get_CoM, get_shifted_ar
-from py4DSTEM.process.calibration import get_probe_size
 
 _aberration_names = {
     (1, 0): "C1",