MRArbGrad 3.1.0__tar.gz → 4.0.0__tar.gz

{mrarbgrad-3.1.0 → mrarbgrad-4.0.0/MRArbGrad.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: MRArbGrad
-Version: 3.1.0
+Version: 4.0.0
 Summary: Gradient waveform design tool for arbitrary k-space trajectories.
 Author-email: Ryan <ryan_shanghaitech@proton.me>
 License-Expression: MIT
@@ -41,7 +41,7 @@ You can also install via `pip install .` but remember to delete `*.egg-info` or
 ## Examples & Usages
 Examples for generating gradient waveforms for either built-in trajectory (trajectory library) or external trajectory (expressed by trajectory function or trajectory samples) can be found in the `example` folder.
 
-## Citation
+## Reference
 If this project helps you, please cite [our paper](https://ieeexplore.ieee.org/document/11352950):
 
 [1] Luo R, Huang H, Miao Q, Xu J, Hu P, Qi H. Real-Time Gradient Waveform Design for Arbitrary k-Space Trajectories. IEEE Transactions on Biomedical Engineering. 2026;1–12. 

{mrarbgrad-3.1.0/MRArbGrad.egg-info → mrarbgrad-4.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: MRArbGrad
-Version: 3.1.0
+Version: 4.0.0
 Summary: Gradient waveform design tool for arbitrary k-space trajectories.
 Author-email: Ryan <ryan_shanghaitech@proton.me>
 License-Expression: MIT
@@ -41,7 +41,7 @@ You can also install via `pip install .` but remember to delete `*.egg-info` or
 ## Examples & Usages
 Examples for generating gradient waveforms for either built-in trajectory (trajectory library) or external trajectory (expressed by trajectory function or trajectory samples) can be found in the `example` folder.
 
-## Citation
+## Reference
 If this project helps you, please cite [our paper](https://ieeexplore.ieee.org/document/11352950):
 
 [1] Luo R, Huang H, Miao Q, Xu J, Hu P, Qi H. Real-Time Gradient Waveform Design for Arbitrary k-Space Trajectories. IEEE Transactions on Biomedical Engineering. 2026;1–12. 

{mrarbgrad-3.1.0 → mrarbgrad-4.0.0}/README.md

@@ -27,7 +27,7 @@ You can also install via `pip install .` but remember to delete `*.egg-info` or
 ## Examples & Usages
 Examples for generating gradient waveforms for either built-in trajectory (trajectory library) or external trajectory (expressed by trajectory function or trajectory samples) can be found in the `example` folder.
 
-## Citation
+## Reference
 If this project helps you, please cite [our paper](https://ieeexplore.ieee.org/document/11352950):
 
 [1] Luo R, Huang H, Miao Q, Xu J, Hu P, Qi H. Real-Time Gradient Waveform Design for Arbitrary k-Space Trajectories. IEEE Transactions on Biomedical Engineering. 2026;1–12. 

{mrarbgrad-3.1.0 → mrarbgrad-4.0.0}/mrarbgrad_src/Function.py

@@ -142,7 +142,6 @@ def getG_VDSpiral_RT\
     
     kRhoPhi0: float64 = 0.5 / (8 * pi),
     kRhoPhi1: float64 = 0.5 / (2 * pi),
-    nAcq: int64 = 128,
 ) -> tuple[list[NDArray], list[NDArray]]:
     '''
     :return: list of trajectory start, list of gradient waveforms
@@ -158,9 +157,7 @@ def getG_VDSpiral_RT\
         float64(dt),
         
         float64(kRhoPhi0),
-        float64(kRhoPhi1),
-        
-        int64(nAcq)
+        float64(kRhoPhi1)
     )
 
 def getG_Rosette\
@@ -294,8 +291,7 @@ def getG_Yarnball_RT\
     gLim: float64 = 50e-3 * 42.5756e6 * 0.256 / 256,
     dt: float64 = 10e-6,
     
-    kRhoPhi: float64 = 0.5 / (2 * pi),
-    nAcq: int64 = 16384,
+    kRhoPhi: float64 = 0.5 / (2 * pi)
 ) -> tuple[list[NDArray], list[NDArray]]:
     '''
     :return: list of trajectory start, list of gradient waveforms
@@ -310,8 +306,7 @@ def getG_Yarnball_RT\
         float64(gLim),
         float64(dt),
         
-        float64(kRhoPhi),
-        int64(nAcq),
+        float64(kRhoPhi)
     )
 
 def getG_Seiffert\

{mrarbgrad-3.1.0 → mrarbgrad-4.0.0}/mrarbgrad_src/ext/main.cpp

@@ -451,7 +451,7 @@ PyObject* getG_VDSpiral(PyObject* self, PyObject* const* args, Py_ssize_t narg)
 
 PyObject* getG_VDSpiral_RT(PyObject* self, PyObject* const* args, Py_ssize_t narg)
 {
-    checkNarg(narg, 8);
+    checkNarg(narg, 7);
 
     MrTraj::GeoPara objGeoPara;
     MrTraj::GradPara objGradPara;
@@ -459,8 +459,7 @@ PyObject* getG_VDSpiral_RT(PyObject* self, PyObject* const* args, Py_ssize_t nar
 
     f64 kRhoPhi0 = (f64)PyFloat_AsDouble(args[5]);
     f64 kRhoPhi1 = (f64)PyFloat_AsDouble(args[6]);
-    i64 nAcq = (i64)PyLong_AsLong(args[7]);
-    VDSpiral_RT traj(objGeoPara, objGradPara, kRhoPhi0, kRhoPhi1, nAcq);
+    VDSpiral_RT traj(objGeoPara, objGradPara, kRhoPhi0, kRhoPhi1);
 
     vv3 vv3K0;
     vvv3 vvv3G;
@@ -555,15 +554,14 @@ PyObject* getG_Yarnball(PyObject* self, PyObject* const* args, Py_ssize_t narg)
 
 PyObject* getG_Yarnball_RT(PyObject* self, PyObject* const* args, Py_ssize_t narg)
 {
-    checkNarg(narg, 7);
+    checkNarg(narg, 6);
 
     MrTraj::GeoPara objGeoPara;
     MrTraj::GradPara objGradPara;
     getGeoGradPara(args, &objGeoPara, &objGradPara);
 
     f64 kRhoPhi = (f64)PyFloat_AsDouble(args[5]);
-    i64 nAcq = (i64)PyLong_AsLong(args[6]);
-    Yarnball_RT traj(objGeoPara, objGradPara, kRhoPhi, nAcq);
+    Yarnball_RT traj(objGeoPara, objGradPara, kRhoPhi);
 
     vv3 vv3K0;
     vvv3 vvv3G;

{mrarbgrad-3.1.0 → mrarbgrad-4.0.0}/mrarbgrad_src/ext/traj/Shell3d.h

@@ -80,18 +80,18 @@ public:
     {
         bool ret = true;
         const f64& rotang = m_rotang;
-        i64 iSet = iAcq%m_nRot;
-        i64 iRot = iAcq/m_nRot;
+        i64 iPhi = iAcq%m_nRot;
+        i64 iTht = iAcq/m_nRot%m_nRot;
 
         if (pv3M0PE)
         {
-            *pv3M0PE = m_vv3BaseM0PE[iSet];
-            ret &= v3::rotate(pv3M0PE, 2, rotang * iRot, *pv3M0PE);
+            *pv3M0PE = m_vv3BaseM0PE[iTht];
+            ret &= v3::rotate(pv3M0PE, 2, rotang*iPhi, *pv3M0PE);
         }
         if (pvv3GRO)
         {
-            *pvv3GRO = m_vvv3BaseGRO[iSet];
-            ret &= v3::rotate(pvv3GRO, 2, rotang * iRot, *pvv3GRO);
+            *pvv3GRO = m_vvv3BaseGRO[iTht];
+            ret &= v3::rotate(pvv3GRO, 2, rotang*iPhi, *pvv3GRO);
         }
 
         return ret;

{mrarbgrad-3.1.0 → mrarbgrad-4.0.0}/mrarbgrad_src/ext/traj/VDSpiral.h

@@ -70,20 +70,21 @@ class VDSpiral_RT: public MrTraj
 {
     // TODO: Goldang sampling is incomplete, shuffled sampling is incomplete.
 public:
-    VDSpiral_RT(const GeoPara& objGeoPara, const GradPara& objGradPara, f64 kRhoPhi0, f64 kRhoPhi1, i64 nAcq):
+    VDSpiral_RT(const GeoPara& objGeoPara, const GradPara& objGradPara, f64 kRhoPhi0, f64 kRhoPhi1):
     /*
      * nAcq: Num of Acq, used to preallocate an array to store PE M0
      */
-        MrTraj(objGeoPara,objGradPara,nAcq,0)
+        MrTraj(objGeoPara,objGradPara,0,0)
     {
         m_kRhoPhi0 = kRhoPhi0;
         m_kRhoPhi1 = kRhoPhi1;
         m_nRot = calNRot(kRhoPhi1, objGeoPara.nPix);
         m_dRotAng = 2e0*M_PI/m_nRot;
         genRandIdx(&m_vi64Idx, m_nRot);
+        m_nAcq = m_nRot;
 
         VDSpiral_TrajFunc tf(m_kRhoPhi0, m_kRhoPhi1, 0);
-        vv3 vv3GRO; calGrad(NULL, &vv3GRO, NULL, tf, m_objGradPara, 4);
+        vv3 vv3GRO; calGrad(NULL, &vv3GRO, NULL, tf, m_objGradPara, 2);
         m_nSampMax = vv3GRO.size();
     }
 
@@ -93,9 +94,9 @@ public:
     virtual bool getGrad(v3* pv3M0PE, vv3* pvv3GRO, i64 iAcq)
     {
         bool ret = true;
-        VDSpiral_TrajFunc tf(m_kRhoPhi0, m_kRhoPhi1, m_vi64Idx[iAcq]*m_dRotAng);
-        ASSERT(iAcq < m_nAcq);
-        ret &= calGrad(pv3M0PE, pvv3GRO, NULL, tf, m_objGradPara, 4);
+        ASSERT(iAcq >= 0);
+        VDSpiral_TrajFunc tf(m_kRhoPhi0, m_kRhoPhi1, m_vi64Idx[iAcq%m_nRot]*m_dRotAng);
+        ret &= calGrad(pv3M0PE, pvv3GRO, NULL, tf, m_objGradPara, 2);
         return ret;
     }
 

{mrarbgrad-3.1.0 → mrarbgrad-4.0.0}/mrarbgrad_src/ext/traj/Yarnball.h

@@ -80,14 +80,20 @@ public:
     {
         bool ret = true;
         const f64& rotang = m_rotang;
-        i64 iSet = iAcq%m_nRot;
-        i64 iRot = iAcq/m_nRot;
+        i64 iPhi = iAcq%m_nRot;
+        i64 iTht = iAcq/m_nRot%m_nRot;
+
+        if (pv3M0PE)
+        {
+            *pv3M0PE = m_vv3BaseM0PE[iTht];
+            ret &= v3::rotate(pv3M0PE, 2, rotang*iPhi, *pv3M0PE);
+        }
+        if (pvv3GRO)
+        {
+            *pvv3GRO = m_vvv3BaseGRO[iTht];
+            ret &= v3::rotate(pvv3GRO, 2, rotang*iPhi, *pvv3GRO);
+        }
 
-        *pv3M0PE = m_vv3BaseM0PE[iSet];
-        *pvv3GRO = m_vvv3BaseGRO[iSet];
-        ret &= v3::rotate(pv3M0PE, 2, rotang*iRot, *pv3M0PE);
-        ret &= v3::rotate(pvv3GRO, 2, rotang*iRot, *pvv3GRO);
-        
         return ret;
     }
 
@@ -100,20 +106,20 @@ protected:
     vvv3 m_vvv3BaseGRO;
 };
 
-/* incomplete - we plan to test 2D real-time first before 3D */
 class Yarnball_RT: public MrTraj
 {
 public:
-    Yarnball_RT(const GeoPara& objGeoPara, const GradPara& objGradPara, f64 kRhoPhi, i64 nAcq):
-        MrTraj(objGeoPara, objGradPara, nAcq, 0)
+    Yarnball_RT(const GeoPara& objGeoPara, const GradPara& objGradPara, f64 kRhoPhi):
+        MrTraj(objGeoPara,objGradPara,0,0)
     {
         m_kRhoPhi = kRhoPhi;
         m_nRot = calNRot(kRhoPhi, objGeoPara.nPix);
         m_dRotAng = 2e0*M_PI/m_nRot;
         genRandIdx(&m_vi64Idx, m_nRot);
+        m_nAcq = m_nRot*m_nRot;
         
         Yarnball_TrajFunc tf(m_kRhoPhi, M_PI/2e0, 0);
-        vv3 vv3GRO; calGrad(NULL, &vv3GRO, NULL, tf, m_objGradPara, 4);
+        vv3 vv3GRO; calGrad(NULL, &vv3GRO, NULL, tf, m_objGradPara, 2);
         m_nSampMax = vv3GRO.size();
     }
 
@@ -123,13 +129,13 @@ public:
     virtual bool getGrad(v3* pv3M0PE, vv3* pvv3GRO, i64 iAcq)
     {
         bool ret = true;
-        i64 iTht = iAcq%m_nRot;
-        i64 iPhi = iAcq/m_nRot;
-        f64 tht = m_dRotAng*m_vi64Idx[iTht];
+        ASSERT(iAcq >= 0);
+        i64 iPhi = iAcq%m_nRot;
+        i64 iTht = iAcq/m_nRot%m_nRot;
         f64 phi = m_dRotAng*m_vi64Idx[iPhi];
+        f64 tht = m_dRotAng*m_vi64Idx[iTht];
         Yarnball_TrajFunc tf(m_kRhoPhi, tht, phi);
-        ASSERT(iAcq<m_nAcq);
-        ret &= calGrad(pv3M0PE, pvv3GRO, NULL, tf, m_objGradPara, 4);
+        ret &= calGrad(pv3M0PE, pvv3GRO, NULL, tf, m_objGradPara, 2);
         return ret;
     }
 

{mrarbgrad-3.1.0 → mrarbgrad-4.0.0}/pyproject.toml

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