diff --git a/Code/Mantid/Framework/DataObjects/test/PeakShapeEllipsoidFactoryTest.h b/Code/Mantid/Framework/DataObjects/test/PeakShapeEllipsoidFactoryTest.h index 6f47715e5bac4bb8f40b91308438e3b27fd2566c..1a42dc4db3ee91d580b673eb051ce1e5f6b657b7 100644 --- a/Code/Mantid/Framework/DataObjects/test/PeakShapeEllipsoidFactoryTest.h +++ b/Code/Mantid/Framework/DataObjects/test/PeakShapeEllipsoidFactoryTest.h @@ -22,6 +22,7 @@ using namespace Mantid; using namespace Mantid::DataObjects; using namespace Mantid::Kernel; using namespace boost::assign; +using Mantid::Kernel::SpecialCoordinateSystem; class PeakShapeEllipsoidFactoryTest : public CxxTest::TestSuite { public: diff --git a/Code/Mantid/Framework/DataObjects/test/PeakShapeEllipsoidTest.h b/Code/Mantid/Framework/DataObjects/test/PeakShapeEllipsoidTest.h index d22daf414d8127ec3d03dd9fe1ecd9f85801d4f5..d844798a82551f8d9cebfdf09ac6948152d7ce88 100644 --- a/Code/Mantid/Framework/DataObjects/test/PeakShapeEllipsoidTest.h +++ b/Code/Mantid/Framework/DataObjects/test/PeakShapeEllipsoidTest.h @@ -31,7 +31,7 @@ public: const MantidVec abcRadii = list_of(2)(3)(4); const MantidVec abcInnerRadii = list_of(5)(6)(7); const MantidVec abcOuterRadii = list_of(8)(9)(10); - const SpecialCoordinateSystem frame = HKL; + const SpecialCoordinateSystem frame = Mantid::Kernel::HKL; const std::string algorithmName = "foo"; const int algorithmVersion = 3; @@ -59,7 +59,7 @@ public: const MantidVec bad_abcInnerRadii = list_of(5)(6); const MantidVec abcOuterRadii = list_of(8)(9)(10); const MantidVec bad_abcOuterRadii = list_of(8)(9)(10)(11); - const SpecialCoordinateSystem frame = HKL; + const SpecialCoordinateSystem frame = Mantid::Kernel::HKL; TSM_ASSERT_THROWS("Should throw, bad directions", PeakShapeEllipsoid(bad_directions, abcRadii, @@ -86,7 +86,7 @@ public: const MantidVec abcRadii = list_of(2)(3)(4); const MantidVec abcInnerRadii = list_of(5)(6)(7); const MantidVec abcOuterRadii = list_of(8)(9)(10); - const SpecialCoordinateSystem frame = HKL; + const SpecialCoordinateSystem frame = Mantid::Kernel::HKL; const std::string algorithmName = "foo"; const int algorithmVersion = 3; @@ -108,7 +108,7 @@ public: PeakShapeEllipsoid a(list_of(V3D(1, 0, 0))(V3D(0, 1, 0))(V3D(0, 0, 1)) .convert_to_container<std::vector<V3D>>(), list_of(2)(3)(4), list_of(5)(6)(7), list_of(8)(9)(10), - HKL, "foo", 1); + Mantid::Kernel::HKL, "foo", 1); PeakShapeEllipsoid b(list_of(V3D(0, 0, 0))(V3D(0, 1, 0))(V3D(0, 0, 1)) .convert_to_container<std::vector<V3D>>(), @@ -132,7 +132,7 @@ public: PeakShapeEllipsoid shape(list_of(V3D(1, 0, 0))(V3D(0, 1, 0))(V3D(0, 0, 1)) .convert_to_container<std::vector<V3D>>(), list_of(2)(3)(4), list_of(5)(6)(7), - list_of(8)(9)(10), HKL, "foo", 1); + list_of(8)(9)(10), Mantid::Kernel::HKL, "foo", 1); TS_ASSERT_EQUALS("ellipsoid", shape.shapeName()); } @@ -144,7 +144,7 @@ public: const MantidVec abcRadii = list_of(2)(3)(4); const MantidVec abcInnerRadii = list_of(5)(6)(7); const MantidVec abcOuterRadii = list_of(8)(9)(10); - const SpecialCoordinateSystem frame = HKL; + const SpecialCoordinateSystem frame = Mantid::Kernel::HKL; const std::string algorithmName = "foo"; const int algorithmVersion = 3;