changed 'qbroad_new' to 'qbroad_seperable'

Author: Rob

src/tests/TestPDFCalculator.hpp

@@ -55,18 +55,18 @@ class TestPDFCalculator : public CxxTest::TestSuite
             TS_ASSERT_EQUALS(0.0, jpw0->getDoubleAttr("delta1"));
             TS_ASSERT_EQUALS(0.0, jpw0->getDoubleAttr("delta2"));
             TS_ASSERT_EQUALS(0.0, jpw0->getDoubleAttr("qbroad"));
-            TS_ASSERT_EQUALS(0.0, jpw0->getDoubleAttr("qbroad_new"));
+            TS_ASSERT_EQUALS(0.0, jpw0->getDoubleAttr("qbroad_seperable"));
             JeongPeakWidth jpw;
             jpw.setDelta1(1.0);
             jpw.setDelta2(2.0);
             jpw.setQbroad(3.0);
-            jpw.setQbroad_new(4.0);
+            jpw.setQbroad_seperable(4.0);
             mpdfc->setPeakWidthModel(jpw.clone());
             const PeakWidthModelPtr& jpw1 = mpdfc->getPeakWidthModel();
             TS_ASSERT_EQUALS(1.0, jpw1->getDoubleAttr("delta1"));
             TS_ASSERT_EQUALS(2.0, jpw1->getDoubleAttr("delta2"));
             TS_ASSERT_EQUALS(3.0, jpw1->getDoubleAttr("qbroad"));
-            TS_ASSERT_EQUALS(4.0, jpw1->getDoubleAttr("qbroad_new"));
+            TS_ASSERT_EQUALS(4.0, jpw1->getDoubleAttr("qbroad_seperable"));
         }
 
 

src/tests/TestPeakWidthModel.hpp

@@ -88,11 +88,11 @@ class TestPeakWidthModel : public CxxTest::TestSuite
             mcjepw->setDelta1(0.1);
             mcjepw->setDelta2(0.2);
             mcjepw->setQbroad(0.3);
-            mcjepw->setQbroad_new(0.4);
+            mcjepw->setQbroad_seperable(0.4);
             TS_ASSERT_EQUALS(0.1, mjepw->getDoubleAttr("delta1"));
             TS_ASSERT_EQUALS(0.2, mjepw->getDoubleAttr("delta2"));
             TS_ASSERT_EQUALS(0.3, mjepw->getDoubleAttr("qbroad"));
-            TS_ASSERT_EQUALS(0.4, mjepw->getDoubleAttr("qbroad_new"));
+            TS_ASSERT_EQUALS(0.4, mjepw->getDoubleAttr("qbroad_seperable"));
         }
 
 
@@ -110,7 +110,7 @@ class TestPeakWidthModel : public CxxTest::TestSuite
             TS_ASSERT_DELTA(0.5 * w, mjepw->calculate(*bnds), meps);
             mcjepw->setDelta2(0);
             mcjepw->setQbroad(sqrt(3));
-            mcjepw->setQbroad_new(0);
+            mcjepw->setQbroad_seperable(0);
             TS_ASSERT_DELTA(2 * w, mjepw->calculate(*bnds), meps);
         }
 
@@ -124,14 +124,14 @@ class TestPeakWidthModel : public CxxTest::TestSuite
             mcjepw->setDelta1(1.1);
             mcjepw->setDoubleAttr("delta2", 2.2);
             mcjepw->setDoubleAttr("qbroad", 0.03);
-            mcjepw->setDoubleAttr("qbroad_new", 0.003);
+            mcjepw->setDoubleAttr("qbroad_seperable", 0.003);
             PeakWidthModelPtr pwm2 = dumpandload(mjepw);
             JeongPeakWidth* cpwm2 = dynamic_cast<JeongPeakWidth*>(pwm2.get());
             TS_ASSERT(cpwm2);
             TS_ASSERT_EQUALS(1.1, pwm2->getDoubleAttr("delta1"));
             TS_ASSERT_EQUALS(2.2, pwm2->getDoubleAttr("delta2"));
             TS_ASSERT_EQUALS(0.03, pwm2->getDoubleAttr("qbroad"));
-            TS_ASSERT_EQUALS(0.003, pwm2->getDoubleAttr("qbroad_new"));
+            TS_ASSERT_EQUALS(0.003, pwm2->getDoubleAttr("qbroad_seperable"));
         }