pyRFtk 2.0.8__tar.gz → 2.0.9__tar.gz

{pyrftk-2.0.8 → pyrftk-2.0.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyRFtk
-Version: 2.0.8
+Version: 2.0.9
 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>

{pyrftk-2.0.8 → pyrftk-2.0.9}/pyproject.toml

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

{pyrftk-2.0.8 → pyrftk-2.0.9}/src/pyRFtk/ReadTSF.py

@@ -1,4 +1,4 @@
-__updated__ = "2025-01-21 15:58:36"
+__updated__ = "2026-05-20 14:58:47"
 
 import numpy as np
 import re
@@ -349,14 +349,15 @@ def ReadTSF(src, **kwargs):
     
     ## do some checking
     nZcs, nZbase = 0, 0
-    if len(Zcs) and (nZcs := Zcs.shape[1]):
+    if len(Zcs) and (nZcs := np.array(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)
+                if False:
+                    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:
@@ -376,7 +377,9 @@ def ReadTSF(src, **kwargs):
             if nZbase == 1 and nZcs != 1:
                 err = []
     
-            
+    else: # this should be the case when no Zcs or gammas are present
+        nZbase = len(Zlist)
+                
         
     # if the data type is Z or Y we need to convert to S
                 
@@ -397,6 +400,7 @@ def ReadTSF(src, **kwargs):
                 
         elif Zbase is not None and (nZbase == 1 or nZbase == Ss.shape[1]):
             Ss = ConvertGeneral(TZbase if TZbase else 50., Ss, Zbase, 'P', 'V')
+            # print(f'have converted the data from {Zbase} in the touchstone  to {TZbase}')
     
         elif Zbase is None: # No Zcs and Zbase is None:
             Ss = ConvertGeneral(TZbase if TZbase else 50., Ss, Zcs, 'P', 'V')
@@ -404,6 +408,7 @@ 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}')
+            raise ValueError('in ReadTSF: please specify Zbase')
         
                 
     # set the portnames
@@ -440,6 +445,7 @@ def ReadTSF(src, **kwargs):
         debug and tLogger.debug(ident(f'set ports to {ports}'))
     
     debug and tLogger.debug(ident(f'< [CommonLib.ReadTSF]',-1))
+    
     return {        
         "ports"     : ports,
         "fs"        : fs,

{pyrftk-2.0.8 → pyrftk-2.0.9}/src/pyRFtk/__init__.py

@@ -1,6 +1,6 @@
-__updated__ = "2025-01-24 07:58:36"
+__updated__ = "2026-04-24 09:20:26"
 
-# print('\n*** using local copy of pyRFtk ***\n')
+print('\n*** using local copy of pyRFtk ***\n')
 
 from .config import tLogger, setLogLevel, logit, ident, _newID, logident
 from .rfBase import rfBase

{pyrftk-2.0.8 → pyrftk-2.0.9}/src/pyRFtk/rfCircuit.py

@@ -1,4 +1,6 @@
-__updated__ = "2023-11-09 10:00:05"
+__updated__ = "2026-05-19 11:11:41"
+
+#FIXME: addblock of a np.array fails because of xpos issues (also __str__ fails)
 
 import numpy as np
 import matplotlib.pyplot as plt
@@ -292,6 +294,30 @@ class rfCircuit(rfBase):
         
         return obj
     
+    #==============================================================================================
+    #
+    # o b j e c t
+    #
+    def object(self,path):
+        """object
+            
+            returns the object pointed to by path
+            
+            eg. rfCircuit_object = self.object('block1.block2. ... .blockN')
+            
+            is equivalent to
+            
+            rfCircuit_object = \
+               self.blocks['block1']['object'].blocks['block2']['object']. ... .blocks['blockN']['object']
+               
+            Note this is similar to findObj 
+        """
+        obj = self
+        for blk in path.split('.'):
+            obj = obj.blocks[blk]['object']
+        
+        return obj
+    
     #===========================================================================
     #
     # _ s u b s t p o r t s
@@ -692,8 +718,12 @@ class rfCircuit(rfBase):
         
         # update the self.xpos
         # self.xpos = []
-        for p, x in zip(oports, RFobj.xpos):
-            self.xpos.append(relpos + x)
+        if hasattr(RFobj,'xpos'):
+            for p, x in zip(oports, RFobj.xpos):
+                self.xpos.append(relpos + x)
+        else:
+            for p in oports:
+                self.xpos.append(relpos)
                 
         _debug_ and tLogger.debug(ident(
             f'< [circuit.addblock] (inserted a new block)', -1

{pyrftk-2.0.8 → pyrftk-2.0.9}/src/pyRFtk/rfGTL.py

@@ -59,6 +59,8 @@ class rfGTL(rfCircuit):
             
         with open(path2model,'r') as f:
             self.model = ast.literal_eval(f.read())
+            
+        pprint(self.model)
         
         try:
             self.GTL = self.model[self.objkey]['GTL']

{pyrftk-2.0.8 → pyrftk-2.0.9}/src/pyRFtk/rfObject.py

@@ -1,4 +1,6 @@
-__updated__ = "2023-11-08 11:19:50"
+__updated__ = "2026-05-20 14:05:43"
+
+#TODO: add the possibility to fill doing  rfObject(fs=[ ...], Ss=[ ... ])
 
 if __name__ == '__main__':
     import sys
@@ -60,9 +62,9 @@ class rfObject():
     and 
     
     excitation = {port1:a1, ... }
-    Vamx, rfObject.maxV(fHz, excitation)
+    Vmax, rfObject.maxV(fHz, excitation)
     
-   
+    [note code partially debugged using co-pilot (GPT-5 mini)]
     """
     #===========================================================================
     #
@@ -85,6 +87,8 @@ class rfObject():
             fixme: no parameters to set the Zcs and Gms port properties
         """
         
+        self.got_args = False
+        
         if not hasattr(self,'args'):
             self.args = args
         
@@ -93,12 +97,76 @@ class rfObject():
         
         self.Id = kwargs.pop('Id',f'{type(self).__name__}_{_newID()}')
         
+        # if only an arg is given -> convert it (type cast) to an rfObject
+        # this eg to convert a list/numpy array to an rfOject
+        #
+        # obj = rfObject(numpy.array([[0,1],[1,0]])
+        # obj.getS(fs) returns [[0,1],[1,0]] for all frequenies fs
+        #
+        # what could be valid kwargs ?
+        #
+        # ports, xpos, Zbase 
+        
+        # print(f'rfObject: Nargs = {len(args)}')
+        
+        if Nargs := len(args):
+            if Nargs == 1:
+                # check type of arg
+                if not isinstance(args[0], (np.ndarray, np.matrix, list)):
+                    raise TypeError(
+                        f'rfObject: args[0] must be of type list, numpy.array or '
+                        f'numpy.matrix; got {type(args[0])}')
+                
+                arg0 = np.array(args[0], dtype=complex)
+                
+                if len(arg0.shape) != 2:
+                    raise TypeError(
+                        f'rfObject: arg[0] must must represent a square 2-dim '
+                        f'array; got {arg0.shape}')
+                 
+                if arg0.shape[0] != arg0.shape[1]:   
+                    raise TypeError(
+                        f'rfObject: arg[0] must must represent a square 2-dim '
+                        f'array; got {arg0.shape[0]} x {arg0.shape[1]}')
+                    
+                self.N = arg0.shape[0]
+                self.ports = [f'm{k:03d}' for k in range(1,self.N+1)]
+                self.Ss = np.array([arg0, arg0])
+                self.fs = np.array([0, 1e18])
+
+                self.got_args = True
+                
+            elif Nargs == 2:
+                raise NotImplementedError()
+            
+            else:
+                raise TypeError(f"rfObject: at most 2 args expected; got {Nargs}")
+        
         #TODO: validate allowed port names
-        self.ports = kwargs.get('ports',[])
-        self.alias = {}
-        if isinstance(self.ports, str):
-            self.ports = self.ports.split()
-        self.N = len(self.ports)
+
+        self.alias = {} #FIXME: what was the idea again ... does not appear to be used
+
+        _ports = kwargs.get('ports', [])
+        if isinstance(_ports, str):
+            _ports = _ports.split()
+        _N = len(_ports)
+        
+        # If the object was created from an argument (e.g. an S-matrix),
+        # self.N and self.ports may already be set. Only override ports
+        # from kwargs when the caller actually provided a non-empty ports list.
+        if hasattr(self, 'N'):
+            if _N:
+                if _N != self.N:
+                    raise ValueError(
+                        f'rfObject: the supplied args suggests a {self.N} port '
+                        f'object but the supplied port kwarg suggests a {_N} port one')
+                # override only when ports were explicitly provided
+                self.ports = _ports
+        else:
+            # no N previously set -> use provided ports count (may be zero)
+            self.N = _N
+            # assign provided ports (may be empty list)
+            self.ports = _ports
         
         self.Zbase = kwargs.get('Zbase', rcparams['Zbase'])
         self.funit = kwargs.get('funit', rcparams['funit'])
@@ -107,13 +175,17 @@ class rfObject():
         
         self.interp = kwargs.get('interp',rcparams['interp'])
         self.interpkws = kwargs.get('interpkws',rcparams['interpkws'])
-        
+            
         self.xpos = kwargs.get('xpos', [0.]*self.N)
-        
+                
         # initialize arrays and stuff
-        self.fs = np.array([],dtype=float).reshape((0,))
+        if not hasattr(self,'fs'):
+            self.fs = np.array([],dtype=float).reshape((0,))
         self.sorted = True
-        self.Ss = np.array([], dtype=complex).reshape((0, self.N, self.N))
+        
+        if not hasattr(self, 'Ss'):
+            self.Ss = np.array([], dtype=complex).reshape((0, self.N, self.N))
+            
         self.Zcs = np.array([], dtype=complex).reshape(0, self.N)
         self.Gms = np.array([], dtype=complex).reshape(0, self.N)
         self.process_kwargs()
@@ -121,13 +193,22 @@ class rfObject():
         
         self.touchstone = kwargs.get('touchstone', None)
         if self.touchstone:
+            if self.got_args:
+                raise ValueError(
+                    f'rfObject: touchstone is not compatible with the use of args')
+                
             Tkwargs = {'Zbase': self.Zbase, 'funit':'HZ'}
+            # FIXME: if Zbase is not supplied it defaults to 50 Ohm but that is
+            #        not taking into account the information supplied in the 
+            #        touchstone !
+            
             for (kw, value) in kwargs.items():
                 if kw in Tkwargs:
                     Tkwargs[kw] = value
             
             self.read_tsf(self.touchstone, **Tkwargs)
-        
+
+
         self.interpOK = False
         
         self.f, self.S = None, None
@@ -214,7 +295,10 @@ class rfObject():
         for kw, val in self.kwargs.items():
             s += ',\n'
             s += '  %s = %r' % (kw,val)
+        if 'Zbase' not in self.kwargs:
+            s += f'\n  Zbase = {self.Zbase} [default]'
         s += '\n)'
+       
         return s
     
     #===========================================================================
@@ -673,3 +757,4 @@ class rfObject():
                 f'pyRFtk2.rfObject.deembed: port(s) {",".join([p for p in ports])}'
                 ' not found.')
 
+

pyrftk-2.0.8/rfCommon.log

@@ -1,67 +0,0 @@
-DEBUG    - config.py            setLogLevel     [   39]: Change loglevel from CRITICAL to DEBUG
-DEBUG    - rfCircuit.py         __init__        [   60]: [  0] > __init__ 
-DEBUG    - rfBase.py            __init__        [   70]: [  1] | > __init__ 
-DEBUG    - rfBase.py            __init__        [  114]: [  2] | | self.fs=[]
-DEBUG    - rfBase.py            __init__        [  138]: [  1] | < __init__
-DEBUG    - rfCircuit.py         __init__        [  110]: [  0] < __init__
-DEBUG    - rfCircuit.py         addblock        [  533]: [  0] > [circuit.addblock] name= TL1, RFobj= rfTRL_1, ports= None, params={}, kwargs= {}
-DEBUG    - rfCircuit.py         addblock        [  698]: [  0] < [circuit.addblock] (inserted a new block)
-DEBUG    - rfCircuit.py         addblock        [  533]: [  0] > [circuit.addblock] name= TL2, RFobj= rfTRL_1, ports= None, params={}, kwargs= {}
-DEBUG    - rfCircuit.py         addblock        [  698]: [  0] < [circuit.addblock] (inserted a new block)
-DEBUG    - rfCircuit.py         connect         [  748]: [  0] > [circuit.connect] ports= ('TL1.1', 'TL2.1', '1')
-DEBUG    - rfCircuit.py         connect         [  821]: [  0] < [circuit.connect]
-DEBUG    - rfCircuit.py         connect         [  748]: [  0] > [circuit.connect] ports= ('TL1.2', 'TL2.2', '2')
-DEBUG    - rfCircuit.py         connect         [  821]: [  0] < [circuit.connect]
-DEBUG    - rfCircuit.py         getS            [ 1203]: [  0] > [circuit.getS] fs= 10000000.0, Zbase= None, params= {}, flags= {}
-DEBUG    - rfCircuit.py         get1S           [ 1228]: [  1] | not using sNp: no sNp
-DEBUG    - rfCircuit.py         get1S           [ 1235]: [  1] | getting S for TL1
-DEBUG    - rfCircuit.py         get1S           [ 1235]: [  1] | getting S for TL2
-DEBUG    - rfCircuit.py         extS            [  949]: [  1] | > [circuit.extS] 
-DEBUG    - rfCircuit.py         extS            [  955]: [  2] | | M is not square (10, 12)
-DEBUG    - rfCircuit.py         extS            [  993]: [  2] | | Portnames= ['1', '2']
-DEBUG    - rfCircuit.py         extS            [  994]: [  2] | | ports=     ['1', '2']
-DEBUG    - rfCircuit.py         extS            [ 1021]: [  2] | | S:
-DEBUG    - rfCircuit.py         extS            [ 1028]: [  2] | |   [2,2]
-DEBUG    - rfCircuit.py         extS            [ 1028]: [  2] | |    0.15417 -104.89°,  0.98804  -14.89°, 
-DEBUG    - rfCircuit.py         extS            [ 1028]: [  2] | |    0.98804  -14.89°,  0.15417 -104.89°, 
-DEBUG    - rfCircuit.py         extS            [ 1030]: [  1] | < [circuit.extS]
-DEBUG    - rfCircuit.py         getS            [ 1282]: [  1] | Ss: 1 matrix
-DEBUG    - rfCircuit.py         getS            [ 1286]: [  1] | f= 10000000.0 Hz
-DEBUG    - rfCircuit.py         getS            [ 1293]: [  1] |   [2,2]
-DEBUG    - rfCircuit.py         getS            [ 1293]: [  1] |    0.15417 -104.89°,  0.98804  -14.89°, 
-DEBUG    - rfCircuit.py         getS            [ 1293]: [  1] |    0.98804  -14.89°,  0.15417 -104.89°, 
-DEBUG    - rfCircuit.py         getS            [ 1295]: [  0] < [circuit.getS]
-DEBUG    - rfCircuit.py         <lambda>        [  840]: [  0] > [circuit.terminate] port= "1", kwargs= {'Z': 0}
-DEBUG    - rfCircuit.py         terminate       [  883]: [  1] | port was an external port
-DEBUG    - rfCircuit.py         <lambda>        [  840]: [  1] | "1" -> idxA: 8, idxB: 9
-DEBUG    - rfCircuit.py         terminate       [  885]: [  1] | self.E["1"] = 10
-DEBUG    - rfCircuit.py         terminate       [  888]: [  1] | self.M[8] -> (1+0j)
-DEBUG    - rfCircuit.py         terminate       [  934]: [  0] < [circuit.terminate]
-DEBUG    - rfCircuit.py         getS            [ 1203]: [  0] > [circuit.getS] fs= 10000000.0, Zbase= None, params= {}, flags= {}
-DEBUG    - rfCircuit.py         get1S           [ 1228]: [  1] | not using sNp: no sNp
-DEBUG    - rfCircuit.py         get1S           [ 1235]: [  1] | getting S for TL1
-DEBUG    - rfCircuit.py         get1S           [ 1235]: [  1] | getting S for TL2
-DEBUG    - rfCircuit.py         extS            [  949]: [  1] | > [circuit.extS] 
-DEBUG    - rfCircuit.py         extS            [  993]: [  2] | | Portnames= ['2']
-DEBUG    - rfCircuit.py         extS            [  994]: [  2] | | ports=     ['2']
-DEBUG    - rfCircuit.py         extS            [ 1021]: [  2] | | S:
-DEBUG    - rfCircuit.py         extS            [ 1028]: [  2] | |   [1,1]
-DEBUG    - rfCircuit.py         extS            [ 1028]: [  2] | |    1.00000 +167.86°, 
-DEBUG    - rfCircuit.py         extS            [ 1030]: [  1] | < [circuit.extS]
-DEBUG    - rfCircuit.py         getS            [ 1282]: [  1] | Ss: 1 matrix
-DEBUG    - rfCircuit.py         getS            [ 1286]: [  1] | f= 10000000.0 Hz
-DEBUG    - rfCircuit.py         getS            [ 1293]: [  1] |   [1,1]
-DEBUG    - rfCircuit.py         getS            [ 1293]: [  1] |    1.00000 +167.86°, 
-DEBUG    - rfCircuit.py         getS            [ 1295]: [  0] < [circuit.getS]
-DEBUG    - rfCircuit.py         getS            [ 1203]: [  0] > [circuit.getS] fs= 10000000.0, Zbase= None, params= {}, flags= {}
-DEBUG    - rfCircuit.py         get1S           [ 1228]: [  1] | not using sNp: no sNp
-DEBUG    - rfCircuit.py         getS            [ 1282]: [  1] | Ss: 1 matrix
-DEBUG    - rfCircuit.py         getS            [ 1286]: [  1] | f= 10000000.0 Hz
-DEBUG    - rfCircuit.py         getS            [ 1293]: [  1] |   [1,1]
-DEBUG    - rfCircuit.py         getS            [ 1293]: [  1] |    1.00000 +167.86°, 
-DEBUG    - rfCircuit.py         getS            [ 1295]: [  0] < [circuit.getS]
-DEBUG    - rfCircuit.py         __init__        [   60]: [  0] > __init__ 
-DEBUG    - rfBase.py            __init__        [   70]: [  1] | > __init__ 
-DEBUG    - rfBase.py            __init__        [  114]: [  2] | | self.fs=[]
-DEBUG    - rfBase.py            __init__        [  138]: [  1] | < __init__
-DEBUG    - rfCircuit.py         __init__        [  110]: [  0] < __init__