MRArbGrad 2.1.0__tar.gz → 3.0.0__tar.gz

{mrarbgrad-2.1.0 → mrarbgrad-3.0.0/MRArbGrad.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: MRArbGrad
-Version: 2.1.0
+Version: 3.0.0
 Summary: Gradient waveform design tool for arbitrary k-space trajectories.
 Author-email: Ryan <ryan_shanghaitech@proton.me>
 License-Expression: MIT

{mrarbgrad-2.1.0 → mrarbgrad-3.0.0}/MRArbGrad.egg-info/SOURCES.txt

@@ -17,12 +17,9 @@ example/example_ExternalFunction2D.py
 example/example_ExternalSamples2D.py
 example/example_ExternalSamples3D.py
 mrarbgrad_src/Function.py
-mrarbgrad_src/TrajFunc.py
 mrarbgrad_src/Utility.py
 mrarbgrad_src/__init__.py
 mrarbgrad_src/ext/main.cpp
-mrarbgrad_src/ext/mag/GradGen.cpp
-mrarbgrad_src/ext/mag/GradGen.h
 mrarbgrad_src/ext/mag/Mag.cpp
 mrarbgrad_src/ext/mag/Mag.h
 mrarbgrad_src/ext/traj/Cones.h
@@ -33,7 +30,7 @@ mrarbgrad_src/ext/traj/Seiffert.h
 mrarbgrad_src/ext/traj/Shell3d.h
 mrarbgrad_src/ext/traj/Spiral.h
 mrarbgrad_src/ext/traj/TrajFunc.h
-mrarbgrad_src/ext/traj/VarDenSpiral.h
+mrarbgrad_src/ext/traj/VDSpiral.h
 mrarbgrad_src/ext/traj/Yarnball.h
 mrarbgrad_src/ext/utility/Intp.h
 mrarbgrad_src/ext/utility/LinIntp.h

{mrarbgrad-2.1.0/MRArbGrad.egg-info → mrarbgrad-3.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: MRArbGrad
-Version: 2.1.0
+Version: 3.0.0
 Summary: Gradient waveform design tool for arbitrary k-space trajectories.
 Author-email: Ryan <ryan_shanghaitech@proton.me>
 License-Expression: MIT

{mrarbgrad-2.1.0 → mrarbgrad-3.0.0}/example/example_BuiltInTraj.py

@@ -26,10 +26,10 @@ mag.setMagTrajRep(1) # enable trajectory reparameterization (experimental)
 mag.setDbgPrint(1) # enable debug info (for benchmark purpose)
 
 # calculate gradient
-# lstArrK0, lstArrGrad = mag.getG_Spiral(is3D=0, **argCom); nAx = 2
-# lstArrK0, lstArrGrad = mag.getG_VarDenSpiral(is3D=0, **argCom); nAx = 2
-# lstArrK0, lstArrGrad = mag.getG_VarDenSpiral_RT(is3D=0, **argCom); nAx = 2
-lstArrK0, lstArrGrad = mag.getG_Rosette(is3D=0, **argCom); nAx = 2
+# lstArrK0, lstArrGrad = mag.getG_Spiral(**argCom); nAx = 2
+# lstArrK0, lstArrGrad = mag.getG_VDSpiral(**argCom); nAx = 2
+# lstArrK0, lstArrGrad = mag.getG_VDSpiral_RT(**argCom); nAx = 2
+lstArrK0, lstArrGrad = mag.getG_Rosette(**argCom); nAx = 2
 # lstArrK0, lstArrGrad = mag.getG_Rosette_Trad(**argCom); nAx = 2
 # lstArrK0, lstArrGrad = mag.getG_Shell3d(**argCom); nAx = 3
 # lstArrK0, lstArrGrad = mag.getG_Yarnball(**argCom); nAx = 3

{mrarbgrad-2.1.0 → mrarbgrad-3.0.0}/example/example_ExternalFunction2D.py

@@ -28,7 +28,7 @@ def Rosette(t):
 pLim = [0,1]
 
 # derive slew-rate constrained trajectory
-arrGrad = mag.calGrad4ExFunc(False, fov, nPix, sLim, gLim, dtGrad, Rosette, None, None, pLim[0], pLim[1])[0]
+arrGrad = mag.calGrad4ExFunc(fov, nPix, sLim, gLim, dtGrad, Rosette, None, None, pLim[0], pLim[1])[0]
 # arrGrad = mag.gradClip(arrGrad, dtGrad, sLim, gLim) # clip slew/grad amp with hardware constraint
 nRO = arrGrad.shape[0]
 

{mrarbgrad-2.1.0 → mrarbgrad-3.0.0}/example/example_ExternalSamples2D.py

@@ -32,7 +32,7 @@ nAx = 2
 
 # derive slew-rate constrained trajectory
 for i in range(1):
-    arrGrad = mag.calGrad4ExSamp(False, fov, nPix, sLim, gLim, dtGrad, arrK)[0]
+    arrGrad = mag.calGrad4ExSamp(fov, nPix, sLim, gLim, dtGrad, arrK)[0]
     # arrGrad = mag.gradClip(arrGrad, dtGrad, sLim, gLim) # clip slew/grad amp with hardware constraint
 nRO = arrGrad.shape[0]
 

{mrarbgrad-2.1.0 → mrarbgrad-3.0.0}/example/example_ExternalSamples3D.py

@@ -24,7 +24,7 @@ arrK = Yarnball(arrP)
 
 # derive slew-rate constrained trajectory
 mag.setDbgPrint(1)
-arrGrad = mag.calGrad4ExSamp(True, fov, nPix, sLim, gLim, dtGrad, arrK)[0]
+arrGrad = mag.calGrad4ExSamp(fov, nPix, sLim, gLim, dtGrad, arrK)[0]
 # arrGrad = mag.gradClip(arrGrad, dtGrad, sLim, gLim) # clip slew/grad amp with hardware constraint
 nRO = arrGrad.shape[0]
 

{mrarbgrad-2.1.0 → mrarbgrad-3.0.0}/mrarbgrad_src/Function.py

@@ -9,7 +9,6 @@ goldang = getGoldang()
 
 def calGrad4ExFunc\
 (
-    is3D: bool = False,
     fov: float64 = 0.256,
     nPix: int64 = 256,
     
@@ -30,7 +29,6 @@ def calGrad4ExFunc\
     '''
     return ext.calGrad4ExFunc\
     (
-        int64(is3D),
         float64(fov),
         int64(nPix),
         
@@ -48,7 +46,6 @@ def calGrad4ExFunc\
 
 def calGrad4ExSamp\
 (
-    is3D: bool = False,
     fov: float64 = 0.256,
     nPix: int64 = 256,
     
@@ -64,7 +61,6 @@ def calGrad4ExSamp\
     '''
     return ext.calGrad4ExSamp\
     (
-        int64(is3D),
         float64(fov),
         int64(nPix),
         
@@ -77,7 +73,6 @@ def calGrad4ExSamp\
     
 def getG_Spiral\
 (
-    is3D: bool = False,
     fov: float64 = 0.256,
     nPix: int64 = 256,
     
@@ -85,6 +80,7 @@ def getG_Spiral\
     gLim: float64 = 50e-3 * 42.5756e6 * 0.256 / 256,
     dt: float64 = 10e-6,
     
+    nSlice: int64 = 1,
     kRhoPhi: float64 = 0.5 / (4 * pi)
 ) -> tuple[list[NDArray], list[NDArray]]:
     '''
@@ -93,7 +89,6 @@ def getG_Spiral\
     '''
     return ext.getG_Spiral\
     (
-        int64(is3D),
         float64(fov),
         int64(nPix),
         
@@ -101,19 +96,20 @@ def getG_Spiral\
         float64(gLim),
         float64(dt),
         
+        int64(nSlice),
         float64(kRhoPhi)
     )
 
-def getG_VarDenSpiral\
+def getG_VDSpiral\
 (
-    is3D: bool = False,
     fov: float64 = 0.256,
     nPix: int64 = 256,
     
     sLim: float64 = 50 * 42.5756e6 * 0.256 / 256,
     gLim: float64 = 50e-3 * 42.5756e6 * 0.256 / 256,
     dt: float64 = 10e-6,
-    
+
+    nSlice: int64 = 1,
     kRhoPhi0: float64 = 0.5 / (8 * pi),
     kRhoPhi1: float64 = 0.5 / (2 * pi),
 ) -> tuple[list[NDArray], list[NDArray]]:
@@ -121,9 +117,8 @@ def getG_VarDenSpiral\
     :return: list of trajectory start, list of gradient waveforms
     :rtype: tuple[list[NDArray], list[NDArray]]
     '''
-    return ext.getG_VarDenSpiral\
+    return ext.getG_VDSpiral\
     (
-        int64(is3D),
         float64(fov),
         int64(nPix),
         
@@ -131,13 +126,13 @@ def getG_VarDenSpiral\
         float64(gLim),
         float64(dt),
         
+        int64(nSlice),
         float64(kRhoPhi0),
         float64(kRhoPhi1)
     )
 
-def getG_VarDenSpiral_RT\
+def getG_VDSpiral_RT\
 (
-    is3D: bool = False,
     fov: float64 = 0.256,
     nPix: int64 = 256,
     
@@ -153,9 +148,8 @@ def getG_VarDenSpiral_RT\
     :return: list of trajectory start, list of gradient waveforms
     :rtype: tuple[list[NDArray], list[NDArray]]
     '''
-    return ext.getG_VarDenSpiral_RT\
+    return ext.getG_VDSpiral_RT\
     (
-        int64(is3D),
         float64(fov),
         int64(nPix),
         
@@ -171,7 +165,6 @@ def getG_VarDenSpiral_RT\
 
 def getG_Rosette\
 (
-    is3D: bool = False,
     fov: float64 = 0.256,
     nPix: int64 = 256,
     
@@ -179,6 +172,7 @@ def getG_Rosette\
     gLim: float64 = 50e-3 * 42.5756e6 * 0.256 / 256,
     dt: float64 = 10e-6,
     
+    nSlice: int64 = 1,
     om1: float64 = 5*pi, 
     om2: float64 = 3*pi, 
     tMax: float64 = 1e0,
@@ -189,7 +183,6 @@ def getG_Rosette\
     '''
     return ext.getG_Rosette\
     (
-        int64(is3D),
         float64(fov),
         int64(nPix),
         
@@ -197,6 +190,7 @@ def getG_Rosette\
         float64(gLim),
         float64(dt),
         
+        int64(nSlice),
         float64(om1),
         float64(om2),
         float64(tMax)
@@ -204,7 +198,6 @@ def getG_Rosette\
 
 def getG_Rosette_Trad\
 (
-    is3D: bool = False,
     fov: float64 = 0.256,
     nPix: int64 = 256,
     
@@ -212,6 +205,7 @@ def getG_Rosette_Trad\
     gLim: float64 = 50e-3 * 42.5756e6 * 0.256 / 256,
     dt: float64 = 10e-6,
     
+    nSlice: int64 = 1,
     om1: float64 = 5*pi, 
     om2: float64 = 3*pi, 
     tMax: float64 = 1e0,
@@ -223,7 +217,6 @@ def getG_Rosette_Trad\
     '''
     return ext.getG_Rosette_Trad\
     (
-        int64(is3D),
         float64(fov),
         int64(nPix),
         
@@ -231,6 +224,7 @@ def getG_Rosette_Trad\
         float64(gLim),
         float64(dt),
         
+        int64(nSlice),
         float64(om1),
         float64(om2),
         float64(tMax),
@@ -239,7 +233,6 @@ def getG_Rosette_Trad\
 
 def getG_Shell3d\
 (
-    is3D: bool = False,
     fov: float64 = 0.256,
     nPix: int64 = 256,
     
@@ -255,7 +248,6 @@ def getG_Shell3d\
     '''
     return ext.getG_Shell3d\
     (
-        int64(is3D),
         float64(fov),
         int64(nPix),
         
@@ -268,7 +260,6 @@ def getG_Shell3d\
 
 def getG_Yarnball\
 (
-    is3D: bool = False,
     fov: float64 = 0.256,
     nPix: int64 = 256,
     
@@ -284,7 +275,6 @@ def getG_Yarnball\
     '''
     return ext.getG_Yarnball\
     (
-        int64(is3D),
         float64(fov),
         int64(nPix),
         
@@ -297,7 +287,6 @@ def getG_Yarnball\
 
 def getG_Seiffert\
 (
-    is3D: bool = False,
     fov: float64 = 0.256,
     nPix: int64 = 256,
     
@@ -314,7 +303,6 @@ def getG_Seiffert\
     '''
     return ext.getG_Seiffert\
     (
-        int64(is3D),
         float64(fov),
         int64(nPix),
         
@@ -328,7 +316,6 @@ def getG_Seiffert\
 
 def getG_Cones\
 (
-    is3D: bool = False,
     fov: float64 = 0.256,
     nPix: int64 = 256,
     
@@ -344,7 +331,6 @@ def getG_Cones\
     '''
     return ext.getG_Cones\
     (
-        int64(is3D),
         float64(fov),
         int64(nPix),
         

{mrarbgrad-2.1.0 → mrarbgrad-3.0.0}/mrarbgrad_src/__init__.py

@@ -1,5 +1,5 @@
 from .Function import calGrad4ExFunc, calGrad4ExSamp
-from .Function import getG_Cones, getG_Rosette, getG_Rosette_Trad, getG_Seiffert, getG_Shell3d, getG_Spiral, getG_VarDenSpiral, getG_VarDenSpiral_RT, getG_Yarnball
+from .Function import getG_Cones, getG_Rosette, getG_Rosette_Trad, getG_Seiffert, getG_Shell3d, getG_Spiral, getG_VDSpiral, getG_VDSpiral_RT, getG_Yarnball
 from .Function import setSolverMtg, setTrajRev, setGoldAng, setShuf, setMaxG0, setMaxG1, setExGEnd, setMagOverSamp, setMagSFS, setMagGradRep, setMagTrajRep, setDbgPrint
 from .Utility import _calDiaphony, rotate, _calJacElip, _calCompElipInt, _calSphFibPt, cvtGrad2Traj, getGoldang, getGoldrat, rand3d, gradClip
 

{mrarbgrad-2.1.0 → mrarbgrad-3.0.0}/mrarbgrad_src/ext/mag/Mag.h

@@ -15,9 +15,6 @@
 class Spline_TrajFunc: public TrajFunc
 {
 public:
-    typedef std::vector<v3> vv3;
-    typedef std::vector<f64> vf64;
-
     Spline_TrajFunc():
         TrajFunc(0,0)
     {}
@@ -87,16 +84,6 @@ protected:
 class Mag
 {
 public:
-    typedef std::vector<i64> vi64;
-    typedef std::vector<f64> vf64;
-    typedef std::list<i64> ll;
-    typedef std::list<f64> lf64;
-
-    typedef std::vector<v3> vv3;
-    typedef std::vector<vv3> vvv3;
-    typedef std::list<v3> lv3;
-    typedef std::list<vv3> lvv3;
-
     Mag();
     bool setup
     (