correct path for passive data, filter passive based on units

Author: mayofaulkner

atlaselectrophysiology/ephys_atlas_gui.py

@@ -1188,6 +1188,8 @@ def filter_unit_pressed(self, type):
         self.img_corr_data = self.plotdata.get_correlation_data_img()
         self.img_fr_data = self.plotdata.get_fr_img()
         self.line_fr_data, self.line_amp_data = self.plotdata.get_fr_amp_data_line()
+        self.probe_rfmap, self.rfmap_boundaries = self.plotdata.get_rfmap_data()
+        self.img_stim_data = self.plotdata.get_passive_events()
         self.img_init.setChecked(True)
         self.line_init.setChecked(True)
         self.probe_init.setChecked(True)
@@ -1546,7 +1548,6 @@ def qc_button_clicked(self):
             if button.isChecked():
                 ephys_desc.append(button.text())
 
-        #ephys_desc = self.ephys_desc.currentText()
         self.loaddata.upload_dj(align_qc, ephys_qc, ephys_desc)
         self.complete_button_pressed()
 

atlaselectrophysiology/plot_data.py

@@ -7,7 +7,6 @@
 from brainbox.task import passive
 import scipy
 from PyQt5 import QtGui
-from scipy.linalg import svd
 
 N_BNK = 4
 BNK_SIZE = 10
@@ -59,7 +58,8 @@ def __init__(self, alf_path, ephys_path):
             self.lfp_data_status = False
 
         try:
-            self.rf_map = alf.io.load_object(self.alf_path, object='passiveRFM', namespace='ibl')
+            self.rf_map = alf.io.load_object(self.alf_path.parent, object='passiveRFM',
+                                             namespace='ibl')
             if len(self.rf_map) == 2:
                 self.rfmap_data_status = True
             else:
@@ -70,7 +70,7 @@ def __init__(self, alf_path, ephys_path):
             self.rfmap_data_status = False
 
         try:
-            self.aud_stim = alf.io.load_object(alf_path, object='passiveStims',
+            self.aud_stim = alf.io.load_object(self.alf_path.parent, object='passiveStims',
                                                namespace='ibl')['table']
             if len(self.aud_stim) > 0:
                 self.passive_data_status = True
@@ -79,7 +79,7 @@ def __init__(self, alf_path, ephys_path):
             self.passive_data_status = False
 
         try:
-            gabor = alf.io.load_object(alf_path, object='passiveGabor',
+            gabor = alf.io.load_object(self.alf_path.parent, object='passiveGabor',
                                        namespace='ibl')['table']
             self.vis_stim = dict()
             self.vis_stim['leftGabor'] = gabor['start'][(gabor['position'] == 35) &
@@ -463,7 +463,7 @@ def get_rfmap_data(self):
                 passive.get_rf_map_over_depth(rf_map_times, rf_map_pos, rf_stim_frames,
                                               self.spikes['times'][self.spike_idx][self.kp_idx],
                                               self.spikes['depths'][self.spike_idx][self.kp_idx],
-                                              D_BIN=160)
+                                              d_bin=160)
             rfs_svd = passive.get_svd_map(rf_map)
             img = dict()
             img['on'] = np.vstack(rfs_svd['on'])