[pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

Author: pre-commit-ci[bot]

src/probeinterface/plotting.py

@@ -152,13 +152,14 @@ def plot_probe(
     import matplotlib.pyplot as plt
 
     if probe.contact_sides is not None:
-        if side is None or side not in ('front', 'back'):
-            raise ValueError("The probe has two side, you must give which one to plot. plot_probe(probe, side='front'|'back')")
+        if side is None or side not in ("front", "back"):
+            raise ValueError(
+                "The probe has two side, you must give which one to plot. plot_probe(probe, side='front'|'back')"
+            )
         mask = probe.contact_sides == side
         probe = probe.get_slice(mask)
         probe._contact_sides = None
 
-
     if ax is None:
         if probe.ndim == 2:
             fig, ax = plt.subplots()

src/probeinterface/probe.py

@@ -302,7 +302,14 @@ def get_shank_count(self) -> int:
         return n
 
     def set_contacts(
-        self, positions, shapes="circle", shape_params={"radius": 10}, plane_axes=None, contact_ids=None, shank_ids=None, contact_sides=None
+        self,
+        positions,
+        shapes="circle",
+        shape_params={"radius": 10},
+        plane_axes=None,
+        contact_ids=None,
+        shank_ids=None,
+        contact_sides=None,
     ):
         """Sets contacts to a Probe.
 
@@ -338,7 +345,6 @@ def set_contacts(
         if positions.shape[1] != self.ndim:
             raise ValueError(f"positions.shape[1]: {positions.shape[1]} and ndim: {self.ndim} do not match!")
 
-        
         if contact_sides is None:
             # Check for duplicate positions
             unique_positions = np.unique(positions, axis=0)
@@ -353,7 +359,7 @@ def set_contacts(
                 unique_positions = np.unique(positions[mask], axis=0)
                 positions_are_not_unique = unique_positions.shape[0] != positions[mask].shape[0]
                 if positions_are_not_unique:
-                    _raise_non_unique_positions_error(positions[mask])                
+                    _raise_non_unique_positions_error(positions[mask])
 
         self._contact_positions = positions
         n = positions.shape[0]
@@ -379,7 +385,7 @@ def set_contacts(
             self._shank_ids = np.asarray(shank_ids).astype(str)
             if self.shank_ids.size != n:
                 raise ValueError(f"shank_ids have wrong size: {self.shanks.ids.size} != {n}")
-        
+
         if contact_sides is None:
             self._contact_sides = contact_sides
         else:
@@ -1029,7 +1035,9 @@ def to_numpy(self, complete: bool = False) -> np.array:
         dtype += [("shank_ids", "U64"), ("contact_ids", "U64")]
 
         if self._contact_sides is not None:
-            dtype += [("contact_sides", "U8"), ]
+            dtype += [
+                ("contact_sides", "U8"),
+            ]
 
         if complete:
             dtype += [("device_channel_indices", "int64")]
@@ -1057,8 +1065,6 @@ def to_numpy(self, complete: bool = False) -> np.array:
         if self._contact_sides is not None:
             arr["contact_sides"] = self.contact_sides
 
-        
-
         if self.contact_ids is None:
             arr["contact_ids"] = [""] * self.get_contact_count()
         else:
@@ -1164,19 +1170,25 @@ def from_numpy(arr: np.ndarray) -> "Probe":
         else:
             plane_axes = None
 
-        
         shank_ids = arr["shank_ids"] if "shank_ids" in fields else None
         contact_sides = arr["contact_sides"] if "contact_sides" in fields else None
 
-        probe.set_contacts(positions=positions, plane_axes=plane_axes, shapes=shapes, shape_params=shape_params, shank_ids=shank_ids, contact_sides=contact_sides)
+        probe.set_contacts(
+            positions=positions,
+            plane_axes=plane_axes,
+            shapes=shapes,
+            shape_params=shape_params,
+            shank_ids=shank_ids,
+            contact_sides=contact_sides,
+        )
 
         if "device_channel_indices" in fields:
             dev_channel_indices = arr["device_channel_indices"]
             if not np.all(dev_channel_indices == -1):
                 probe.set_device_channel_indices(dev_channel_indices)
         if "contact_ids" in fields:
             probe.set_contact_ids(arr["contact_ids"])
-        
+
         # contact annotations
         for k in contact_annotation_fields:
             probe.annotate_contacts(**{k: arr[k]})

tests/test_plotting.py

@@ -53,10 +53,19 @@ def test_plot_probegroup():
 def test_plot_probe_two_side():
     probe = Probe()
     probe.set_contacts(
-        positions=np.array([[0, 0], [0, 10], [0, 20],[0, 0], [0, 10], [0, 20],]),
+        positions=np.array(
+            [
+                [0, 0],
+                [0, 10],
+                [0, 20],
+                [0, 0],
+                [0, 10],
+                [0, 20],
+            ]
+        ),
         shapes="circle",
         contact_ids=["F1", "F2", "F3", "B1", "B2", "B3"],
-        contact_sides=["front", "front", "front", "back", "back","back"]
+        contact_sides=["front", "front", "front", "back", "back", "back"],
     )
 
     plot_probe(probe, with_contact_id=True, side="front")

tests/test_probe.py

@@ -201,25 +201,33 @@ def test_double_side_probe():
 
     probe = Probe()
     probe.set_contacts(
-        positions=np.array([[0, 0], [0, 10], [0, 20],[0, 0], [0, 10], [0, 20],]),
+        positions=np.array(
+            [
+                [0, 0],
+                [0, 10],
+                [0, 20],
+                [0, 0],
+                [0, 10],
+                [0, 20],
+            ]
+        ),
         shapes="circle",
-        contact_sides=["front", "front", "front", "back", "back","back"]
+        contact_sides=["front", "front", "front", "back", "back", "back"],
     )
     print(probe)
 
     assert "contact_sides" in probe.to_dict()
 
     probe2 = Probe.from_dict(probe.to_dict())
-    assert probe2 == probe 
+    assert probe2 == probe
 
     probe3 = Probe.from_numpy(probe.to_numpy())
-    assert probe3 == probe 
+    assert probe3 == probe
 
     probe4 = Probe.from_dataframe(probe.to_dataframe())
     assert probe4 == probe
 
 
-
 if __name__ == "__main__":
     test_probe()