pyRFtk 2.0.2__tar.gz → 2.0.3__tar.gz

pyrftk-2.0.3/.gitignore

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

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: pyRFtk
-Version: 2.0.2
+Version: 2.0.3
 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,6 +11,7 @@ Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 
 # pyRFtk
+[![DOI](https://zenodo.org/badge/702980029.svg)](https://zenodo.org/doi/10.5281/zenodo.10391750)
 ![logo](logo.png)
 ## About
 

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

@@ -1,4 +1,5 @@
 # pyRFtk
+[![DOI](https://zenodo.org/badge/702980029.svg)](https://zenodo.org/doi/10.5281/zenodo.10391750)
 ![logo](logo.png)
 ## About
 

{pyrftk-2.0.2 → pyrftk-2.0.3}/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.3"
 authors = [
   { name="Frederic Durodie", email="frederic.durodie@rma.ac.be" },
   { name="Arthur Adriaens", email="arthur.adriaens@mil.be" },

pyrftk-2.0.3/src/pyRFtk/.gitignore

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

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

@@ -35,7 +35,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 +114,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)
         
@@ -190,7 +209,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('!\s*([\$]?[A-Za-z0-9_]+)\s*=\s*(.+)',
                                               aline)
                         if varline:
                             pvars[varline[0][0]] = varline[0][1]
@@ -322,17 +341,26 @@ def ReadTSF(src, **kwargs):
         pass
         
     # 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 not hasattr(Zbase,'__iter__'):
+                if Zbase != TZbase:
+                    Ss = ConvertGeneral(TZbase, Ss, Zbase, 'V', 'V')
+                
+            else:
+                Ss = ConvertGeneral(TZbase, Ss, Zbase, 'P', 'V')
     
         else: # Zbase is None:
             if len(Zcs[0]) == N:
@@ -340,7 +368,8 @@ def ReadTSF(src, **kwargs):
             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 +416,7 @@ def ReadTSF(src, **kwargs):
         "markers"   : markers,
         "Zc"        : Zcs,
         "Gm"        : Gms,
-        "variables" : None,
+        "variables" : pvars,
         "datafmt"   : datafmt,
     }
 

pyrftk-2.0.3/src/pyRFtk/WriteTSF.py

@@ -0,0 +1,174 @@
+__updated__ = "2024-08-29 15:46:08"
+
+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\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.3}/src/pyRFtk/__init__.py

@@ -1,4 +1,6 @@
-__updated__ = "2023-09-22 15:55:47"
+__updated__ = "2024-08-29 09:55:04"
+
+print('using local copy of pyRFtk')
 
 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.3}/src/pyRFtk/config.py

@@ -195,7 +195,7 @@ rcparams = {
     'funit'  : 'Hz',     # 'Hz' | 'kHz' | 'MHz' | 'GHz' # keep to Hz for the moment
     'fs'     : (35e6, 60e6, 251),
     'interp' : 'MA',     # 'MA' | 'RI' | 'dB'
-    'interpkws' : {'kind': 3, 
+    'interpkws' : {'kind': 1, 
                    'fill_value':'extrapolate'
                   },
 }

{pyrftk-2.0.2 → pyrftk-2.0.3}/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)
         
     #===========================================================================