Merge branch 'main' of https://github.com/datajoint/element-array-ephys…

… into spikeglx
kabilar · Sep 16, 2023 · 9374a11 · 9374a11
2 parents 2b75f9f + 3b8efe5
commit 9374a11
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 13 deletions.
diff --git a/element_array_ephys/probe.py b/element_array_ephys/probe.py
@@ -1,8 +1,6 @@
 """
 Neuropixels Probes
 """
-from __future__ import annotations
-
 import datajoint as dj
 
 from .readers import probe_geometry
@@ -109,13 +107,10 @@ def create_neuropixels_probe(probe_type: str = "neuropixels 1.0 - 3A"):
         npx_probes_config["neuropixels 2.0 - MS"] = npx_probes_config["NP2010"]
 
         probe_type = {"probe_type": probe_type}
-        probe_params = {
-            n: v
-            for n, v in zip(
+        probe_params = dict(zip(
                 probe_geometry.geom_param_names,
-                npx_probes_config[probe_type["probe_type"]],
-            )
-        }
+                npx_probes_config[probe_type["probe_type"]]
+            ))
         electrode_layouts = probe_geometry.build_npx_probe(
             **{**probe_params, **probe_type}
         )

diff --git a/element_array_ephys/readers/probe_geometry.py b/element_array_ephys/readers/probe_geometry.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import numpy as np
 import pandas as pd
 from typing import List

diff --git a/element_array_ephys/readers/spikeglx.py b/element_array_ephys/readers/spikeglx.py
@@ -450,12 +450,12 @@ def _transform_geom_to_shank(self):
 
         from . import probe_geometry
 
-        probe_params = {
-            n: v
-            for n, v in zip(
-                probe_geometry.geom_param_names, probe_geometry.M[self.probe_PN]
+        probe_params = dict(
+            zip(
+                probe_geometry.geom_param_names, 
+                probe_geometry.M[self.probe_PN]
             )
-        }
+        )
         probe_params["probe_type"] = self.probe_PN
         elec_pos_df = probe_geometry.build_npx_probe(**probe_params)