xarray-behave 0.35.5__tar.gz → 0.35.7__tar.gz

{xarray-behave-0.35.5 → xarray-behave-0.35.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xarray-behave
-Version: 0.35.5
+Version: 0.35.7
 Summary: xarray tools for behavioral data.
 Author-email: Jan Clemens <clemensjan@googlemail.com>
 Requires-Python: >3.6

{xarray-behave-0.35.5 → xarray-behave-0.35.7}/src/xarray_behave/__init__.py

@@ -1,6 +1,6 @@
 """xarray tools for behavioral data."""
 
-__version__ = "0.35.5"
+__version__ = "0.35.7"
 
 from .xarray_behave import assemble, assemble_metrics, load, save
 import os

{xarray-behave-0.35.5 → xarray-behave-0.35.7}/src/xarray_behave/annot.py

@@ -87,7 +87,7 @@ class Events(UserDict):
     ):
         if possible_event_names is None:
             possible_event_names = []
-        unique_names = list(set(names))
+        unique_names = list(np.unique(names))  # use `np.unique` instead of `set` to have reproducible order of names for now
         unique_names.extend(possible_event_names)
         dct = {name: [] for name in unique_names}
 
@@ -548,6 +548,18 @@ class Events(UserDict):
         self[name] = np.delete(self[name], indices, axis=0)
         return indices
 
+    def sort(self, names: Optional[List[str]] = None):
+        """Sort annotations by start time.
+
+        Args:
+            names (Optional[List[str]], optional): _description_. Defaults to None.
+        """
+        if names is None:
+            names = self.names
+
+        for name in names:
+            self[name] = self[name][np.argsort(self[name][:, 0]), :]
+
     def find_next(self, t: float, names: Optional[List[str]] = None):
         """Find event starting after `t` of type in names.
 
@@ -564,7 +576,9 @@ class Events(UserDict):
             names = self.names
 
         nxt = []
+
         for name in names:
+            self.sort([name])
             cmp = self[name][:, 0] > t
             if np.any(cmp):
                 nxt.append(self[name][np.argmax(cmp), 0])
@@ -588,6 +602,7 @@ class Events(UserDict):
 
         nxt = []
         for name in names:
+            self.sort([name])
             cmp = self[name][:, 1] < t
             if np.any(cmp):
                 nxt.append(self[name][np.argmin(cmp) - 1, 0])

{xarray-behave-0.35.5 → xarray-behave-0.35.7}/src/xarray_behave/gui/app.py

@@ -2084,24 +2084,26 @@ class PSV(MainWindow):
             self.update_frame()
 
     def set_prev_cuepoint(self, qt_keycode):
-        if self.edit_only_current_events:  # of the currently active type
-            names = [self.current_event_name]
-        else:  # of any type
-            names = self.event_times.names
-
+        # if self.edit_only_current_events:  # of the currently active type
+        #     names = [self.current_event_name]
+        # else:  # of any type
+        #     names = self.event_times.names
+        names = [self.current_event_name]
         t = (self.t0 - 1) / self.fs_song
         nxt = self.event_times.find_prev(t, names)
+
         if nxt is not None:
             self.t0 = nxt * self.fs_song
 
     def set_next_cuepoint(self, qt_keycode):
-        if self.edit_only_current_events:  # of the currently active type
-            names = [self.current_event_name]
-        else:  # of any type
-            names = self.event_times.names
-
+        # if self.edit_only_current_events:  # of the currently active type
+        #     names = [self.current_event_name]
+        # else:  # of any type
+        #     names = self.event_times.names
+        names = [self.current_event_name]
         t = (self.t0 + 1) / self.fs_song
         nxt = self.event_times.find_next(t, names)
+
         if nxt is not None:
             self.t0 = nxt * self.fs_song
 

{xarray-behave-0.35.5 → xarray-behave-0.35.7}/src/xarray_behave/xarray_behave.py

@@ -177,6 +177,7 @@ def assemble(
         ss_ball, last_sample_number_ball, sampling_rate_ball = ld.load_times(filepath_timestamps_ball, filepath_daq)
 
     filepath_timestamps_movie = Path(root, res_path, datename, f"{datename}_movieframes.csv")
+    ss_movie = None
     if os.path.exists(filepath_daq) and os.path.exists(filepath_timestamps_movie):
         ss_movie, last_sample_number_movie, sampling_rate_movie = ld.load_movietimes(filepath_timestamps_movie, filepath_daq)
 
@@ -284,20 +285,23 @@ def assemble(
     with_movieparams = False
     if include_movieparams:
         logger.info("Loading movie params:")
-        movieparams_loader = io.get_loader(kind="movieparams", basename=os.path.join(root, dat_path, datename, datename))
-        if movieparams_loader:
-            try:
-                xr_movieparams = movieparams_loader.make(movieparams_loader.path)
-                xr_movieparams = add_time(xr_movieparams, ss_movie, dim="frame_number_movie", suffix="_movie")
-
-                logger.info(f"   {movieparams_loader.path} loaded.")
-                with_movieparams = True
-            except Exception as e:
-                logger.info(f"   Loading {movieparams_loader.path} failed.")
-                logger.exception(e)
+        if ss_movie is None:
+            logger.warning("   Failed loading movie params - no ss_movie")
         else:
-            logger.info("   Found no movie params data.")
-        logger.info("Done.")
+            movieparams_loader = io.get_loader(kind="movieparams", basename=os.path.join(root, dat_path, datename, datename))
+            if movieparams_loader:
+                try:
+                    xr_movieparams = movieparams_loader.make(movieparams_loader.path)
+                    xr_movieparams = add_time(xr_movieparams, ss_movie, dim="frame_number_movie", suffix="_movie")
+
+                    logger.info(f"   {movieparams_loader.path} loaded.")
+                    with_movieparams = True
+                except Exception as e:
+                    logger.info(f"   Loading {movieparams_loader.path} failed.")
+                    logger.exception(e)
+            else:
+                logger.warning("   Found no movie params data.")
+            logger.info("Done.")
 
     # Init empty and event data
     auto_event_seconds: Dict[str, Any] = {}