Changed phase angle range as required by re #5542

Signed-off-by: Karl Palmen <karl.palmen@stfc.ac.uk>
mantidproject · Jul 6, 2012 · b65765e · b65765e
1 parent 9461ead
commit b65765e
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 12 deletions.
diff --git a/Code/Mantid/Framework/CurveFitting/src/Abragam.cpp b/Code/Mantid/Framework/CurveFitting/src/Abragam.cpp
@@ -57,10 +57,11 @@ void Abragam::setActiveParameter(size_t i,double value)
     setParameter(j,fabs(value),false);  // Make sigma positive
   else if (parameterName(j) == "Phi")
   {
-    double a = fmod(value, 2*M_PI); // Put angle in range of 0 to 360 degrees
-    if( a<0 ) a += 2*M_PI; 
-    setParameter(j,a,false);
-  }
+    // Put angle in range of (-180 to 180] degrees
+    double a = fmod(value, 2*M_PI); 
+    if( a<=-M_PI ) a += 2*M_PI; 
+    if( a>M_PI ) a-= 2*M_PI;
+    setParameter(j,a,false);  }
   else
     setParameter(j,value,false);
 }

diff --git a/Code/Mantid/Framework/CurveFitting/src/ExpDecayOsc.cpp b/Code/Mantid/Framework/CurveFitting/src/ExpDecayOsc.cpp
@@ -62,9 +62,11 @@ void ExpDecayOsc::setActiveParameter(size_t i,double value)
   size_t j = i;
 
   if (parameterName(j) == "Phi")
-  {
-    double a = fmod(value, 2*M_PI); // Put angle in range of 0 to 360 degrees
-    if( a<0 ) a += 2*M_PI; 
+  { 
+    // Put angle in range of (-180 to 180] degrees
+    double a = fmod(value, 2*M_PI); 
+    if( a<=-M_PI ) a += 2*M_PI; 
+    if( a>M_PI ) a-= 2*M_PI;
     setParameter(j,a,false);
   }
   else

diff --git a/Code/Mantid/Framework/CurveFitting/src/GausOsc.cpp b/Code/Mantid/Framework/CurveFitting/src/GausOsc.cpp
@@ -66,10 +66,11 @@ void GausOsc::setActiveParameter(size_t i,double value)
     setParameter(j,fabs(value),false);  // Make sigma positive
   else if (parameterName(j) == "Phi")
   {
-    double a = fmod(value, 2*M_PI); // Put angle in range of 0 to 360 degrees
-    if( a<0 ) a += 2*M_PI; 
-    setParameter(j,a,false);
-  }
+    // Put angle in range of (-180 to 180] degrees
+    double a = fmod(value, 2*M_PI); 
+    if( a<=-M_PI ) a += 2*M_PI; 
+    if( a>M_PI ) a-= 2*M_PI;
+    setParameter(j,a,false);  }
   else
     setParameter(j,value,false);
 }

diff --git a/Code/Mantid/Framework/CurveFitting/test/GausOscTest.h b/Code/Mantid/Framework/CurveFitting/test/GausOscTest.h
@@ -113,7 +113,7 @@ class GausOscTest : public CxxTest::TestSuite
     TS_ASSERT_DELTA( out->getParameter("A"), 128.7 ,0.9);
     TS_ASSERT_DELTA( out->getParameter("Sigma"), 0.35 ,0.005);
     TS_ASSERT_DELTA( out->getParameter("Frequency"), 1/8.0 ,0.01);  // Period of 8
-    TS_ASSERT_DELTA( out->getParameter("Phi"), 3.1415926536/4.0 ,0.01);  // 360 + 45 degrees
+    TS_ASSERT_DELTA( out->getParameter("Phi"), 3.1415926536/4.0 ,0.01);  //  45 degrees
 
     // check its categories
     const std::vector<std::string> categories = out->categories();