sdfr 1.4.1__py3-none-win32.whl → 1.4.3__py3-none-win32.whl

sdfr/_commit_info.py

@@ -1,2 +1,2 @@
-__commit_date__ = "Wed Jun 4 23:52:44 2025 +0100"
-__commit_id__ = "2a253d656c6c5be2d4ff1b7d0071155ef5f2f93c"
+__commit_date__ = "Tue Jun 10 10:08:15 2025 +0100"
+__commit_id__ = "78518bb920d66415e43857a26b0e7f914bd05da1"

sdfr/loadlib.py

@@ -40,9 +40,9 @@ def _loadlib():
     local_dir = Path(__file__).resolve().parent
     site_dirs = [Path(x) / "sdfr" for x in getsitepackages()]
     path_dirs = [Path(x) for x in sys.path]
-    exts = ("so", "dylib", "dll")
-    for lib_dir, ext in product([local_dir, *site_dirs, *path_dirs], exts):
-        if (lib := lib_dir / f"libsdfc_shared.{ext}").exists():
+    libs = ("libsdfc_shared.so", "libsdfc_shared.dylib", "sdfc_shared.dll")
+    for lib_dir, libname in product([local_dir, *site_dirs, *path_dirs], libs):
+        if (lib := lib_dir / libname).exists():
             return ct.cdll.LoadLibrary(str(lib))
     raise RuntimeError("Could not find library 'libsdfc_shared'")
 

sdfr/sdf_helper.py

@@ -1262,19 +1262,31 @@ def plot_rays(var, skip=1, rays=None, **kwargs):
     ----------
     var : sdf.Block
         The SDF variable for the rays to plot
+    rays : list
+        A list of ray numbers to plot
+    ray_start : integer
+        The first ray number to plot
+    ray_stop : integer
+        The last ray number to plot
     skip : integer
         Number of rays to skip before selecting the next one to plot
     """
 
-    ray_start = -1
-    l = "ray_start"
-    if l in kwargs:
-        ray_start = kwargs[l]
+    if rays:
+        if isinstance(rays, int):
+            rays = [rays]
+    else:
+        ray_start, ray_stop = None, None
+
+        l = "ray_start"
+        if l in kwargs:
+            ray_start = kwargs[l]
+
+        l = "ray_stop"
+        if l in kwargs:
+            ray_stop = kwargs[l]
 
-    ray_stop = 1e9
-    l = "ray_stop"
-    if l in kwargs:
-        ray_stop = kwargs[l]
+        ray_slice = slice(ray_start, ray_stop, skip)
 
     if isinstance(var, sdf.BlockStitchedPath):
         v = var.data[0]
@@ -1303,27 +1315,26 @@ def plot_rays(var, skip=1, rays=None, **kwargs):
                 v = var.data[0]
                 vmin = v.data.min()
                 vmax = v.data.max()
-                for iray, v in enumerate(var.data):
-                    if iray < ray_start:
-                        continue
-                    if iray > ray_stop:
-                        break
-                    if iray % skip == 0:
-                        vmin = min(vmin, v.data.min())
-                        vmax = max(vmax, v.data.max())
+                if rays:
+                    ray_list = [var.data[i] for i in rays]
+                else:
+                    ray_list = var.data[ray_slice]
+                for v in ray_list:
+                    vmin = min(vmin, v.data.min())
+                    vmax = max(vmax, v.data.max())
                 if k0 not in kwargs:
                     kwargs[k0] = vmin
                 if k1 not in kwargs:
                     kwargs[k1] = vmax
 
-        for iray, v in enumerate(var.data):
-            if iray < ray_start:
-                continue
-            if iray > ray_stop:
-                break
-            if iray % skip == 0:
-                plot_auto(v, update=False, **kwargs)
-                kwargs["hold"] = True
+        if rays:
+            ray_list = [var.data[i] for i in rays]
+        else:
+            ray_list = var.data[ray_slice]
+
+        for v in ray_list:
+            plot_auto(v, update=False, **kwargs)
+            kwargs["hold"] = True
 
         plot_auto(var.data[0], axis_only=True, **kwargs)
         kwargs["hold"] = True
@@ -1341,17 +1352,16 @@ def plot_rays(var, skip=1, rays=None, **kwargs):
     if k not in kwargs and not (k0 in kwargs and k1 in kwargs):
         vmin = var.data.min()
         vmax = var.data.max()
-        iray = -1
-        for k in data.keys():
+
+        if rays:
+            ray_list = [data[i] for i in rays]
+        else:
+            ray_list = data[ray_slice]
+
+        for k in ray_list.keys():
             if k.startswith(start) and k.endswith(end):
-                iray += 1
-                if iray < ray_start:
-                    continue
-                if iray > ray_stop:
-                    break
-                if iray % skip == 0:
-                    vmin = min(vmin, data[k].data.min())
-                    vmax = max(vmax, data[k].data.max())
+                vmin = min(vmin, data[k].data.min())
+                vmax = max(vmax, data[k].data.max())
         if k0 not in kwargs:
             kwargs[k0] = vmin
         if k1 not in kwargs:
@@ -1367,17 +1377,15 @@ def plot_rays(var, skip=1, rays=None, **kwargs):
             + ")$"
         )
 
-    iray = -1
-    for k in data.keys():
+    if rays:
+        ray_list = [data[i] for i in rays]
+    else:
+        ray_list = data[ray_slice]
+
+    for k in ray_list.keys():
         if k.startswith(start) and k.endswith(end):
-            iray += 1
-            if iray < ray_start:
-                continue
-            if iray > ray_stop:
-                break
-            if iray % skip == 0:
-                plot_auto(data[k], hold=True, update=False, **kwargs)
-                kwargs["hold"] = True
+            plot_auto(data[k], hold=True, update=False, **kwargs)
+            kwargs["hold"] = True
 
     plot_auto(var, axis_only=True, **kwargs)
     kwargs["hold"] = True

{sdfr-1.4.1.dist-info → sdfr-1.4.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: sdfr
-Version: 1.4.1
+Version: 1.4.3
 Summary: Python module for processing SDF files
 Author-Email: Keith Bennett <k.bennett@warwick.ac.uk>
 Requires-Dist: numpy

sdfr-1.4.3.dist-info/RECORD

@@ -0,0 +1,12 @@
+sdfr/__init__.py,sha256=OxcJAJ0ADoE54vgqMQqxhoFWyU2ldb3fb-_LFyeZZfQ,1209
+sdfr/_commit_info.py,sha256=m_JZRhDwnK9FYuMipiiKsSYgntEAJH7hyVCQZetAD-c,112
+sdfr/loadlib.py,sha256=xxp5MX-u7ZHIc12mcvN-y8L5UEjY-aEgINj2r-1swWk,2358
+sdfr/SDF.py,sha256=bt4DOuOTmbc_lvtTBz7khVtbaFStiO6RKN2FAq3DjrI,31144
+sdfr/sdf_helper.py,sha256=cI6F9531e7hbp6oe_hnjPi9pdl6QddsTbohqlNdyg6c,63755
+sdfr/sdfc_shared.dll,sha256=Ruh6tS3GlTuhk3GO-lFOja7mKAFjqe9emE7962nL3Vg,102400
+sdfr/sdfc_shared.lib,sha256=3tq7FEdM0AIZ5XN6oilKzMfrbTk29r7JWvPq5UQpJw0,3652
+sdfr-1.4.3.dist-info/METADATA,sha256=GTu3uSmFPTzK-K8j6cSPzDZHP7XzslpP6v1KnVi6cZU,370
+sdfr-1.4.3.dist-info/WHEEL,sha256=2gMiQ9URLdcVSVn--wWLd3wXucnRxZtbu4ekGokbEAk,99
+sdfr-1.4.3.dist-info/licenses/LICENSE,sha256=gpLeavs1KxgJFrpL_uVDh0MoDvPfJoZ89A5dSCl4P5U,1652
+sdfr-1.4.3.dist-info/licenses/LICENSE_README.txt,sha256=KlBSoHArwoXbiygx3IJTjtgM7hLNO9o8ZMlZV77nrXs,235
+sdfr-1.4.3.dist-info/RECORD,,

sdfr-1.4.1.dist-info/RECORD

@@ -1,11 +0,0 @@
-sdfr/__init__.py,sha256=OxcJAJ0ADoE54vgqMQqxhoFWyU2ldb3fb-_LFyeZZfQ,1209
-sdfr/_commit_info.py,sha256=20v94y3_6YeM0pAm8wRm70t5ebQ18y2FoifXCDo9mD8,111
-sdfr/loadlib.py,sha256=EMcnZhh68fS72Bjv8QtfDzPbowx1FfaqX4TPhDl-o94,2328
-sdfr/SDF.py,sha256=bt4DOuOTmbc_lvtTBz7khVtbaFStiO6RKN2FAq3DjrI,31144
-sdfr/sdf_helper.py,sha256=jS4fxmq1y7PeryrPFuB_Lgu5n88-cNggaWMvQy4XqSA,63682
-sdfr/sdfc_shared.dll,sha256=lxqaJ8LgkG7vUn7UXIeGm5McWm5nLoFTCCLIRjcvCAM,11264
-sdfr-1.4.1.dist-info/METADATA,sha256=OpBhOHlMqYOw0H7MAMZDdSqIBvDHcfIzUPagTMoDz3U,370
-sdfr-1.4.1.dist-info/WHEEL,sha256=2gMiQ9URLdcVSVn--wWLd3wXucnRxZtbu4ekGokbEAk,99
-sdfr-1.4.1.dist-info/licenses/LICENSE,sha256=gpLeavs1KxgJFrpL_uVDh0MoDvPfJoZ89A5dSCl4P5U,1652
-sdfr-1.4.1.dist-info/licenses/LICENSE_README.txt,sha256=KlBSoHArwoXbiygx3IJTjtgM7hLNO9o8ZMlZV77nrXs,235
-sdfr-1.4.1.dist-info/RECORD,,