Skip to content

Commit e9191dd

Browse files
authored
Merge pull request #5 from ttngu207/main
minor tweak using `schema.database`, awaiting `schema.is_activated`
2 parents dadda0d + d606233 commit e9191dd

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

elements_ephys/ephys.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def activate(ephys_schema_name, probe_schema_name=None, create_schema=True, crea
3636
context.update(**{name: add_objects[name]})
3737

3838
# activate
39-
if not probe.schema.is_activated:
39+
if probe.schema.database is not None:
4040
probe.schema.activate(probe_schema_name or ephys_schema_name,
4141
create_schema=create_schema, create_tables=create_tables)
4242

@@ -372,10 +372,9 @@ def key_source(self):
372372
def make(self, key):
373373
units = {u['unit']: u for u in (Clustering.Unit & key).fetch(as_dict=True, order_by='unit')}
374374

375-
neuropixels_dir = EphysRecording._get_neuropixels_data_directory(key)
376-
meta_filepath = next(pathlib.Path(neuropixels_dir).glob('*.ap.meta'))
375+
neuropixels_dir = get_neuropixels_data_directory(key)
377376

378-
ks_dir = ClusteringTask._get_ks_data_dir(key)
377+
ks_dir = get_kilosort_output_directory(key)
379378
ks = kilosort.Kilosort(ks_dir)
380379

381380
# -- Get channel and electrode-site mapping
@@ -410,7 +409,7 @@ def make(self, key):
410409
self.Electrode.insert(unit_waveforms, ignore_extra_fields=True)
411410

412411

413-
# ===================================== Quality Control [WIP] =====================================
412+
# ----------- Quality Control ----------
414413

415414
@schema
416415
class ClusterQualityMetrics(dj.Imported):

0 commit comments

Comments
 (0)