MRArbGrad 4.1.1__tar.gz → 4.2.0__tar.gz

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

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

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

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

{mrarbgrad-4.1.1 → mrarbgrad-4.2.0}/mrarbgrad_src/Function.py

@@ -371,6 +371,8 @@ def setGoldAng(x): ext.setGoldAng(x)
 def setShuf(x): ext.setShuf(x)
 def setMaxG0(x): ext.setMaxG0(x)
 def setMaxG1(x): ext.setMaxG1(x)
+def setMagGradSamp(x): ext.setMagGradSamp(x)
+def setMagTrajSamp(x): ext.setMagTrajSamp(x)
 def setMagOverSamp(x): ext.setMagOverSamp(x)
 def setMagSFS(x): ext.setMagSFS(x)
 def setMagGradRep(x): ext.setMagGradRep(x)

{mrarbgrad-4.1.1 → mrarbgrad-4.2.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, setMagOverSamp, setMagSFS, setMagGradRep, setMagTrajRep, setDbgPrint, saveF64, loadF64, saveF32, loadF32
+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 . import trajfunc

{mrarbgrad-4.1.1 → mrarbgrad-4.2.0}/mrarbgrad_src/ext/mag/Mag.cpp

@@ -8,29 +8,31 @@ i64 gMag_oversamp = -1; // oversample ratio, overwrite the set value
 bool gMag_enSFS = false; // Single Forward Sweep flag
 bool gMag_enGradRep = true; // Gradient Reparameterization
 bool gMag_enTrajRep = true; // use trajectory reparameterization for MAG solver
-i64 gMag_nTrajSamp = 1000; // num. of samp. when doing Traj. Rep.
 
-Mag::Mag()
+Mag::Mag(i64 nGradSampRsv, i64 nTrajSampRsv)
 {
     // for solver
-    m_dt = 10e-6; m_oversamp = 8;
-    i64 nSampReserve = i64(100e-3/m_dt); // reserve for 100ms
+    if (nGradSampRsv)
+    {
+        m_vf64P_Bac.reserve(nGradSampRsv * 8);
+        m_vv3G_Bac.reserve(nGradSampRsv * 8);
+        m_vf64GNorm_Bac.reserve(nGradSampRsv * 8);
 
-    m_vf64P_Bac.reserve(nSampReserve*m_oversamp);
-    m_vv3G_Bac.reserve(nSampReserve*m_oversamp);
-    m_vf64GNorm_Bac.reserve(nSampReserve*m_oversamp);
+        m_vf64P_For.reserve(nGradSampRsv * 8);
+        m_vv3G_For.reserve(nGradSampRsv * 8);
 
-    m_vf64P_For.reserve(nSampReserve*m_oversamp);
-    m_vv3G_For.reserve(nSampReserve*m_oversamp);
+        m_vf64P.reserve(nGradSampRsv);
+        m_vv3G.reserve(nGradSampRsv);
 
-    m_vf64P.reserve(nSampReserve);
-    m_vv3G.reserve(nSampReserve);
-    
-    // for trajectory reparameterization
-    m_vv3TrajSamp.resize(gMag_nTrajSamp);
+        m_intp.init(nGradSampRsv * 8);
+        m_intp.m_eSearchMode = Intp::ECached;
+    }
 
-    m_intp.init(nSampReserve*m_oversamp);
-    m_intp.m_eSearchMode = Intp::ECached;
+    // for trajectory reparameterization
+    if (gMrTraj_nTrajSampRsv)
+    {
+        m_vv3TrajSamp.resize(gMrTraj_nTrajSampRsv);
+    }
 }
 
 bool Mag::init
@@ -52,9 +54,9 @@ bool Mag::init
     {
         f64 p0 = ptTraj->getP0();
         f64 p1 = ptTraj->getP1();
-        for (i64 i = 0; i < gMag_nTrajSamp; ++i)
+        for (i64 i = 0; i < gMrTraj_nTrajSampRsv; ++i)
         {
-            f64 p = p0 + (p1-p0) * (i)/f64(gMag_nTrajSamp-1);
+            f64 p = p0 + (p1-p0) * (i)/f64(gMrTraj_nTrajSampRsv-1);
             ptTraj->getK(&m_vv3TrajSamp[i], p);
         }
         m_sptfTraj = Spline_TrajFunc(m_vv3TrajSamp);

{mrarbgrad-4.1.1 → mrarbgrad-4.2.0}/mrarbgrad_src/ext/mag/Mag.h

@@ -16,7 +16,7 @@ extern i64 gMag_oversamp;
 extern bool gMag_enSFS;
 extern bool gMag_enGradRep;
 extern bool gMag_enTrajRep;
-extern i64 gMag_nTrajSamp;
+extern i64 gMrTraj_nTrajSampRsv;
 
 // virtual TrajFunc, take in discrete samples and construct a Segmentied Cubic Polynomial function
 class Spline_TrajFunc: public TrajFunc
@@ -24,9 +24,9 @@ class Spline_TrajFunc: public TrajFunc
 public:
     Spline_TrajFunc():
         TrajFunc(0,0),
-        m_intpX(gMag_nTrajSamp),
-        m_intpY(gMag_nTrajSamp),
-        m_intpZ(gMag_nTrajSamp)
+        m_intpX(gMrTraj_nTrajSampRsv),
+        m_intpY(gMrTraj_nTrajSampRsv),
+        m_intpZ(gMrTraj_nTrajSampRsv)
     {}
 
     Spline_TrajFunc(const vv3& vv3K):
@@ -97,19 +97,19 @@ protected:
 class Mag
 {
 public:
-    Mag();
+    Mag(i64 nSampReserve=0, i64 nTrajSampRsv=0);
     bool init
     (
         TrajFunc* ptTraj,
         f64 sLim, f64 gLim,
-        f64 dt=10e-6, i64 oversamp=10, 
+        f64 dt=10e-6, i64 oversamp=8, 
         f64 dG0Norm=0e0, f64 dG1Norm=0e0
     );
     bool init
     (
         const vv3& vv3TrajSamp,
         f64 sLim, f64 gLim,
-        f64 dt=10e-6, i64 oversamp=10, 
+        f64 dt=10e-6, i64 oversamp=8, 
         f64 dG0Norm=0e0, f64 dG1Norm=0e0
     );
     ~Mag();

{mrarbgrad-4.1.1 → mrarbgrad-4.2.0}/mrarbgrad_src/ext/main.cpp

@@ -644,6 +644,24 @@ PyObject* setMaxG1(PyObject* self, PyObject* const* args, Py_ssize_t narg)
     return Py_None;
 }
 
+PyObject* setMagGradSamp(PyObject* self, PyObject* const* args, Py_ssize_t narg)
+{
+    extern i64 gMrTraj_nGradSampRsv;
+    chkNarg(narg, 1);
+    gMrTraj_nGradSampRsv = PyLong_AsLong(args[0]);
+    Py_INCREF(Py_None);
+    return Py_None;
+}
+
+PyObject* setMagTrajSamp(PyObject* self, PyObject* const* args, Py_ssize_t narg)
+{
+    extern i64 gMrTraj_nTrajSampRsv;
+    chkNarg(narg, 1);
+    gMrTraj_nTrajSampRsv = PyLong_AsLong(args[0]);
+    Py_INCREF(Py_None);
+    return Py_None;
+}
+
 PyObject* setMagOverSamp(PyObject* self, PyObject* const* args, Py_ssize_t narg)
 {
     extern i64 gMag_oversamp;
@@ -822,6 +840,8 @@ static PyMethodDef aMeth[] =
     {"setShuf", (PyCFunction)setShuf, METH_FASTCALL, ""},
     {"setMaxG0", (PyCFunction)setMaxG0, METH_FASTCALL, ""},
     {"setMaxG1", (PyCFunction)setMaxG1, METH_FASTCALL, ""},
+    {"setMagGradSamp", (PyCFunction)setMagGradSamp, METH_FASTCALL, ""},
+    {"setMagTrajSamp", (PyCFunction)setMagTrajSamp, METH_FASTCALL, ""},
     {"setMagOverSamp", (PyCFunction)setMagOverSamp, METH_FASTCALL, ""},
     {"setMagSFS", (PyCFunction)setMagSFS, METH_FASTCALL, ""},
     {"setMagGradRep", (PyCFunction)setMagGradRep, METH_FASTCALL, ""},

{mrarbgrad-4.1.1 → mrarbgrad-4.2.0}/mrarbgrad_src/ext/traj/MrTraj.h

@@ -13,6 +13,8 @@
 bool gMrTraj_enMtg = false; // whether to use Lustig's minTimeGrad solver
 f64 gMrTraj_g0Norm = 0e0; // initial gradient amplitude
 f64 gMrTraj_g1Norm = 0e0; // final gradient amplitude
+i64 gMrTraj_nGradSampRsv = 10000; // buffer size of mag solver
+i64 gMrTraj_nTrajSampRsv = 10000; // num. of samp. when doing Traj. Rep.
 
 /* 
  * A set of trajectories sufficient to fully-sample the k-space
@@ -51,7 +53,11 @@ public:
         m_nAcq(m_nAcq),
         m_nSampMax(m_nSampMax)
     {
-        m_mag = Mag();
+        m_mag = Mag
+        (
+            gMrTraj_nGradSampRsv,
+            gMrTraj_nTrajSampRsv
+        );
         m_vv3GRampFront.reserve(1000);
         m_vv3GRampBack.reserve(1000);
     }
@@ -361,8 +367,6 @@ protected:
     bool calGrad(v3* pv3M0PE, vv3* pvv3GRO, vf64* pvf64P, TrajFunc& tfTraj, GradPara& objGradPara, i64 oversamp=8)
     {
         bool ret = true;
-        const f64& sLim = objGradPara.sLim;
-        const f64& dt = objGradPara.dt;
         
         // calculate GRO
         TIC;

{mrarbgrad-4.1.1 → mrarbgrad-4.2.0}/mrarbgrad_src/ext/utility/LinIntp.h

@@ -27,8 +27,6 @@ public:
 
     virtual bool fit(const vf64& vf64X, const vf64& vf64Y)
     {
-        ASSERT((i64)vf64X.size() <= m_sizCache);
-        ASSERT((i64)vf64Y.size() <= m_sizCache);
         ASSERT(vf64X.size() == vf64Y.size());
         const i64 nSamp = vf64X.size();
         ASSERT(nSamp >= 2);

{mrarbgrad-4.1.1 → mrarbgrad-4.2.0}/mrarbgrad_src/ext/utility/SplineIntp.h

@@ -37,8 +37,6 @@ public:
 
     virtual bool fit(const vf64& vf64X, const vf64& vf64Y)
     {
-        ASSERT((i64)vf64X.size() <= m_sizCache);
-        ASSERT((i64)vf64Y.size() <= m_sizCache);
         ASSERT(vf64X.size() == vf64Y.size());
         const i64 nSamp = vf64X.size();
         ASSERT(nSamp >= 2);

{mrarbgrad-4.1.1 → mrarbgrad-4.2.0}/mrarbgrad_src/ext/utility/v3.cpp

@@ -1,6 +1,5 @@
 #include "v3.h"
 #include <array>
-#include <cinttypes>
 #include <cstring> // test
 
 v3::v3() :x(0e0), y(0e0), z(0e0) {}
@@ -386,11 +385,15 @@ bool v3::saveF64(FILE* pfHdr, FILE* pfBin, const vv3& vv3Data)
 bool v3::loadF64(FILE* pfHdr, FILE* pfBin, vv3* pvv3Data)
 {
     bool ret = true;
-    i64 lenData = 0;
     pvv3Data->clear();
-    int nRead = fscanf(pfHdr, "float64[%" SCNi64 "][3];\n", &lenData);
-    if (nRead==EOF) return true; // EOF
-    else if (nRead!=1) return false;
+    i64 lenData = 0;
+    {
+        long _;
+        int nRead = fscanf(pfHdr, "float64[%ld][3];\n", &_);
+        lenData = (i64)_;
+        if (nRead == EOF) return true; // EOF
+        else if (nRead != 1) return false;
+    }
     pvv3Data->resize(lenData);
 
     f64* bufFile = (f64*)malloc(lenData*3*sizeof(f64));
@@ -424,11 +427,15 @@ bool v3::saveF32(FILE* pfHdr, FILE* pfBin, const vv3& vv3Data)
 bool v3::loadF32(FILE* pfHdr, FILE* pfBin, vv3* pvv3Data)
 {
     bool ret = true;
-    i64 lenData = 0;
     pvv3Data->clear();
-    int nRead = fscanf(pfHdr, "float32[%" SCNi64 "][3];\n", &lenData);
-    if (nRead==EOF) return true; // EOF
-    else if (nRead!=1) return false;
+    i64 lenData = 0;
+    {
+        long _;
+        int nRead = fscanf(pfHdr, "float32[%ld][3];\n", &_);
+        lenData = (i64)_;
+        if (nRead == EOF) return true; // EOF
+        else if (nRead != 1) return false;
+    }
     pvv3Data->resize(lenData);
 
     f32* bufFile = (f32*)malloc(lenData*3*sizeof(f32));

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

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