Merge pull request #492 from py4dstem/dev

version 0.14.3 update and release

docs/source/api/emd.rst

@@ -12,7 +12,6 @@ Classes
 .. autoclass:: emdfile.PointList
 .. autoclass:: emdfile.PointListArray
 .. autoclass:: emdfile.Root
-.. autoclass:: emdfile.RootedNode
 
 
 Functions
@@ -26,4 +25,4 @@ Functions
 .. autofunction:: emdfile.read
 .. autofunction:: emdfile.save
 .. autofunction:: emdfile.set_author
-.. autofunction:: emdfile.tqdmnd
+.. autofunction:: emdfile.tqdmnd

py4DSTEM/__init__.py

@@ -2,62 +2,93 @@
 from emdfile import tqdmnd
 
 
-# io classes
+### io
+
+# substructure
 from emdfile import (
     Node,
     Root,
     Metadata,
     Array,
     PointList,
     PointListArray,
-    Custom
+    Custom,
+    print_h5_tree,
 )
+_emd_hook = True
 
-# processing classes
-from py4DSTEM.classes import (
-    DataCube,
+# structure
+from py4DSTEM import io
+from py4DSTEM.io import import_file,read,save
+
+
+
+### basic data classes
+
+# data
+from py4DSTEM.data import (
+    Data,
+    Calibration,
     DiffractionSlice,
     RealSlice,
-    VirtualDiffraction,
-    VirtualImage,
-    Probe,
     QPoints,
-    Calibration,
-    Data,
 )
-from py4DSTEM.process.diskdetection import (
+
+# datacube
+from py4DSTEM.datacube import (
+    DataCube,
+    VirtualImage,
+    VirtualDiffraction
+)
+
+
+
+### visualization
+
+from py4DSTEM import visualize
+from py4DSTEM.visualize import show, show_complex
+
+### analysis classes
+
+# braggvectors
+from py4DSTEM.braggvectors import (
+    Probe,
     BraggVectors,
     BraggVectorMap,
 )
+
+# strain
+from py4DSTEM.process import StrainMap
+
+# TODO - crystal
+# TODO - ptycho
+# TODO - others
+
+# TODO - where
 from py4DSTEM.process import (
     PolarDatacube,
 )
 
 
 
-# submodules
-from py4DSTEM import io
+
+### more submodules
+# TODO
+
 from py4DSTEM import preprocess
 from py4DSTEM import process
-from py4DSTEM import classes
-from py4DSTEM import visualize
 
 
 
+### utilities
 
-# functions
-from emdfile import print_h5_tree
-from py4DSTEM.visualize import show
-from py4DSTEM.io import import_file,read,save
+# config
 from py4DSTEM.utils.configuration_checker import check_config
+# TODO - config .toml
 
-
-# test paths
+# testing
 from os.path import dirname,join
 _TESTPATH = join(dirname(__file__), "../test/unit_test_data")
 
 
-# hook for emd _get_class
-_emd_hook = True
-
 

py4DSTEM/braggvectors/__init__.py

@@ -0,0 +1,8 @@
+from py4DSTEM.braggvectors.probe import Probe
+from py4DSTEM.braggvectors.braggvectors import BraggVectors
+from py4DSTEM.braggvectors.braggvector_methods import BraggVectorMap
+from py4DSTEM.braggvectors.diskdetection import *
+from py4DSTEM.braggvectors.probe import *
+#from .diskdetection_aiml import *
+#from .diskdetection_parallel_new import *
+