Skip to content
Snippets Groups Projects
Commit 59a2136f authored by Dan Nixon's avatar Dan Nixon
Browse files

Add the options to the UIs 

Re #12736
parent fe4be80e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/ConvFit.cpp
+ 15
− 0
View file @ 59a2136f
...@@ -91,6 +91,10 @@ namespace IDA ...@@ -91,6 +91,10 @@ namespace IDA
m_properties["FABADAChainLength"] = m_dblManager->addProperty("Chain Length"); m_properties["FABADAChainLength"] = m_dblManager->addProperty("Chain Length");
m_dblManager->setDecimals(m_properties["FABADAChainLength"], 0); m_dblManager->setDecimals(m_properties["FABADAChainLength"], 0);
m_dblManager->setValue(m_properties["FABADAChainLength"], 10000); m_dblManager->setValue(m_properties["FABADAChainLength"], 10000);
m_properties["FABADAConvergenceCriteria"] = m_dblManager->addProperty("Convergence Criteria");
m_dblManager->setValue(m_properties["FABADAConvergenceCriteria"], 0.1);
m_properties["FABADAJumpAcceptanceRate"] = m_dblManager->addProperty("Acceptance Rate");
m_dblManager->setValue(m_properties["FABADAJumpAcceptanceRate"], 0.25);
m_cfTree->addProperty(m_properties["FABADA"]); m_cfTree->addProperty(m_properties["FABADA"]);
// Background type // Background type
...@@ -843,6 +847,13 @@ namespace IDA ...@@ -843,6 +847,13 @@ namespace IDA
int chainLength = static_cast<int>(m_dblManager->value(m_properties["FABADAChainLength"])); int chainLength = static_cast<int>(m_dblManager->value(m_properties["FABADAChainLength"]));
minimizer += ",ChainLength=" + QString::number(chainLength); minimizer += ",ChainLength=" + QString::number(chainLength);
double convergenceCriteria = m_dblManager->value(m_properties["FABADAConvergenceCriteria"]);
minimizer += ",ConvergenceCriteria=" + QString::number(convergenceCriteria);
double jumpAcceptanceRate = m_dblManager->value(m_properties["FABADAJumpAcceptanceRate"]);
minimizer += ",JumpAcceptanceRate=" + QString::number(jumpAcceptanceRate);
minimizer += ",PDF=" + outputName + "_PDF"; minimizer += ",PDF=" + outputName + "_PDF";
if(m_blnManager->value(m_properties["OutputFABADAChain"])) if(m_blnManager->value(m_properties["OutputFABADAChain"]))
...@@ -1314,6 +1325,8 @@ namespace IDA ...@@ -1314,6 +1325,8 @@ namespace IDA
m_properties["FABADA"]->addSubProperty(m_properties["OutputFABADAChain"]); m_properties["FABADA"]->addSubProperty(m_properties["OutputFABADAChain"]);
m_properties["FABADA"]->addSubProperty(m_properties["FABADAChainLength"]); m_properties["FABADA"]->addSubProperty(m_properties["FABADAChainLength"]);
m_properties["FABADA"]->addSubProperty(m_properties["FABADAConvergenceCriteria"]);
m_properties["FABADA"]->addSubProperty(m_properties["FABADAJumpAcceptanceRate"]);
} }
else else
{ {
...@@ -1321,6 +1334,8 @@ namespace IDA ...@@ -1321,6 +1334,8 @@ namespace IDA
m_properties["FABADA"]->removeSubProperty(m_properties["OutputFABADAChain"]); m_properties["FABADA"]->removeSubProperty(m_properties["OutputFABADAChain"]);
m_properties["FABADA"]->removeSubProperty(m_properties["FABADAChainLength"]); m_properties["FABADA"]->removeSubProperty(m_properties["FABADAChainLength"]);
m_properties["FABADA"]->removeSubProperty(m_properties["FABADAConvergenceCriteria"]);
m_properties["FABADA"]->removeSubProperty(m_properties["FABADAJumpAcceptanceRate"]);
} }
} }
} }
......
Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IqtFit.cpp
+ 15
− 0
View file @ 59a2136f
...@@ -80,6 +80,10 @@ namespace IDA ...@@ -80,6 +80,10 @@ namespace IDA
m_properties["FABADAChainLength"] = m_dblManager->addProperty("Chain Length"); m_properties["FABADAChainLength"] = m_dblManager->addProperty("Chain Length");
m_dblManager->setDecimals(m_properties["FABADAChainLength"], 0); m_dblManager->setDecimals(m_properties["FABADAChainLength"], 0);
m_dblManager->setValue(m_properties["FABADAChainLength"], 10000); m_dblManager->setValue(m_properties["FABADAChainLength"], 10000);
m_properties["FABADAConvergenceCriteria"] = m_dblManager->addProperty("Convergence Criteria");
m_dblManager->setValue(m_properties["FABADAConvergenceCriteria"], 0.1);
m_properties["FABADAJumpAcceptanceRate"] = m_dblManager->addProperty("Acceptance Rate");
m_dblManager->setValue(m_properties["FABADAJumpAcceptanceRate"], 0.25);
m_ffTree->addProperty(m_properties["FABADA"]); m_ffTree->addProperty(m_properties["FABADA"]);
connect(m_ffRangeManager, SIGNAL(valueChanged(QtProperty*, double)), this, SLOT(propertyChanged(QtProperty*, double))); connect(m_ffRangeManager, SIGNAL(valueChanged(QtProperty*, double)), this, SLOT(propertyChanged(QtProperty*, double)));
...@@ -548,6 +552,8 @@ namespace IDA ...@@ -548,6 +552,8 @@ namespace IDA
m_properties["FABADA"]->addSubProperty(m_properties["OutputFABADAChain"]); m_properties["FABADA"]->addSubProperty(m_properties["OutputFABADAChain"]);
m_properties["FABADA"]->addSubProperty(m_properties["FABADAChainLength"]); m_properties["FABADA"]->addSubProperty(m_properties["FABADAChainLength"]);
m_properties["FABADA"]->addSubProperty(m_properties["FABADAConvergenceCriteria"]);
m_properties["FABADA"]->addSubProperty(m_properties["FABADAJumpAcceptanceRate"]);
} }
else else
{ {
...@@ -555,6 +561,8 @@ namespace IDA ...@@ -555,6 +561,8 @@ namespace IDA
m_properties["FABADA"]->removeSubProperty(m_properties["OutputFABADAChain"]); m_properties["FABADA"]->removeSubProperty(m_properties["OutputFABADAChain"]);
m_properties["FABADA"]->removeSubProperty(m_properties["FABADAChainLength"]); m_properties["FABADA"]->removeSubProperty(m_properties["FABADAChainLength"]);
m_properties["FABADA"]->removeSubProperty(m_properties["FABADAConvergenceCriteria"]);
m_properties["FABADA"]->removeSubProperty(m_properties["FABADAJumpAcceptanceRate"]);
} }
} }
} }
...@@ -611,6 +619,13 @@ namespace IDA ...@@ -611,6 +619,13 @@ namespace IDA
int chainLength = static_cast<int>(m_dblManager->value(m_properties["FABADAChainLength"])); int chainLength = static_cast<int>(m_dblManager->value(m_properties["FABADAChainLength"]));
minimizer += ",ChainLength=" + QString::number(chainLength); minimizer += ",ChainLength=" + QString::number(chainLength);
double convergenceCriteria = m_dblManager->value(m_properties["FABADAConvergenceCriteria"]);
minimizer += ",ConvergenceCriteria=" + QString::number(convergenceCriteria);
double jumpAcceptanceRate = m_dblManager->value(m_properties["FABADAJumpAcceptanceRate"]);
minimizer += ",JumpAcceptanceRate=" + QString::number(jumpAcceptanceRate);
minimizer += ",PDF=" + outputName + "_PDF"; minimizer += ",PDF=" + outputName + "_PDF";
if(m_blnManager->value(m_properties["OutputFABADAChain"])) if(m_blnManager->value(m_properties["OutputFABADAChain"]))
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment