Merge remote-tracking branch 'origin/dev' into phase_contrast

py4dstem · Sep 13, 2024 · 02d0c03 · 02d0c03
2 parents 9404842 + 1137637
commit 02d0c03
Show file tree

Hide file tree

Showing 7 changed files with 587 additions and 16 deletions.
diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
@@ -17,7 +17,7 @@ jobs:
           fetch-depth: 0
 
       - name: Lint Code Base
-        uses: github/super-linter@v6
+        uses: github/super-linter@v7
         env:
           VALIDATE_ALL_CODEBASE: false
           VALIDATE_PYTHON_FLAKE8: true

diff --git a/py4DSTEM/process/diffraction/__init__.py b/py4DSTEM/process/diffraction/__init__.py
@@ -2,3 +2,4 @@
 from py4DSTEM.process.diffraction.flowlines import *
 from py4DSTEM.process.diffraction.tdesign import *
 from py4DSTEM.process.diffraction.crystal_phase import *
+from py4DSTEM.process.diffraction.digital_dark_field import *