Merge pull request #18 from jat255/Separate-inits-for-RecStack-and-To…

…moStack Better separation of concerns between CommonStack and TomoStack
usnistgov · Nov 5, 2024 · e39b5ad · e39b5ad
2 parents 6d0543e + 372af43
commit e39b5ad
Show file tree

Hide file tree

Showing 9 changed files with 2,836 additions and 2,534 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -60,7 +60,10 @@ jobs:
           with-cuda: true
           poetry-options: "--with=dev --without=gpu"
       - name: Install ffmpeg
-        uses: FedericoCarboni/setup-ffmpeg@v3
+        uses: Wandalen/wretry.action@master
+        with:
+          action: FedericoCarboni/setup-ffmpeg@v3
+          attempt_limit: 3
       - name: Run docstring example tests
         run: poetry run pytest --doctest-modules --ignore=etspy/tests etspy/ 
       - name: Run full test suite

diff --git a/docs/examples/etspy_demo.ipynb b/docs/examples/etspy_demo.ipynb
diff --git a/etspy/align.py b/etspy/align.py
@@ -1011,7 +1011,10 @@ def tilt_maximage(
         nshifts = shifts.shape[0]
         shifted = ali.isig[0:nshifts, :].deepcopy()
         for i in range(nshifts):
-            shifted.data[:, :, i] = np.roll(ali.isig[idx, :].data, int(shifts[i]))
+            shifted.data[:, :, i] = np.roll(
+                ali.isig[idx:idx+1, :].data.squeeze(),
+                int(shifts[i]),
+            )
         shifted_rec = shifted.reconstruct("SIRT", 100, constrain=True)
         image_sum = cast(BaseSignal, shifted_rec.sum(axis=(1, 2)))
         tilt_shift = shifts[image_sum.data.argmin()]