Merge branch 'datajoint:main' into main

Author: JaerongA

element_array_ephys/ephys_acute.py

@@ -841,6 +841,10 @@ def make(self, key):
                         spikeglx_meta_filepath.parent
                     )
                     spikeglx_recording.validate_file("ap")
+                    run_CatGT = (
+                        params.pop("run_CatGT", True)
+                        and "_tcat." not in spikeglx_meta_filepath.stem
+                    )
 
                     if clustering_method.startswith("pykilosort"):
                         kilosort_triggering.run_pykilosort(
@@ -861,7 +865,7 @@ def make(self, key):
                             ks_output_dir=kilosort_dir,
                             params=params,
                             KS2ver=f'{Decimal(clustering_method.replace("kilosort", "")):.1f}',
-                            run_CatGT=True,
+                            run_CatGT=run_CatGT,
                         )
                         run_kilosort.run_modules()
                 elif acq_software == "Open Ephys":

element_array_ephys/ephys_chronic.py

@@ -772,6 +772,10 @@ def make(self, key):
                         spikeglx_meta_filepath.parent
                     )
                     spikeglx_recording.validate_file("ap")
+                    run_CatGT = (
+                        params.pop("run_CatGT", True)
+                        and "_tcat." not in spikeglx_meta_filepath.stem
+                    )
 
                     if clustering_method.startswith("pykilosort"):
                         kilosort_triggering.run_pykilosort(
@@ -792,7 +796,7 @@ def make(self, key):
                             ks_output_dir=kilosort_dir,
                             params=params,
                             KS2ver=f'{Decimal(clustering_method.replace("kilosort", "")):.1f}',
-                            run_CatGT=True,
+                            run_CatGT=run_CatGT,
                         )
                         run_kilosort.run_modules()
                 elif acq_software == "Open Ephys":

element_array_ephys/ephys_no_curation.py

@@ -848,6 +848,10 @@ def make(self, key):
                         spikeglx_meta_filepath.parent
                     )
                     spikeglx_recording.validate_file("ap")
+                    run_CatGT = (
+                        params.pop("run_CatGT", True)
+                        and "_tcat." not in spikeglx_meta_filepath.stem
+                    )
 
                     if clustering_method.startswith("pykilosort"):
                         kilosort_triggering.run_pykilosort(
@@ -868,7 +872,7 @@ def make(self, key):
                             ks_output_dir=kilosort_dir,
                             params=params,
                             KS2ver=f'{Decimal(clustering_method.replace("kilosort", "")):.1f}',
-                            run_CatGT=True,
+                            run_CatGT=run_CatGT,
                         )
                         run_kilosort.run_modules()
                 elif acq_software == "Open Ephys":

element_array_ephys/readers/spikeglx.py

@@ -167,8 +167,12 @@ def validate_file(self, file_type="ap"):
         file_path = self.root_dir / (self.root_name + f".{file_type}.bin")
         file_size = file_path.stat().st_size
 
-        meta_mapping = {"ap": self.apmeta, "lf": self.lfmeta}
-        meta = meta_mapping[file_type]
+        if file_type == "ap":
+            meta = self.apmeta
+        elif file_type == "lf":
+            meta = self.lfmeta
+        else:
+            raise KeyError(f"Unknown file_type {file_type} - must be 'ap' or 'lf'")
 
         if file_size != meta.meta["fileSizeBytes"]:
             raise IOError(