Skip to content
Snippets Groups Projects
Commit bb16f758 authored by Stéphane Poirier's avatar Stéphane Poirier
Browse files

bug fixed

parent 8eec932c
No related branches found
No related tags found
No related merge requests found
......@@ -403,25 +403,7 @@ void Spectrometer::read_attr_hardware(vector<long> &attr_list)
{
//DEBUG_STREAM << "Spectrometer::read_attr_hardware(vector<long> &attr_list) entering... "<< endl;
// Add your own code here
if (m_task)
{
//- get data from task
SpectrometerTask::DataReturnValues l_data;
m_task->get_data_return_values(l_data);
m_intensity_buf = l_data.m_intensity_buf;
m_buffer_offset_index = l_data.buffer_offset_index;
if (l_data.intensity != NULL)
{
m_intensity = l_data.intensity;
m_nbPtsIntensity = l_data.intensityPtsNb;
}
if (l_data.lambda != NULL)
{
m_lambda = l_data.lambda;
m_nbPtsLambda = l_data.lambdaPtsNb;
}
}
get_task_values();
}
//+----------------------------------------------------------------------------
//
......@@ -878,7 +860,12 @@ Tango::DevVarDoubleArray *Spectrometer::get_intensity(Tango::DevULong argin)
//------------------------------------------------------------
Tango::DevVarDoubleArray *argout = new Tango::DevVarDoubleArray();
get_task_values();
DEBUG_STREAM << "Spectrometer::get_intensity(): entering... !" << endl;
DEBUG_STREAM << "argin : " << argin << endl;
DEBUG_STREAM << "m_buffer_offset_index : " << m_buffer_offset_index << endl;
// Add your own code to control device here
if( argin < m_intensity_buf.size() && argin >= m_buffer_offset_index )
......@@ -893,6 +880,34 @@ Tango::DevVarDoubleArray *Spectrometer::get_intensity(Tango::DevULong argin)
return argout;
}
//+----------------------------------------------------------------------------
//
// method : Spectrometer::get_task_values
//
//-----------------------------------------------------------------------------
void Spectrometer::get_task_values()
{
// Add your own code here
if (m_task)
{
//- get data from task
SpectrometerTask::DataReturnValues l_data;
m_task->get_data_return_values(l_data);
m_intensity_buf = l_data.m_intensity_buf;
m_buffer_offset_index = l_data.buffer_offset_index;
if (l_data.intensity != NULL)
{
m_intensity = l_data.intensity;
m_nbPtsIntensity = l_data.intensityPtsNb;
}
if (l_data.lambda != NULL)
{
m_lambda = l_data.lambda;
m_nbPtsLambda = l_data.lambdaPtsNb;
}
}
}
......
......@@ -397,6 +397,9 @@ protected :
std::size_t m_buffer_offset_index;
Tango::DevULong m_acquisition_count;
void get_task_values();
};
} // namespace_ns
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment