waveforms 2.2.1__tar.gz → 2.2.2__tar.gz

{waveforms-2.2.1 → waveforms-2.2.2}/PKG-INFO

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

{waveforms-2.2.1 → waveforms-2.2.2}/waveforms/_waveform.pyx

@@ -358,15 +358,17 @@ def _drag(t: np.ndarray, t0: float, freq: float, width: float, delta: float,
 
 def _mollifier(t: np.ndarray, r: float, d: int):
     x = t / r
+    xx_1 = np.abs(x)**2 - 1
     if d == 0:
-        return np.exp(1 / (np.abs(x)**2 - 1) + 1)
+        return np.where(xx_1 == 0, 0, np.exp(1 / xx_1 + 1))
     else:
         p = np.poly1d([-2, 0])
         for n in range(1, d):
             p = np.poly1d([1, 0, -2, 0, 1]) * p.deriv() + np.poly1d(
                 [-4 * n, 0, 4 * n - 2, 0]) * p
-        return np.exp(1 / (np.abs(x)**2 - 1) +
-                      1) * p(x) / (1 - x**2)**(2 * d) / r**d
+        return np.where(xx_1 == 0, 0,
+                        np.exp(1 / xx_1 + 1) /
+                        (-xx_1)**(2 * d)) * p(x) / r**d
 
 
 LINEAR = registerBaseFunc(_LINEAR)

{waveforms-2.2.1 → waveforms-2.2.2}/waveforms/version.py

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

{waveforms-2.2.1 → waveforms-2.2.2}/waveforms/waveform.py

@@ -739,6 +739,8 @@ class WaveVStack(Waveform):
         wav.start = self.start
         wav.stop = self.stop
         wav.sample_rate = self.sample_rate
+        wav.filters = self.filters
+        wav.label = self.label
         return wav
 
     @staticmethod
@@ -757,6 +759,8 @@ class WaveVStack(Waveform):
         ret.stop = self.stop
         ret.shift = self.shift + time
         ret.offset = self.offset
+        ret.filters = self.filters
+        ret.label = self.label
         return ret
 
     def __add__(self, other) -> WaveVStack:
@@ -775,6 +779,8 @@ class WaveVStack(Waveform):
         else:
             # ret.wlist.append(((+inf, ), (_const(1.0 * other), )))
             ret.offset += other
+        ret.filters = self.filters
+        ret.label = self.label
         return ret
 
     def __radd__(self, v) -> WaveVStack:
@@ -787,10 +793,14 @@ class WaveVStack(Waveform):
             if self.offset != 0:
                 w = other * self.offset
                 ret.wlist.append((w.bounds, w.seq))
+            ret.filters = self.filters
+            ret.label = self.label
             return ret
         else:
             ret = WaveVStack([Waveform(*w) * other for w in self.wlist])
             ret.offset = self.offset * other
+            ret.filters = self.filters
+            ret.label = self.label
             return ret
 
     def __rmul__(self, v) -> WaveVStack:

{waveforms-2.2.1 → waveforms-2.2.2}/waveforms.egg-info/PKG-INFO

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