MRArbGrad 4.2.0__tar.gz → 4.3.0__tar.gz

{mrarbgrad-4.2.0 → mrarbgrad-4.3.0/MRArbGrad.egg-info}/PKG-INFO

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

{mrarbgrad-4.2.0/MRArbGrad.egg-info → mrarbgrad-4.3.0}/PKG-INFO

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

{mrarbgrad-4.2.0 → mrarbgrad-4.3.0}/mrarbgrad_src/Utility.py

@@ -5,8 +5,8 @@ from numpy.typing import *
 goldrat = (1+sqrt(5))/2
 goldang = (2*pi)/(1+goldrat)
 
-getGoldrat = lambda: goldrat
-getGoldang = lambda: goldang
+def getGoldrat()->float: return goldrat
+def getGoldang()->float: return goldang
 
 def gradClip(lstArrGrad:list[NDArray]|NDArray, dt:float, sLim:float, gLim:float) -> list[NDArray]|NDArray:
     """
@@ -55,6 +55,14 @@ def rand3d(i:int|NDArray, nAx:int=3, kx=sqrt(2), ky=sqrt(3), kz=sqrt(7)) -> NDAr
         (i**2 * 1/(1+ky))%1,
         (i**3 * 1/(1+kz))%1
     ][:nAx]).T
+    
+def genPermTab(n:int) -> list[int]:
+    inc = around(n*(goldrat-1)).astype(int64)
+    while gcd(inc,n)!=1: inc-=1
+    lstIdx = []
+    for i in range(n):
+        lstIdx.append(i*inc%n)
+    return lstIdx
 
 def cvtGrad2Traj(arrG:NDArray, dtGrad:int|float, dtADC:int|float, nShift:int|float=1.0) -> tuple[NDArray, NDArray]:
     """

{mrarbgrad-4.2.0 → mrarbgrad-4.3.0}/mrarbgrad_src/__init__.py

@@ -1,6 +1,6 @@
 from .Function import calGrad4ExFunc, calGrad4ExSamp
 from .Function import getG_Cones, getG_Rosette, getG_Rosette_Trad, getG_Seiffert, getG_Shell3d, getG_Spiral, getG_VDSpiral, getG_VDSpiral_RT, getG_Yarnball, getG_Yarnball_RT
 from .Function import setSolverMtg, setTrajRev, setGoldAng, setShuf, setMaxG0, setMaxG1, setMagGradSamp, setMagTrajSamp, setMagOverSamp, setMagSFS, setMagGradRep, setMagTrajRep, setDbgPrint, saveF64, loadF64, saveF32, loadF32
-from .Utility import _calDiaphony, rotate, _calJacElip, _calCompElipInt, _calSphFibPt, cvtGrad2Traj, getGoldang, getGoldrat, rand3d, gradClip
+from .Utility import _calDiaphony, rotate, _calJacElip, _calCompElipInt, _calSphFibPt, cvtGrad2Traj, getGoldang, getGoldrat, rand3d, gradClip, genPermTab
 
 from . import trajfunc

{mrarbgrad-4.2.0 → mrarbgrad-4.3.0}/mrarbgrad_src/ext/traj/VDSpiral.h

@@ -14,7 +14,10 @@ public:
         m_phi0 = phi0;
 
         m_p0 = 0e0;
-        m_p1 = (std::log(m_kRhoPhi1)-std::log(m_kRhoPhi0)) / (2e0*(m_kRhoPhi1-m_kRhoPhi0));
+        if (m_kRhoPhi0!=m_kRhoPhi1)
+        { m_p1 = (std::log(kRhoPhi1)-std::log(kRhoPhi0)) / (2e0*(kRhoPhi1-kRhoPhi0)); }
+        else
+        { m_p1 = 0.5e0/kRhoPhi0; }
     }
 
     virtual bool getK(v3* k, f64 p)
@@ -22,7 +25,11 @@ public:
         if (k==NULL) return false;
         
         f64& phi = p;
-        f64 rho = m_kRhoPhi0*(std::exp(2e0*(m_kRhoPhi1 - m_kRhoPhi0)*phi) - 1e0) / (2e0*(m_kRhoPhi1 - m_kRhoPhi0));
+        f64 rho;
+        if (m_kRhoPhi0!=m_kRhoPhi1)
+        { rho = m_kRhoPhi0*(std::exp(2e0*(m_kRhoPhi1 - m_kRhoPhi0)*phi) - 1e0) / (2e0*(m_kRhoPhi1 - m_kRhoPhi0)); }
+        else
+        { rho = m_kRhoPhi0*phi; }
         k->x = rho * std::cos(phi + m_phi0);
         k->y = rho * std::sin(phi + m_phi0);
         k->z = 0e0;
@@ -39,19 +46,16 @@ protected:
 class VDSpiral: public MrTraj_2D
 {
 public:
-    VDSpiral(const GeoPara& objGeoPara, const GradPara& objGradPara, i64 nStack, f64 kRhoPhi0, f64 dRhoPhi1):
+    VDSpiral(const GeoPara& objGeoPara, const GradPara& objGradPara, i64 nStack, f64 kRhoPhi0, f64 kRhoPhi1):
         MrTraj_2D(objGeoPara,objGradPara,0,0,0,0,v3(),vv3())
     {
-        if (kRhoPhi0==dRhoPhi1) throw std::invalid_argument("kRhoPhi0==dRhoPhi1");
-
-        m_ptfBaseTraj = new VDSpiral_TrajFunc(kRhoPhi0, dRhoPhi1);
+        m_ptfBaseTraj = new VDSpiral_TrajFunc(kRhoPhi0, kRhoPhi1);
         ASSERT(m_ptfBaseTraj!=NULL);
         m_nStack = nStack;
 
-        i64 nRot = calNRot(std::max(kRhoPhi0, dRhoPhi1), m_objGeoPara.nPix);
+        i64 nRot = calNRot(std::max(kRhoPhi0, kRhoPhi1), m_objGeoPara.nPix);
         m_rotang = calRotAng(nRot);
         m_nAcq = nRot*m_nStack;
-        PRINT(m_nAcq) // TEST
 
         calGrad(&m_v3BaseM0PE, &m_vv3BaseGRO, NULL, *m_ptfBaseTraj, m_objGradPara);
         m_nSampMax = m_vv3BaseGRO.size();
@@ -78,7 +82,7 @@ public:
     {
         m_kRhoPhi0 = kRhoPhi0;
         m_kRhoPhi1 = kRhoPhi1;
-        m_nAcq = calNRot(kRhoPhi1, objGeoPara.nPix);
+        m_nAcq = calNRot(std::max(kRhoPhi0, kRhoPhi1), objGeoPara.nPix);
         m_dRotAng = 2e0*M_PI/m_nAcq;
         genPermTab(&m_vi64PermTab, m_nAcq);
 

{mrarbgrad-4.2.0 → mrarbgrad-4.3.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "MRArbGrad"
-version = "4.2.0"
+version = "4.3.0"
 dependencies = ["numpy"]
 
 description = "Gradient waveform design tool for arbitrary k-space trajectories."