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

Remove the restriction which prevented connecting nodes of the same direction....

Remove the restriction which prevented connecting nodes of the same direction. This was an artificial restriction, since later checks make sure that the network has exactly one feeder.
parent 5bf9f5de
No related branches found
Tags 01.10.00
No related merge requests found
...@@ -131,7 +131,6 @@ namespace ChimeraTK { ...@@ -131,7 +131,6 @@ namespace ChimeraTK {
template< typename UserType > template< typename UserType >
template< typename UserType_o > template< typename UserType_o >
void Accessor<UserType>::connectTo(Accessor<UserType_o> &targetAccessor) { void Accessor<UserType>::connectTo(Accessor<UserType_o> &targetAccessor) {
assert( _direction != targetAccessor._direction );
Application::getInstance().connectAccessors(*this, targetAccessor); Application::getInstance().connectAccessors(*this, targetAccessor);
} }
...@@ -139,7 +138,6 @@ namespace ChimeraTK { ...@@ -139,7 +138,6 @@ namespace ChimeraTK {
template< typename UserType > template< typename UserType >
void Accessor<UserType>::feedToControlSystem(const std::string& name) { void Accessor<UserType>::feedToControlSystem(const std::string& name) {
assert( _direction == VariableDirection::feeding );
VariableNetwork &network = Application::getInstance().findOrCreateNetwork(this); VariableNetwork &network = Application::getInstance().findOrCreateNetwork(this);
network.addAppNode(*this); network.addAppNode(*this);
network.addConsumingPublication(name); network.addConsumingPublication(name);
...@@ -149,7 +147,6 @@ namespace ChimeraTK { ...@@ -149,7 +147,6 @@ namespace ChimeraTK {
template< typename UserType > template< typename UserType >
void Accessor<UserType>::consumeFromControlSystem(const std::string& name) { void Accessor<UserType>::consumeFromControlSystem(const std::string& name) {
assert( _direction == VariableDirection::consuming );
VariableNetwork &network = Application::getInstance().findOrCreateNetwork(this); VariableNetwork &network = Application::getInstance().findOrCreateNetwork(this);
network.addAppNode(*this); network.addAppNode(*this);
network.addFeedingPublication(*this,name); network.addFeedingPublication(*this,name);
...@@ -167,7 +164,6 @@ namespace ChimeraTK { ...@@ -167,7 +164,6 @@ namespace ChimeraTK {
template< typename UserType > template< typename UserType >
void Accessor<UserType>::consumeFromDevice(const std::string &deviceAlias, const std::string &registerName, void Accessor<UserType>::consumeFromDevice(const std::string &deviceAlias, const std::string &registerName,
UpdateMode mode) { UpdateMode mode) {
assert( _direction == VariableDirection::consuming );
VariableNetwork &network = Application::getInstance().findOrCreateNetwork(this); VariableNetwork &network = Application::getInstance().findOrCreateNetwork(this);
network.addAppNode(*this); network.addAppNode(*this);
network.addFeedingDeviceRegister(*this, deviceAlias, registerName, mode); network.addFeedingDeviceRegister(*this, deviceAlias, registerName, mode);
...@@ -177,7 +173,6 @@ namespace ChimeraTK { ...@@ -177,7 +173,6 @@ namespace ChimeraTK {
template< typename UserType > template< typename UserType >
void Accessor<UserType>::feedToDevice(const std::string &deviceAlias, const std::string &registerName) { void Accessor<UserType>::feedToDevice(const std::string &deviceAlias, const std::string &registerName) {
assert( _direction == VariableDirection::feeding );
VariableNetwork &network = Application::getInstance().findOrCreateNetwork(this); VariableNetwork &network = Application::getInstance().findOrCreateNetwork(this);
network.addAppNode(*this); network.addAppNode(*this);
network.addConsumingDeviceRegister(deviceAlias, registerName); network.addConsumingDeviceRegister(deviceAlias, registerName);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment