From 0c34fff0ecead18e3e96dea16eb5378a48211c69 Mon Sep 17 00:00:00 2001
From: Xavier Elattaoui <xavier.elattaoui@synchrotron-soleil.fr>
Date: Tue, 14 Feb 2017 14:52:03 +0000
Subject: [PATCH] added timer for each attributes
---
pom.xml | 2 +-
src/AcquireWaveformLecroy.cpp | 77 +++++++++++++++++++++++------------
2 files changed, 52 insertions(+), 27 deletions(-)
diff --git a/pom.xml b/pom.xml
index ead0e38..520decf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
<groupId>fr.soleil.device</groupId>
<artifactId>AcquireWaveformLecroy-${aol}-${mode}</artifactId>
- <version>1.1.17-SNAPSHOT</version>
+ <version>1.1.17</version>
<packaging>nar</packaging>
<name>AcquireWaveformLecroy</name>
<description>AcquireWaveformLecroy device</description>
diff --git a/src/AcquireWaveformLecroy.cpp b/src/AcquireWaveformLecroy.cpp
index 6a616f9..512e00c 100644
--- a/src/AcquireWaveformLecroy.cpp
+++ b/src/AcquireWaveformLecroy.cpp
@@ -481,9 +481,8 @@ yat::Timer t;
{
reallocate_spectrums(data_length);
}
- //- get waveform data
- attr_rawWaveformData_read = waveform_ptr->get_raw_waveform_data();
- attr_verticalScaledData_read = waveform_ptr->get_vertical_scaled_waveform_data();
+
+
}
catch(const lecroy::WaveformException &we)
{
@@ -499,26 +498,7 @@ yat::Timer t;
);
}
- *attr_waveArray1_read = waveform_ptr->get_wavedesc_descriptor()->wave_array_1;
-
- *attr_waveArray2_read = waveform_ptr->get_wavedesc_descriptor()->wave_array_2;
-
- *attr_waveArrayCount_read = data_length;
-
- *attr_nominalBits_read = waveform_ptr->get_wavedesc_descriptor()->nominal_bits;
-
- *attr_horizontalInterval_read = (double) (waveform_ptr->get_wavedesc_descriptor()->horizontal_interval);
-
- *attr_horizontalOffset_read = waveform_ptr->get_wavedesc_descriptor()->horizontal_offset;
-
- *attr_verticalGain_read = (double) (waveform_ptr->get_wavedesc_descriptor()->vertical_gain);
-
- *attr_verticalOffset_read = waveform_ptr->get_wavedesc_descriptor()->vertical_offset;
-
- std::string response = waveform_ptr->get_trigger_time_value();
- strcpy(*attr_triggerTime_read, response.c_str());
-
- INFO_STREAM << "READ_HW : all data ar now updated. DONE in " << t.elapsed_msec() << " milliseconds.\n" << std::endl;
+ INFO_STREAM << "READ_HW : all data are now updated. DONE in " << t.elapsed_msec() << " milliseconds.\n" << std::endl;
}
//+----------------------------------------------------------------------------
@@ -531,8 +511,13 @@ yat::Timer t;
void AcquireWaveformLecroy::read_verticalScaledData(Tango::Attribute &attr)
{
//- DEBUG_STREAM << "AcquireWaveformLecroy::read_verticalScaledData(Tango::Attribute &attr) entering... "<< endl;
+yat::Timer t;
+
// Add your own code here
+ attr_verticalScaledData_read = waveform_ptr->get_vertical_scaled_waveform_data();
+
attr.set_value(attr_verticalScaledData_read, data_length);
+ INFO_STREAM << "read_verticalScaledData : " << t.elapsed_msec() << " milliseconds.\n" << std::endl;
}
//+----------------------------------------------------------------------------
@@ -545,8 +530,14 @@ void AcquireWaveformLecroy::read_verticalScaledData(Tango::Attribute &attr)
void AcquireWaveformLecroy::read_triggerTime(Tango::Attribute &attr)
{
//- DEBUG_STREAM << "AcquireWaveformLecroy::read_triggerTime(Tango::Attribute &attr) entering... "<< endl;
+yat::Timer t;
+
// Add your own code here
+ std::string response = waveform_ptr->get_trigger_time_value();
+ strcpy(*attr_triggerTime_read, response.c_str());
+
attr.set_value(attr_triggerTime_read);
+ DEBUG_STREAM << "read_triggerTime : " << t.elapsed_msec() << " milliseconds.\n" << std::endl;
}
//+----------------------------------------------------------------------------
@@ -559,8 +550,13 @@ void AcquireWaveformLecroy::read_triggerTime(Tango::Attribute &attr)
void AcquireWaveformLecroy::read_verticalOffset(Tango::Attribute &attr)
{
//- DEBUG_STREAM << "AcquireWaveformLecroy::read_verticalOffset(Tango::Attribute &attr) entering... "<< endl;
+yat::Timer t;
+
//- Add your own code here
+ *attr_verticalOffset_read = waveform_ptr->get_wavedesc_descriptor()->vertical_offset;
+
attr.set_value(attr_verticalOffset_read);
+ DEBUG_STREAM << "read_verticalOffset : " << t.elapsed_msec() << " milliseconds.\n" << std::endl;
}
//+----------------------------------------------------------------------------
@@ -573,8 +569,13 @@ void AcquireWaveformLecroy::read_verticalOffset(Tango::Attribute &attr)
void AcquireWaveformLecroy::read_verticalGain(Tango::Attribute &attr)
{
//- DEBUG_STREAM << "AcquireWaveformLecroy::read_verticalGain(Tango::Attribute &attr) entering... "<< endl;
+yat::Timer t;
+
//- Add your own code here
+ *attr_verticalGain_read = (double) (waveform_ptr->get_wavedesc_descriptor()->vertical_gain);
+
attr.set_value(attr_verticalGain_read);
+ DEBUG_STREAM << "read_verticalGain : " << t.elapsed_msec() << " milliseconds.\n" << std::endl;
}
//+----------------------------------------------------------------------------
@@ -587,8 +588,12 @@ void AcquireWaveformLecroy::read_verticalGain(Tango::Attribute &attr)
void AcquireWaveformLecroy::read_horizontalOffset(Tango::Attribute &attr)
{
//- DEBUG_STREAM << "AcquireWaveformLecroy::read_horizontalOffset(Tango::Attribute &attr) entering... "<< endl;
- //- Add your own code here
+ yat::Timer t;
+
+ //- Add your own code here
+ *attr_horizontalOffset_read = waveform_ptr->get_wavedesc_descriptor()->horizontal_offset;
attr.set_value(attr_horizontalOffset_read);
+ DEBUG_STREAM << "read_horizontalOffset : " << t.elapsed_msec() << " milliseconds.\n" << std::endl;
}
//+----------------------------------------------------------------------------
@@ -601,8 +606,12 @@ void AcquireWaveformLecroy::read_horizontalOffset(Tango::Attribute &attr)
void AcquireWaveformLecroy::read_horizontalInterval(Tango::Attribute &attr)
{
//- DEBUG_STREAM << "AcquireWaveformLecroy::read_horizontalInterval(Tango::Attribute &attr) entering... "<< endl;
- //- Add your own code here
+ yat::Timer t;
+
+ //- Add your own code here
+ *attr_horizontalInterval_read = (double) (waveform_ptr->get_wavedesc_descriptor()->horizontal_interval);
attr.set_value(attr_horizontalInterval_read);
+ DEBUG_STREAM << "read_horizontalInterval : " << t.elapsed_msec() << " milliseconds.\n" << std::endl;
}
//+----------------------------------------------------------------------------
@@ -615,8 +624,11 @@ void AcquireWaveformLecroy::read_horizontalInterval(Tango::Attribute &attr)
void AcquireWaveformLecroy::read_nominalBits(Tango::Attribute &attr)
{
//- DEBUG_STREAM << "AcquireWaveformLecroy::read_nominalBits(Tango::Attribute &attr) entering... "<< endl;
+yat::Timer t;
//- Add your own code here
+ *attr_nominalBits_read = waveform_ptr->get_wavedesc_descriptor()->nominal_bits;
attr.set_value(attr_nominalBits_read);
+ DEBUG_STREAM << "read_nominalBits : " << t.elapsed_msec() << " milliseconds.\n" << std::endl;
}
//+----------------------------------------------------------------------------
@@ -629,8 +641,11 @@ void AcquireWaveformLecroy::read_nominalBits(Tango::Attribute &attr)
void AcquireWaveformLecroy::read_waveArrayCount(Tango::Attribute &attr)
{
//- DEBUG_STREAM << "AcquireWaveformLecroy::read_waveArrayCount(Tango::Attribute &attr) entering... "<< endl;
+yat::Timer t;
//- Add your own code here
+ *attr_waveArrayCount_read = data_length;
attr.set_value(attr_waveArrayCount_read);
+ DEBUG_STREAM << "read_waveArrayCount : " << t.elapsed_msec() << " milliseconds.\n" << std::endl;
}
//+----------------------------------------------------------------------------
@@ -643,8 +658,11 @@ void AcquireWaveformLecroy::read_waveArrayCount(Tango::Attribute &attr)
void AcquireWaveformLecroy::read_waveArray2(Tango::Attribute &attr)
{
//- DEBUG_STREAM << "AcquireWaveformLecroy::read_waveArray2(Tango::Attribute &attr) entering... "<< endl;
+yat::Timer t;
// Add your own code here
+ *attr_waveArray2_read = waveform_ptr->get_wavedesc_descriptor()->wave_array_2;
attr.set_value(attr_waveArray2_read);
+ DEBUG_STREAM << "read_waveArray2 : " << t.elapsed_msec() << " milliseconds.\n" << std::endl;
}
//+----------------------------------------------------------------------------
@@ -657,8 +675,11 @@ void AcquireWaveformLecroy::read_waveArray2(Tango::Attribute &attr)
void AcquireWaveformLecroy::read_waveArray1(Tango::Attribute &attr)
{
//- DEBUG_STREAM << "AcquireWaveformLecroy::read_waveArray1(Tango::Attribute &attr) entering... "<< endl;
+yat::Timer t;
//- Add your own code here
+ *attr_waveArray1_read = waveform_ptr->get_wavedesc_descriptor()->wave_array_1;
attr.set_value(attr_waveArray1_read);
+ DEBUG_STREAM << "read_waveArray1 : " << t.elapsed_msec() << " milliseconds.\n" << std::endl;
}
//+----------------------------------------------------------------------------
@@ -671,8 +692,12 @@ void AcquireWaveformLecroy::read_waveArray1(Tango::Attribute &attr)
void AcquireWaveformLecroy::read_rawWaveformData(Tango::Attribute &attr)
{
//- DEBUG_STREAM << "AcquireWaveformLecroy::read_rawWaveformData(Tango::Attribute &attr) entering... "<< endl;
- //- Add your own code here
+ //- Add your own code here
+ yat::Timer t;
+ //- get waveform data
+ attr_rawWaveformData_read = waveform_ptr->get_raw_waveform_data();
attr.set_value(attr_rawWaveformData_read, data_length);
+ INFO_STREAM << "read_rawWaveformData : " << t.elapsed_msec() << " milliseconds.\n" << std::endl;
}
//+----------------------------------------------------------------------------
--
GitLab