mrzerocore 0.2.10__cp37-abi3-win32.whl → 0.2.12__cp37-abi3-win32.whl

MRzeroCore/phantom/brainweb/__init__.py

@@ -151,7 +151,7 @@ def generate_brainweb_phantoms(
             print("Adding tissue to phantom", end="", flush=True)
             maps["PD_map"] += tissue_data["PD"] * tissue_map * noise()
             maps["T1_map"] += tissue_data["T1"] * tissue_map * noise()
-            maps["T2_map"] += tissue_data["T2"] * noise()
+            maps["T2_map"] += tissue_data["T2"] * tissue_map * noise()
             maps["T2dash_map"] += tissue_data["T2'"] * tissue_map * noise()
             maps["D_map"] += tissue_data["D"] * tissue_map * noise()
             print(" - done")

MRzeroCore/phantom/brainweb/brainweb_data.json

@@ -33,7 +33,7 @@
       "gm": {
         "PD": 0.8,
         "T1": 1.56,
-        "T2": 0.0083,
+        "T2": 0.083,
         "T2'": 0.32,
         "D": 0.83
       },

MRzeroCore/phantom/voxel_grid_phantom.py

@@ -157,6 +157,10 @@ class VoxelGridPhantom:
             T2dash = torch.tensor(data['T2dash_map'])
             PD = torch.tensor(data['PD_map'])
             D = torch.tensor(data['D_map'])
+            try:
+                size = torch.tensor(data['FOV'])
+            except KeyError:
+                size = torch.tensor([0.192, 0.192, 0.192])
 
         # Generate a somewhat plausible B0 and B1 map.
         # Visually fitted to look similar to the numerical_brain_cropped
@@ -174,11 +178,6 @@ class VoxelGridPhantom:
         B0 -= (B0 * weight).sum()
         B1 /= (B1 * weight).sum()
 
-        try:
-            size = torch.tensor(data['FOV'])
-        except KeyError:
-            size = torch.tensor([0.192, 0.192, 0.192])
-
         return cls(
             PD, T1, T2, T2dash, D, B0, B1[None, ...],
             torch.ones(1, *PD.shape), size,

MRzeroCore/simulation/main_pass.py

@@ -18,12 +18,9 @@ def execute_graph(graph: Graph,
                   min_emitted_signal: float = 1e-2,
                   min_latent_signal: float = 1e-2,
                   print_progress: bool = True,
-                  ) -> torch.Tensor:
-    """Calculate the signal of the sequence by computing the graph.
-
-    This function can optionally return the + or z magnetisation and the
-    encoding of all states, if requested. The encoding consists of the signal
-    of a distribution and its k-t space trajectory.
+                  return_mag_z: int | bool | None = None,
+                  ) -> torch.Tensor | list:
+    """Calculate the signal of the sequence by executing the phase graph.
 
     Parameters
     ----------
@@ -40,11 +37,18 @@ def execute_graph(graph: Graph,
         Should be <= than min_emitted_signal.
     print_progress : bool
         If true, the current repetition is printed while simulating.
+    return_mag_z : int or bool, optional
+        If set, returns the longitudinal magnetisation of either the given
+        repetition (int) or all repetitions (``True``).
+
 
     Returns
     -------
     signal : torch.Tensor
         The simulated signal of the sequence.
+    mag_z : torch.Tensor | list[torch.Tensor]
+        The longitudinal magnetisation of the specified or all repetition(s).
+
     """
     if seq.normalized_grads:
         grad_scale = 1 / data.size
@@ -67,6 +71,7 @@ def execute_graph(graph: Graph,
     # Calculate kt_vec ourselves for autograd
     graph[0][0].kt_vec = torch.zeros(4, device=data.device)
 
+    mag_z = []
     for i, (dists, rep) in enumerate(zip(graph[1:], seq)):
         if print_progress:
             print(f"\rCalculating repetition {i+1} / {len(seq)}", end='')
@@ -129,7 +134,8 @@ def execute_graph(graph: Graph,
         # Use the same adc phase for all coils
         adc_rot = torch.exp(1j * rep.adc_phase).unsqueeze(1)
 
-
+        mag_z_rep = []
+        mag_z.append(mag_z_rep)
         for dist in dists:
             # Create a list only containing ancestors that were simulated
             ancestors = list(filter(
@@ -142,6 +148,9 @@ def execute_graph(graph: Graph,
                 continue  # skip dists for which no ancestors were simulated
 
             dist.mag = sum([calc_mag(ancestor) for ancestor in ancestors])
+            if dist.dist_type in ['z0', 'z'] and return_mag_z in [i, True]:
+                mag_z_rep.append(dist.mag)
+
             # The pre_pass already calculates kt_vec, but that does not
             # work with autograd -> we need to calculate it with torch
             if dist.dist_type == 'z0':
@@ -224,6 +233,10 @@ def execute_graph(graph: Graph,
         print(" - done")
 
     # Only return measured samples
-    return torch.cat([
+    measured = torch.cat([
         sig[rep.adc_usage > 0, :] for sig, rep in zip(signal, seq)
     ])
+    if return_mag_z is not None:
+        return measured, mag_z
+    else:
+        return measured

{MRzeroCore-0.2.10.dist-info → MRzeroCore-0.2.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MRzeroCore
-Version: 0.2.10
+Version: 0.2.12
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
@@ -18,9 +18,9 @@ Summary: Core functionality of MRzero
 Author-email: Jonathan Endres <jonathan.endres@uk-erlangen.de>
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown; charset=UTF-8; variant=GFM
-Project-URL: MRzero-Paper, https://arxiv.org/abs/2002.04265
-Project-URL: Documentation, https://mrzero-core.readthedocs.io/
 Project-URL: Repository, https://github.com/MRsources/MRzero-Core
+Project-URL: Documentation, https://mrzero-core.readthedocs.io/
+Project-URL: MRzero-Paper, https://arxiv.org/abs/2002.04265
 
 [![Documentation Status](https://readthedocs.org/projects/mrzero-core/badge/?version=latest)](https://mrzero-core.readthedocs.io/en/latest/?badge=latest)
 

{MRzeroCore-0.2.10.dist-info → MRzeroCore-0.2.12.dist-info}/RECORD

@@ -1,13 +1,13 @@
-MRzeroCore-0.2.10.dist-info/METADATA,sha256=QVGqnWXhjyHY8RqGRhPwRnr_MIkWiLveY00qEnCZAXw,3801
-MRzeroCore-0.2.10.dist-info/WHEEL,sha256=gXYpX75r-fJLXR2RD6r-k3EXD66bMIXTAL43kNqJgxg,92
-MRzeroCore-0.2.10.dist-info/license_files/LICENSE,sha256=rd_IFJ484uAluv8CigP2CpXg4l2GJLLKENqB6-RXPp4,35112
-MRzeroCore/phantom/brainweb/brainweb_data.json,sha256=HETnXgLJndWbqeL4yfm8N-f9t0EwO-v6HzRA46f4VPU,1795
+MRzeroCore-0.2.12.dist-info/METADATA,sha256=Bbz05wbitS0vBO9HNYxnuOVtFPfzqjx4Z_bEvGeLCy0,3801
+MRzeroCore-0.2.12.dist-info/WHEEL,sha256=gXYpX75r-fJLXR2RD6r-k3EXD66bMIXTAL43kNqJgxg,92
+MRzeroCore-0.2.12.dist-info/license_files/LICENSE,sha256=rd_IFJ484uAluv8CigP2CpXg4l2GJLLKENqB6-RXPp4,35112
+MRzeroCore/phantom/brainweb/brainweb_data.json,sha256=El9J5dfEIwGi4_SoRif6ic6IVSMKh01jK0hNRbBYNqA,1794
 MRzeroCore/phantom/brainweb/brainweb_data_sources.txt,sha256=Sh6NFLU1bhdaD0pp12D_Hc70cA_UC1s7KdHcuoGTKuA,1853
 MRzeroCore/phantom/brainweb/output/.gitkeep,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-MRzeroCore/phantom/brainweb/__init__.py,sha256=R48NlkMNpMgyKKwFm-5iUlhxBKctQ6dXx7yCmyVwm6E,6828
+MRzeroCore/phantom/brainweb/__init__.py,sha256=f0mGtGMO0oi4d-HyRlvE042UgLD-jgsVKLF-7h9JD1g,6841
 MRzeroCore/phantom/custom_voxel_phantom.py,sha256=Pt5X1KjOgzNo6ebINyl4oT8drFTWp4NU3Mi3e5a0YVM,10413
 MRzeroCore/phantom/sim_data.py,sha256=rL0eRk_CuvzxIHrjcjHA2nexYEBieu70B2nS6VlhcxQ,7118
-MRzeroCore/phantom/voxel_grid_phantom.py,sha256=wAereuWTbJRBYVPRKT93tQlI-jDDOx1QDT2z5nrhFeY,16613
+MRzeroCore/phantom/voxel_grid_phantom.py,sha256=h1UAsOzQRQPBuC6m_qpIj2eTYtjBl2Ogz_Kkt4ZQH3E,16627
 MRzeroCore/pulseq/exporter.py,sha256=RlIHkXNVmQy-ywixIPeWeICnb9jq4_1_9O8HujBigLs,17226
 MRzeroCore/pulseq/exporter_v2.py,sha256=GVnhC6bmbxbYq4CFrBbL2nj98B_u3OVglOt50J19pkk,30554
 MRzeroCore/pulseq/helpers.py,sha256=ZEtctXy7qm6BLexcwNRDd8xPSBFNiy5dUeifOo5bYkw,8774
@@ -28,9 +28,9 @@ MRzeroCore/pulseq/pulseq_loader/__init__.py,sha256=6OLwC3k9LSjl8aRin9pV4-Rb-Q3YS
 MRzeroCore/reconstruction.py,sha256=LGk5EdgQ4AkhWN-7Q81YMkIEEW0T9Q37O2Pat0d-d4o,4277
 MRzeroCore/sequence.py,sha256=wqRwpUIKdX9mgmctmIL2Ttr3eZPJ_H1ACLamkzPp7sY,27647
 MRzeroCore/simulation/isochromat_sim.py,sha256=u6KbN7S8REOHiKqzDGMma7937cKX4bnmj3gXoAiNLi0,9185
-MRzeroCore/simulation/main_pass.py,sha256=u2LrBYnKkS5FSJVUaCTSVyM7NCgQvtFUr1BQNmNriWk,9361
+MRzeroCore/simulation/main_pass.py,sha256=DNXEJmN7AEWuqNbMma6AWqJpHH4ihhC3YRJKRhoi4RU,9830
 MRzeroCore/simulation/pre_pass.py,sha256=5wmXKxgFeGwA7yrqTkOjcWoFuGuRYEPzedRGqkx2Evg,5117
 MRzeroCore/util.py,sha256=39TPselHu7f218BRdjHB4_kCSPnFuCC45YmdGotc4uA,11460
 MRzeroCore/__init__.py,sha256=8WViV9GQRwnksnopAAfKWRmtRYk75DC3ke4OQwLx-fU,850
-MRzeroCore/_prepass.pyd,sha256=sFkaev8d637tr-84sX-DyDP8BigAztIR0SxbW8NSKbY,351232
-MRzeroCore-0.2.10.dist-info/RECORD,,
+MRzeroCore/_prepass.pyd,sha256=NIJkecmf-necJn1FPdJw_IOaiN-hr08NiyYWBslD6z8,354304
+MRzeroCore-0.2.12.dist-info/RECORD,,