Merge pull request #522 from smribet/strain_take_2

More strain less stress
py4dstem · Oct 23, 2023 · 247322c · 247322c
2 parents dc95f2d + 9d2e36c
commit 247322c
Show file tree

Hide file tree

Showing 12 changed files with 1,485 additions and 1,855 deletions.
diff --git a/py4DSTEM/__init__.py b/py4DSTEM/__init__.py
@@ -53,7 +53,7 @@
 )
 
 # strain
-from py4DSTEM.process import StrainMap
+from py4DSTEM.process.strain.strain import StrainMap
 
 # TODO - crystal
 # TODO - ptycho

diff --git a/py4DSTEM/process/__init__.py b/py4DSTEM/process/__init__.py
@@ -1,11 +1,9 @@
 from py4DSTEM.process.polar import PolarDatacube
-from py4DSTEM.process.strain import StrainMap
+from py4DSTEM.process.strain.strain import StrainMap
 
-from py4DSTEM.process import latticevectors
 from py4DSTEM.process import phase
 from py4DSTEM.process import calibration
 from py4DSTEM.process import utils
 from py4DSTEM.process import classification
-from py4DSTEM.process import latticevectors
 from py4DSTEM.process import diffraction
 from py4DSTEM.process import wholepatternfit
diff --git a/py4DSTEM/process/latticevectors/__init__.py b/py4DSTEM/process/latticevectors/__init__.py
diff --git a/py4DSTEM/process/latticevectors/fit.py b/py4DSTEM/process/latticevectors/fit.py