From 6bfb9413035ec1176e44101f6373f7707313b71d Mon Sep 17 00:00:00 2001
From: Dan Nixon <dan@dan-nixon.com>
Date: Thu, 16 Apr 2015 16:11:39 +0100
Subject: [PATCH] Default to a higher MaxIteration limit for FABADA
Refs #11561
---
.../MantidQt/CustomInterfaces/src/Indirect/ConvFit.cpp | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/ConvFit.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/ConvFit.cpp
index 58a4a42d922..cc09cc7e3de 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/ConvFit.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/ConvFit.cpp
@@ -763,12 +763,12 @@ namespace IDA
QString ConvFit::minimizerString(QString outputName) const
{
QString minimizer = "Levenberg-Marquardt";
+
if(m_blnManager->value(m_properties["UseFABADA"]))
{
minimizer = "FABADA";
int chainLength = static_cast<int>(m_dblManager->value(m_properties["FABADAChainLength"]));
-
minimizer += ",ChainLength=" + QString::number(chainLength);
minimizer += ",PDF=" + outputName + "_PDF";
@@ -1221,11 +1221,16 @@ namespace IDA
{
if(checked)
{
+ // FABADA needs a much higher iteration limit
+ m_dblManager->setValue(m_properties["MaxIterations"], 20000);
+
m_properties["FABADA"]->addSubProperty(m_properties["OutputFABADAChain"]);
m_properties["FABADA"]->addSubProperty(m_properties["FABADAChainLength"]);
}
else
{
+ m_dblManager->setValue(m_properties["MaxIterations"], 500);
+
m_properties["FABADA"]->removeSubProperty(m_properties["OutputFABADAChain"]);
m_properties["FABADA"]->removeSubProperty(m_properties["FABADAChainLength"]);
}
--
GitLab