MRArbGrad 3.0.0__tar.gz → 3.0.1__tar.gz

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

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

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

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

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

@@ -6,8 +6,8 @@ import mrarbgrad as mag
 gamma = 42.5756e6
 fov = 0.256
 nPix = 256
-dtGrad = 10e-6 * 1e-1
-dtADC = 2.5e-6 * 1e-1
+dtGrad = 10e-6
+dtADC = 1e-6
 sLim = 50 * gamma * fov/nPix
 gLim = 20e-3 * gamma * fov/nPix
 # gLim = 1/nPix/dtADC
@@ -28,6 +28,8 @@ def Rosette(t):
 pLim = [0,1]
 
 # derive slew-rate constrained trajectory
+mag.setMaxG0(0)
+mag.setMaxG1(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-3.0.0 → mrarbgrad-3.0.1}/mrarbgrad_src/Function.py

@@ -347,7 +347,6 @@ 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 setExGEnd(x): ext.setExGEnd(x)
 def setMagOverSamp(x): ext.setMagOverSamp(x)
 def setMagSFS(x): ext.setMagSFS(x)
 def setMagGradRep(x): ext.setMagGradRep(x)

{mrarbgrad-3.0.0 → mrarbgrad-3.0.1}/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
-from .Function import setSolverMtg, setTrajRev, setGoldAng, setShuf, setMaxG0, setMaxG1, setExGEnd, setMagOverSamp, setMagSFS, setMagGradRep, setMagTrajRep, setDbgPrint
+from .Function import setSolverMtg, setTrajRev, setGoldAng, setShuf, setMaxG0, setMaxG1, setMagOverSamp, setMagSFS, setMagGradRep, setMagTrajRep, setDbgPrint
 from .Utility import _calDiaphony, rotate, _calJacElip, _calCompElipInt, _calSphFibPt, cvtGrad2Traj, getGoldang, getGoldrat, rand3d, gradClip
 
 from . import trajfunc

{mrarbgrad-3.0.0 → mrarbgrad-3.0.1}/mrarbgrad_src/ext/main.cpp

@@ -634,6 +634,7 @@ PyObject* setMaxG0(PyObject* self, PyObject* const* args, Py_ssize_t narg)
     bool enMaxG0 = PyLong_AsLong(args[0]);
     if (enMaxG0) gMrTraj_g0Norm = 1e6;
     else gMrTraj_g0Norm = 0e0;
+    PRINT(gMrTraj_g0Norm); // test
     Py_INCREF(Py_None);
     return Py_None;
 }
@@ -645,6 +646,7 @@ PyObject* setMaxG1(PyObject* self, PyObject* const* args, Py_ssize_t narg)
     bool enMaxG1 = PyLong_AsLong(args[0]);
     if (enMaxG1) gMrTraj_g1Norm = 1e6;
     else gMrTraj_g1Norm = 0e0;
+    PRINT(gMrTraj_g1Norm); // test
     Py_INCREF(Py_None);
     return Py_None;
 }

{mrarbgrad-3.0.0 → mrarbgrad-3.0.1}/mrarbgrad_src/ext/traj/MrTraj.h

@@ -77,15 +77,6 @@ public:
     void setGyoMagRat(f64 x)
     { m_gamma = x; }
 
-    void setUseMtg(bool x)
-    { gMrTraj_enMtg = x; }
-
-    void setGNorm0(f64 x)
-    { gMrTraj_g0Norm = x; }
-
-    void setGNorm1(f64 x)
-    { gMrTraj_g1Norm = x; }
-
     // a deterministic random number generator
     static bool genRand3d(v3* v3Res, i64 lIdx)
     {
@@ -327,6 +318,8 @@ protected:
             ret &= calGRO_MTG(pvv3G, pvf64P, vf64C, objGradPara);
         }
 
+        intpGrad(pvv3G, pvf64P, objGradPara.sLim, objGradPara.dt);
+
         return ret;
     }
 
@@ -357,6 +350,8 @@ protected:
             ret &= calGRO_MTG(pvv3G, pvf64P, vf64C, objGradPara);
         }
 
+        intpGrad(pvv3G, pvf64P, objGradPara.sLim, objGradPara.dt);
+
         return ret;
     }
 
@@ -371,7 +366,15 @@ protected:
         ret &= calGRO(pvv3GRO, pvf64P, tfTraj, objGradPara, oversamp);
         TOC;
 
-        // if GEnd needs to be fixed
+        if (pv3M0PE) ret &= tfTraj.getK0(pv3M0PE);
+
+        return ret;
+    }
+
+    bool intpGrad(vv3* pvv3GRO, vf64* pvf64P, f64 sLim, f64 dt)
+    {
+        bool ret = true;
+
         if (gMrTraj_g0Norm==0e0 && pvv3GRO)
         {
             // add ramp gradient to satisfy desired Gstart and Gfinal
@@ -380,7 +383,7 @@ protected:
             pvv3GRO->insert(pvv3GRO->begin(), vv3GRampFront.begin(), vv3GRampFront.end());
             
             // corresponding parameter sequence
-            if (pvf64P && !pvf64P->empty()) // null: user does not need p seq, empty: q seq not supported
+            if (pvf64P && !pvf64P->empty()) // null: user does not need p seq, empty: p seq not supported
             {
                 vf64 vf64PInsert = vf64(vv3GRampFront.size(), pvf64P->front());
                 pvf64P->insert(pvf64P->begin(), vf64PInsert.begin(), vf64PInsert.end());
@@ -394,15 +397,13 @@ protected:
             pvv3GRO->insert(pvv3GRO->end(), vv3GRampBack.begin(), vv3GRampBack.end());
             
             // corresponding parameter sequence
-            if (pvf64P && !pvf64P->empty()) // null: user does not need p seq, empty: q seq not supported
+            if (pvf64P && !pvf64P->empty()) // null: user does not need p seq, empty: p seq not supported
             {
                 vf64 vf64PInsert = vf64(vv3GRampBack.size(), pvf64P->back());
                 pvf64P->insert(pvf64P->end(), vf64PInsert.begin(), vf64PInsert.end());
             }
         }
 
-        if (pv3M0PE) ret &= tfTraj.getK0(pv3M0PE);
-
         return ret;
     }
 };

{mrarbgrad-3.0.0 → mrarbgrad-3.0.1}/pyproject.toml

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