From afa38a037f6d4013e4f804bf7201aeab3141193c Mon Sep 17 00:00:00 2001
From: Martin Hierholzer <martin.hierholzer@desy.de>
Date: Thu, 10 Nov 2016 14:44:26 +0100
Subject: [PATCH] changed the units, just to have different units in the
example
---
example/demoApp.cc | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/example/demoApp.cc b/example/demoApp.cc
index 2a971255..172706be 100644
--- a/example/demoApp.cc
+++ b/example/demoApp.cc
@@ -16,8 +16,8 @@ namespace ctk = ChimeraTK;
class AutomationModule : public ctk::ApplicationModule {
public:
- CTK_SCALAR_INPUT(double, operatorSetpoint, "MV/m", ctk::UpdateMode::poll, "Setpoint given by the operator");
- CTK_SCALAR_OUTPUT(double, loopSetpoint, "MV/m", "Setpoint computed by the automation module");
+ CTK_SCALAR_INPUT(double, operatorSetpoint, "Celsius", ctk::UpdateMode::poll, "Setpoint given by the operator");
+ CTK_SCALAR_OUTPUT(double, loopSetpoint, "Celsius", "Setpoint computed by the automation module");
void mainLoop() {
loopSetpoint = 0;
@@ -40,9 +40,9 @@ class AutomationModule : public ctk::ApplicationModule {
class ControlLoopModule : public ctk::ApplicationModule {
public:
- CTK_SCALAR_INPUT(double, setpoint, "MV/m", ctk::UpdateMode::push, "Setpoint for my control loop");
- CTK_SCALAR_INPUT(double, readback, "MV/m", ctk::UpdateMode::push, "Control loop input value");
- CTK_SCALAR_OUTPUT(double, actuator, "MV/m", "Actuator output of the control loop");
+ CTK_SCALAR_INPUT(double, setpoint, "Celsius", ctk::UpdateMode::push, "Setpoint for my control loop");
+ CTK_SCALAR_INPUT(double, readback, "Celsius", ctk::UpdateMode::push, "Control loop input value");
+ CTK_SCALAR_OUTPUT(double, actuator, "A", "Actuator output of the control loop");
void mainLoop() {
@@ -67,8 +67,8 @@ class ControlLoopModule : public ctk::ApplicationModule {
class SimulatorModule : public ctk::ApplicationModule {
public:
- CTK_SCALAR_INPUT(double, actuator, "MV/m", ctk::UpdateMode::push, "Actuator input for the simulation");
- CTK_SCALAR_OUTPUT(double, readback, "MV/m", "Readback output value of the simulation");
+ CTK_SCALAR_INPUT(double, actuator, "A", ctk::UpdateMode::push, "Actuator input for the simulation");
+ CTK_SCALAR_OUTPUT(double, readback, "Celsius", "Readback output value of the simulation");
double lastValue{0};
--
GitLab