sdfr 1.4.0__py3-none-win32.whl → 1.4.2__py3-none-win32.whl

sdfr/SDF.py

@@ -367,7 +367,7 @@ class BlockList:
 
         block = h.contents.blocklist
         self.Header = get_header(h.contents)
-        meshes = []
+        mesh_id_map = {}
         mesh_vars = []
         self._block_ids = {}
         self._block_names = {}
@@ -417,7 +417,7 @@ class BlockList:
                 if block.datatype_out != 0:
                     newblock = BlockLagrangianMesh(block)
                     newblock_mid = block
-                    meshes.append(newblock)
+                    mesh_id_map[newblock.id] = newblock
             elif blocktype == SdfBlockType.SDF_BLOCKTYPE_NAMEVALUE:
                 newblock = BlockNameValue(block)
             elif (
@@ -430,7 +430,7 @@ class BlockList:
                 if block.datatype_out != 0:
                     newblock = BlockPlainMesh(block)
                     newblock_mid = block
-                    meshes.append(newblock)
+                    mesh_id_map[newblock.id] = newblock
             elif (
                 blocktype == SdfBlockType.SDF_BLOCKTYPE_POINT_DERIVED
                 or blocktype == SdfBlockType.SDF_BLOCKTYPE_POINT_VARIABLE
@@ -439,7 +439,7 @@ class BlockList:
                 mesh_vars.append(newblock)
             elif blocktype == SdfBlockType.SDF_BLOCKTYPE_POINT_MESH:
                 newblock = BlockPointMesh(block)
-                meshes.append(newblock)
+                mesh_id_map[newblock.id] = newblock
             elif blocktype == SdfBlockType.SDF_BLOCKTYPE_RUN_INFO:
                 self.Run_info = get_run_info(block)
             elif blocktype == SdfBlockType.SDF_BLOCKTYPE_STATION:
@@ -452,7 +452,8 @@ class BlockList:
                 # print(name,SdfBlockType(blocktype).name)
                 pass
             if newblock is not None:
-                self.__dict__[name] = newblock
+                if not block.dont_display:
+                    self.__dict__[name] = newblock
                 self._block_ids.update({block.id.decode(): newblock})
                 self._block_names.update({block.name.decode(): newblock})
             block = block.next
@@ -467,7 +468,8 @@ class BlockList:
                     newblock = BlockLagrangianMesh(block_mid, mid=True)
                 elif blocktype == SdfBlockType.SDF_BLOCKTYPE_PLAIN_MESH:
                     newblock = BlockPlainMesh(block_mid, mid=True)
-                self.__dict__[name] = newblock
+                if not newblock_mid.dont_display:
+                    self.__dict__[name] = newblock
                 nm = block_mid.id.decode() + "_mid"
                 self._block_ids.update({nm: newblock})
                 nm = block_mid.name.decode() + "_mid"
@@ -475,10 +477,8 @@ class BlockList:
 
         for var in mesh_vars:
             gid = var.grid_id
-            for mesh in meshes:
-                if mesh.id == gid:
-                    var._grid = mesh
-                    break
+            if gid in mesh_id_map:
+                var._grid = mesh_id_map[gid]
 
     def __del__(self):
         self._clib.sdf_stack_destroy.argtypes = [ct.c_void_p]

sdfr/__init__.py

@@ -30,7 +30,10 @@ from .loadlib import (
 
 from importlib.metadata import version, PackageNotFoundError
 
-__version__ = version(_module_name)
+try:
+    __version__ = version(_module_name)
+except Exception:
+    __version__ = "0.0.0"
 
 __all__ = [
     "SDF",

sdfr/_commit_info.py

@@ -1,2 +1,2 @@
-__commit_date__ = "Tue May 20 13:50:42 2025 +0100"
-__commit_id__ = "f5e130988f5c6f06f9fb34a23cefc953857a3908"
+__commit_date__ = "Fri Jun 6 11:53:05 2025 +0100"
+__commit_id__ = "5dcc8bbaddd76aaeb5f5c8d335b32f272fd3e05e"

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.0.dist-info → sdfr-1.4.2.dist-info}/METADATA

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

sdfr-1.4.2.dist-info/RECORD

@@ -0,0 +1,11 @@
+sdfr/__init__.py,sha256=OxcJAJ0ADoE54vgqMQqxhoFWyU2ldb3fb-_LFyeZZfQ,1209
+sdfr/_commit_info.py,sha256=jwTvStv8tg4Qb70lnQJKYmLqt8iKXFkCWyjp6Nny_v8,111
+sdfr/loadlib.py,sha256=EMcnZhh68fS72Bjv8QtfDzPbowx1FfaqX4TPhDl-o94,2328
+sdfr/SDF.py,sha256=bt4DOuOTmbc_lvtTBz7khVtbaFStiO6RKN2FAq3DjrI,31144
+sdfr/sdf_helper.py,sha256=cI6F9531e7hbp6oe_hnjPi9pdl6QddsTbohqlNdyg6c,63755
+sdfr/sdfc_shared.dll,sha256=gFEUnchXoZ0R7kaItozUs8g7oqDt6Qd1fxgLH5A-6P8,11264
+sdfr-1.4.2.dist-info/METADATA,sha256=qv9qETHA5SXPuwveGOfKF2t8B3sUMBgvpV6j7hda6tI,370
+sdfr-1.4.2.dist-info/WHEEL,sha256=2gMiQ9URLdcVSVn--wWLd3wXucnRxZtbu4ekGokbEAk,99
+sdfr-1.4.2.dist-info/licenses/LICENSE,sha256=gpLeavs1KxgJFrpL_uVDh0MoDvPfJoZ89A5dSCl4P5U,1652
+sdfr-1.4.2.dist-info/licenses/LICENSE_README.txt,sha256=KlBSoHArwoXbiygx3IJTjtgM7hLNO9o8ZMlZV77nrXs,235
+sdfr-1.4.2.dist-info/RECORD,,

{sdfr-1.4.0.dist-info → sdfr-1.4.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: scikit-build-core 0.11.3
+Generator: scikit-build-core 0.11.4
 Root-Is-Purelib: false
 Tag: py3-none-win32
 

sdfr-1.4.0.dist-info/RECORD

@@ -1,11 +0,0 @@
-sdfr/__init__.py,sha256=vSTzC03qtlxqcn-7dewmUa59NvhaZ-QqBi1svDCDzIo,1153
-sdfr/_commit_info.py,sha256=Y1T_D5xV7pPNpFclUlE2MHliyoyslJdRjgENYFLIdpY,112
-sdfr/loadlib.py,sha256=EMcnZhh68fS72Bjv8QtfDzPbowx1FfaqX4TPhDl-o94,2328
-sdfr/SDF.py,sha256=C-bS8EBSUhBYMmq9HSd1D8PoMnVOKV3rmURFwU4D5tY,31052
-sdfr/sdf_helper.py,sha256=jS4fxmq1y7PeryrPFuB_Lgu5n88-cNggaWMvQy4XqSA,63682
-sdfr/sdfc_shared.dll,sha256=h23N5g-5EuuyEGisbsrb_qhpr6xOoRwsxEEXIx11cWk,11264
-sdfr-1.4.0.dist-info/METADATA,sha256=lkxSLGXDi0cJXyueMbl5CWZelo3inMyLBplq13u0Sco,370
-sdfr-1.4.0.dist-info/WHEEL,sha256=MWx6St2fF6bImwReczHwY9SS3H0iODdNhwcweEl6Zjs,99
-sdfr-1.4.0.dist-info/licenses/LICENSE,sha256=gpLeavs1KxgJFrpL_uVDh0MoDvPfJoZ89A5dSCl4P5U,1652
-sdfr-1.4.0.dist-info/licenses/LICENSE_README.txt,sha256=KlBSoHArwoXbiygx3IJTjtgM7hLNO9o8ZMlZV77nrXs,235
-sdfr-1.4.0.dist-info/RECORD,,