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

Compile errors fixed (last?)

parent fe0d4c92
No related branches found
No related tags found
No related merge requests found
...@@ -113,7 +113,7 @@ oss << "WaveForm_data::get_waveform_data( ) -> ENTERING ..." << std::endl; ...@@ -113,7 +113,7 @@ oss << "WaveForm_data::get_waveform_data( ) -> ENTERING ..." << std::endl;
//- send the request //- send the request
SocketLecroy::get_instance( )->TCP_WriteDevice(cmdStr,length,true); SocketLecroy::get_instance( )->TCP_WriteDevice(cmdStr,length,true);
time_to_write_data = t.elapsed_msec; time_to_write_data = t.elapsed_msec();
oss << "\tTime to WRITE command : " << time_to_write_data << std::endl; oss << "\tTime to WRITE command : " << time_to_write_data << std::endl;
//- delete cmd allocation //- delete cmd allocation
...@@ -151,7 +151,7 @@ oss << "\tTime to WRITE command : " << time_to_write_data << std::endl; ...@@ -151,7 +151,7 @@ oss << "\tTime to WRITE command : " << time_to_write_data << std::endl;
try try
{ {
SocketLecroy::get_instance( )->TCP_ReadDevice(ptrRawData,length,&response_length); SocketLecroy::get_instance( )->TCP_ReadDevice(ptrRawData,length,&response_length);
time_to_read_data = t.elapsed_msec - time_to_write_data; time_to_read_data = t.elapsed_msec() - time_to_write_data;
oss << "\tTime to READ " << response_length << " data : " << time_to_read_data << std::endl; oss << "\tTime to READ " << response_length << " data : " << time_to_read_data << std::endl;
//std::cout << "\t WaveForm_data::get_waveform_data( ) -> READ DONE, respLgth = " << response_length << std::endl; //std::cout << "\t WaveForm_data::get_waveform_data( ) -> READ DONE, respLgth = " << response_length << std::endl;
} }
...@@ -215,7 +215,7 @@ oss << "\tTime to READ " << response_length << " data : " << time_to_read_data < ...@@ -215,7 +215,7 @@ oss << "\tTime to READ " << response_length << " data : " << time_to_read_data <
vertical_scaled_waveform_data[idx] = (waveBlockData->vertical_gain * sh_raw_waveform_data[idx]) - waveBlockData->vertical_offset; vertical_scaled_waveform_data[idx] = (waveBlockData->vertical_gain * sh_raw_waveform_data[idx]) - waveBlockData->vertical_offset;
//std::cout << "\t WaveForm_data::get_waveform_data( ) -> LOOP idx = " << idx << std::endl; //std::cout << "\t WaveForm_data::get_waveform_data( ) -> LOOP idx = " << idx << std::endl;
} }
time_to_copy_data = t.elapsed_msec - time_to_read_data; time_to_copy_data = t.elapsed_msec() - time_to_read_data;
oss << "\tTime to COPY " << response_length << " data : " << time_to_copy_data << std::ends; oss << "\tTime to COPY " << response_length << " data : " << time_to_copy_data << std::ends;
time_to_get_waveformData = oss.str(); time_to_get_waveformData = oss.str();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment