Skip to content
Snippets Groups Projects
Commit bd61c0ff authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

..

parent 150f4b62
No related branches found
No related tags found
1 merge request!1631sort data examples; split file import 1/2 D; other minor cleanup
...@@ -144,21 +144,16 @@ void MinimizerAdapter::setParameter(unsigned int index, const mumufit::Parameter ...@@ -144,21 +144,16 @@ void MinimizerAdapter::setParameter(unsigned int index, const mumufit::Parameter
if (par.limits().isFixed()) if (par.limits().isFixed())
success = rootMinimizer()->SetFixedVariable(index, par.name().c_str(), par.value()); success = rootMinimizer()->SetFixedVariable(index, par.name().c_str(), par.value());
else if (par.limits().isLimited()) { else if (par.limits().isLimited())
success = rootMinimizer()->SetLimitedVariable(index, par.name().c_str(), par.value(), success = rootMinimizer()->SetLimitedVariable(index, par.name().c_str(), par.value(),
par.step(), par.limits().lowerLimit(), par.step(), par.limits().lowerLimit(),
par.limits().upperLimit()); par.limits().upperLimit());
} else if (par.limits().isLowerLimited())
else if (par.limits().isLowerLimited()) {
success = rootMinimizer()->SetLowerLimitedVariable(index, par.name().c_str(), par.value(), success = rootMinimizer()->SetLowerLimitedVariable(index, par.name().c_str(), par.value(),
par.step(), par.limits().lowerLimit()); par.step(), par.limits().lowerLimit());
} else if (par.limits().isUpperLimited())
else if (par.limits().isUpperLimited()) {
success = rootMinimizer()->SetUpperLimitedVariable(index, par.name().c_str(), par.value(), success = rootMinimizer()->SetUpperLimitedVariable(index, par.name().c_str(), par.value(),
par.step(), par.limits().upperLimit()); par.step(), par.limits().upperLimit());
}
else if (par.limits().isLimitless()) else if (par.limits().isLimitless())
success = rootMinimizer()->SetVariable(index, par.name().c_str(), par.value(), par.step()); success = rootMinimizer()->SetVariable(index, par.name().c_str(), par.value(), par.step());
...@@ -198,9 +193,8 @@ std::vector<double> MinimizerAdapter::parErrorsAtMinimum() const ...@@ -198,9 +193,8 @@ std::vector<double> MinimizerAdapter::parErrorsAtMinimum() const
{ {
std::vector<double> result; std::vector<double> result;
result.resize(fitRank(), 0.0); result.resize(fitRank(), 0.0);
if (rootMinimizer()->Errors() != nullptr) { if (rootMinimizer()->Errors() != nullptr)
std::copy(rootMinimizer()->Errors(), rootMinimizer()->Errors() + fitRank(), result.begin()); std::copy(rootMinimizer()->Errors(), rootMinimizer()->Errors() + fitRank(), result.begin());
}
return result; return result;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment