From 674fae911575111020b0f59ef5cfc3429b03d98d Mon Sep 17 00:00:00 2001 From: Douglas Clowes Date: Thu, 13 Nov 2014 12:40:18 +1100 Subject: [PATCH] Regenerate SCT drivers --- .../instrument/config/environment/magneticField/sct_tsi_smc.tcl | 2 +- site_ansto/instrument/config/environment/sct_hiden_xcs.tcl | 2 +- site_ansto/instrument/config/environment/sct_huber_pilot.tcl | 2 +- site_ansto/instrument/config/environment/sct_knauer_pump.tcl | 2 +- site_ansto/instrument/config/environment/sct_nhq_200.tcl | 2 +- .../config/environment/temperature/sct_julabo_lh45_gen.tcl | 2 +- .../config/environment/temperature/sct_mercury_base.tcl | 2 +- .../config/environment/temperature/sct_mercury_pres.tcl | 2 +- .../config/environment/temperature/sct_mercury_scpi.tcl | 2 +- .../config/environment/temperature/sct_mercury_temp.tcl | 2 +- .../config/environment/temperature/sct_mercury_valve.tcl | 2 +- .../config/environment/temperature/sct_pfeiffer_hg.tcl | 2 +- .../instrument/config/environment/temperature/sct_west_6100.tcl | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/site_ansto/instrument/config/environment/magneticField/sct_tsi_smc.tcl b/site_ansto/instrument/config/environment/magneticField/sct_tsi_smc.tcl index 7f30d08a..e3607e66 100644 --- a/site_ansto/instrument/config/environment/magneticField/sct_tsi_smc.tcl +++ b/site_ansto/instrument/config/environment/magneticField/sct_tsi_smc.tcl @@ -89,7 +89,7 @@ proc ::scobj::tsi_smc::checkstatus {tc_root} { if {[hpropexists [sct] simulated] && [sct simulated] == "true"} { set pv "${sp}" hupdateif ${tc_root}/[sct driveable] ${sp} - } + } else { set pv "[hval ${tc_root}/[sct driveable]]" } if { abs(${pv} - ${sp}) <= [sct tolerance] } { diff --git a/site_ansto/instrument/config/environment/sct_hiden_xcs.tcl b/site_ansto/instrument/config/environment/sct_hiden_xcs.tcl index 6758f56d..766a81af 100644 --- a/site_ansto/instrument/config/environment/sct_hiden_xcs.tcl +++ b/site_ansto/instrument/config/environment/sct_hiden_xcs.tcl @@ -89,7 +89,7 @@ proc ::scobj::hiden_xcs::checkstatus {tc_root} { if {[hpropexists [sct] simulated] && [sct simulated] == "true"} { set pv "${sp}" hupdateif ${tc_root}/[sct driveable] ${sp} - } + } else { set pv "[hval ${tc_root}/[sct driveable]]" } if { abs(${pv} - ${sp}) <= [sct tolerance] } { diff --git a/site_ansto/instrument/config/environment/sct_huber_pilot.tcl b/site_ansto/instrument/config/environment/sct_huber_pilot.tcl index 6e4774b0..105af927 100644 --- a/site_ansto/instrument/config/environment/sct_huber_pilot.tcl +++ b/site_ansto/instrument/config/environment/sct_huber_pilot.tcl @@ -92,7 +92,7 @@ proc ::scobj::huber_pilot::checkstatus {tc_root} { if {[hpropexists [sct] simulated] && [sct simulated] == "true"} { set pv "${sp}" hupdateif ${tc_root}/[sct driveable] ${sp} - } + } else { set pv "[hval ${tc_root}/[sct driveable]]" } if { abs(${pv} - ${sp}) <= [sct tolerance] } { diff --git a/site_ansto/instrument/config/environment/sct_knauer_pump.tcl b/site_ansto/instrument/config/environment/sct_knauer_pump.tcl index 61aef858..2e04881a 100644 --- a/site_ansto/instrument/config/environment/sct_knauer_pump.tcl +++ b/site_ansto/instrument/config/environment/sct_knauer_pump.tcl @@ -586,7 +586,7 @@ proc ::scobj::knauer_pump::volume_checkstatus {tc_root} { if {[hpropexists [sct] simulated] && [sct simulated] == "true"} { set pv "${sp}" hupdateif ${tc_root}/[sct driveable] ${sp} - } + } else { set pv "[hval ${tc_root}/[sct driveable]]" } if { abs(${pv} - ${sp}) <= [sct tolerance] } { diff --git a/site_ansto/instrument/config/environment/sct_nhq_200.tcl b/site_ansto/instrument/config/environment/sct_nhq_200.tcl index 96855507..eb583049 100644 --- a/site_ansto/instrument/config/environment/sct_nhq_200.tcl +++ b/site_ansto/instrument/config/environment/sct_nhq_200.tcl @@ -89,7 +89,7 @@ proc ::scobj::nhq_200::checkstatus {tc_root} { if {[hpropexists [sct] simulated] && [sct simulated] == "true"} { set pv "${sp}" hupdateif ${tc_root}/[sct driveable] ${sp} - } + } else { set pv "[hval ${tc_root}/[sct driveable]]" } if { abs(${pv} - ${sp}) <= [sct tolerance] } { diff --git a/site_ansto/instrument/config/environment/temperature/sct_julabo_lh45_gen.tcl b/site_ansto/instrument/config/environment/temperature/sct_julabo_lh45_gen.tcl index 708ef71e..922c20ef 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_julabo_lh45_gen.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_julabo_lh45_gen.tcl @@ -89,7 +89,7 @@ proc ::scobj::julabo_lh45_gen::checkstatus {tc_root} { if {[hpropexists [sct] simulated] && [sct simulated] == "true"} { set pv "${sp}" hupdateif ${tc_root}/[sct driveable] ${sp} - } + } else { set pv "[hval ${tc_root}/[sct driveable]]" } if { abs(${pv} - ${sp}) <= [sct tolerance] } { diff --git a/site_ansto/instrument/config/environment/temperature/sct_mercury_base.tcl b/site_ansto/instrument/config/environment/temperature/sct_mercury_base.tcl index 5b2a7d6b..576e4163 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_mercury_base.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_mercury_base.tcl @@ -89,7 +89,7 @@ proc ::scobj::mercury_base::checkstatus {tc_root} { if {[hpropexists [sct] simulated] && [sct simulated] == "true"} { set pv "${sp}" hupdateif ${tc_root}/[sct driveable] ${sp} - } + } else { set pv "[hval ${tc_root}/[sct driveable]]" } if { abs(${pv} - ${sp}) <= [sct tolerance] } { diff --git a/site_ansto/instrument/config/environment/temperature/sct_mercury_pres.tcl b/site_ansto/instrument/config/environment/temperature/sct_mercury_pres.tcl index c0c754c3..c71bf29c 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_mercury_pres.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_mercury_pres.tcl @@ -89,7 +89,7 @@ proc ::scobj::mercury_pres::checkstatus {tc_root} { if {[hpropexists [sct] simulated] && [sct simulated] == "true"} { set pv "${sp}" hupdateif ${tc_root}/[sct driveable] ${sp} - } + } else { set pv "[hval ${tc_root}/[sct driveable]]" } if { abs(${pv} - ${sp}) <= [sct tolerance] } { diff --git a/site_ansto/instrument/config/environment/temperature/sct_mercury_scpi.tcl b/site_ansto/instrument/config/environment/temperature/sct_mercury_scpi.tcl index a7fb0ab2..1e025d09 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_mercury_scpi.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_mercury_scpi.tcl @@ -89,7 +89,7 @@ proc ::scobj::mercury_scpi::checkstatus {tc_root} { if {[hpropexists [sct] simulated] && [sct simulated] == "true"} { set pv "${sp}" hupdateif ${tc_root}/[sct driveable] ${sp} - } + } else { set pv "[hval ${tc_root}/[sct driveable]]" } if { abs(${pv} - ${sp}) <= [sct tolerance] } { diff --git a/site_ansto/instrument/config/environment/temperature/sct_mercury_temp.tcl b/site_ansto/instrument/config/environment/temperature/sct_mercury_temp.tcl index 228afefa..ce3c9d40 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_mercury_temp.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_mercury_temp.tcl @@ -89,7 +89,7 @@ proc ::scobj::mercury_temp::checkstatus {tc_root} { if {[hpropexists [sct] simulated] && [sct simulated] == "true"} { set pv "${sp}" hupdateif ${tc_root}/[sct driveable] ${sp} - } + } else { set pv "[hval ${tc_root}/[sct driveable]]" } if { abs(${pv} - ${sp}) <= [sct tolerance] } { diff --git a/site_ansto/instrument/config/environment/temperature/sct_mercury_valve.tcl b/site_ansto/instrument/config/environment/temperature/sct_mercury_valve.tcl index 93565135..41c27428 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_mercury_valve.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_mercury_valve.tcl @@ -89,7 +89,7 @@ proc ::scobj::mercury_valve::checkstatus {tc_root} { if {[hpropexists [sct] simulated] && [sct simulated] == "true"} { set pv "${sp}" hupdateif ${tc_root}/[sct driveable] ${sp} - } + } else { set pv "[hval ${tc_root}/[sct driveable]]" } if { abs(${pv} - ${sp}) <= [sct tolerance] } { diff --git a/site_ansto/instrument/config/environment/temperature/sct_pfeiffer_hg.tcl b/site_ansto/instrument/config/environment/temperature/sct_pfeiffer_hg.tcl index 6814d2ab..635e141a 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_pfeiffer_hg.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_pfeiffer_hg.tcl @@ -128,7 +128,7 @@ proc ::scobj::pfeiffer_hg::checkstatus {tc_root} { if {[hpropexists [sct] simulated] && [sct simulated] == "true"} { set pv "${sp}" hupdateif ${tc_root}/[sct driveable] ${sp} - } + } else { set pv "[hval ${tc_root}/[sct driveable]]" } if { abs(${pv} - ${sp}) <= [sct tolerance] } { diff --git a/site_ansto/instrument/config/environment/temperature/sct_west_6100.tcl b/site_ansto/instrument/config/environment/temperature/sct_west_6100.tcl index cdc7fb77..ad5e0ae0 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_west_6100.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_west_6100.tcl @@ -89,7 +89,7 @@ proc ::scobj::west_6100::checkstatus {tc_root} { if {[hpropexists [sct] simulated] && [sct simulated] == "true"} { set pv "${sp}" hupdateif ${tc_root}/[sct driveable] ${sp} - } + } else { set pv "[hval ${tc_root}/[sct driveable]]" } if { abs(${pv} - ${sp}) <= [sct tolerance] } {