Skip to content
Snippets Groups Projects
Commit 31b3212c authored by Xavier ELATTAOUI's avatar Xavier ELATTAOUI
Browse files

TANGODEVIC-1953: lib and device ok

parents 1cab97cb e4c072f1
No related branches found
No related tags found
No related merge requests found
autogen.sh 100755 → 100644
File mode changed from 100755 to 100644
pom.xml 100755 → 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
......@@ -652,9 +652,6 @@ namespace DataFitter_ns
// extract NaN data (TANGODEVIC-964)
std::size_t nb_data = new_data->experimental_data_x.size();
//- TANGODEVIC-1953 TODO : ajouter numéro ticket et vérifier std::max!!
const double Y_CONSTANT = 1.E07;
// std::vector<double> tmp_data_y;
for(std::size_t idx=0; idx < nb_data; idx++)
{
if ( std::isnan(new_data->experimental_data_x.at(idx)) || std::isnan(new_data->experimental_data_y.at(idx)) )
......@@ -663,10 +660,6 @@ namespace DataFitter_ns
new_data->experimental_data_y.erase(new_data->experimental_data_y.begin()+idx);
new_data->experimental_data_sigma.erase(new_data->experimental_data_sigma.begin()+idx);
}
//- TANGODEVIC-1953
new_data->experimental_data_y[idx] = new_data->experimental_data_y[idx] * Y_CONSTANT;
// tmp_data_y.push_back(new_data->experimental_data_y[idx] * Y_CONSTANT);
}
// do the fit and fill new Data instance
......@@ -691,7 +684,6 @@ namespace DataFitter_ns
gsldata_y.stride = 1;
// Set the position of the data to fit at the first element of the ROI
gsldata_y.data = &(new_data->experimental_data_y.at(oROI_FirstIdx));
// gsldata_y.data = &(tmp_data_y.at(oROI_FirstIdx));
gsldata_y.block = NULL;
gsldata_y.owner = 0;
......@@ -858,13 +850,6 @@ namespace DataFitter_ns
new_data->fitted_data_y.resize(fitted_data_size);
new_data->derivative_fitted_data_y.resize(fitted_data_size);
//- TODO Ticket TANGODEVIC-1953 : faut-il le faire pour new_data->derivative_fitted_data_y ?
for(std::size_t idx=0; idx<fitted_data_size; idx++)
{
new_data->fitted_data_y[idx] = new_data->fitted_data_y[idx] / Y_CONSTANT;
new_data->derivative_fitted_data_y[idx] = new_data->derivative_fitted_data_y[idx] / Y_CONSTANT;
}
gsl_vector gsldata_fittedx;
gsldata_fittedx.size = fitted_data_size;
gsldata_fittedx.stride = 1;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment