Re #5808. This should fix the bug.

mantidproject · Aug 28, 2012 · 70836f0 · 70836f0
1 parent 504579c
commit 70836f0
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/Code/Mantid/Framework/API/src/MultiDomainFunction.cpp b/Code/Mantid/Framework/API/src/MultiDomainFunction.cpp
@@ -109,7 +109,7 @@ namespace API
     }
     const CompositeDomain& cd = dynamic_cast<const CompositeDomain&>(domain);
     // domain must not have less parts than m_maxIndex
-    if (cd.getNParts() < m_maxIndex)
+    if (cd.getNParts() <= m_maxIndex)
     {
       throw std::invalid_argument("CompositeDomain has too few parts (" 
         + boost::lexical_cast<std::string>(cd.getNParts()) +

diff --git a/Code/Mantid/Framework/API/test/MultiDomainFunctionTest.h b/Code/Mantid/Framework/API/test/MultiDomainFunctionTest.h
@@ -195,6 +195,20 @@ class MultiDomainFunctionTest : public CxxTest::TestSuite
 
   }
 
+  void test_set_wrong_index()
+  {
+    multi.setDomainIndices(1,std::vector<size_t>());
+    multi.setDomainIndices(2,std::vector<size_t>());
+
+    FunctionValues values(domain);
+
+    multi.setDomainIndex(0,3);
+    TS_ASSERT_THROWS( multi.function(domain,values), std::invalid_argument );
+
+    multi.setDomainIndex(0,4);
+    TS_ASSERT_THROWS( multi.function(domain,values), std::invalid_argument );
+  }
+
   void test_calc()
   {
     multi.setDomainIndex(0,0);