clean up

Author: guruuprasadk

__init__.py

@@ -0,0 +1,36 @@
+# Copyright (c) 2014, Dignity Health
+# 
+#     The GPI core node library is licensed under
+# either the BSD 3-clause or the LGPL v. 3.
+# 
+#     Under either license, the following additional term applies:
+# 
+#         NO CLINICAL USE.  THE SOFTWARE IS NOT INTENDED FOR COMMERCIAL
+# PURPOSES AND SHOULD BE USED ONLY FOR NON-COMMERCIAL RESEARCH PURPOSES.  THE
+# SOFTWARE MAY NOT IN ANY EVENT BE USED FOR ANY CLINICAL OR DIAGNOSTIC
+# PURPOSES.  YOU ACKNOWLEDGE AND AGREE THAT THE SOFTWARE IS NOT INTENDED FOR
+# USE IN ANY HIGH RISK OR STRICT LIABILITY ACTIVITY, INCLUDING BUT NOT LIMITED
+# TO LIFE SUPPORT OR EMERGENCY MEDICAL OPERATIONS OR USES.  LICENSOR MAKES NO
+# WARRANTY AND HAS NOR LIABILITY ARISING FROM ANY USE OF THE SOFTWARE IN ANY
+# HIGH RISK OR STRICT LIABILITY ACTIVITIES.
+# 
+#     If you elect to license the GPI core node library under the LGPL the
+# following applies:
+# 
+#         This file is part of the GPI core node library.
+# 
+#         The GPI core node library is free software: you can redistribute it
+# and/or modify it under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation, either version 3 of the License,
+# or (at your option) any later version. GPI core node library is distributed
+# in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+# the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the GNU Lesser General Public License for more details.
+# 
+#         You should have received a copy of the GNU Lesser General Public
+# License along with the GPI core node library. If not, see
+# <http://www.gnu.org/licenses/>.
+
+VERSION = '2.0.0'
+RELEASE_DATE = '2019Jul30'
+

gpi_core/spiral/cpp/WPCompose.cpp

@@ -212,18 +212,11 @@ void WPCompose::composeKSPnSDC(dVector& kspX, dVector& kspY,
     // Calculate base ksp and sdc
     mWPOut->ComputeKSPnSDC(mKspOutX, mKspOutY, mSdcOut);
 
-    if (cg_crds_sdc) {
-        mWPOut->ComputeKSPnSDCForCG(mKspOutX, mKspOutY, mSdcOut);
-    }
-
     kspLengths[2] = mKspOutX.size();
 
     if (mDualTau) {
         mWPIn->ComputeKSPnSDC(mKspInX, mKspInY, mSdcIn);
 
-        if (cg_crds_sdc) {
-            mWPIn->ComputeKSPnSDCForCG(mKspInX, mKspInY, mSdcIn);
-        } 
         kspLengths[0] = mKspInX.size();
 
         mKspInX = _negative(_flip(mKspInX));

gpi_core/spiral/cpp/WPGen.cpp

@@ -198,13 +198,6 @@ void WPGen::_computeTimings()
   totalSpiralPts = spiralReadPts + spiralRampPts;
 
   kspacePts = static_cast<int>(readoutDur / mDwell);
-
-  // Constant Gradient crd variables (fast arc followed by constant gradient)
-  mDwellCG = 1.0 / (mGamma * gradMaxIn * mFov);
-  mArcDurCG = nyqNumberArms / (2.0 * mGamma * gradMaxIn * mFov);
-  mG0CG = mDelta / (2.0 * mGamma * gradMaxIn);
-  mCtaCG = 2.0 * M_PI * (mGamma * mGamma * gradMaxIn * gradMaxIn * mFov * mFov) / (nyqNumberArms * nyqNumberArms);
-  mTotalCGDur = mArcDurCG + (gradDur1 - mG0CG) + outRingDur;
 }
 
 void WPGen::ComputeBaseSpiral(dVector& gradX, dVector& gradY)
@@ -698,63 +691,6 @@ dVector& sdc)
   mKSPComputed = true;
 }
 
-void WPGen::ComputeKSPnSDCForCG(dVector& kspX, dVector& kspY, dVector& sdc)
-{
-  const double cgg = gradMaxSpiral;
-  const double csg = cgg / gradMaxSpiral;
-  int kpts_cg = static_cast<int>(mTotalCGDur / mDwellCG);
-
-  kspX.resize(kpts_cg, 0.0);
-  kspY.resize(kpts_cg, 0.0);
-  sdc.resize(kpts_cg, 0.0);
-
-  double ctg = sqrt(2.0 * mGamma * gradMax / mDelta);
-  double theta, phi = 0., arm2arm, krad = 0., phi0, alpha;
-
-  for (int i = 0; i < kpts_cg; i++) {
-    double t = static_cast<double>(i) * mDwellCG;
-
-    // ARC
-    if (t < mArcDurCG) {
-      theta = mCtaCG * t * t;
-      krad = mDelta * sqrt(2.0 * (1.0 - cos(theta)));
-      phi = atan2(1.0 - cos(theta), sin(theta)) + 1.0 - 0.5 * M_PI;
-      arm2arm = sin(theta);
-      sdc[i] = (t / mArcDurCG) * arm2arm;
-    } else {
-      t = t - mArcDurCG + mG0CG;
-
-      // GRAD
-      if (mAddOuterRing) {
-        if (t < mTotalCGDur) {
-          sdc[i] = 1.0;
-          theta = ctg * sqrt(t);
-          krad = mDelta * sqrt(theta * theta + 1.0);
-          phi = theta - acos(mDelta / krad);
-        } else {
-          // RING
-          phi0 = ctg * sqrt(outRingDur1);
-          if (t < outRingDur1) {
-            alpha = 0.5 * M_PI * (outRingDur1 - t) / outRingDur;
-            sdc[i] = csg * sin(alpha); // Sin() is ad-hoc for inter-arm distance
-            theta = thetaPrimeRing * (t - gradDur1);
-            krad = sqrt(rcLim * rcLim + mDelta * mDelta + 2.0 * rcLim * mDelta * sin(theta));
-            phi = phi0 - acos((rcLim * sin(theta) + mDelta) / krad);
-          }
-        }
-      } else {
-        sdc[i] = 1.0;
-        theta = ctg * sqrt(t);
-        krad = mDelta * sqrt(theta * theta + 1.0);
-        phi = theta - acos(mDelta / krad);
-      }
-    }
-
-    kspX[i] = krad * cos(phi) * mGridRes * mRes * coordsScaleFactor;
-    kspY[i] = krad * sin(phi) * mGridRes * mRes * coordsScaleFactor;
-  }
-}
-
 void WPGen::ComputeTimeMap(std::vector<dVector > & timeMap)
 {
   //////////////////////////////////////

gpi_core/spiral/cpp/WPGen.hpp

@@ -45,14 +45,10 @@ class DLL_PUBLIC WPGen {
 
     ~WPGen(); // Destructor
 
-    //void ComputeGradients(dVector& gradX, dVector& gradY);
-
     void ComputeBaseSpiral(dVector& gradX, dVector& gradY);
     void ComputeRampDown(dVector& rampX, dVector& rampY);
     bool ComputeM0M1Trapezoids(dVector& m0m1X, dVector& m0m1Y);
     void ComputeKSPnSDC(dVector& kspX,   dVector& kspY, dVector& sdc);
-    void ComputeKSPnSDCForCG(dVector& kspX, dVector& kspY, dVector& sdc);
-
     void ComputeTimeMap(std::vector<dVector >& timeMap);
 
     // Getter methods