pyibis-ami 7.2.1__py3-none-any.whl → 7.2.2__py3-none-any.whl

{pyibis_ami-7.2.1.dist-info → pyibis_ami-7.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyibis-ami
-Version: 7.2.1
+Version: 7.2.2
 Summary: Facilitates working directly with IBIS-AMI DLLs from the Python command prompt.
 Author-email: David Banas <capn.freako@gmail.com>
 License-Expression: BSD-3-Clause

{pyibis_ami-7.2.1.dist-info → pyibis_ami-7.2.2.dist-info}/RECORD

@@ -1,14 +1,14 @@
-pyibis_ami-7.2.1.dist-info/licenses/LICENSE,sha256=iUtKhGdFJ8yC7IpQuUiwjveBUd6Uxk4tZ68yKfStPrM,1293
+pyibis_ami-7.2.2.dist-info/licenses/LICENSE,sha256=iUtKhGdFJ8yC7IpQuUiwjveBUd6Uxk4tZ68yKfStPrM,1293
 pyibisami/IBIS_AMI_Checker.ipynb,sha256=3LwppSqwVuPD85kVKdXOdtXdDKr9ba8fib1_IJ1jjMc,1390165
 pyibisami/IBIS_AMI_Tester.ipynb,sha256=ywuwhAChAZXmk_Q1fkmS8scN6ZuV6gLteG_KfQa8NQ8,784499
 pyibisami/__init__.py,sha256=DxWwWtfpqEKhGY9tdQqjjnEYR7tTC7OyPSfnKH-g0Qs,668
 pyibisami/__main__.py,sha256=-2FQZACAF5NBVMl02Pf2aq4-gKvgjv2VyMGuIwhpX-w,317
-pyibisami/common.py,sha256=ynAQwtM7m9bByGept1IP6E0hl4WZ6Pbv6L8aD3fFH2U,1178
+pyibisami/common.py,sha256=T3FMCHYx10f0-16U092l_xDHaaJmkIuZ-FiHJ0mnM6A,1182
 pyibisami/ami/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyibisami/ami/config.py,sha256=fXfROquueeUX5larasZ8ia_FuvfAyuvmyW67fBOQA5I,10804
 pyibisami/ami/generic.ami.em,sha256=EZpswZid-iRDDBnUuR3lL0fd1M6o6SCaoJKGeGALwZI,499
 pyibisami/ami/generic.ibs.em,sha256=7kwwe1vSoV6p-ZCMbrUGniwTs1hLpDOBa6TfxQJbX7Q,5791
-pyibisami/ami/model.py,sha256=oYG8kuwCZ-CtK_s_ckCqUwp0mMYyCtASx1cKDrOYGew,23528
+pyibisami/ami/model.py,sha256=sZuAWDTHafok89PEOlnAn1qBxHAfTnxgGvFHrCr-Bhs,24914
 pyibisami/ami/parameter.py,sha256=Fk_qibbVGxK6hifYAzhyp-zgMUvOewrv-CjkiaCYZbM,10992
 pyibisami/ami/parser.py,sha256=EXa57w-4KA77wZAvyBf4mhEdpa2s92zG0nqAP8Xg_kU,25681
 pyibisami/ami/reserved_parameter_names.py,sha256=hOIDREU_TbXaZHbGQaBv98CJB_8z2mzPiBlLa1_IjIQ,1781
@@ -20,8 +20,8 @@ pyibisami/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyibisami/tools/run_notebook.py,sha256=vVDccARwVnpu1EH50G8gKatt6pdPFqsNycxk-LsZzK8,5440
 pyibisami/tools/run_tests.py,sha256=Kaopc0a3XxSuatRtPgvgT5JukIB-My4Gfxwn5ASEZh4,9344
 pyibisami/tools/test_results.xsl,sha256=RQv9oiu6XQ8Q_swO0ak1FGdL28h3ucJr_FAWsgD001I,1662
-pyibis_ami-7.2.1.dist-info/METADATA,sha256=a0zsR9L_P7D39bncEt7SOG9rCxNd1vu5m2ApAEQJcug,5273
-pyibis_ami-7.2.1.dist-info/WHEEL,sha256=L0N565qmK-3nM2eBoMNFszYJ_MTx03_tQ0CQu1bHLYo,91
-pyibis_ami-7.2.1.dist-info/entry_points.txt,sha256=x2QobJi2Pu25LgUeWg60XZzOWH8j2R60oWGN-1Z7uVA,149
-pyibis_ami-7.2.1.dist-info/top_level.txt,sha256=k2KfR4t4tJ47HrnzvSh77w9N2Xyz8_uUusJLbqXK0g4,10
-pyibis_ami-7.2.1.dist-info/RECORD,,
+pyibis_ami-7.2.2.dist-info/METADATA,sha256=AZfdnTFMXiRyb6JDp6Xk8ug2huFqp2PJZ7c2VamNOz4,5273
+pyibis_ami-7.2.2.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+pyibis_ami-7.2.2.dist-info/entry_points.txt,sha256=x2QobJi2Pu25LgUeWg60XZzOWH8j2R60oWGN-1Z7uVA,149
+pyibis_ami-7.2.2.dist-info/top_level.txt,sha256=k2KfR4t4tJ47HrnzvSh77w9N2Xyz8_uUusJLbqXK0g4,10
+pyibis_ami-7.2.2.dist-info/RECORD,,

{pyibis_ami-7.2.1.dist-info → pyibis_ami-7.2.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.0.1)
+Generator: setuptools (78.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

pyibisami/ami/model.py

@@ -159,6 +159,13 @@ class AMIModelInitializer:
                 if key in self._init_data:
                     self._init_data[key] = optional_args[key]
 
+    def __str__(self):
+        return "\n\t".join([
+            f"AMIModelInitializer instance:",
+            f"`ami_params`: {self.ami_params}",
+            f"`info_params`: {self.ami_params}",
+            ])
+
     def _getChannelResponse(self):
         return list(map(float, self._init_data["channel_response"]))
 
@@ -234,6 +241,7 @@ class AMIModel:  # pylint: disable=too-many-instance-attributes
             OSError: If given file cannot be opened.
         """
 
+        self._filename = filename
         self._ami_mem_handle = None
         my_dll = CDLL(filename)
         self._amiInit = my_dll.AMI_Init
@@ -255,6 +263,24 @@ class AMIModel:  # pylint: disable=too-many-instance-attributes
         if self._ami_mem_handle:
             self._amiClose(self._ami_mem_handle)
 
+    def __str__(self):
+        return "\n\t".join([
+            f"AMIModel instance: `{self._filename}`",
+            f"Length of initOut = {len(self._initOut)}",
+            f"row_size = {self._row_size}",
+            f"num_aggressors = {self._num_aggressors}",
+            f"sample_interval = {self._sample_interval}",
+            f"bit_time = {self._bit_time}",
+            f"samps_per_bit = {self._samps_per_bit}",
+            f"bits_per_call = {self._bits_per_call}",
+            f"ami_params_in = {self._ami_params_in}",
+            f"ami_params_out = {self._ami_params_out}",
+            f"&ami_mem_handle = {byref(self._ami_mem_handle)}",
+            f"Message = {self._msg}",
+            f"AMI_Init(): {self._amiInit}",
+            f"AMI_GetWave(): {self._amiGetWave}",
+            f"AMI_Close(): {self._amiClose}",])
+
     def initialize(self, init_object: AMIModelInitializer):
         """
         Wraps the ``AMI_Init()`` function.
@@ -298,15 +324,13 @@ class AMIModel:  # pylint: disable=too-many-instance-attributes
             "bit_time"
         ]
         self._info_params = init_object.info_params  # pylint: disable=attribute-defined-outside-init
-        assert self._info_params, RuntimeError(
-            f"`info_params` is None!\n`init_object: {init_object}"
-        )  # pylint: disable=attribute-defined-outside-init
 
         # Check GetWave() consistency if possible.
         if init_object.info_params and init_object.info_params["GetWave_Exists"]:
-            assert self._amiGetWave, RuntimeError(
-                "Reserved parameter `GetWave_Exists` is True, but I can't bind to `AMI_GetWave()`!"
-            )
+            if not self._amiGetWave:
+                raise RuntimeError(
+                    "Reserved parameter `GetWave_Exists` is True, but I can't bind to `AMI_GetWave()`!"
+                )
 
         # Construct the AMI parameters string.
         def sexpr(pname, pval):
@@ -420,9 +444,19 @@ class AMIModel:  # pylint: disable=too-many-instance-attributes
             else:
                 tmp_wave = wave[idx: idx + samps_per_call]
             _wave = Signal(*tmp_wave)
-            self._amiGetWave(
-                byref(_wave), len(_wave), byref(_clock_times), byref(self._ami_params_out), self._ami_mem_handle
-            )  # type: ignore
+            try:
+                self._amiGetWave(
+                    byref(_wave), len(_wave), byref(_clock_times),
+                    byref(self._ami_params_out), self._ami_mem_handle
+                )  # type: ignore
+            except OSError:
+                print(self)
+                print(f"byref(_wave): {byref(_wave)}")
+                print(f"len(_wave): {len(_wave)}")
+                print(f"byref(_clock_times): {byref(_clock_times)}")
+                print(f"byref(self._ami_params_out): {byref(self._ami_params_out)}")
+                print(f"self._ami_mem_handle: {self._ami_mem_handle}")
+                raise
             wave_out.extend(_wave)
             clock_times.extend(_clock_times)
             params_out.append(self.ami_params_out)

pyibisami/common.py

@@ -14,8 +14,8 @@ from scipy.linalg       import convolution_matrix, lstsq
 
 Real = TypeVar("Real", float, float)
 Comp = TypeVar("Comp", complex, complex)
-Rvec: TypeAlias = npt.NDArray[Real]
-Cvec: TypeAlias = npt.NDArray[Comp]
+Rvec: TypeAlias = npt.NDArray["Real"]
+Cvec: TypeAlias = npt.NDArray["Comp"]
 
 PI:    float = 3.141592653589793238462643383279502884
 TWOPI: float = 2.0 * PI