waveforms 2.1.0__tar.gz → 2.1.1__tar.gz

{waveforms-2.1.0 → waveforms-2.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: waveforms
-Version: 2.1.0
+Version: 2.1.1
 Summary: Edit waveforms used in experiment
 Author-email: feihoo87 <feihoo87@gmail.com>
 Maintainer-email: feihoo87 <feihoo87@gmail.com>

{waveforms-2.1.0 → waveforms-2.1.1}/waveforms/utils.py

@@ -1,6 +1,6 @@
 from itertools import repeat
 from types import MappingProxyType
-from typing import Optional, Sequence
+from typing import Optional, Sequence, cast
 
 import numpy as np
 import scipy.sparse as sp
@@ -20,13 +20,13 @@ def freeze(x):
     elif isinstance(x, (np.ndarray, np.matrix)):
         x.flags.writeable = False
     elif isinstance(x, sp.spmatrix):
-        x.data.flags.writeable = False
-        if x.format in {'csr', 'csc', 'bsr'}:
-            x.indices.flags.writeable = False
-            x.indptr.flags.writeable = False
-        elif x.format == 'coo':
-            x.row.flags.writeable = False
-            x.col.flags.writeable = False
+        cast(np.ndarray, getattr(x, 'data')).flags.writeable = False
+        if getattr(x, 'format') in {'csr', 'csc', 'bsr'}:
+            cast(np.ndarray, getattr(x, 'indices')).flags.writeable = False
+            cast(np.ndarray, getattr(x, 'indptr')).flags.writeable = False
+        elif getattr(x, 'format') == 'coo':
+            cast(np.ndarray, getattr(x, 'row')).flags.writeable = False
+            cast(np.ndarray, getattr(x, 'col')).flags.writeable = False
     elif isinstance(x, bytearray):
         x = bytes(x)
     return x
@@ -72,12 +72,14 @@ def getFTMatrix(fList: Sequence[float],
     if weight is None or len(weight) == 0:
         weight = np.full(numOfPoints, 2 / numOfPoints)
     if phaseList is None or len(phaseList) == 0:
-        phaseList = np.zeros_like(fList)
+        phase_list = np.zeros_like(fList)
+    else:
+        phase_list = phaseList
     if weight.ndim == 1:
-        weightList = repeat(weight)
+        weight_list = repeat(weight)
     else:
-        weightList = weight
-    for f, phase, weight in zip(fList, phaseList, weightList):
+        weight_list = weight
+    for f, phase, weight in zip(fList, phase_list, weight_list):
         e.append(weight * np.exp(-1j * (2 * np.pi * f * t + phase)))
     return np.asarray(e).T
 

{waveforms-2.1.0 → waveforms-2.1.1}/waveforms/version.py

@@ -1,2 +1,2 @@
 """Define version number here and read it from setup.py automatically"""
-__version__ = "2.1.0"
+__version__ = "2.1.1"

{waveforms-2.1.0 → waveforms-2.1.1}/waveforms/waveform.py

@@ -179,6 +179,10 @@ class Waveform:
             sig = self.__call__(x, out=out, function_lib=function_lib)
             if filters is not None:
                 sos, initial = filters
+                if not isinstance(sos, np.ndarray):
+                    sos = np.array(sos)
+                elif not sos.flags.writeable:
+                    sos = sos.copy()
                 if initial:
                     sig = sosfilt(sos, sig - initial) + initial
                 else:

{waveforms-2.1.0 → waveforms-2.1.1}/waveforms.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: waveforms
-Version: 2.1.0
+Version: 2.1.1
 Summary: Edit waveforms used in experiment
 Author-email: feihoo87 <feihoo87@gmail.com>
 Maintainer-email: feihoo87 <feihoo87@gmail.com>