waveforms 2.2.1__tar.gz → 2.2.3__tar.gz

waveforms-2.2.3/MANIFEST.in

@@ -0,0 +1,4 @@
+include src/*.h
+include waveforms/_waveform.pyx
+include waveforms/Waveform.g4
+include MANIFEST.in

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: waveforms
-Version: 2.2.1
+Version: 2.2.3
 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.3}/pyproject.toml

@@ -68,5 +68,8 @@ content-type = "text/markdown"
 license-files = ["LICENSE"]
 include-package-data = true
 
+[tool.setuptools.package-data]
+waveforms = ["WaveformLexer.py", "WaveformParser.py", "WaveformListener.py"]
+
 [tool.setuptools.dynamic]
 version = {attr = "waveforms.version.__version__"}

waveforms-2.2.3/waveforms/Waveform.g4

@@ -0,0 +1,68 @@
+grammar Waveform;
+
+// 主规则
+expr: assignment | expression ;
+
+assignment: ID '=' expression ;
+
+expression
+    : expression op=('**' | '^') expression                    # PowerExpression
+    | expression op=('*' | '/') expression                     # MultiplyDivideExpression
+    | expression op=('+' | '-') expression                     # AddSubtractExpression
+    | expression op=('<<' | '>>') expression                   # ShiftExpression
+    | '(' expression ')'                                       # ParenthesesExpression
+    | '-' expression                                           # UnaryMinusExpression
+    | functionCall                                             # FunctionCallExpression
+    | CONSTANT                                                 # ConstantExpression
+    | NUMBER                                                   # NumberExpression
+    | STRING                                                   # StringExpression
+    | list                                                     # ListExpression
+    | tuple                                                    # TupleExpression
+    | ID                                                       # IdentifierExpression
+    ;
+
+functionCall
+    : ID '(' ')'                                               # NoArgFunction
+    | ID '(' args ')'                                          # ArgsFunction  
+    | ID '(' kwargs ')'                                        # KwargsFunction
+    | ID '(' args ',' kwargs ')'                               # ArgsKwargsFunction
+    ;
+
+args: expression (',' expression)* ;
+
+kwargs: kwarg (',' kwarg)* ;
+
+kwarg: ID '=' expression ;
+
+list: '[' ']' | '[' expression (',' expression)* ']' ;
+
+tuple: '(' expression ',' ')' | '(' expression (',' expression)+ ')' ;
+
+// 词法规则
+NUMBER
+    : REAL
+    | INT
+    | IMAG
+    ;
+
+REAL: (DIGIT+ ('.' DIGIT*)? | '.' DIGIT+) ([eE] [+-]? DIGIT+)? ;
+
+INT: DIGIT+ ;
+
+IMAG: (REAL | INT) 'j' ;
+
+STRING: '"' (~["\r\n])* '"' | '\'' (~['\r\n])* '\'' ;
+
+CONSTANT: 'pi' | 'e' | 'inf' ;
+
+ID: [a-zA-Z_][a-zA-Z0-9_]* ;
+
+// 运算符
+POW: '**' ;
+LSHIFT: '<<' ;
+RSHIFT: '>>' ;
+
+// 忽略空白字符
+WS: [ \t\r\n]+ -> skip ;
+
+fragment DIGIT: [0-9] ; 

{waveforms-2.2.1 → waveforms-2.2.3}/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.3}/waveforms/distortion.py

@@ -135,8 +135,18 @@ def exp_decay_filter(
             poles (p) and gain (k). See scipy.signal.lfilter for more.
 
     Returns:
-        tuple: (b, a) array like, numerator (b) and denominator (a)
+        if output is 'ba', return (b, a) array like, numerator (b) and denominator (a)
         polynomials of the IIR filter. See scipy.signal.lfilter for more.
+        if output is 'sos', return array of second-order filter coefficients with shape
+        (n_sections, 6). See scipy.signal.sosfilt for more.
+        if output is 'zpk', return (z, p, k) array like, zeros (z), poles (p) and gain (k).
+        See scipy.signal.zpk2tf for more.
+    
+    Raises:
+        ValueError: if output is not 'ba', 'sos', or 'zpk'
+    
+    Notes:
+        The filter is stable if all poles are inside the unit circle.
     """
 
     if isinstance(amp, (int, float, complex)):
@@ -155,11 +165,14 @@ def exp_decay_filter(
     numerator = numerator + denominator
 
     z = cast(NDArray[np.float64], np.exp(-numerator.roots / sample_rate))
-    p = cast(NDArray[np.float64], np.exp(-denominator.roots / sample_rate))
+    # p = cast(NDArray[np.float64], np.exp(-denominator.roots / sample_rate))
+    p = np.exp(-1 / (np.asarray(tau) * sample_rate))
+
     if inv:
         z, p = p, z
-    k = cast(float,
-             numerator(0) / denominator(0) * np.prod(1 - p) / np.prod(1 - z))
+    # remove poles outside the unit circle to make the filter stable
+    p = p[np.abs(p) < 1]
+    k = cast(float, (np.prod(1 - p) / np.prod(1 - z)).real)
 
     if output == 'sos':
         return cast(NDArray[np.float64], zpk2sos(z, p, k))

{waveforms-2.2.1 → waveforms-2.2.3}/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.3"

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

@@ -28,6 +28,14 @@ def _test_spec_num(num, spec):
     return False, x, 0
 
 
+def _exp_num(s):
+    if "e" in s:
+        a, n = s.split("e")
+        n = float(n)
+        s = f"{a} \\times 10^{{{n:g}}}"
+    return s
+
+
 def _spec_num_latex(num):
     for spec, spec_latex in [(1, ''), (np.sqrt(2), '\\sqrt{2}'),
                              (np.sqrt(3), '\\sqrt{3}'),
@@ -44,13 +52,14 @@ def _spec_num_latex(num):
                 if x.numerator == 1:
                     return f"{spec_latex}"
                 else:
-                    return f"{x.numerator:g}{spec_latex}"
+                    s = _exp_num(f"{x.numerator:g}")
+                    return f"{s}{spec_latex}"
             else:
                 if x.numerator < 0:
                     return f"-\\frac{{{-x.numerator}}}{{{x.denominator}}}{spec_latex}"
                 else:
                     return f"\\frac{{{x.numerator}}}{{{x.denominator}}}{spec_latex}"
-    return f"{num:g}"
+    return _exp_num(f"{num:g}")
 
 
 def _num_latex(num):
@@ -65,10 +74,6 @@ def _num_latex(num):
     s = _spec_num_latex(num.real)
     if s == '' and round(num.real) == 1:
         return '1'
-    if "e" in s:
-        a, n = s.split("e")
-        n = float(n)
-        s = f"{a} \\times 10^{{{n:g}}}"
     return s
 
 
@@ -739,6 +744,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 +764,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 +784,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 +798,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.3}/waveforms.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: waveforms
-Version: 2.2.1
+Version: 2.2.3
 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.3}/waveforms.egg-info/SOURCES.txt

@@ -7,6 +7,7 @@ src/waveform.h
 tests/test_multi_drag.py
 tests/test_waveform.py
 tests/test_wavevstack.py
+waveforms/Waveform.g4
 waveforms/WaveformLexer.py
 waveforms/WaveformListener.py
 waveforms/WaveformParser.py

waveforms-2.2.1/MANIFEST.in

@@ -1,3 +0,0 @@
-include src/*.h
-include waveforms/_waveform.pyx
-include MANIFEST.in