pyRFtk 2.0.5__tar.gz → 2.0.7__tar.gz

{pyrftk-2.0.5 → pyrftk-2.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyRFtk
-Version: 2.0.5
+Version: 2.0.7
 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.5 → pyrftk-2.0.7}/pyproject.toml

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

{pyrftk-2.0.5 → pyrftk-2.0.7}/src/pyRFtk/ReadTSF.py

@@ -1,4 +1,4 @@
-__updated__ = "2024-12-20 14:21:08"
+__updated__ = "2025-01-21 15:58:36"
 
 import numpy as np
 import re
@@ -94,6 +94,7 @@ def ReadTSF(src, **kwargs):
                         )
                         
                 if not got_marker:
+                    # we effectively started reading the numerical data
                     comments.append('*** DATA MARKER ***')
                     got_marker = len(comments)
 
@@ -107,7 +108,7 @@ def ReadTSF(src, **kwargs):
     
     # analyse the format string: 
     #  for unnormalized data (R missing) Zbase is set to None
-    items = tformat[1:].upper().split()[::-1]
+    items = tformat[1:].upper().split()[::-1] # note we reverse the order here
     datatype, datafmt, funit, Zbase = 'S', 'MA', 'GHZ', None 
     while len(items):
         kw = items.pop()
@@ -131,17 +132,19 @@ def ReadTSF(src, **kwargs):
                 Zbase = Zlist[0]
                 
             elif NZ > 1:
-                debug and tLogger.debug(ident(f'Zbase [{len(Zlist)}] {", ".join([str(z) for z in Zlist])}'))
+                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}'))
+                debug and tLogger.debug(
+                    ident(f'Zbase not specified in R [ERROR]: set to {Zbase}'))
         else:
             raise ValueError('Unrecognized format specification: %r' % kw)
         
-    # detect special comments
+    # process special comments
     ports = None
     part = None
     numbering = None
@@ -345,7 +348,8 @@ def ReadTSF(src, **kwargs):
         pass
     
     ## do some checking
-    if nZcs := Zcs.shape[1]:
+    nZcs, nZbase = 0, 0
+    if len(Zcs) and (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

{pyrftk-2.0.5 → pyrftk-2.0.7}/src/pyRFtk/__init__.py

@@ -1,6 +1,6 @@
-__updated__ = "2024-12-20 14:11:19"
+__updated__ = "2025-01-24 07:58:36"
 
-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.5 → pyrftk-2.0.7}/src/pyRFtk/config.py

@@ -1,4 +1,4 @@
-__updated__ = "2023-04-20 08:40:02"
+__updated__ = "2025-01-16 08:40:30"
 
 import time
 import string
@@ -7,6 +7,8 @@ import logging
 import inspect
 
 import os
+import sys
+import traceback
 import atexit
 
 LOGFILE = 'rfCommon.log'
@@ -53,6 +55,8 @@ def setLogLevel(level):
 #=-----------------------------------------------------------------------------#
 
 setLogLevel(logging.CRITICAL)
+sys_excepthook = sys.excepthook
+# print(f'sys.excepthook = {sys_excepthook}')
 
 def CleanUpLogFile():
     try:
@@ -65,7 +69,18 @@ def CleanUpLogFile():
     except FileNotFoundError:
         pass
 
+def CleanUpLogFile1(type, value, tb):
+    print('calling pyRFtk.CleanUpLogFile after program crash')
+    CleanUpLogFile()
+    traceback_details = "\n".join(traceback.extract_tb(tb).format())
+
+    msg = f"caller: {type}: {value}\n{traceback_details}"
+    print(msg)
+    sys.excepthook = sys_excepthook
+    
+    
 atexit.register(CleanUpLogFile)
+sys.excepthook = CleanUpLogFile1
 
 #=-----------------------------------------------------------------------------#
 

{pyrftk-2.0.5 → pyrftk-2.0.7}/src/pyRFtk/plotVSWs.py

@@ -101,7 +101,7 @@ def plotVSWs(VSWs, maxlev=4, Id = None,  **kwargs):
         
         #= = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
         
-        def find(BLK, VSW, curdist2=np.Inf, curBLK='', curUp=yp, curX=xp):
+        def find(BLK, VSW, curdist2=np.inf, curBLK='', curUp=yp, curX=xp):
             _debug_ and tLogger.debug(ident(
                 f'> [find] BLK= {BLK}, '
                 f'VSW= {[_ for _ in VSW] if isinstance(VSW, dict) else type(VSW)}, '

{pyrftk-2.0.5 → pyrftk-2.0.7}/src/pyRFtk/resolveTLparams.py

@@ -371,7 +371,7 @@ class TLresolver():
                         #   these are assumption-like settings for mur and epsr
                         #   when failing to find anything that solves with the
                         #   current set of found kw's
-                        f0 = 1E6 if self.f0 in [np.NaN,None] else self.f0
+                        f0 = 1E6 if self.f0 in [np.nan,None] else self.f0
                         x0 = 0
                         tol = 1e-7
                         got, new = getattr(self,kw)(f0,x0), fun(f0,x0)
@@ -401,7 +401,7 @@ class TLresolver():
     def __str__(self, full=True):
         l1 = max([len(self.kwset[kw]["source"]) for kw in self.order])
         s = ''
-        f0 = self.f0 if self.f0 not in [np.NaN, None] else 1E6
+        f0 = self.f0 if self.f0 not in [np.nan, None] else 1E6
         s += f'parameters / values at {f0/1e6:.3f} MHz, x=0, w = 2pi f\n'
         for kw in self.order:
             sig = signature(getattr(self, kw)).parameters