diff --git a/Fit/Adapter/MinimizerAdapter.cpp b/Fit/Adapter/MinimizerAdapter.cpp index 3eaf32ebda9fc62f4bd10b27a58d5904ee6cf2fe..85ba581a05dc7dd8bdfbad196f0043ecd1d6d7be 100644 --- a/Fit/Adapter/MinimizerAdapter.cpp +++ b/Fit/Adapter/MinimizerAdapter.cpp @@ -144,21 +144,16 @@ void MinimizerAdapter::setParameter(unsigned int index, const mumufit::Parameter if (par.limits().isFixed()) 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(), par.step(), par.limits().lowerLimit(), par.limits().upperLimit()); - } - - else if (par.limits().isLowerLimited()) { + else if (par.limits().isLowerLimited()) success = rootMinimizer()->SetLowerLimitedVariable(index, par.name().c_str(), par.value(), 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(), par.step(), par.limits().upperLimit()); - } else if (par.limits().isLimitless()) success = rootMinimizer()->SetVariable(index, par.name().c_str(), par.value(), par.step()); @@ -198,9 +193,8 @@ std::vector<double> MinimizerAdapter::parErrorsAtMinimum() const { std::vector<double> result; result.resize(fitRank(), 0.0); - if (rootMinimizer()->Errors() != nullptr) { + if (rootMinimizer()->Errors() != nullptr) std::copy(rootMinimizer()->Errors(), rootMinimizer()->Errors() + fitRank(), result.begin()); - } return result; }