Skip to content
Snippets Groups Projects
Commit 5ca0df95 authored by Graziano Scalamera's avatar Graziano Scalamera
Browse files

Read bunchnumber from device proxy in RTMode when RNM not compiled

parent b122db5f
No related branches found
No related tags found
No related merge requests found
......@@ -57,6 +57,7 @@
#define EXPOSURE_ATTR "Exposure"
#define TRIGGER_ATTR "Trigger"
#define COUNTER_ATTR "AcquisitionCounter"
#define BUNCHNUM_ATTR "BunchNumber"
#define ROI_ATTR "HwRoiParam"
#define START_CMD "Start"
#define STOP_CMD "Stop"
......
......@@ -358,6 +358,8 @@ void readthread::run(void *)
char check;
rnm_bunch_number_get_value(0, 1, &buf_bunch_num, &check);
//buf_bunch_num = fit_counter;
#else
buf_bunch_num = GetBunchnumber();
#endif
if(old_bunch_number != buf_bunch_num-1)
{
......@@ -1093,6 +1095,26 @@ void readthread::StopMeas()
{
}
Tango::DevLong readthread::GetBunchnumber()
{
CCDSpectrometer *_device = static_cast<CCDSpectrometer *>(device);
Tango::DevLong bunch_number=0;
try {
//Tango::DevDouble data;
_device->dpmutex->lock();
_device->dp->read_attribute(BUNCHNUM_ATTR)>>bunch_number;
_device->dpmutex->unlock();
}
catch(Tango::DevFailed &e)
{
_device->dpmutex->unlock();
INFO_STREAM << __func__ << ": error reading BN =" << e.errors[0].desc;
abort_sleep(0.05);
return 0;
}
return bunch_number;
}
}
......@@ -38,6 +38,7 @@ class readthread : public omni_thread, public Tango::TangoMonitor, public Tango:
uint32_t numavg;
int PrepareMeas();
int Measure(double *l_pSpectrum);
Tango::DevLong GetBunchnumber();
void StopMeas();
int Heartbeat();
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment