Merge branch 'master' into lagged_dmdc

nmank · web-flow · commit 837ffbde5a1a · 2024-04-17T12:20:43.000+02:00
diff --git a/docs/source/_tutorials/tutorial12cdmd.html b/docs/source/_tutorials/tutorial12cdmd.html
diff --git a/tutorials/tutorial12/tutorial-12-cdmd.ipynb b/tutorials/tutorial12/tutorial-12-cdmd.ipynb
@@ -185,7 +185,7 @@
     "    if noise:\n",
     "        vid += np.random.normal(0, noise_amt, vid.shape)\n",
     "        vid = vid.clip(0, 1)\n",
-    "    return np.vstack(imgs).T, shape\n",
+    "    return vid, shape\n",
     "\n",
     "\n",
     "def get_video(object: str = \"frog\") -> np.ndarray:\n",
diff --git a/tutorials/tutorial12/tutorial-12-cdmd.py b/tutorials/tutorial12/tutorial-12-cdmd.py
@@ -121,7 +121,7 @@ def get_video_dmd(
     if noise:
         vid += np.random.normal(0, noise_amt, vid.shape)
         vid = vid.clip(0, 1)
-    return np.vstack(imgs).T, shape
+    return vid, shape
 
 
 def get_video(object: str = "frog") -> np.ndarray:
