Refs #11006. Fixing tests

mantidproject · Mar 2, 2015 · e42a974 · e42a974
1 parent 100abb4
commit e42a974
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 15 deletions.
diff --git a/Code/Mantid/Framework/Geometry/src/Crystal/PointGroupFactory.cpp b/Code/Mantid/Framework/Geometry/src/Crystal/PointGroupFactory.cpp
@@ -189,12 +189,12 @@ DECLARE_POINTGROUP("4/mmm", "-y,x,z; x,y,-z; x,-y,-z", "Tetragonal")
 
 DECLARE_POINTGROUP("3 h", "-y,x-y,z", "Trigonal - Hexagonal")
 DECLARE_POINTGROUP("-3 h", "y,y-x,-z", "Trigonal - Hexagonal")
-DECLARE_POINTGROUP("321 h", "-y,x-y,z; x-y,-y,-z", "Trigonal - Hexagonal")
-DECLARE_POINTGROUP("312 h", "-y,x-y,z; x,x-y,-z", "Trigonal - Hexagonal")
-DECLARE_POINTGROUP("3m1 h", "-y,x-y,z; y-x,y,z", "Trigonal - Hexagonal")
-DECLARE_POINTGROUP("31m h", "-y,x-y,z; -x,y-x,z", "Trigonal - Hexagonal")
-DECLARE_POINTGROUP("-3m1 h", "y,y-x,-z; x-y,-y,-z", "Trigonal - Hexagonal")
-DECLARE_POINTGROUP("-31m h", "y,y-x,-z; x,x-y,-z", "Trigonal - Hexagonal")
+DECLARE_POINTGROUP("321", "-y,x-y,z; x-y,-y,-z", "Trigonal - Hexagonal")
+DECLARE_POINTGROUP("312", "-y,x-y,z; x,x-y,-z", "Trigonal - Hexagonal")
+DECLARE_POINTGROUP("3m1", "-y,x-y,z; y-x,y,z", "Trigonal - Hexagonal")
+DECLARE_POINTGROUP("31m", "-y,x-y,z; -x,y-x,z", "Trigonal - Hexagonal")
+DECLARE_POINTGROUP("-3m1", "y,y-x,-z; x-y,-y,-z", "Trigonal - Hexagonal")
+DECLARE_POINTGROUP("-31m", "y,y-x,-z; x,x-y,-z", "Trigonal - Hexagonal")
 
 DECLARE_POINTGROUP("3", "z,x,y", "Trigonal - Rhombohedral")
 DECLARE_POINTGROUP("-3", "-z,-x,-y", "Trigonal - Rhombohedral")

diff --git a/Code/Mantid/Framework/Geometry/test/PointGroupTest.h b/Code/Mantid/Framework/Geometry/test/PointGroupTest.h
@@ -20,7 +20,6 @@ using namespace Mantid::Geometry;
 class PointGroupTest : public CxxTest::TestSuite
 {
 public:
-
     void check_point_group(std::string name, V3D hkl, size_t numEquiv, V3D * equiv)
     {
         PointGroup_sptr testedPointGroup = PointGroupFactory::Instance().createPointGroup(name);
@@ -66,13 +65,13 @@ class PointGroupTest : public CxxTest::TestSuite
     { V3D equiv[] = {V3D(1,2,3),V3D(-2,1-2,3), V3D(-1+2,-1,3), V3D(-1,-2,-3), V3D(2,-1+2,-3), V3D(1-2,1,-3)};
     check_point_group("-3 h", V3D(1,2,3), 6, equiv); }
     { V3D equiv[] = {V3D(7,2,3),V3D(-2,7-2,3),V3D(-7+2,-7,3),V3D(2,7,-3),V3D(7-2,-2,-3),V3D(-7,-7+2,-3),V3D(-7,-2,-3),V3D(2,-7+2,-3),V3D(7-2,7,-3),V3D(-2,-7,3),V3D(-7+2,2,3),V3D(7,7-2,3)};
-    check_point_group("-3m1 h", V3D(7,2,3), 12, equiv); }
+    check_point_group("-3m1", V3D(7,2,3), 12, equiv); }
     { V3D equiv[] = {
         V3D(7,2,3),V3D(-2,7-2,3),V3D(-7+2,-7,3),
         V3D(-2,-7,-3),V3D(-7+2,2,-3),V3D(7,7-2,-3),
         V3D(-7,-2,-3),V3D(2,-7+2,-3),V3D(7-2,7,-3),
         V3D(2,7,3),V3D(7-2,-2,3),V3D(-7,-7+2,3)};
-    check_point_group("-31m h", V3D(7,2,3), 12, equiv); }
+    check_point_group("-31m", V3D(7,2,3), 12, equiv); }
     { V3D equiv[] = {V3D(7,2,3),V3D(-2,7-2,3),V3D(-7+2,-7,3),V3D(-7,-2,3),V3D(2,-7+2,3),V3D(7-2,7,3),V3D(-7,-2,-3),V3D(2,-7+2,-3),V3D(7-2,7,-3),V3D(7,2,-3),V3D(-2,7-2,-3),V3D(-7+2,-7,-3)};
     check_point_group("6/m", V3D(7,2,3), 12, equiv); }
     { V3D equiv[] = {V3D(7,2,3),V3D(-2,7-2,3),V3D(-7+2,-7,3),V3D(-7,-2,3),V3D(2,-7+2,3),V3D(7-2,7,3),V3D(2,7,-3),V3D(7-2,-2,-3),V3D(-7,-7+2,-3),V3D(-2,-7,-3),V3D(-7+2,2,-3),V3D(7,7-2,-3),V3D(-7,-2,-3),V3D(2,-7+2,-3),V3D(7-2,7,-3),V3D(7,2,-3),V3D(-2,7-2,-3),V3D(-7+2,-7,-3),V3D(-2,-7,3),V3D(-7+2,2,3),V3D(7,7-2,3),V3D(2,7,3),V3D(7-2,-2,3),V3D(-7,-7+2,3)};
@@ -135,12 +134,12 @@ class PointGroupTest : public CxxTest::TestSuite
 
       crystalSystemsMap["3 h"] = PointGroup::Trigonal;
       crystalSystemsMap["-3 h"] = PointGroup::Trigonal;
-      crystalSystemsMap["321 h"] = PointGroup::Trigonal;
-      crystalSystemsMap["312 h"] = PointGroup::Trigonal;
-      crystalSystemsMap["3m1 h"] = PointGroup::Trigonal;
-      crystalSystemsMap["31m h"] = PointGroup::Trigonal;
-      crystalSystemsMap["-3m1 h"] = PointGroup::Trigonal;
-      crystalSystemsMap["-31m h"] = PointGroup::Trigonal;
+      crystalSystemsMap["321"] = PointGroup::Trigonal;
+      crystalSystemsMap["312"] = PointGroup::Trigonal;
+      crystalSystemsMap["3m1"] = PointGroup::Trigonal;
+      crystalSystemsMap["31m"] = PointGroup::Trigonal;
+      crystalSystemsMap["-3m1"] = PointGroup::Trigonal;
+      crystalSystemsMap["-31m"] = PointGroup::Trigonal;
       crystalSystemsMap["3"] = PointGroup::Trigonal;
       crystalSystemsMap["-3"] = PointGroup::Trigonal;
       crystalSystemsMap["32"] = PointGroup::Trigonal;