Check angles in UnitCell. Refs #4708

mantidproject · Feb 1, 2012 · c34b644 · c34b644
1 parent a3f21a4
commit c34b644
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/Code/Mantid/Framework/Geometry/src/Crystal/UnitCell.cpp b/Code/Mantid/Framework/Geometry/src/Crystal/UnitCell.cpp
@@ -438,10 +438,14 @@ namespace Geometry
   /// Private function, called at initialization or whenever lattice parameters are changed
   void UnitCell::recalculate()
   {
-      calculateG();
-      calculateGstar();
-      calculateReciprocalLattice();
-      calculateB();
+    if ((da[3]>da[4]+da[5])||(da[4]>da[3]+da[5])||(da[5]>da[4]+da[3]))
+    {
+      throw std::invalid_argument("Invalid angles");
+    }
+    calculateG();
+    calculateGstar();
+    calculateReciprocalLattice();
+    calculateB();
   }
 
   /// Private function to calculate #G matrix

diff --git a/Code/Mantid/Framework/Geometry/test/UnitCellTest.h b/Code/Mantid/Framework/Geometry/test/UnitCellTest.h
@@ -92,8 +92,7 @@ class UnitCellTest : public CxxTest::TestSuite
 
   }
   void test_UnitCellCrash(){
-      TS_WARN("This throw unhandled exception");
-      //UnitCell US(10.4165,3.4165,10.4165,30,45,80);
+    TS_ASSERT_THROWS(UnitCell(10.4165,3.4165,10.4165,30,45,80);,std::invalid_argument);
   }
 
 };