labdata 0.1.6__tar.gz → 0.1.7__tar.gz

{labdata-0.1.6 → labdata-0.1.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: labdata
-Version: 0.1.6
+Version: 0.1.7
 Summary: Package to manage data in experimental neuroscience labs
 Author-email: Joao Couto <jpcouto@gmail.com>
 Project-URL: Homepage, https://github.com/jcouto/labdata

{labdata-0.1.6 → labdata-0.1.7}/labdata/__init__.py

@@ -1,4 +1,4 @@
-VERSION = "0.1.6"
+VERSION = "0.1.7"
 
 from .utils import *
 from .copy import copy_to_upload_server

{labdata-0.1.6 → labdata-0.1.7}/labdata/schema/ephys.py

@@ -279,39 +279,27 @@ class SpikeSorting(dj.Manual):
             return [float(s) for s in sampling_rates] # cast to float if decimal
 
         def get_units_with_waveforms(self, return_seconds = True, interp_method = 'cubic-spline'):
-            units = []
-            sampling_rates = self.get_sampling_rates()
-            # get the interpolation functions for all experiments if return_seconds = True
-            if return_seconds:
-                exps = (EphysRecording.ProbeSetting() & self.proj()).proj().fetch(as_dict = True)
-                interpolations = dict()
-                for e in exps:
-                    k = '{subject_name}_{session_name}_{dataset_name}_{probe_num}'.format(**e)
-                    try:
-                        interpolations[k] = (StreamSync() & e).apply(None, method = interp_method)
-                    except:
-                        interpolations[k] = None
-            for p,u,r in zip(self.proj(),self,sampling_rates):
-                w = (SpikeSorting.Waveforms() & p)
+            units = self.get_spike_times(as_dict = True,return_seconds = return_seconds, interp_method = interp_method)
+            for u in units:
+                w = (SpikeSorting.Waveforms() & u)
                 if len(w):
                     w = w.fetch('waveform_median')[0]
                 else:
                     w = None
-                units.append(dict(u, waveform_median = w))
-                if return_seconds:
-                    k = '{subject_name}_{session_name}_{dataset_name}_{probe_num}'.format(**p)
-                    if interpolations[k] is None:
-                        units[-1]['spike_times'] = units[-1]['spike_times'].astype(np.float32)/np.float32(r)
-                    else:
-                        units[-1]['spike_times'] = interpolations[k](units[-1]['spike_times'].astype(np.float32))
+                u['waveform_median'] = w
             return units
         
-        def get_spike_times(self, as_dict = True, return_seconds = True, extra_keys = [], warn = True, include_metrics = False,
+        def get_spike_times(self, as_dict = True,
+                            return_seconds = True,
+                            extra_keys = [],
+                            warn = True,
+                            include_metrics = False,
                             interp_method = 'cubic-spline'):
             '''
 spike_times = get_spike_times()
 
 Gets spike times corrected if the sync is applied.
+
     defaults:
         as_dict = True
         return_seconds = True

{labdata-0.1.6 → labdata-0.1.7}/labdata.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: labdata
-Version: 0.1.6
+Version: 0.1.7
 Summary: Package to manage data in experimental neuroscience labs
 Author-email: Joao Couto <jpcouto@gmail.com>
 Project-URL: Homepage, https://github.com/jcouto/labdata