changed 'qbroad_new' to 'qbroad_seperable'

Author: Rob

src/diffpy/srreal/JeongPeakWidth.cpp

@@ -30,16 +30,16 @@ using namespace std;
 // Constructors --------------------------------------------------------------
 
 JeongPeakWidth::JeongPeakWidth() :
-    mdelta1(0.0), mdelta2(0.0), mqbroad(0.0), mqbroad_new(0.0)
+    mdelta1(0.0), mdelta2(0.0), mqbroad(0.0), mqbroad_seperable(0.0)
 {
     this->registerDoubleAttribute("delta1",
             this, &JeongPeakWidth::getDelta1, &JeongPeakWidth::setDelta1);
     this->registerDoubleAttribute("delta2",
             this, &JeongPeakWidth::getDelta2, &JeongPeakWidth::setDelta2);
     this->registerDoubleAttribute("qbroad",
             this, &JeongPeakWidth::getQbroad, &JeongPeakWidth::setQbroad);
-    this->registerDoubleAttribute("qbroad_new",
-            this, &JeongPeakWidth::getQbroad_new, &JeongPeakWidth::setQbroad_new);
+    this->registerDoubleAttribute("qbroad_seperable",
+            this, &JeongPeakWidth::getQbroad_seperable, &JeongPeakWidth::setQbroad_seperable);
 }
 
 
@@ -72,7 +72,7 @@ double JeongPeakWidth::calculate(const BaseBondGenerator& bnds) const
     // avoid calculating square root of negative value
     double fwhm = (corr <= 0) ? 0.0 :
         (sqrt(corr) * this->DebyeWallerPeakWidth::calculate(bnds) +
-        pow(this->getQbroad_new()*r, 2));
+        pow(this->getQbroad_seperable()*r, 2));
     return fwhm;
 }
 
@@ -85,7 +85,7 @@ double JeongPeakWidth::maxWidth(StructureAdapterPtr stru,
             this->msdSharpeningRatio(rmin),
             this->msdSharpeningRatio(rmax));
     // if the sharpening factor is larger than 1 adjust the maximum width
-    double rv = maxwidth0 * sqrt(max(1.0, maxmsdsharp))+ pow(this->getQbroad_new()*rmax, 2);
+    double rv = maxwidth0 * sqrt(max(1.0, maxmsdsharp))+ pow(this->getQbroad_seperable()*rmax, 2);
     return rv;
 }
 
@@ -121,16 +121,16 @@ const double& JeongPeakWidth::getQbroad() const
 }
 
 
-const double& JeongPeakWidth::getQbroad_new() const
+const double& JeongPeakWidth::getQbroad_seperable() const
 {
-    return mqbroad_new;
+    return mqbroad_seperable;
 }
 
 
-void JeongPeakWidth::setQbroad_new(double qbroad_new)
+void JeongPeakWidth::setQbroad_seperable(double qbroad_seperable)
 {
-    if (mqbroad_new != qbroad_new)  mticker.click();
-    mqbroad_new = qbroad_new;
+    if (mqbroad_seperable != qbroad_seperable)  mticker.click();
+    mqbroad_seperable = qbroad_seperable;
 }
 
 

src/diffpy/srreal/JeongPeakWidth.hpp

@@ -49,16 +49,16 @@ class JeongPeakWidth : public DebyeWallerPeakWidth
         void setDelta2(double);
         const double& getQbroad() const;
         void setQbroad(double);
-        const double& getQbroad_new() const;
-        void setQbroad_new(double);
+        const double& getQbroad_seperable() const;
+        void setQbroad_seperable(double);
 
     private:
 
         // data
         double mdelta1;
         double mdelta2;
         double mqbroad;
-        double mqbroad_new;
+        double mqbroad_seperable;
 
         // methods
         double msdSharpeningRatio(const double& r) const;
@@ -74,7 +74,7 @@ class JeongPeakWidth : public DebyeWallerPeakWidth
             ar & mdelta1;
             ar & mdelta2;
             ar & mqbroad;
-            ar & mqbroad_new;
+            ar & mqbroad_seperable;
         }
 
 };