Skip to content
Snippets Groups Projects
Commit d5489400 authored by Martin Christoph Hierholzer's avatar Martin Christoph Hierholzer
Browse files

change type of macro pulse number PV to int64_t (as this is the data type... 

change type of macro pulse number PV to int64_t (as this is the data type expected by DOOCS) and convert if necessary via the TypeChangingDecorator
parent d2b6019d
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
include/DoocsProcessArray.h
+ 2
− 2
View file @ d5489400
......@@ -84,13 +84,13 @@ namespace ChimeraTK {
void publishZeroMQ() { publishZMQ = true; }
void setMacroPulseNumberSource(boost::shared_ptr<ChimeraTK::NDRegisterAccessor<int>> macroPulseNumberSource) {
void setMacroPulseNumberSource(boost::shared_ptr<ChimeraTK::NDRegisterAccessor<int64_t>> macroPulseNumberSource) {
_macroPulseNumberSource = macroPulseNumberSource;
}
protected:
boost::shared_ptr<ChimeraTK::NDRegisterAccessor<DOOCS_PRIMITIVE_T>> _processArray;
boost::shared_ptr<ChimeraTK::NDRegisterAccessor<int>> _macroPulseNumberSource;
boost::shared_ptr<ChimeraTK::NDRegisterAccessor<int64_t>> _macroPulseNumberSource;
bool publishZMQ{false};
// Internal function which copies the content from the DOOCS container into the
......
include/DoocsProcessScalar.h
+ 2
− 2
View file @ d5489400
......@@ -89,13 +89,13 @@ namespace ChimeraTK {
void publishZeroMQ() { publishZMQ = true; }
void setMacroPulseNumberSource(boost::shared_ptr<ChimeraTK::NDRegisterAccessor<int>> macroPulseNumberSource) {
void setMacroPulseNumberSource(boost::shared_ptr<ChimeraTK::NDRegisterAccessor<int64_t>> macroPulseNumberSource) {
_macroPulseNumberSource = macroPulseNumberSource;
}
protected:
boost::shared_ptr<ChimeraTK::NDRegisterAccessor<T>> _processScalar;
boost::shared_ptr<ChimeraTK::NDRegisterAccessor<int>> _macroPulseNumberSource;
boost::shared_ptr<ChimeraTK::NDRegisterAccessor<int64_t>> _macroPulseNumberSource;
bool publishZMQ{false};
};
......
include/DoocsSpectrum.h
+ 2
− 2
View file @ d5489400
......@@ -45,7 +45,7 @@ namespace ChimeraTK {
void publishZeroMQ() { publishZMQ = true; }
void setMacroPulseNumberSource(boost::shared_ptr<ChimeraTK::NDRegisterAccessor<int>> macroPulseNumberSource) {
void setMacroPulseNumberSource(boost::shared_ptr<ChimeraTK::NDRegisterAccessor<int64_t>> macroPulseNumberSource) {
_macroPulseNumberSource = macroPulseNumberSource;
}
......@@ -53,7 +53,7 @@ namespace ChimeraTK {
boost::shared_ptr<ChimeraTK::NDRegisterAccessor<float>> _processArray;
boost::shared_ptr<ChimeraTK::NDRegisterAccessor<float>> _startAccessor;
boost::shared_ptr<ChimeraTK::NDRegisterAccessor<float>> _incrementAccessor;
boost::shared_ptr<ChimeraTK::NDRegisterAccessor<int>> _macroPulseNumberSource;
boost::shared_ptr<ChimeraTK::NDRegisterAccessor<int64_t>> _macroPulseNumberSource;
bool publishZMQ{false};
// Internal function which copies the content from the DOOCS container into the
......
src/DoocsPVFactory.cc
+ 35
− 28
View file @ d5489400
......@@ -63,18 +63,20 @@ namespace ChimeraTK {
// set macro pulse number source, if configured
if(propertyDescription.macroPulseNumberSource.size() > 0) {
auto mpnSource = _controlSystemPVManager->getProcessArray<int>(propertyDescription.macroPulseNumberSource);
if(mpnSource->getNumberOfSamples() != 1) {
throw ChimeraTK::logic_error("The property '" + mpnSource->getName() +
auto mpnSource = _controlSystemPVManager->getProcessVariable(propertyDescription.macroPulseNumberSource);
auto mpnDecorated = getDecorator<int64_t>(mpnSource, DecoratorType::C_style_conversion);
if(mpnDecorated->getNumberOfSamples() != 1) {
throw ChimeraTK::logic_error("The property '" + mpnDecorated->getName() +
"' is used as a macro pulse number source, but it has an array length of " +
std::to_string(mpnSource->getNumberOfSamples()) + ". Length must be exactly 1");
std::to_string(mpnDecorated->getNumberOfSamples()) + ". Length must be exactly 1");
}
if(!mpnSource->isReadable()) {
throw ChimeraTK::logic_error("The property '" + mpnSource->getName() +
if(!mpnDecorated->isReadable()) {
throw ChimeraTK::logic_error("The property '" + mpnDecorated->getName() +
"' is used as a macro pulse number source, but it is not readable.");
}
boost::dynamic_pointer_cast<DoocsProcessScalar<DOOCS_PRIMITIVE_T, DOOCS_T>>(doocsPV)->setMacroPulseNumberSource(
mpnSource);
mpnDecorated);
_updater.addVariable(ChimeraTK::ScalarRegisterAccessor<int64_t>(mpnDecorated), _eqFct, [] {});
}
return doocsPV;
......@@ -111,18 +113,20 @@ namespace ChimeraTK {
// set macro pulse number source, if configured
if(propertyDescription.macroPulseNumberSource.size() > 0) {
auto mpnSource = _controlSystemPVManager->getProcessArray<int>(propertyDescription.macroPulseNumberSource);
if(mpnSource->getNumberOfSamples() != 1) {
throw ChimeraTK::logic_error("The property '" + mpnSource->getName() +
auto mpnSource = _controlSystemPVManager->getProcessVariable(propertyDescription.macroPulseNumberSource);
auto mpnDecorated = getDecorator<int64_t>(mpnSource, DecoratorType::C_style_conversion);
if(mpnDecorated->getNumberOfSamples() != 1) {
throw ChimeraTK::logic_error("The property '" + mpnDecorated->getName() +
"' is used as a macro pulse number source, but it has an array length of " +
std::to_string(mpnSource->getNumberOfSamples()) + ". Length must be exactly 1");
std::to_string(mpnDecorated->getNumberOfSamples()) + ". Length must be exactly 1");
}
if(!mpnSource->isReadable()) {
throw ChimeraTK::logic_error("The property '" + mpnSource->getName() +
if(!mpnDecorated->isReadable()) {
throw ChimeraTK::logic_error("The property '" + mpnDecorated->getName() +
"' is used as a macro pulse number source, but it is not readable.");
}
boost::dynamic_pointer_cast<DoocsProcessScalar<std::string, D_string>>(doocsPV)->setMacroPulseNumberSource(
mpnSource);
mpnDecorated);
_updater.addVariable(ChimeraTK::ScalarRegisterAccessor<int64_t>(mpnDecorated), _eqFct, [] {});
}
return doocsPV;
......@@ -171,17 +175,18 @@ namespace ChimeraTK {
// set macro pulse number source, if configured
if(spectrumDescription.macroPulseNumberSource.size() > 0) {
auto mpnSource = _controlSystemPVManager->getProcessArray<int>(spectrumDescription.macroPulseNumberSource);
if(mpnSource->getNumberOfSamples() != 1) {
throw ChimeraTK::logic_error("The property '" + mpnSource->getName() +
auto mpnSource = _controlSystemPVManager->getProcessVariable(spectrumDescription.macroPulseNumberSource);
auto mpnDecorated = getDecorator<int64_t>(mpnSource, DecoratorType::C_style_conversion);
if(mpnDecorated->getNumberOfSamples() != 1) {
throw ChimeraTK::logic_error("The property '" + mpnDecorated->getName() +
"' is used as a macro pulse number source, but it has an array length of " +
std::to_string(mpnSource->getNumberOfSamples()) + ". Length must be exactly 1");
std::to_string(mpnDecorated->getNumberOfSamples()) + ". Length must be exactly 1");
}
if(!mpnSource->isReadable()) {
throw ChimeraTK::logic_error("The property '" + mpnSource->getName() +
if(!mpnDecorated->isReadable()) {
throw ChimeraTK::logic_error("The property '" + mpnDecorated->getName() +
"' is used as a macro pulse number source, but it is not readable.");
}
boost::dynamic_pointer_cast<DoocsSpectrum>(doocsPV)->setMacroPulseNumberSource(mpnSource);
boost::dynamic_pointer_cast<DoocsSpectrum>(doocsPV)->setMacroPulseNumberSource(mpnDecorated);
}
return doocsPV;
......@@ -296,18 +301,20 @@ namespace ChimeraTK {
// set macro pulse number source, if configured
if(arrayDescription.macroPulseNumberSource.size() > 0) {
auto mpnSource = _controlSystemPVManager->getProcessArray<int>(arrayDescription.macroPulseNumberSource);
if(mpnSource->getNumberOfSamples() != 1) {
throw ChimeraTK::logic_error("The property '" + mpnSource->getName() +
auto mpnSource = _controlSystemPVManager->getProcessVariable(arrayDescription.macroPulseNumberSource);
auto mpnDecorated = getDecorator<int64_t>(mpnSource, DecoratorType::C_style_conversion);
if(mpnDecorated->getNumberOfSamples() != 1) {
throw ChimeraTK::logic_error("The property '" + mpnDecorated->getName() +
"' is used as a macro pulse number source, but it has an array length of " +
std::to_string(mpnSource->getNumberOfSamples()) + ". Length must be exactly 1");
std::to_string(mpnDecorated->getNumberOfSamples()) + ". Length must be exactly 1");
}
if(!mpnSource->isReadable()) {
throw ChimeraTK::logic_error("The property '" + mpnSource->getName() +
if(!mpnDecorated->isReadable()) {
throw ChimeraTK::logic_error("The property '" + mpnDecorated->getName() +
"' is used as a macro pulse number source, but it is not readable.");
}
boost::dynamic_pointer_cast<DoocsProcessArray<DOOCS_T, DOOCS_PRIMITIVE_T>>(doocsPV)->setMacroPulseNumberSource(
mpnSource);
mpnDecorated);
_updater.addVariable(ChimeraTK::ScalarRegisterAccessor<int64_t>(mpnDecorated), _eqFct, [] {});
}
return doocsPV;
......
tests/serverTestZeroMQ-DoocsVariableConfig.xml
+ 6
− 1
View file @ d5489400
<?xml version="1.0" encoding="UTF-8"?>
<device_server xmlns="https://github.com/ChimeraTK/ControlSystemAdapter-DoocsAdapter">
<!-- We use a type which is processed by the ReferenceTestApplication before the data properties used by the test.
Otherwise the macro pulse number gets attachted to the next value. The order is determined by the order of types
in the HolderMap, as this map is iterated. -->
<macro_pulse_number_source>/INT/FROM_DEVICE_SCALAR</macro_pulse_number_source>
<location name="UINT">
......@@ -21,6 +24,8 @@
<import>/FLOAT</import>
</location>
<import>/</import>
<location name="INT">
<property source="/INT/TO_DEVICE_SCALAR" name="TO_DEVICE_SCALAR"/>
</location>
</device_server>
tests/src/serverTestZeroMQ.cpp
+ 18
− 14
View file @ d5489400
......@@ -68,12 +68,16 @@ BOOST_AUTO_TEST_CASE(testScalar) {
auto appPVmanager = referenceTestApplication.getPVManager();
uint32_t expectedValue = 42;
DoocsServerTestHelper::doocsSet<uint32_t>("//UINT/TO_DEVICE_SCALAR", expectedValue);
/// Note: The data is processed by the ReferenceTestApplication in the order of the types as listed in the HolderMap
/// of the ReferenceTestApplication. INT comes before UINT and FLOAT, so the macro pulse number is first written and
/// then our values.
int macroPulseNumber = 12345;
DoocsServerTestHelper::doocsSet<int>("//INT/TO_DEVICE_SCALAR", macroPulseNumber);
uint32_t expectedValue = 42;
DoocsServerTestHelper::doocsSet<uint32_t>("//UINT/TO_DEVICE_SCALAR", expectedValue);
EqData dst;
EqAdr ea;
ea.adr("doocs://localhost:" + DoocsLauncher::rpc_no + "/F/D/UINT/FROM_DEVICE_SCALAR");
......@@ -124,10 +128,10 @@ BOOST_AUTO_TEST_CASE(testScalar) {
BOOST_CHECK_EQUAL(receivedInfo.sec, secs);
BOOST_CHECK_EQUAL(receivedInfo.usec, usecs);
BOOST_CHECK_EQUAL(receivedInfo.ident, macroPulseNumber);
expectedValue = 100 + i;
DoocsServerTestHelper::doocsSet<uint32_t>("//UINT/TO_DEVICE_SCALAR", expectedValue);
++macroPulseNumber;
DoocsServerTestHelper::doocsSet<int>("//INT/TO_DEVICE_SCALAR", macroPulseNumber);
expectedValue = 100 + i;
DoocsServerTestHelper::doocsSet<uint32_t>("//UINT/TO_DEVICE_SCALAR", expectedValue);
}
}
......@@ -142,12 +146,12 @@ BOOST_AUTO_TEST_CASE(testArray) {
auto appPVmanager = referenceTestApplication.getPVManager();
std::vector<int32_t> expectedArrayValue = {42, 43, 44, 45, 46, 47, 48, 49, 50, 51};
DoocsServerTestHelper::doocsSet<int32_t>("//UINT/TO_DEVICE_ARRAY", expectedArrayValue);
int macroPulseNumber = 99999;
DoocsServerTestHelper::doocsSet<int>("//INT/TO_DEVICE_SCALAR", macroPulseNumber);
std::vector<int32_t> expectedArrayValue = {42, 43, 44, 45, 46, 47, 48, 49, 50, 51};
DoocsServerTestHelper::doocsSet<int32_t>("//UINT/TO_DEVICE_ARRAY", expectedArrayValue);
EqData dst;
EqAdr ea;
ea.adr("doocs://localhost:" + DoocsLauncher::rpc_no + "/F/D/UINT/FROM_DEVICE_ARRAY");
......@@ -200,10 +204,10 @@ BOOST_AUTO_TEST_CASE(testArray) {
BOOST_CHECK_EQUAL(receivedInfo.sec, secs);
BOOST_CHECK_EQUAL(receivedInfo.usec, usecs);
BOOST_CHECK_EQUAL(receivedInfo.ident, macroPulseNumber);
expectedArrayValue[1] = 100 + i;
DoocsServerTestHelper::doocsSet<int32_t>("//UINT/TO_DEVICE_ARRAY", expectedArrayValue);
--macroPulseNumber;
DoocsServerTestHelper::doocsSet<int>("//INT/TO_DEVICE_SCALAR", macroPulseNumber);
expectedArrayValue[1] = 100 + i;
DoocsServerTestHelper::doocsSet<int32_t>("//UINT/TO_DEVICE_ARRAY", expectedArrayValue);
}
}
......@@ -218,12 +222,12 @@ BOOST_AUTO_TEST_CASE(testSpectrum) {
auto appPVmanager = referenceTestApplication.getPVManager();
std::vector<float> expectedFloatArrayValue = {42, 43, 44, 45, 46, 47, 48, 49, 50, 51};
DoocsServerTestHelper::doocsSet<float>("//FLOAT/TO_DEVICE_ARRAY", expectedFloatArrayValue);
int macroPulseNumber = -100;
DoocsServerTestHelper::doocsSet<int>("//INT/TO_DEVICE_SCALAR", macroPulseNumber);
std::vector<float> expectedFloatArrayValue = {42, 43, 44, 45, 46, 47, 48, 49, 50, 51};
DoocsServerTestHelper::doocsSet<float>("//FLOAT/TO_DEVICE_ARRAY", expectedFloatArrayValue);
EqData dst;
EqAdr ea;
ea.adr("doocs://localhost:" + DoocsLauncher::rpc_no + "/F/D/FLOAT/FROM_DEVICE_ARRAY");
......@@ -277,10 +281,10 @@ BOOST_AUTO_TEST_CASE(testSpectrum) {
BOOST_CHECK_EQUAL(receivedInfo.sec, secs);
BOOST_CHECK_EQUAL(receivedInfo.usec, usecs);
BOOST_CHECK_EQUAL(receivedInfo.ident, macroPulseNumber);
expectedFloatArrayValue[1] = 100 + i;
DoocsServerTestHelper::doocsSet<float>("//FLOAT/TO_DEVICE_ARRAY", expectedFloatArrayValue);
macroPulseNumber *= -2;
DoocsServerTestHelper::doocsSet<int>("//INT/TO_DEVICE_SCALAR", macroPulseNumber);
expectedFloatArrayValue[1] = 100 + i;
DoocsServerTestHelper::doocsSet<float>("//FLOAT/TO_DEVICE_ARRAY", expectedFloatArrayValue);
}
}
......
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

imprint | privacy | Conditions of Use