@@ -111,10 +111,10 @@ def get_session_directory(session_key: dict) -> str:
111111
112112@schema
113113class AcquisitionSoftware (dj .Lookup ):
114- definition = """ # Name of software used for recording of neuropixels probes - SpikeGLX or OpenEphys
114+ definition = """ # Name of software used for recording of neuropixels probes - SpikeGLX or Open Ephys
115115 acq_software: varchar(24)
116116 """
117- contents = zip (['SpikeGLX' , 'OpenEphys ' ])
117+ contents = zip (['SpikeGLX' , 'Open Ephys ' ])
118118
119119
120120@schema
@@ -169,15 +169,15 @@ def make(self, key):
169169 # search session dir and determine acquisition software
170170 acq_software = None
171171 for ephys_pattern , ephys_acq_type in zip (['*.ap.meta' , '*.oebin' ],
172- ['SpikeGLX' , 'OpenEphys ' ]):
172+ ['SpikeGLX' , 'Open Ephys ' ]):
173173 ephys_meta_filepaths = [fp for fp in sess_dir .rglob (ephys_pattern )]
174174 if len (ephys_meta_filepaths ):
175175 acq_software = ephys_acq_type
176176 break
177177
178178 if acq_software is None :
179179 raise FileNotFoundError (f'Ephys recording data not found!'
180- f' Neither SpikeGLX nor OpenEphys recording files found' )
180+ f' Neither SpikeGLX nor Open Ephys recording files found' )
181181
182182 if acq_software == 'SpikeGLX' :
183183 for meta_filepath in ephys_meta_filepaths :
@@ -209,7 +209,7 @@ def make(self, key):
209209 ** insertion_key ,
210210 'file_path' : meta_filepath .relative_to (root_dir ).as_posix ()})
211211
212- elif acq_software == 'OpenEphys ' :
212+ elif acq_software == 'Open Ephys ' :
213213 loaded_oe = openephys .OpenEphys (sess_dir )
214214 for probe_SN , oe_probe in loaded_oe .probes .items ():
215215 insertion_key = (ProbeInsertion & key & {'probe' : probe_SN }).fetch1 ('KEY' )
@@ -298,7 +298,7 @@ def make(self, key):
298298 'shank_col' : shank_col ,
299299 'shank_row' : shank_row }).fetch1 ('KEY' ))
300300
301- elif acq_software == 'OpenEphys ' :
301+ elif acq_software == 'Open Ephys ' :
302302 sess_dir = pathlib .Path (get_session_directory (key ))
303303 loaded_oe = openephys .OpenEphys (sess_dir )
304304 oe_probe = loaded_oe .probes [probe_sn ]
@@ -606,7 +606,7 @@ def yield_unit_waveforms():
606606 npx_meta_fp = ephys_root_dir / (EphysRecording .EphysFile & key
607607 & 'file_path LIKE "%.ap.meta"' ).fetch1 ('file_path' )
608608 npx_recording = spikeglx .SpikeGLX (npx_meta_fp .parent )
609- elif acq_software == 'OpenEphys ' :
609+ elif acq_software == 'Open Ephys ' :
610610 sess_dir = pathlib .Path (get_session_directory (key ))
611611 loaded_oe = openephys .OpenEphys (sess_dir )
612612 npx_recording = loaded_oe .probes [probe_sn ]
@@ -697,7 +697,7 @@ def get_neuropixels_channel2electrode_map(ephys_recording_key, acq_software):
697697 & {'shank' : shank ,
698698 'shank_col' : shank_col ,
699699 'shank_row' : shank_row }).fetch1 ('KEY' )
700- elif acq_software == 'OpenEphys ' :
700+ elif acq_software == 'Open Ephys ' :
701701 sess_dir = pathlib .Path (get_session_directory (ephys_recording_key ))
702702 loaded_oe = openephys .OpenEphys (sess_dir )
703703 probe_sn = (ProbeInsertion & ephys_recording_key ).fetch1 ('probe' )
0 commit comments