mrzerocore 0.4.3__cp37-abi3-win32.whl → 0.4.4__cp37-abi3-win32.whl

MRzeroCore/phantom/nifti_phantom.py

@@ -138,7 +138,7 @@ class NiftiTissue:
 
     def to_dict(self) -> dict:
         def serialize_prop(prop):
-            if isinstance(prop, float):
+            if isinstance(prop, (float, int)):
                 return prop
             elif isinstance(prop, NiftiRef):
                 return prop.to_str()

MRzeroCore/phantom/tissue_dict.py

@@ -173,21 +173,27 @@ class TissueDict(dict[str, VoxelGridPhantom]):
               ) -> SimData:
         data_list = [self[tissue].build(PD_threshold, voxel_shape) for tissue in self]
 
-        return SimData(
-            PD=torch.cat([obj.PD for obj in data_list]),
-            T1=torch.cat([obj.T1 for obj in data_list]),
-            T2=torch.cat([obj.T2 for obj in data_list]),
-            T2dash=torch.cat([obj.T2dash for obj in data_list]),
-            D=torch.cat([obj.D for obj in data_list]),
-            B0=torch.cat([obj.B0 for obj in data_list]),
-            B1=torch.cat([obj.B1 for obj in data_list], 1),
-            coil_sens=torch.cat([obj.coil_sens for obj in data_list], 1),
-            voxel_pos=torch.cat([obj.voxel_pos for obj in data_list], 0),
-            tissue_masks=torch.stack([obj.tissue_masks for obj in data_list]),
-            size=data_list[0].size,
-            nyquist=data_list[0].nyquist,
-            dephasing_func=data_list[0].dephasing_func,
-        )
+        kwargs = {
+            "PD": torch.cat([obj.PD for obj in data_list]),
+            "T1": torch.cat([obj.T1 for obj in data_list]),
+            "T2": torch.cat([obj.T2 for obj in data_list]),
+            "T2dash": torch.cat([obj.T2dash for obj in data_list]),
+            "D": torch.cat([obj.D for obj in data_list]),
+            "B0": torch.cat([obj.B0 for obj in data_list]),
+            "B1": torch.cat([obj.B1 for obj in data_list], 1),
+            "coil_sens": torch.cat([obj.coil_sens for obj in data_list], 1),
+            "voxel_pos": torch.cat([obj.voxel_pos for obj in data_list], 0),
+            "size": data_list[0].size,
+            "nyquist": data_list[0].nyquist,
+            "dephasing_func": data_list[0].dephasing_func,
+        }
+
+        # Only add tissue_masks if any object has it non-empty
+        if any(obj.tissue_masks for obj in data_list):
+            kwargs["tissue_masks"] = torch.stack([obj.tissue_masks for obj in data_list])
+
+        return SimData(**kwargs)
+
 
 # ============================
 # Helpers for importing NIfTIs

{mrzerocore-0.4.3.dist-info → mrzerocore-0.4.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mrzerocore
-Version: 0.4.3
+Version: 0.4.4
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy

{mrzerocore-0.4.3.dist-info → mrzerocore-0.4.4.dist-info}/RECORD

@@ -1,14 +1,14 @@
 MRzeroCore\__init__.py,sha256=iktazBNEX7stg5LMX5oZhdGIOjruC6P6JhDw1zlzerI,948
-MRzeroCore\_prepass.pyd,sha256=Tshyxp8Xd7uvMIBxOKR-Z6K9sGzrs-gOVlDo4QYq-AA,335360
+MRzeroCore\_prepass.pyd,sha256=rJDKyLubHRyiMgX9IemAub9tFtYj8_0F1Ic-nkXL5W4,330240
 MRzeroCore\phantom\brainweb\.gitignore,sha256=SbeXqTGl3ZPaLjXKvQDSqzbCCywsaD6JtVgfbGV7OHY,10
 MRzeroCore\phantom\brainweb\__init__.py,sha256=mo3T7_Jxi_w8YIqWDSBB1Wkklej18VqzeUxKwb55d1c,7484
 MRzeroCore\phantom\brainweb\brainweb_data.json,sha256=mCn-us2-aRfhWv1hhp0vwIeKj2zQBXaCmBi-7ItCATk,1710
 MRzeroCore\phantom\brainweb\brainweb_data_sources.txt,sha256=Sh6NFLU1bhdaD0pp12D_Hc70cA_UC1s7KdHcuoGTKuA,1853
 MRzeroCore\phantom\brainweb\output\.gitkeep,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 MRzeroCore\phantom\custom_voxel_phantom.py,sha256=YLSbiVHgN3kAjLSGWRlu-QGDBW_wQjEUGE1Zy_2ri3c,9261
-MRzeroCore\phantom\nifti_phantom.py,sha256=ngSbd8AAmnFdh8rsWMOIhXHOWZOr1H-COSWpgW78sZQ,6223
+MRzeroCore\phantom\nifti_phantom.py,sha256=B5CN9D5YhgWUULBIcXQlHJ81OZEFA0zLMfO-DVg9y58,6230
 MRzeroCore\phantom\sim_data.py,sha256=be5zLb35gWPnrPTlE6LRFSF7MTZJDwJTZMqJFCd_wC8,7818
-MRzeroCore\phantom\tissue_dict.py,sha256=yhys0ViSIDim9JHnG4R5Wcv2P65xJsW3qZ0UNvKTexE,10380
+MRzeroCore\phantom\tissue_dict.py,sha256=7CRLEbQQFYmFj4BE2RCy4Q_7Hbax3GhOy9KYBzDwe2s,10582
 MRzeroCore\phantom\voxel_grid_phantom.py,sha256=GTTd1r8gC8ME8s2q8M_7mzTRG2tssUuMZ0TpucuOxe8,21166
 MRzeroCore\pulseq\exporter.py,sha256=RlIHkXNVmQy-ywixIPeWeICnb9jq4_1_9O8HujBigLs,17226
 MRzeroCore\pulseq\exporter_v2.py,sha256=GVnhC6bmbxbYq4CFrBbL2nj98B_u3OVglOt50J19pkk,30554
@@ -34,7 +34,7 @@ MRzeroCore\simulation\main_pass.py,sha256=Zqv_z3gQm0yqHC6F3wzIW2UPi1yJFZm5j5vWUU
 MRzeroCore\simulation\pre_pass.py,sha256=Cov8VvJn93c3WHsHGYnpppFBR_nG7TKDPvcx5j0_11g,6843
 MRzeroCore\simulation\sig_to_mrd.py,sha256=vv_wT-F2ipBc0Ryu7MlZGvcdJhTbpP39QNpTnbKkygo,13587
 MRzeroCore\util.py,sha256=hxsyaWqNPFxOl_ryLeeGQxuQl5Skih4sPoi_vSDhIvA,34652
-mrzerocore-0.4.3.dist-info\METADATA,sha256=gfcihHBOPB3HmWW084htaHs0y7s7jqcH1kKofraFL8I,5049
-mrzerocore-0.4.3.dist-info\WHEEL,sha256=hfkWaPgT5ELgjDhRnK_NkNNdkvUwoEoJy2QANKL_tfs,91
-mrzerocore-0.4.3.dist-info\licenses\LICENSE,sha256=rd_IFJ484uAluv8CigP2CpXg4l2GJLLKENqB6-RXPp4,35112
-mrzerocore-0.4.3.dist-info\RECORD,,
+mrzerocore-0.4.4.dist-info\METADATA,sha256=QaIo_XjPa4yLuY62f2Gd7ez6D43DBECgAG7siMitObI,5049
+mrzerocore-0.4.4.dist-info\WHEEL,sha256=hfkWaPgT5ELgjDhRnK_NkNNdkvUwoEoJy2QANKL_tfs,91
+mrzerocore-0.4.4.dist-info\licenses\LICENSE,sha256=rd_IFJ484uAluv8CigP2CpXg4l2GJLLKENqB6-RXPp4,35112
+mrzerocore-0.4.4.dist-info\RECORD,,