Skip to content
Snippets Groups Projects
Commit 6cc2988c authored by Sonia Minolli's avatar Sonia Minolli
Browse files

Added erf function (TANGODEVIC-1843)

Data not reset in case of no fit convergence (TANGODEVIC-1842)
parent 84fd1656
No related branches found
No related tags found
No related merge requests found
...@@ -631,13 +631,12 @@ DataFitterTask::FitStatus DataFitterTask::dofit() ...@@ -631,13 +631,12 @@ DataFitterTask::FitStatus DataFitterTask::dofit()
break; break;
} }
//debut TANGODEVIC-1263 // Add condition to avoid data reset when fit does not converge
if (ret_val.state != Tango::RUNNING) if ((ret_val.state != Tango::RUNNING) && (status != GSL_CONTINUE))
{ {
this->reset_data(); this->reset_data();
return ret_val; return ret_val;
} }
//fin TANGODEVIC-1263
if ( config_.fit_params.auto_guess ) if ( config_.fit_params.auto_guess )
{ {
......
...@@ -62,6 +62,8 @@ struct tango_string ...@@ -62,6 +62,8 @@ struct tango_string
}; };
// initial parameters of the fit // initial parameters of the fit
// Nota: for parameters of the KnifeEdge(x) function: "mu" is associated to "position"
// "sigma" is associated to "width"
struct Params struct Params
{ {
Params() Params()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment