pyRFtk 2.0.2__tar.gz → 2.0.4__tar.gz

pyrftk-2.0.4/.gitignore

@@ -0,0 +1,2 @@
+/.project
+/.pydevproject

{pyrftk-2.0.2 → pyrftk-2.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: pyRFtk
-Version: 2.0.2
+Version: 2.0.4
 Summary: Design tool for RF antennae networks
 Project-URL: Homepage, https://lpp-erm-kms.github.io/pyrftk/
 Author-email: Frederic Durodie <frederic.durodie@rma.ac.be>, Arthur Adriaens <arthur.adriaens@mil.be>
@@ -11,14 +11,15 @@ Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 
 # pyRFtk
-![logo](logo.png)
+[![DOI](https://zenodo.org/badge/702980029.svg)](https://zenodo.org/doi/10.5281/zenodo.10391750)
+![logo](https://github.com/LPP-ERM-KMS/pyRFtk/blob/master/logo/logo.svg)
 ## About
 
 pyRFtk is a Python library able to build and analyse RF circuits, originally designed for ICRH antennae but now widely deployable.
 you can:
 - Incorporate touchstone files to create your own elements
-- See the maximum current throughout your circuit
-- Compute the S-matrix
+- See the currents throughout your circuit
+- Compute S-matrices
 - Detect Arcs
 - Deembed systems
 - ...

{pyrftk-2.0.2 → pyrftk-2.0.4}/README.md

@@ -1,12 +1,13 @@
 # pyRFtk
-![logo](logo.png)
+[![DOI](https://zenodo.org/badge/702980029.svg)](https://zenodo.org/doi/10.5281/zenodo.10391750)
+![logo](https://github.com/LPP-ERM-KMS/pyRFtk/blob/master/logo/logo.svg)
 ## About
 
 pyRFtk is a Python library able to build and analyse RF circuits, originally designed for ICRH antennae but now widely deployable.
 you can:
 - Incorporate touchstone files to create your own elements
-- See the maximum current throughout your circuit
-- Compute the S-matrix
+- See the currents throughout your circuit
+- Compute S-matrices
 - Detect Arcs
 - Deembed systems
 - ...

pyrftk-2.0.4/logo/logo.svg

@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   version="1.1"
+   id="svg1"
+   width="853.33331"
+   height="429.33334"
+   viewBox="0 0 853.33331 429.33334"
+   sodipodi:docname="logo.pdf"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1">
+    <inkscape:page
+       x="0"
+       y="0"
+       id="page1"
+       width="853.33331"
+       height="429.33334"
+       margin="0"
+       bleed="0" />
+  </sodipodi:namedview>
+  <g
+     id="g1"
+     inkscape:groupmode="layer"
+     inkscape:label="">
+    <path
+       id="path1"
+       d="m 96.414,77.684 c 4.492,-0.301 7.867,1.453 10.129,5.254 0.5,43.535 0.5,87.07 0,130.601 -0.043,5.02 -2.547,7.52 -7.504,7.508 -3.297,-0.149 -5.805,-1.649 -7.504,-4.504 -0.25,-6.754 -0.5,-13.512 -0.75,-20.266 -1.613,-1.457 -3.488,-1.832 -5.625,-1.125 -0.707,7.465 -4.707,10.719 -12.008,9.758 -1.875,-0.875 -3.25,-2.254 -4.125,-4.129 -0.125,-16.519 -0.5,-33.035 -1.125,-49.539 -2.093,-1.949 -4.222,-1.949 -6.379,0 -0.027,9.578 -0.527,19.086 -1.5,28.524 -2.808,2.82 -6.187,3.695 -10.128,2.625 -2.29,-1.539 -3.665,-3.664 -4.125,-6.379 -0.5,-17.766 -0.5,-35.528 0,-53.293 1.96,-4.996 5.585,-6.871 10.878,-5.629 3.204,1.965 4.829,4.84 4.875,8.633 2.25,3.004 4.504,3.004 6.754,0 0.25,-9.008 0.5,-18.016 0.75,-27.02 2.387,-4.305 6.012,-5.683 10.879,-4.129 1.813,1.246 3.188,2.871 4.125,4.879 0.25,27.27 0.5,54.543 0.75,81.813 2.004,2 4.004,2 6.004,0 0.25,-32.774 0.5,-65.551 0.75,-98.328 1.27,-2.145 2.899,-3.895 4.879,-5.254 z"
+       style="fill:#343434;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       transform="scale(1.3333333)" />
+    <path
+       id="path2"
+       d="m 119.672,77.684 c 4.492,-0.301 7.871,1.453 10.129,5.254 0.25,6.757 0.5,13.511 0.75,20.269 1.355,1.422 2.98,1.797 4.879,1.125 1.008,-2.652 2.132,-5.277 3.375,-7.883 5.269,-4.172 9.769,-3.422 13.504,2.254 0.25,16.262 0.5,32.524 0.75,48.785 1.566,2.762 3.57,3.012 6.003,0.75 0.25,-8.504 0.5,-17.011 0.75,-25.519 2.418,-5.887 6.547,-7.512 12.379,-4.879 0.965,1.062 1.84,2.187 2.625,3.379 0.504,18.765 0.504,37.531 0,56.293 -3.566,6.074 -8.066,6.828 -13.504,2.254 -0.96,-2.75 -2.085,-5.375 -3.374,-7.883 -1.899,-0.672 -3.524,-0.297 -4.879,1.125 -0.25,9.258 -0.5,18.515 -0.75,27.773 -3.504,4.899 -7.883,5.774 -13.129,2.625 -1.024,-1.457 -1.649,-3.086 -1.875,-4.879 -0.25,-27.019 -0.5,-54.039 -0.75,-81.062 -2.004,-2 -4.004,-2 -6.004,0 -0.25,32.277 -0.5,64.551 -0.75,96.828 -1.344,5.824 -4.973,7.949 -10.879,6.379 -1.875,-0.875 -3.25,-2.254 -4.129,-4.129 -0.5,-44.535 -0.5,-89.07 0,-133.605 1.273,-2.145 2.898,-3.895 4.879,-5.254 z"
+       style="fill:#ff7427;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       transform="scale(1.3333333)" />
+    <path
+       id="path3"
+       d="m 319.816,97.902 c -3.441,0 -6.878,0.016 -10.32,0.047 v 72.809 c 6.059,0.472 11.809,-0.028 17.258,-1.5 V 136.98 c 1.676,-0.222 3.176,0.028 4.5,0.75 8.398,10.903 16.902,21.786 25.512,32.653 6.5,0.5 13.004,0.5 19.507,0 0.715,-0.539 0.836,-1.164 0.375,-1.879 -6.152,-7.426 -12.027,-15.059 -17.632,-22.891 -5.711,-0.843 -11.461,-1.593 -17.258,-2.254 -3.02,-0.91 -5.524,-2.535 -7.504,-4.875 -0.406,-0.05 -0.656,-0.296 -0.75,-0.754 3.215,-0.742 6.465,-0.996 9.754,-0.75 3.801,-0.3 7.551,-0.925 11.254,-1.875 6.449,-2.199 10.574,-6.574 12.383,-13.136 2.332,-13.231 -3.047,-21.114 -16.133,-23.641 -10.313,-0.285 -20.629,-0.426 -30.946,-0.426 z m 13.797,0.27 c 10.016,0.14 14.731,6.199 14.149,18.168 1.297,14.84 -5.457,21.469 -20.258,19.89 V 98.703 c 2.219,-0.379 4.254,-0.558 6.109,-0.531 z"
+       style="fill:#353535;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       transform="scale(1.3333333)" />
+    <path
+       id="path4"
+       d="m 419.039,133.227 c 5.023,-0.247 10.027,0.007 15.004,0.753 -8.234,0.75 -16.488,1 -24.758,0.75 -1.25,0 -2.5,0 -3.75,0 0,12.008 0,24.02 0,36.028 -5.754,0 -11.508,0 -17.258,0 0,-24.27 0,-48.539 0,-72.809 17.758,-0.125 35.516,0 53.27,0.379 0.859,5.57 0.984,11.199 0.375,16.887 -0.602,0.976 -1.477,1.476 -2.625,1.5 -1.957,-0.477 -3.703,-1.352 -5.254,-2.625 -5.609,-5.18 -11.363,-10.184 -17.254,-15.012 -3.746,-0.375 -7.496,-0.5 -11.254,-0.375 0,11.508 0,23.016 0,34.524 4.5,0 9,0 13.504,0 z"
+       style="fill:#333333;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       transform="scale(1.3333333)" />
+    <path
+       id="path5"
+       d="m 199.395,112.914 c -2.567,0 -5.129,0.016 -7.696,0.047 -0.742,19.211 -0.992,38.477 -0.75,57.797 5.946,0.234 11.821,-0.012 17.633,-0.75 0.375,-6.5 0.5,-13.008 0.375,-19.516 5.527,0.028 11.031,-0.347 16.508,-1.125 5.539,-0.824 9.918,-3.453 13.129,-7.883 5.754,-15.886 0.379,-25.269 -16.133,-28.144 -7.688,-0.285 -15.375,-0.426 -23.066,-0.426 z m 11.667,1.461 c 4.696,0.133 7.872,2.664 9.524,7.594 1.703,7.648 1.203,15.152 -1.5,22.519 -2.422,3.649 -5.801,5.153 -10.129,4.504 v -34.527 c 0.734,-0.078 1.434,-0.11 2.105,-0.09 z"
+       style="fill:#353535;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       transform="scale(1.3333333)" />
+    <path
+       id="path6"
+       d="m 244.969,112.961 c 6.297,-0.227 12.551,0.023 18.758,0.754 5.628,10.258 11.253,20.515 16.882,30.773 2.766,-4.039 5.149,-8.293 7.129,-12.761 -2.613,-5.227 -5.242,-10.481 -7.879,-15.762 -0.367,-0.969 -0.492,-1.969 -0.375,-3.004 6.254,0 12.504,0 18.758,0 0.121,1.277 -0.004,2.527 -0.375,3.754 -5.754,10.508 -11.504,21.015 -17.258,31.523 -0.25,7.258 -0.5,14.512 -0.75,21.77 -5.754,1 -11.504,1 -17.257,0 -0.25,-7.758 -0.5,-15.512 -0.75,-23.27 -6.164,-10.465 -12.043,-21.097 -17.633,-31.898 0.187,-0.676 0.437,-1.301 0.75,-1.879 z"
+       style="fill:#353535;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       transform="scale(1.3333333)" />
+    <path
+       id="path7"
+       d="m 447.551,112.961 c 17.004,-0.125 34.015,0 51.019,0.379 0.739,7.566 0.989,15.199 0.75,22.89 -2.117,0.313 -3.742,-0.437 -4.879,-2.25 -3.953,-6.71 -8.203,-13.214 -12.753,-19.515 -0.25,18.512 -0.5,37.027 -0.75,55.543 -5.063,0.859 -10.196,0.984 -15.379,0.375 -0.621,-18.586 -1,-37.223 -1.129,-55.918 -4.793,6.551 -9.293,13.305 -13.504,20.265 -1.301,1.579 -2.801,1.829 -4.5,0.75 -0.5,-7.003 -0.5,-14.011 0,-21.015 0.539,-0.406 0.914,-0.91 1.125,-1.504 z"
+       style="fill:#363636;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       transform="scale(1.3333333)" />
+    <path
+       id="path8"
+       d="m 511.324,112.961 c 5.446,-0.231 10.821,0.019 16.133,0.754 0.621,18.941 0.496,37.832 -0.375,56.668 -5.687,0.609 -11.316,0.484 -16.883,-0.375 -0.5,-18.516 -0.5,-37.031 0,-55.543 0.539,-0.406 0.914,-0.91 1.125,-1.504 z"
+       style="fill:#353535;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       transform="scale(1.3333333)" />
+    <path
+       id="path9"
+       d="m 542.836,112.961 c 8.004,0 16.008,0 24.012,0 0.117,1.035 -0.008,2.035 -0.375,3.004 -6.379,7.758 -12.758,15.512 -19.133,23.269 6.98,9.36 14.109,18.618 21.383,27.77 0.757,1.148 1.132,2.398 1.125,3.754 -7.082,0.332 -14.086,-0.043 -21.008,-1.125 -5.844,-8.098 -11.969,-15.981 -18.383,-23.645 -0.363,-0.711 -0.488,-1.461 -0.375,-2.25 4.523,0.403 8.777,-0.476 12.754,-2.629 3.781,-3.527 7.277,-7.277 10.504,-11.257 -3.535,-4.946 -7.16,-9.825 -10.879,-14.637 -0.352,-0.809 -0.227,-1.563 0.375,-2.254 z"
+       style="fill:#353535;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       transform="scale(1.3333333)" />
+    <path
+       id="path10"
+       d="m 201.453,191.773 c 17.258,0 34.516,0 51.77,0 0,0.75 0,1.5 0,2.254 -17.254,0 -34.512,0 -51.77,0 0,-0.754 0,-1.504 0,-2.254 z"
+       style="fill:#3a3a3a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       transform="scale(1.3333333)" />
+    <path
+       id="path11"
+       d="m 507.574,191.773 c 17.254,0 34.512,0 51.77,0 0,0.75 0,1.5 0,2.254 -17.258,0 -34.516,0 -51.77,0 0,-0.754 0,-1.504 0,-2.254 z"
+       style="fill:#3a3a3a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       transform="scale(1.3333333)" />
+    <text
+       id="text11"
+       xml:space="preserve"
+       transform="matrix(1.3333333,0,0,1.3338481,353.27835,264.36785)"><tspan
+         style="font-variant:normal;font-weight:normal;font-size:20.0078px;font-family:'Hack Nerd Font';writing-mode:lr-tb;fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         x="0 12.205783 24.431574 36.637356 48.84314 61.08894 73.294724 85.500504 97.726295 109.93208 122.13786 134.36365 146.56944 158.79523 171.02103 183.22681 195.43259 207.65837 219.86417"
+         y="0"
+         sodipodi:role="line"
+         id="tspan11">RF circuit modeling</tspan></text>
+    <path
+       id="path12"
+       d="m 403.902,132.238 h 31.227 v 2.977 h -31.227 z"
+       style="fill:#333333;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       transform="scale(1.3333333)" />
+  </g>
+</svg>

{pyrftk-2.0.2 → pyrftk-2.0.4}/pyproject.toml

@@ -3,7 +3,7 @@ requires = ["hatchling","numpy","matplotlib","logging"]
 build-backend = "hatchling.build"
 [project]
 name = "pyRFtk"
-version = "2.0.2"
+version = "2.0.4"
 authors = [
   { name="Frederic Durodie", email="frederic.durodie@rma.ac.be" },
   { name="Arthur Adriaens", email="arthur.adriaens@mil.be" },

pyrftk-2.0.4/src/pyRFtk/.gitignore

@@ -0,0 +1,2 @@
+/rfCommon.log
+/__pycache__/*

{pyrftk-2.0.2 → pyrftk-2.0.4}/src/pyRFtk/ReadTSF.py

@@ -1,7 +1,11 @@
-__updated__ = "2023-09-12 10:02:08"
+__updated__ = "2024-12-20 14:21:08"
 
 import numpy as np
 import re
+import os
+from warnings import warn
+_warn_skips = (os.path.dirname(__file__),)
+
 from .getlines import getlines 
 from .config import tLogger, logit, ident
 from .config import fscale
@@ -35,7 +39,7 @@ def ReadTSF(src, **kwargs):
     
     #TODO: implement ports, funit
     
-    TZbase = kwargs.pop('Zbase', 50.)
+    TZbase = kwargs.pop('Zbase', None)
     Tfunit = kwargs.get('funit', 'GHz')
     Tports = kwargs.get('ports', 'port-%03d')
     Tcomments = kwargs.get('comments',[])
@@ -114,7 +118,26 @@ def ReadTSF(src, **kwargs):
         elif kw in ['HZ','KHZ','MHZ','GHZ']:
             funit = kw
         elif kw == 'R':
-            Zbase = float(items.pop())
+            Zlist = []
+            while len(items):
+                try:
+                    item = items[-1]
+                    Zlist.append(float(item))
+                except ValueError:
+                    break
+                items.pop()
+                
+            if (NZ := len(Zlist)) == 1:
+                Zbase = Zlist[0]
+                
+            elif NZ > 1:
+                debug and tLogger.debug(ident(f'Zbase [{len(Zlist)}] {", ".join([str(z) for z in Zlist])}'))
+                Zbase = Zlist
+                
+            else:
+                # this should be flagged as an error in the touchstone
+                Zbase = 50. if TZbase is None else TZbase
+                debug and tLogger.debug(ident(f'Zbase not specified in R [ERROR]: set to {Zbase}'))
         else:
             raise ValueError('Unrecognized format specification: %r' % kw)
         
@@ -164,7 +187,7 @@ def ReadTSF(src, **kwargs):
     pvars = {}
     GENERAL_MIXED = False
     source = re.findall(
-        '(?i)! Touchstone file exported from HFSS (\d{4}\.\d+\.\d+)',
+        r'(?i)! Touchstone file exported from HFSS (\d{4}\.\d+\.\d+)',
         comments[0])
     debug and tLogger.debug(ident(f'source = {source}'))
     
@@ -190,7 +213,7 @@ def ReadTSF(src, **kwargs):
                     lineno += 1
                     aline = comments[lineno]
                     while aline.strip() != '!':
-                        varline = re.findall('!\s*([A-Za-z0-9_]+)\s*=\s*(.+)',
+                        varline = re.findall(r'!\s*([\$]?[A-Za-z0-9_]+)\s*=\s*(.+)',
                                               aline)
                         if varline:
                             pvars[varline[0][0]] = varline[0][1]
@@ -216,8 +239,8 @@ def ReadTSF(src, **kwargs):
     
     re_compile = True # check if compiling regexes is faster ... not really
     if re_compile:
-        reGline = re.compile('(?i)\s*(?:Gamma)\s+!?(.+)')
-        reZline = re.compile('(?i)\s*(?:Port Impedance)(.+)')
+        reGline = re.compile(r'(?i)\s*(?:Gamma)\s+!?(.+)')
+        reZline = re.compile(r'(?i)\s*(?:Port Impedance)(.+)')
     
     for aline in comments[got_marker:]:
         # check for gamma or port impedance lines
@@ -233,8 +256,8 @@ def ReadTSF(src, **kwargs):
             Gline = reGline.search(rest)
             Zline = reZline.search(rest)
         else:
-            Gline = re.findall('(?i)\s*(Gamma)\s+!?(.+)',rest)
-            Zline = re.findall('(?i)\s*(Port Impedance)(.+)',rest)
+            Gline = re.findall(r'(?i)\s*(Gamma)\s+!?(.+)',rest)
+            Zline = re.findall(r'(?i)\s*(Port Impedance)(.+)',rest)
         
         
         if Gline or (lastline == 'gamma' and not Zline):
@@ -320,27 +343,65 @@ def ReadTSF(src, **kwargs):
         Ss = 10**(Ss.real/20.) * np.exp(1j * Ss.imag * np.pi / 180.)
     else: # datafmt == 'RI':
         pass
+    
+    ## do some checking
+    if nZcs := Zcs.shape[1]:
+        # Zcs (and probably gammas) were present in the file
+        if Zbase is not None:
+            # there was also a R ... in the format
+            if (nZbase := len(Zbase) if hasattr(Zbase, '__iter__') else 1) != nZcs :
+                warn(f'\nInconsistent length of the Zcs ({nZcs}) comments and the '
+                     f'format supplied reference impedance R ({nZbase})',
+                     stacklevel=4)
+            else:
+                # numbers match ... but do the values
+                if nZbase == 1:
+                    errfs = np.max(np.abs([(Zbase - Zcs_k)/Zbase for Zcs_k in Zcs[:,0]]))
+                else:
+                    errfs = np.max(np.abs([
+                        [(Zbase_l - Zcs_kl)/Zbase_l for Zbase_l, Zcs_kl in zip(Zbase, Zcs_k)]
+                         for Zcs_k in Zcs
+                        ]))
+                    
+                if (tol := 1e-3) < errfs:
+                    warn(
+                        f'\nInconsistent values for the reference impedances from Zcs comments'
+                        f' and the one supplied in the format parameter R (rel. err. = {errfs:0.2g} > {tol:0.2g})',
+                        stacklevel=4)
+                    
+            if nZbase == 1 and nZcs != 1:
+                err = []
+    
+            
         
     # if the data type is Z or Y we need to convert to S
+                
+    #FIXME: if TZbase was given then Zbase can be ignored
+    Zbase = 50. if datatype in 'ZY' and Zbase is None else Zbase
     if datatype == 'Z':
-        Ss = S_from_Z(Ss, Zbase if Zbase else TZbase)
+        # Ss = S_from_Z(Ss, Zbase if Zbase else TZbase)
+        Ss = S_from_Z(Ss,  TZbase if TZbase else Zbase)
         
     elif datatype == 'Y':
-        Ss = S_from_Y(Ss, Zbase if Zbase else TZbase)
-    
+        # Ss = S_from_Y(Ss, Zbase if Zbase else TZbase)
+        Ss = S_from_Y(Ss, TZbase if TZbase else Zbase)
+        
     else: # datatype == 'S':
     
-        if Zbase is not None:
-            if Zbase != TZbase:
-                Ss = ConvertGeneral(TZbase, Ss, Zbase, 'V', 'V')
+        if nZcs:  # prefer the Zcs data over the format line R data
+            Ss = ConvertGeneral(TZbase if TZbase else 50., Ss, Zcs, 'P', 'V')
+                
+        elif Zbase is not None and (nZbase == 1 or nZbase == Ss.shape[1]):
+            Ss = ConvertGeneral(TZbase if TZbase else 50., Ss, Zbase, 'P', 'V')
     
-        else: # Zbase is None:
-            if len(Zcs[0]) == N:
-                Ss = ConvertGeneral(TZbase, Ss, Zcs, 'P', 'V')
-            else:
-                logit['ERROR'] and tLogger.error(f'len(Zcs)[{len(Zcs)}] != N[{N}]')
-                logit['ERROR'] and tLogger.error(f'Zcs={Zcs}')
-            
+        elif Zbase is None: # No Zcs and Zbase is None:
+            Ss = ConvertGeneral(TZbase if TZbase else 50., Ss, Zcs, 'P', 'V')
+        
+        else:
+            logit['ERROR'] and tLogger.error(f'len(Zcs)[{len(Zcs)}] != N[{N}]')
+            logit['ERROR'] and tLogger.error(f'Zcs={Zcs}')
+        
+                
     # set the portnames
     
     if 'ports' in kwargs:
@@ -387,7 +448,7 @@ def ReadTSF(src, **kwargs):
         "markers"   : markers,
         "Zc"        : Zcs,
         "Gm"        : Gms,
-        "variables" : None,
+        "variables" : pvars,
         "datafmt"   : datafmt,
     }
 

pyrftk-2.0.4/src/pyRFtk/WriteTSF.py

@@ -0,0 +1,174 @@
+__updated__ = "2024-12-20 14:21:10"
+
+import numpy as np
+import re
+import time
+
+
+
+#===============================================================================
+#
+# W r i t e T S F 
+#
+#===============================================================================
+
+def WriteTSF(object, path2tsf=None,
+           fs=[], 
+           tsf_format='MHZ S DB R 50', 
+           num_format=None,
+           comments = ''):
+    
+    """WriteTSF:
+    
+        object     : a pyFtk object (rfCircuit, fObject, rfTRL, ...)
+        path2tsf   : path to file: if it is None or an empty string the TSF is
+                     returned as a string
+        tsf_format : the touchstone version 1.1 string
+        num_format : tuple for resp. the freq,  reat and imag number format
+        comments   : multi-line string
+        
+        
+        note (I believe) the touchstone specification 1.1 transposes the 
+             the coefficients for .s2p (2-ports): this is not implemented here
+             as it is (apparently) not done in ReadTSF. 
+        
+    """
+
+    s  = '! TouchStone file (pyRFtk.WriteTSF version %s)\n' % __updated__
+    s += '! Date : %s \n\n' % time.strftime("%Y-%m-%d %H:%M:%S",time.localtime())
+    
+    scomments = comments.split('\n')
+    if len(scomments) > 0 :
+        for line in scomments :
+            s += '! %s\n' % line
+        
+    s += '\n# %s \n\n' % tsf_format
+    
+    fscale = {'HZ': 1e0, 'KHZ':1e3,'MHZ':1e6, 'GHZ':1e9, 'THZ':1e12}[
+        re.findall('^.*?([KMG]?HZ).*$',tsf_format.upper())[0]]
+
+    try:
+        zref = float(
+                re.findall(
+                    r'^.*?R\s*([-+]?(?:\d*[\.])?\d+(?:[eE][-+]?\d+)?).*?$',
+                    tsf_format
+                )[0]
+               )
+    except:
+        zref = 50.0
+        
+    fmt = re.findall('(RI|MA|DB)',tsf_format.upper())
+    if len(fmt) == 0:
+        fmt = 'DB'  # default
+    elif len(fmt) == 1:
+        fmt = fmt[0]
+    else:
+        raise ValueError(
+            'WriteTSF: one one of DB, RI or MA allowed in format string'
+            )
+        
+    try:
+        if len(object.ports) > 0 :
+            s += '!PORTS ' + ', '.join(object.ports) + '\n\n'
+    except AttributeError:
+        pass
+    
+    if len(fs) == 0:
+        
+        # try an find a way to a list of meaning full frequencies
+        try:
+            if len(object.fs) > 0:
+                fs = object.fs
+        except AttributeError:
+            pass
+    
+    if len(fs) == 0:
+        raise ValueError(
+            'could not find list of frequencies in object and no list was supplied'
+            )
+    nports = len(object)
+    
+    if num_format is None:
+        if fmt in ['DB','MA']:
+            num_format = ('9.5f', '15.12f', '+8.4f')
+        else:
+            num_format = ('8.4f', '10.7f', '10.7f')
+    
+    tnumfmt = f'%{num_format[1]} %{num_format[2]} '
+    
+    for k,fk in enumerate(fs):
+        s += (f'%{num_format[0]}' % (fk / fscale)) + ' '
+        d = object.getS(fk, Zbase=zref)
+        for kr in range(nports):
+            for kc in range(nports):
+                dij = d[kr,kc]
+                if fmt == 'RI':
+                    s += tnumfmt % (np.real(dij),np.imag(dij))
+                    
+                elif fmt == 'DB':
+                    s += tnumfmt% (20.*np.log10(np.abs(dij)),
+                                               np.angle(dij,1))
+                    
+                else: # can only be MA
+                    s += tnumfmt % (np.abs(dij),np.angle(dij,1))
+                    
+                if (kc % 4 == 3) and (kc is not nports-1):
+                    if kc == 3:
+                        s += ' !    row %d' % (kr+1)
+                    s += '\n'+' '*10
+                    
+            if nports > 2:
+                s += '\n'
+                if kr != nports-1:
+                    s += ' '*9
+
+        s += '\n'      
+                
+        
+    if path2tsf:
+        with open(path2tsf,'w') as f:
+            f.write(s)
+                     
+    else:
+        return s
+
+     
+#===============================================================================
+#
+# _ _ m a i n _ _
+#
+#===============================================================================
+
+if __name__ == '__main__':
+    
+    import os
+    import matplotlib.pyplot as pl 
+    
+    import sys
+    sys.path.insert(0, '/home/frederic/git/pyrftk/src/pyRFtk')
+    
+    from pyRFtk import rfObject
+    
+    path2data = '/home/frederic/git/twa-on-west/data/high'
+    
+    fs = np.load(os.path.join(path2data,'f_lst.npy'))
+    R = np.load(os.path.join(path2data,'S22_TWA.npy'))
+    
+    Q = rfObject(Zbase=30)
+    Q.setS(f=fs, S=R, Portnames=['in','out'])
+    
+    WriteTSF(Q, tsf := os.path.join(path2data,f'test.s{len(Q)}p'),fs=np.linspace(45e6,65e6,201))
+    
+    T = rfObject(touchstone=tsf)
+    print(T)
+    
+    Sq = Q.getS(fs,Zbase=30)
+    St = T.getS(fs,Zbase=30)
+    print(St.shape)
+    for i in range(len(Q)):
+        for j in range(len(Q)):
+            pl.plot(fs, np.abs(Sq[:,i,j]-St[:,i,j]), label=f'Sq$_{{{i}{j}}}$')
+    
+    pl.show()
+    print(Q)
+    

{pyrftk-2.0.2 → pyrftk-2.0.4}/src/pyRFtk/__init__.py

@@ -1,4 +1,6 @@
-__updated__ = "2023-09-22 15:55:47"
+__updated__ = "2024-12-20 14:11:19"
+
+print('\n*** using local copy of pyRFtk ***\n')
 
 from .config import tLogger, setLogLevel, logit, ident, _newID, logident
 from .rfBase import rfBase
@@ -19,6 +21,7 @@ from .Y_from_S import Y_from_S
 
 from .ConvertGeneral import ConvertGeneral
 from .ReadTSF import ReadTSF
+from .WriteTSF import WriteTSF
 from .maxfun import maxfun
 from .resolveTLparams import TLresolver
 from .plotVSWs import plotVSWs, scaleVSW, strVSW

{pyrftk-2.0.2 → pyrftk-2.0.4}/src/pyRFtk/rfObject.py

@@ -573,6 +573,7 @@ class rfObject():
         self.shape = r['shape']
         self.Zcs = np.array(r['Zc'])
         self.Gms = np.array(r['Gm'])
+        self.variables = r['variables']
         self.xpos = [0.] * len(self)
         
     #===========================================================================