Merge branch 'dev' of https://github.com/cbroz1/spyglass

CBroz1 · Oct 11, 2023 · 170e722 · 170e722
2 parents 5116212 + a53b50a
commit 170e722
Show file tree

Hide file tree

Showing 7 changed files with 725 additions and 631 deletions.
diff --git a/src/spyglass/common/common_device.py b/src/spyglass/common/common_device.py
diff --git a/src/spyglass/common/common_dio.py b/src/spyglass/common/common_dio.py
@@ -34,11 +34,12 @@ def make(self, key):
         )
         if behav_events is None:
             print(
-                f"No conforming behavioral events data interface found in {nwb_file_name}\n"
+                "No conforming behavioral events data interface found in "
+                + f"{nwb_file_name}\n"
             )
             return
 
-        # the times for these events correspond to the valid times for the raw data
+        # Times for these events correspond to the valid times for the raw data
         key["interval_list_name"] = (
             Raw() & {"nwb_file_name": nwb_file_name}
         ).fetch1("interval_list_name")
@@ -55,8 +56,10 @@ def plot_all_dio_events(self):
 
         Examples
         --------
-        > (DIOEvents & {'nwb_file_name': 'arthur20220314_.nwb'}).plot_all_dio_events()
-        > (DIOEvents & [{'nwb_file_name': "arthur20220314_.nwb"}, {"nwb_file_name": "arthur20220316_.nwb"}]).plot_all_dio_events()
+        > restr1 = {'nwb_file_name': 'arthur20220314_.nwb'}
+        > restr2 = {'nwb_file_name': 'arthur20220316_.nwb'}
+        > (DIOEvents & restr1).plot_all_dio_events()
+        > (DIOEvents & [restr1, restr2]).plot_all_dio_events()
 
         """
         behavioral_events = self.fetch_nwb()