From 86d4732b06e1fdb873c9819908fc5eb9d2e4004d Mon Sep 17 00:00:00 2001 From: Douglas Clowes Date: Thu, 13 Nov 2014 13:43:51 +1100 Subject: [PATCH] Regenerate SCT drivers --- site_ansto/instrument/config/environment/hiden_xcs_sct.tcl | 2 +- site_ansto/instrument/config/environment/huber_pilot_sct.tcl | 2 +- site_ansto/instrument/config/environment/knauer_pump_sct.tcl | 2 +- .../instrument/config/environment/magneticField/tsi_smc_sct.tcl | 2 +- site_ansto/instrument/config/environment/nhq_200_sct.tcl | 2 +- .../config/environment/temperature/eurotherm_3200_sct.tcl | 2 +- .../config/environment/temperature/julabo_lh45_gen_sct.tcl | 2 +- .../config/environment/temperature/mercury_base_sct.tcl | 2 +- .../config/environment/temperature/mercury_pres_sct.tcl | 2 +- .../config/environment/temperature/mercury_scpi_sct.tcl | 2 +- .../config/environment/temperature/mercury_temp_sct.tcl | 2 +- .../config/environment/temperature/mercury_valve_sct.tcl | 2 +- .../config/environment/temperature/pfeiffer_hg_sct.tcl | 2 +- .../instrument/config/environment/temperature/west_6100_sct.tcl | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/site_ansto/instrument/config/environment/hiden_xcs_sct.tcl b/site_ansto/instrument/config/environment/hiden_xcs_sct.tcl index 5f81b474..966e7623 100644 --- a/site_ansto/instrument/config/environment/hiden_xcs_sct.tcl +++ b/site_ansto/instrument/config/environment/hiden_xcs_sct.tcl @@ -92,7 +92,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/huber_pilot_sct.tcl b/site_ansto/instrument/config/environment/huber_pilot_sct.tcl index ff8071d3..ccfbfed3 100644 --- a/site_ansto/instrument/config/environment/huber_pilot_sct.tcl +++ b/site_ansto/instrument/config/environment/huber_pilot_sct.tcl @@ -95,7 +95,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/knauer_pump_sct.tcl b/site_ansto/instrument/config/environment/knauer_pump_sct.tcl index 4b018915..136f2f65 100644 --- a/site_ansto/instrument/config/environment/knauer_pump_sct.tcl +++ b/site_ansto/instrument/config/environment/knauer_pump_sct.tcl @@ -589,7 +589,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/magneticField/tsi_smc_sct.tcl b/site_ansto/instrument/config/environment/magneticField/tsi_smc_sct.tcl index cf705659..5bd23ec0 100644 --- a/site_ansto/instrument/config/environment/magneticField/tsi_smc_sct.tcl +++ b/site_ansto/instrument/config/environment/magneticField/tsi_smc_sct.tcl @@ -92,7 +92,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/nhq_200_sct.tcl b/site_ansto/instrument/config/environment/nhq_200_sct.tcl index 40b5e483..d2ba565f 100644 --- a/site_ansto/instrument/config/environment/nhq_200_sct.tcl +++ b/site_ansto/instrument/config/environment/nhq_200_sct.tcl @@ -92,7 +92,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/eurotherm_3200_sct.tcl b/site_ansto/instrument/config/environment/temperature/eurotherm_3200_sct.tcl index e3b6f79d..6bc89b23 100644 --- a/site_ansto/instrument/config/environment/temperature/eurotherm_3200_sct.tcl +++ b/site_ansto/instrument/config/environment/temperature/eurotherm_3200_sct.tcl @@ -92,7 +92,7 @@ proc ::scobj::eurotherm_3200::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/julabo_lh45_gen_sct.tcl b/site_ansto/instrument/config/environment/temperature/julabo_lh45_gen_sct.tcl index 40454f85..9dc4143a 100644 --- a/site_ansto/instrument/config/environment/temperature/julabo_lh45_gen_sct.tcl +++ b/site_ansto/instrument/config/environment/temperature/julabo_lh45_gen_sct.tcl @@ -92,7 +92,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/mercury_base_sct.tcl b/site_ansto/instrument/config/environment/temperature/mercury_base_sct.tcl index 51beb26b..ca19f8fd 100644 --- a/site_ansto/instrument/config/environment/temperature/mercury_base_sct.tcl +++ b/site_ansto/instrument/config/environment/temperature/mercury_base_sct.tcl @@ -92,7 +92,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/mercury_pres_sct.tcl b/site_ansto/instrument/config/environment/temperature/mercury_pres_sct.tcl index 22e93a54..cdd900e7 100644 --- a/site_ansto/instrument/config/environment/temperature/mercury_pres_sct.tcl +++ b/site_ansto/instrument/config/environment/temperature/mercury_pres_sct.tcl @@ -92,7 +92,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/mercury_scpi_sct.tcl b/site_ansto/instrument/config/environment/temperature/mercury_scpi_sct.tcl index d6fcd58e..1aeeff94 100644 --- a/site_ansto/instrument/config/environment/temperature/mercury_scpi_sct.tcl +++ b/site_ansto/instrument/config/environment/temperature/mercury_scpi_sct.tcl @@ -92,7 +92,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/mercury_temp_sct.tcl b/site_ansto/instrument/config/environment/temperature/mercury_temp_sct.tcl index efdc3df1..aac830f8 100644 --- a/site_ansto/instrument/config/environment/temperature/mercury_temp_sct.tcl +++ b/site_ansto/instrument/config/environment/temperature/mercury_temp_sct.tcl @@ -92,7 +92,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/mercury_valve_sct.tcl b/site_ansto/instrument/config/environment/temperature/mercury_valve_sct.tcl index 02fee45e..a520a67e 100644 --- a/site_ansto/instrument/config/environment/temperature/mercury_valve_sct.tcl +++ b/site_ansto/instrument/config/environment/temperature/mercury_valve_sct.tcl @@ -92,7 +92,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/pfeiffer_hg_sct.tcl b/site_ansto/instrument/config/environment/temperature/pfeiffer_hg_sct.tcl index 441853f9..3ae698b9 100644 --- a/site_ansto/instrument/config/environment/temperature/pfeiffer_hg_sct.tcl +++ b/site_ansto/instrument/config/environment/temperature/pfeiffer_hg_sct.tcl @@ -131,7 +131,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/west_6100_sct.tcl b/site_ansto/instrument/config/environment/temperature/west_6100_sct.tcl index e24a8595..4d7c7199 100644 --- a/site_ansto/instrument/config/environment/temperature/west_6100_sct.tcl +++ b/site_ansto/instrument/config/environment/temperature/west_6100_sct.tcl @@ -92,7 +92,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] } {