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

renamed VariableNetworkNode getTriggerReceiver() into VariableNetworkNode...

renamed VariableNetworkNode getTriggerReceiver() into VariableNetworkNode getNodeToTrigger() for better clarity
parent 1ba83df1
No related branches found
No related tags found
No related merge requests found
......@@ -131,7 +131,7 @@ namespace ChimeraTK {
const std::string& getUnit() const;
const std::string& getDescription() const;
VariableNetwork& getOwner() const;
VariableNetworkNode getTriggerReceiver();
VariableNetworkNode getNodeToTrigger();
const std::string& getPublicName() const;
const std::string& getDeviceAlias() const;
const std::string& getRegisterName() const;
......@@ -192,7 +192,7 @@ namespace ChimeraTK {
mtca4u::TransferElement *appNode{nullptr};
/** Pointer to network which should be triggered by this node */
VariableNetworkNode triggerReceiver;
VariableNetworkNode nodeToTrigger;
/** Pointer to the network providing the external trigger. May only be used for feeding nodes with an
* update mode poll. When enabled, the update mode will be converted into push. */
......
......@@ -535,7 +535,7 @@ void Application::typedMakeConnection(VariableNetwork &network) {
connectionMade = true;
}
else if(consumer.getType() == NodeType::TriggerReceiver) {
consumer.getTriggerReceiver().getOwner().setExternalTriggerImpl(feedingImpl);
consumer.getNodeToTrigger().getOwner().setExternalTriggerImpl(feedingImpl);
connectionMade = true;
}
else {
......@@ -603,7 +603,7 @@ void Application::typedMakeConnection(VariableNetwork &network) {
else if(consumer.getType() == NodeType::TriggerReceiver) {
if(!usedTriggerReceiver) fanOut->addSlave(triggerConnection.first);
usedTriggerReceiver = true;
consumer.getTriggerReceiver().getOwner().setExternalTriggerImpl(triggerConnection.second);
consumer.getNodeToTrigger().getOwner().setExternalTriggerImpl(triggerConnection.second);
}
else {
throw ApplicationExceptionWithID<ApplicationExceptionID::illegalParameter>("Unexpected node type!");
......@@ -643,7 +643,7 @@ void Application::typedMakeConnection(VariableNetwork &network) {
consumer.dump();
auto impls = createApplicationVariable<UserType>(consumer);
feeder.getAppAccessor<UserType>().replace(impls.first);
consumer.getTriggerReceiver().getOwner().setExternalTriggerImpl(impls.second);
consumer.getNodeToTrigger().getOwner().setExternalTriggerImpl(impls.second);
connectionMade = true;
}
else if(consumer.getType() == NodeType::Constant) {
......@@ -684,7 +684,7 @@ void Application::typedMakeConnection(VariableNetwork &network) {
else if(consumer.getType() == NodeType::TriggerReceiver) {
if(!usedTriggerReceiver) fanOut->addSlave(triggerConnection.first);
usedTriggerReceiver = true;
consumer.getTriggerReceiver().getOwner().setExternalTriggerImpl(triggerConnection.second);
consumer.getNodeToTrigger().getOwner().setExternalTriggerImpl(triggerConnection.second);
}
else {
throw ApplicationExceptionWithID<ApplicationExceptionID::illegalParameter>("Unexpected node type!");
......
......@@ -83,7 +83,7 @@ namespace ChimeraTK {
{
pdata->type = NodeType::TriggerReceiver;
pdata->direction = VariableDirection::consuming;
pdata->triggerReceiver = nodeToTrigger;
pdata->nodeToTrigger = nodeToTrigger;
pdata->name = "trigger:"+nodeToTrigger.getName();
}
......@@ -375,9 +375,9 @@ namespace ChimeraTK {
/*********************************************************************************************************************/
VariableNetworkNode VariableNetworkNode::getTriggerReceiver() {
assert(pdata->triggerReceiver.getType() != NodeType::invalid);
return pdata->triggerReceiver;
VariableNetworkNode VariableNetworkNode::getNodeToTrigger() {
assert(pdata->nodeToTrigger.getType() != NodeType::invalid);
return pdata->nodeToTrigger;
}
/*********************************************************************************************************************/
......
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