Changeset 18344 for branches/fscctrl_safety_limits/src/fscctrl.cc

Timestamp:

10/15/15 20:55:12 (9 years ago)

Author:

dneise

Message:

found the mistake, that lead to an exception without any more information. The 'names' in SetupConfiguration and EvalOPtions must of course be that same, if they are not. One gets an exception ... but not a little bit more ... really awesome.

File:

• branches/fscctrl_safety_limits/src/fscctrl.cc (modified) (1 diff)

branches/fscctrl_safety_limits/src/fscctrl.cc

@@ -1183 +1183 @@
         fFSC.SetPositionsBias(v2);
 
-        fFSC.SetEthernetSwitchCurrentLimit( conf.Get<double>("ethernet_switch") );
-        fFSC.SetFFCcurrentLimit( conf.Get<double>("FFC") );
-        fFSC.SetFLPcurrentLimit( conf.Get<double>("FLP") );
-        fFSC.SetFADdigitalCurrentLimit( conf.Get<double>("FAD_digital") );
-        fFSC.SetFADnegativeCurrentLimit( conf.Get<double>("FAD_negative") );
-        fFSC.SetFADpositiveCurrentLimit( conf.Get<double>("FAD_positive") );
-        fFSC.SetFPAdigitalCurrentLimit( conf.Get<double>("FPA_digital") );
-        fFSC.SetFPAnegativeCurrentLimit( conf.Get<double>("FPA_negative") );
-        fFSC.SetFPApositiveCurrentLimit( conf.Get<double>("FPA_positive") );
+        fFSC.SetEthernetSwitchCurrentLimit( conf.Get<double>("max-current.ethernet-switch") );
+        fFSC.SetFFCcurrentLimit( conf.Get<double>("max-current.FFC") );
+        fFSC.SetFLPcurrentLimit( conf.Get<double>("max-current.FLP") );
+        fFSC.SetFADdigitalCurrentLimit( conf.Get<double>("max-current.FAD-digital") );
+        fFSC.SetFADnegativeCurrentLimit( conf.Get<double>("max-current.FAD-negative") );
+        fFSC.SetFADpositiveCurrentLimit( conf.Get<double>("max-current.FAD-positive") );
+        fFSC.SetFPAdigitalCurrentLimit( conf.Get<double>("max-current.FPA-digital") );
+        fFSC.SetFPAnegativeCurrentLimit( conf.Get<double>("max-current.FPA-negative") );
+        fFSC.SetFPApositiveCurrentLimit( conf.Get<double>("max-current.FPA-positive") );
 
         SetEndpoint(conf.Get<string>("addr"));