Merge pull request #162 from zm711/dep-fixes

Fix numpy deprecations

Author: alejoe91

src/MEArec/cli.py

@@ -405,6 +405,9 @@ def gen_recordings(params, **kwargs):
     if kwargs["filt_cutoff"] is not None:
         if isinstance(kwargs["filt_cutoff"], tuple):
             kwargs["filt_cutoff"] = list(kwargs["filt_cutoff"])
+        # for high-pass filter, make a scalar
+        if len(kwargs["filt_cutoff"]) == 1:
+            kwargs["filt_cutoff"] = kwargs["filt_cutoff"][0]
         params_dict["recordings"]["filter_cutoff"] = kwargs["filt_cutoff"]
     if kwargs["filt_order"] is not None:
         params_dict["recordings"]["filt_order"] = kwargs["filt_order"]

src/MEArec/simulate_cells.py

@@ -1107,7 +1107,7 @@ def get_rnd_rot_Arvo():
             random rotation matrix
         """
         gamma = np.random.uniform(0, 2.0 * np.pi)
-        rotation_z = np.matrix([[np.cos(gamma), -np.sin(gamma), 0], [np.sin(gamma), np.cos(gamma), 0], [0, 0, 1]])
+        rotation_z = np.array([[np.cos(gamma), -np.sin(gamma), 0], [np.sin(gamma), np.cos(gamma), 0], [0, 0, 1]])
         x = np.random.uniform(size=2)
         v = np.array(
             [np.cos(2.0 * np.pi * x[0]) * np.sqrt(x[1]), np.sin(2.0 * np.pi * x[0]) * np.sqrt(x[1]), np.sqrt(1 - x[1])]