linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SICS-839 Change TCL var from nominal_outp_current to NominalOutpCurrent

Browse Source
This commit is contained in:
Douglas Clowes
2015-01-07 10:20:40 +11:00
parent 0afb08a7a3
commit 76d7191754
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
site_ansto/instrument/config/environment/magneticField/sct_bruker_BEC1.tcl
View File

@ -375,7 +375,7 @@ proc inTolerance {expectedLength} {
set nodename $tc_root/sensor/nominal_outp_current set nodename $tc_root/sensor/nominal_outp_current
set setpt [hval $nodename] set setpt [hval $nodename]
set nodename $tc_root/sensor/desired_current set nodename $tc_root/sensor/desired_current
set nominal_outp_current [hval $nodename] set NominalOutpCurrent [hval $nodename]
# clientput "inTolerance(): comparing sensor/setpoint=$setpt with actual sensorValue=$temp" # clientput "inTolerance(): comparing sensor/setpoint=$setpt with actual sensorValue=$temp"
set diff [expr {abs($setpt - $NominalOutpCurrent)}] set diff [expr {abs($setpt - $NominalOutpCurrent)}]
if {$diff > $::scobj::bruker_BEC1::bruker_BEC1_driveTolerance} { if {$diff > $::scobj::bruker_BEC1::bruker_BEC1_driveTolerance} {
@ -851,7 +851,7 @@ proc checktol {tc_root} {
set catch_status [ catch { set catch_status [ catch {
set retVal 0 set retVal 0
set sensorValue $tc_root/sensor/desired_current set sensorValue $tc_root/sensor/desired_current
set nominal_outp_current [hval $sensorValue] set NominalOutpCurrent [hval $sensorValue]
set isetp $tc_root/sensor/nominal_outp_current set isetp $tc_root/sensor/nominal_outp_current
set setpt [hval $isetp] set setpt [hval $isetp]
set tol [hval $tc_root/emon/tolerance] set tol [hval $tc_root/emon/tolerance]