Merge pull request #93 from CBroz1/rk

Ensure Path type for get_spikeglx_meta_filepath
datajoint · Sep 19, 2022 · a738ee7 · a738ee7
2 parents 6757ef7 + 0e94252
commit a738ee7
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 7 deletions.
diff --git a/element_array_ephys/ephys_acute.py b/element_array_ephys/ephys_acute.py
@@ -890,9 +890,14 @@ def yield_unit_waveforms():
 
 def get_spikeglx_meta_filepath(ephys_recording_key):
     # attempt to retrieve from EphysRecording.EphysFile
-    spikeglx_meta_filepath = (EphysRecording.EphysFile & ephys_recording_key
-                              & 'file_path LIKE "%.ap.meta"').fetch1('file_path')
-
+    spikeglx_meta_filepath = pathlib.Path(
+        (
+            EphysRecording.EphysFile
+            & ephys_recording_key
+            & 'file_path LIKE "%.ap.meta"'
+        ).fetch1("file_path")
+    )
+
     try:
         spikeglx_meta_filepath = find_full_path(get_ephys_root_data_dir(),
                                                 spikeglx_meta_filepath)

diff --git a/element_array_ephys/ephys_chronic.py b/element_array_ephys/ephys_chronic.py
@@ -835,8 +835,13 @@ def yield_unit_waveforms():
 
 def get_spikeglx_meta_filepath(ephys_recording_key):
     # attempt to retrieve from EphysRecording.EphysFile
-    spikeglx_meta_filepath = (EphysRecording.EphysFile & ephys_recording_key
-                              & 'file_path LIKE "%.ap.meta"').fetch1('file_path')
+    spikeglx_meta_filepath = pathlib.Path(
+        (
+            EphysRecording.EphysFile
+            & ephys_recording_key
+            & 'file_path LIKE "%.ap.meta"'
+        ).fetch1("file_path")
+    )
 
     try:
         spikeglx_meta_filepath = find_full_path(get_ephys_root_data_dir(),

diff --git a/element_array_ephys/ephys_no_curation.py b/element_array_ephys/ephys_no_curation.py
@@ -849,8 +849,13 @@ def yield_unit_waveforms():
 
 def get_spikeglx_meta_filepath(ephys_recording_key):
     # attempt to retrieve from EphysRecording.EphysFile
-    spikeglx_meta_filepath = (EphysRecording.EphysFile & ephys_recording_key
-                              & 'file_path LIKE "%.ap.meta"').fetch1('file_path')
+    spikeglx_meta_filepath = pathlib.Path(
+        (
+            EphysRecording.EphysFile
+            & ephys_recording_key
+            & 'file_path LIKE "%.ap.meta"'
+        ).fetch1("file_path")
+    )
 
     try:
         spikeglx_meta_filepath = find_full_path(get_ephys_root_data_dir(),