Re #11105. Added one more unit test.

mantidproject · Mar 11, 2015 · e330b17 · e330b17
1 parent 5bc2a27
commit e330b17
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/Code/Mantid/Framework/CurveFitting/src/EstimatePeakErrors.cpp b/Code/Mantid/Framework/CurveFitting/src/EstimatePeakErrors.cpp
@@ -122,14 +122,21 @@ void EstimatePeakErrors::init() {
 void EstimatePeakErrors::exec() {
 
   IFunction_sptr function = getProperty("Function");
-  auto matrix = function->getCovarianceMatrix();
 
   ITableWorkspace_sptr results =
       WorkspaceFactory::Instance().createTable("TableWorkspace");
   results->addColumn("str", "Parameter");
   results->addColumn("double", "Value");
   results->addColumn("double", "Error");
 
+  auto matrix = function->getCovarianceMatrix();
+  if ( !matrix )
+  {
+    g_log.warning() << "Function dosn't have covariance matrix." << std::endl;
+    setProperty("OutputWorkspace", results);
+    return;
+  }
+
   IPeakFunction *peak = dynamic_cast<IPeakFunction *>(function.get());
 
   if (peak) {

diff --git a/Code/Mantid/Framework/CurveFitting/test/EstimatePeakErrorsTest.h b/Code/Mantid/Framework/CurveFitting/test/EstimatePeakErrorsTest.h
@@ -101,6 +101,23 @@ class EstimatePeakErrorsTest : public CxxTest::TestSuite
     AnalysisDataService::Instance().clear();
   }
 
+  void test_on_Gaussian_unfitted()
+  {
+    auto fun = FunctionFactory::Instance().createInitialized("name=Gaussian,PeakCentre=0,Height=1,Sigma=2");
+
+    EstimatePeakErrors alg;
+    alg.initialize();
+    alg.setProperty("Function",fun);
+    alg.setPropertyValue("OutputWorkspace","Errors");
+    alg.execute();
+
+    auto res = AnalysisDataService::Instance().retrieveWS<ITableWorkspace>("Errors");
+    TS_ASSERT_EQUALS( res->rowCount(), 0 );
+
+    AnalysisDataService::Instance().clear();
+  }
+
+
   void test_on_Lorentzians()
   {
     std::string funStr = "name=Lorentzian,Amplitude=10,PeakCentre=-4,FWHM=2;"