Regen sct drivers after refactoring

2014-09-29 15:38:32 +10:00
parent 814c8741c3
commit 29650b420c
20 changed files with 1014 additions and 322 deletions
--- a/site_ansto/instrument/config/environment/temperature/julabo_lh45_gen_sct.tcl
+++ b/site_ansto/instrument/config/environment/temperature/julabo_lh45_gen_sct.tcl
@@ -376,6 +376,7 @@ proc ::scobj::julabo_lh45_gen::mkDriver { sct_controller name device_class simul

    set scobj_hpath /sics/${name}

+
    hfactory ${scobj_hpath}/heating_power_percent plain user float
    hsetprop ${scobj_hpath}/heating_power_percent read ${ns}::getValue ${scobj_hpath} rdValue {in_pv_01}
    hsetprop ${scobj_hpath}/heating_power_percent rdValue ${ns}::rdValue ${scobj_hpath}
@@ -389,6 +390,13 @@ proc ::scobj::julabo_lh45_gen::mkDriver { sct_controller name device_class simul
    hsetprop ${scobj_hpath}/heating_power_percent type "part"
    hsetprop ${scobj_hpath}/heating_power_percent nxalias "${name}_heating_power_percent"

+    if {[string equal -nocase "${simulation_flag}" "false"]} {
+      ${sct_controller} poll ${scobj_hpath}/heating_power_percent 1
+    } else {
+      ::scobj::julabo_lh45_gen::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for julabo_lh45_gen"
+    }
+
+
    hfactory ${scobj_hpath}/lh45_lasterror plain user text
    hsetprop ${scobj_hpath}/lh45_lasterror control true
    hsetprop ${scobj_hpath}/lh45_lasterror data true
@@ -400,6 +408,7 @@ proc ::scobj::julabo_lh45_gen::mkDriver { sct_controller name device_class simul
    hsetprop ${scobj_hpath}/lh45_lasterror type "part"
    hsetprop ${scobj_hpath}/lh45_lasterror nxalias "${name}_lh45_lasterror"

+
    hfactory ${scobj_hpath}/lh45_state plain user text
    hsetprop ${scobj_hpath}/lh45_state read ${ns}::getState ${scobj_hpath} rdState {status}
    hsetprop ${scobj_hpath}/lh45_state rdState ${ns}::rdState ${scobj_hpath}
@@ -413,6 +422,13 @@ proc ::scobj::julabo_lh45_gen::mkDriver { sct_controller name device_class simul
    hsetprop ${scobj_hpath}/lh45_state type "part"
    hsetprop ${scobj_hpath}/lh45_state nxalias "${name}_lh45_state"

+    if {[string equal -nocase "${simulation_flag}" "false"]} {
+      ${sct_controller} poll ${scobj_hpath}/lh45_state 1
+    } else {
+      ::scobj::julabo_lh45_gen::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for julabo_lh45_gen"
+    }
+
+
    hfactory ${scobj_hpath}/overtemp_warnlimit plain user float
    hsetprop ${scobj_hpath}/overtemp_warnlimit read ${ns}::getValue ${scobj_hpath} rdValue {in_sp_03}
    hsetprop ${scobj_hpath}/overtemp_warnlimit rdValue ${ns}::rdValue ${scobj_hpath}
@@ -426,6 +442,13 @@ proc ::scobj::julabo_lh45_gen::mkDriver { sct_controller name device_class simul
    hsetprop ${scobj_hpath}/overtemp_warnlimit type "part"
    hsetprop ${scobj_hpath}/overtemp_warnlimit nxalias "${name}_overtemp_warnlimit"

+    if {[string equal -nocase "${simulation_flag}" "false"]} {
+      ${sct_controller} poll ${scobj_hpath}/overtemp_warnlimit 1
+    } else {
+      ::scobj::julabo_lh45_gen::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for julabo_lh45_gen"
+    }
+
+
    hfactory ${scobj_hpath}/remote_ctrl plain spy text
    hsetprop ${scobj_hpath}/remote_ctrl control true
    hsetprop ${scobj_hpath}/remote_ctrl data true
@@ -437,6 +460,7 @@ proc ::scobj::julabo_lh45_gen::mkDriver { sct_controller name device_class simul
    hsetprop ${scobj_hpath}/remote_ctrl type "part"
    hsetprop ${scobj_hpath}/remote_ctrl nxalias "${name}_remote_ctrl"

+
    hfactory ${scobj_hpath}/setpoint plain user float
    hsetprop ${scobj_hpath}/setpoint read ${ns}::getValue ${scobj_hpath} rdValue {in_sp_00}
    hsetprop ${scobj_hpath}/setpoint rdValue ${ns}::rdValue ${scobj_hpath}
@@ -464,6 +488,14 @@ proc ::scobj::julabo_lh45_gen::mkDriver { sct_controller name device_class simul
    hsetprop ${scobj_hpath}/setpoint units "C"
    hsetprop ${scobj_hpath}/setpoint nxalias "${name}_setpoint"

+    if {[string equal -nocase "${simulation_flag}" "false"]} {
+      ${sct_controller} poll ${scobj_hpath}/setpoint 1
+      ${sct_controller} write ${scobj_hpath}/setpoint
+    } else {
+      ::scobj::julabo_lh45_gen::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for julabo_lh45_gen"
+    }
+
+
    hfactory ${scobj_hpath}/subtemp_warnlimit plain user float
    hsetprop ${scobj_hpath}/subtemp_warnlimit read ${ns}::getValue ${scobj_hpath} rdValue {in_sp_04}
    hsetprop ${scobj_hpath}/subtemp_warnlimit rdValue ${ns}::rdValue ${scobj_hpath}
@@ -477,25 +509,19 @@ proc ::scobj::julabo_lh45_gen::mkDriver { sct_controller name device_class simul
    hsetprop ${scobj_hpath}/subtemp_warnlimit type "part"
    hsetprop ${scobj_hpath}/subtemp_warnlimit nxalias "${name}_subtemp_warnlimit"

-    hsetprop ${scobj_hpath} data "true"
-    hsetprop ${scobj_hpath} klass "@none"
-    hsetprop ${scobj_hpath} type "part"
-
    if {[string equal -nocase "${simulation_flag}" "false"]} {
-      ${sct_controller} poll ${scobj_hpath}/heating_power_percent 1
-      ${sct_controller} poll ${scobj_hpath}/lh45_state 1
-      ${sct_controller} poll ${scobj_hpath}/overtemp_warnlimit 1
-      ${sct_controller} poll ${scobj_hpath}/setpoint 1
      ${sct_controller} poll ${scobj_hpath}/subtemp_warnlimit 1
-      ${sct_controller} write ${scobj_hpath}/setpoint
    } else {
      ::scobj::julabo_lh45_gen::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for julabo_lh45_gen"
    }

+    hsetprop ${scobj_hpath} data "true"
+    hsetprop ${scobj_hpath} klass "@none"
+    hsetprop ${scobj_hpath} type "part"
+    ansto_makesctdrive ${name}_setpoint ${scobj_hpath}/setpoint ${scobj_hpath}/sensor/value ${sct_controller}
+
    hfactory ${scobj_hpath}/mode plain spy none
-    hsetprop ${scobj_hpath}/mode data "true"
-    hsetprop ${scobj_hpath}/mode klass "@none"
-    hsetprop ${scobj_hpath}/mode type "part"
+

    hfactory ${scobj_hpath}/mode/ext_else_bath plain user int
    hsetprop ${scobj_hpath}/mode/ext_else_bath read ${ns}::getValue ${scobj_hpath} rdValue {in_mode_04}
@@ -513,6 +539,14 @@ proc ::scobj::julabo_lh45_gen::mkDriver { sct_controller name device_class simul
    hsetprop ${scobj_hpath}/mode/ext_else_bath type "part"
    hsetprop ${scobj_hpath}/mode/ext_else_bath nxalias "${name}_mode_ext_else_bath"

+    if {[string equal -nocase "${simulation_flag}" "false"]} {
+      ${sct_controller} poll ${scobj_hpath}/mode/ext_else_bath 1
+      ${sct_controller} write ${scobj_hpath}/mode/ext_else_bath
+    } else {
+      ::scobj::julabo_lh45_gen::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for julabo_lh45_gen"
+    }
+
+
    hfactory ${scobj_hpath}/mode/on_else_off plain user int
    hsetprop ${scobj_hpath}/mode/on_else_off read ${ns}::getValue ${scobj_hpath} rdValue {in_mode_05}
    hsetprop ${scobj_hpath}/mode/on_else_off rdValue ${ns}::rdValue ${scobj_hpath}
@@ -530,18 +564,17 @@ proc ::scobj::julabo_lh45_gen::mkDriver { sct_controller name device_class simul
    hsetprop ${scobj_hpath}/mode/on_else_off nxalias "${name}_mode_on_else_off"

    if {[string equal -nocase "${simulation_flag}" "false"]} {
-      ${sct_controller} poll ${scobj_hpath}/mode/ext_else_bath 1
      ${sct_controller} poll ${scobj_hpath}/mode/on_else_off 1
-      ${sct_controller} write ${scobj_hpath}/mode/ext_else_bath
      ${sct_controller} write ${scobj_hpath}/mode/on_else_off
    } else {
      ::scobj::julabo_lh45_gen::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for julabo_lh45_gen"
    }
+    hsetprop ${scobj_hpath}/mode data "true"
+    hsetprop ${scobj_hpath}/mode klass "@none"
+    hsetprop ${scobj_hpath}/mode type "part"

    hfactory ${scobj_hpath}/sensor plain spy none
-    hsetprop ${scobj_hpath}/sensor data "true"
-    hsetprop ${scobj_hpath}/sensor klass "@none"
-    hsetprop ${scobj_hpath}/sensor type "part"
+

    hfactory ${scobj_hpath}/sensor/bathtemp plain internal float
    hsetprop ${scobj_hpath}/sensor/bathtemp read ${ns}::getValue ${scobj_hpath} rdSensor {in_pv_00}
@@ -558,6 +591,13 @@ proc ::scobj::julabo_lh45_gen::mkDriver { sct_controller name device_class simul
    hsetprop ${scobj_hpath}/sensor/bathtemp units "C"
    hsetprop ${scobj_hpath}/sensor/bathtemp nxalias "${name}_sensor_bathtemp"

+    if {[string equal -nocase "${simulation_flag}" "false"]} {
+      ${sct_controller} poll ${scobj_hpath}/sensor/bathtemp 1
+    } else {
+      ::scobj::julabo_lh45_gen::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for julabo_lh45_gen"
+    }
+
+
    hfactory ${scobj_hpath}/sensor/end_temperature plain internal float
    hsetprop ${scobj_hpath}/sensor/end_temperature control true
    hsetprop ${scobj_hpath}/sensor/end_temperature data true
@@ -570,6 +610,7 @@ proc ::scobj::julabo_lh45_gen::mkDriver { sct_controller name device_class simul
    hsetprop ${scobj_hpath}/sensor/end_temperature units "C"
    hsetprop ${scobj_hpath}/sensor/end_temperature nxalias "${name}_sensor_end_temperature"

+
    hfactory ${scobj_hpath}/sensor/external plain internal float
    hsetprop ${scobj_hpath}/sensor/external read ${ns}::getValue ${scobj_hpath} rdSensor {in_pv_02}
    hsetprop ${scobj_hpath}/sensor/external rdSensor ${ns}::rdSensor ${scobj_hpath}
@@ -585,6 +626,13 @@ proc ::scobj::julabo_lh45_gen::mkDriver { sct_controller name device_class simul
    hsetprop ${scobj_hpath}/sensor/external units "C"
    hsetprop ${scobj_hpath}/sensor/external nxalias "${name}_sensor_external"

+    if {[string equal -nocase "${simulation_flag}" "false"]} {
+      ${sct_controller} poll ${scobj_hpath}/sensor/external 1
+    } else {
+      ::scobj::julabo_lh45_gen::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for julabo_lh45_gen"
+    }
+
+
    hfactory ${scobj_hpath}/sensor/start_temperature plain internal float
    hsetprop ${scobj_hpath}/sensor/start_temperature control true
    hsetprop ${scobj_hpath}/sensor/start_temperature data true
@@ -597,6 +645,7 @@ proc ::scobj::julabo_lh45_gen::mkDriver { sct_controller name device_class simul
    hsetprop ${scobj_hpath}/sensor/start_temperature units "C"
    hsetprop ${scobj_hpath}/sensor/start_temperature nxalias "${name}_sensor_start_temperature"

+
    hfactory ${scobj_hpath}/sensor/value plain internal float
    hsetprop ${scobj_hpath}/sensor/value control true
    hsetprop ${scobj_hpath}/sensor/value data true
@@ -610,19 +659,12 @@ proc ::scobj::julabo_lh45_gen::mkDriver { sct_controller name device_class simul
    hsetprop ${scobj_hpath}/sensor/value type "part"
    hsetprop ${scobj_hpath}/sensor/value units "C"
    hsetprop ${scobj_hpath}/sensor/value nxalias "${name}_sensor_value"
-
-    if {[string equal -nocase "${simulation_flag}" "false"]} {
-      ${sct_controller} poll ${scobj_hpath}/sensor/bathtemp 1
-      ${sct_controller} poll ${scobj_hpath}/sensor/external 1
-    } else {
-      ::scobj::julabo_lh45_gen::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for julabo_lh45_gen"
-    }
+    hsetprop ${scobj_hpath}/sensor data "true"
+    hsetprop ${scobj_hpath}/sensor klass "@none"
+    hsetprop ${scobj_hpath}/sensor type "part"
    hsetprop ${scobj_hpath} klass ${device_class}
    hsetprop ${scobj_hpath} data true
    hsetprop ${scobj_hpath} debug_threshold 5
-    if {[string equal -nocase "${simulation_flag}" "false"]} {
-      ansto_makesctdrive ${name}_setpoint ${scobj_hpath}/setpoint ${scobj_hpath}/sensor/value ${sct_controller}
-    }
 # mkDriver hook code starts
    if { ${ctrl_sensor} == "external" } {
      hset ${scobj_hpath}/mode/ext_else_bath 1
--- a/site_ansto/instrument/config/environment/temperature/lakeshore_218_sct.tcl
+++ b/site_ansto/instrument/config/environment/temperature/lakeshore_218_sct.tcl
@@ -169,6 +169,7 @@ proc ::scobj::lakeshore_218::mkDriver { sct_controller name device_class simulat

    set scobj_hpath /sics/${name}

+
    hfactory ${scobj_hpath}/krdg plain user text
    hsetprop ${scobj_hpath}/krdg read ${ns}::getValue ${scobj_hpath} rdValue {KRDG? 0}
    hsetprop ${scobj_hpath}/krdg rdValue ${ns}::rdValue ${scobj_hpath}
@@ -182,20 +183,18 @@ proc ::scobj::lakeshore_218::mkDriver { sct_controller name device_class simulat
    hsetprop ${scobj_hpath}/krdg type "part"
    hsetprop ${scobj_hpath}/krdg nxalias "${name}_krdg"

-    hsetprop ${scobj_hpath} data "false"
-    hsetprop ${scobj_hpath} klass "@none"
-    hsetprop ${scobj_hpath} type "part"
-
    if {[string equal -nocase "${simulation_flag}" "false"]} {
      ${sct_controller} poll ${scobj_hpath}/krdg 1
    } else {
      ::scobj::lakeshore_218::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for lakeshore_218"
    }

+    hsetprop ${scobj_hpath} data "false"
+    hsetprop ${scobj_hpath} klass "@none"
+    hsetprop ${scobj_hpath} type "part"
+
    hfactory ${scobj_hpath}/sensor plain spy none
-    hsetprop ${scobj_hpath}/sensor data "true"
-    hsetprop ${scobj_hpath}/sensor klass "@none"
-    hsetprop ${scobj_hpath}/sensor type "part"
+

    hfactory ${scobj_hpath}/sensor/ch1 plain user float
    hsetprop ${scobj_hpath}/sensor/ch1 read ${ns}::getTemp ${scobj_hpath} rdValue {0}
@@ -210,6 +209,13 @@ proc ::scobj::lakeshore_218::mkDriver { sct_controller name device_class simulat
    hsetprop ${scobj_hpath}/sensor/ch1 type "part"
    hsetprop ${scobj_hpath}/sensor/ch1 nxalias "${name}_sensor_ch1"

+    if {[string equal -nocase "${simulation_flag}" "false"]} {
+      ${sct_controller} poll ${scobj_hpath}/sensor/ch1 1
+    } else {
+      ::scobj::lakeshore_218::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for lakeshore_218"
+    }
+
+
    hfactory ${scobj_hpath}/sensor/ch2 plain user float
    hsetprop ${scobj_hpath}/sensor/ch2 read ${ns}::getTemp ${scobj_hpath} rdValue {1}
    hsetprop ${scobj_hpath}/sensor/ch2 rdValue ${ns}::rdValue ${scobj_hpath}
@@ -223,6 +229,13 @@ proc ::scobj::lakeshore_218::mkDriver { sct_controller name device_class simulat
    hsetprop ${scobj_hpath}/sensor/ch2 type "part"
    hsetprop ${scobj_hpath}/sensor/ch2 nxalias "${name}_sensor_ch2"

+    if {[string equal -nocase "${simulation_flag}" "false"]} {
+      ${sct_controller} poll ${scobj_hpath}/sensor/ch2 1
+    } else {
+      ::scobj::lakeshore_218::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for lakeshore_218"
+    }
+
+
    hfactory ${scobj_hpath}/sensor/ch3 plain user float
    hsetprop ${scobj_hpath}/sensor/ch3 read ${ns}::getTemp ${scobj_hpath} rdValue {2}
    hsetprop ${scobj_hpath}/sensor/ch3 rdValue ${ns}::rdValue ${scobj_hpath}
@@ -236,6 +249,13 @@ proc ::scobj::lakeshore_218::mkDriver { sct_controller name device_class simulat
    hsetprop ${scobj_hpath}/sensor/ch3 type "part"
    hsetprop ${scobj_hpath}/sensor/ch3 nxalias "${name}_sensor_ch3"

+    if {[string equal -nocase "${simulation_flag}" "false"]} {
+      ${sct_controller} poll ${scobj_hpath}/sensor/ch3 1
+    } else {
+      ::scobj::lakeshore_218::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for lakeshore_218"
+    }
+
+
    hfactory ${scobj_hpath}/sensor/ch4 plain user float
    hsetprop ${scobj_hpath}/sensor/ch4 read ${ns}::getTemp ${scobj_hpath} rdValue {3}
    hsetprop ${scobj_hpath}/sensor/ch4 rdValue ${ns}::rdValue ${scobj_hpath}
@@ -249,6 +269,13 @@ proc ::scobj::lakeshore_218::mkDriver { sct_controller name device_class simulat
    hsetprop ${scobj_hpath}/sensor/ch4 type "part"
    hsetprop ${scobj_hpath}/sensor/ch4 nxalias "${name}_sensor_ch4"

+    if {[string equal -nocase "${simulation_flag}" "false"]} {
+      ${sct_controller} poll ${scobj_hpath}/sensor/ch4 1
+    } else {
+      ::scobj::lakeshore_218::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for lakeshore_218"
+    }
+
+
    hfactory ${scobj_hpath}/sensor/ch5 plain user float
    hsetprop ${scobj_hpath}/sensor/ch5 read ${ns}::getTemp ${scobj_hpath} rdValue {4}
    hsetprop ${scobj_hpath}/sensor/ch5 rdValue ${ns}::rdValue ${scobj_hpath}
@@ -262,6 +289,13 @@ proc ::scobj::lakeshore_218::mkDriver { sct_controller name device_class simulat
    hsetprop ${scobj_hpath}/sensor/ch5 type "part"
    hsetprop ${scobj_hpath}/sensor/ch5 nxalias "${name}_sensor_ch5"

+    if {[string equal -nocase "${simulation_flag}" "false"]} {
+      ${sct_controller} poll ${scobj_hpath}/sensor/ch5 1
+    } else {
+      ::scobj::lakeshore_218::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for lakeshore_218"
+    }
+
+
    hfactory ${scobj_hpath}/sensor/ch6 plain user float
    hsetprop ${scobj_hpath}/sensor/ch6 read ${ns}::getTemp ${scobj_hpath} rdValue {5}
    hsetprop ${scobj_hpath}/sensor/ch6 rdValue ${ns}::rdValue ${scobj_hpath}
@@ -275,6 +309,13 @@ proc ::scobj::lakeshore_218::mkDriver { sct_controller name device_class simulat
    hsetprop ${scobj_hpath}/sensor/ch6 type "part"
    hsetprop ${scobj_hpath}/sensor/ch6 nxalias "${name}_sensor_ch6"

+    if {[string equal -nocase "${simulation_flag}" "false"]} {
+      ${sct_controller} poll ${scobj_hpath}/sensor/ch6 1
+    } else {
+      ::scobj::lakeshore_218::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for lakeshore_218"
+    }
+
+
    hfactory ${scobj_hpath}/sensor/ch7 plain user float
    hsetprop ${scobj_hpath}/sensor/ch7 read ${ns}::getTemp ${scobj_hpath} rdValue {6}
    hsetprop ${scobj_hpath}/sensor/ch7 rdValue ${ns}::rdValue ${scobj_hpath}
@@ -288,6 +329,13 @@ proc ::scobj::lakeshore_218::mkDriver { sct_controller name device_class simulat
    hsetprop ${scobj_hpath}/sensor/ch7 type "part"
    hsetprop ${scobj_hpath}/sensor/ch7 nxalias "${name}_sensor_ch7"

+    if {[string equal -nocase "${simulation_flag}" "false"]} {
+      ${sct_controller} poll ${scobj_hpath}/sensor/ch7 1
+    } else {
+      ::scobj::lakeshore_218::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for lakeshore_218"
+    }
+
+
    hfactory ${scobj_hpath}/sensor/ch8 plain user float
    hsetprop ${scobj_hpath}/sensor/ch8 read ${ns}::getTemp ${scobj_hpath} rdValue {7}
    hsetprop ${scobj_hpath}/sensor/ch8 rdValue ${ns}::rdValue ${scobj_hpath}
@@ -302,17 +350,13 @@ proc ::scobj::lakeshore_218::mkDriver { sct_controller name device_class simulat
    hsetprop ${scobj_hpath}/sensor/ch8 nxalias "${name}_sensor_ch8"

    if {[string equal -nocase "${simulation_flag}" "false"]} {
-      ${sct_controller} poll ${scobj_hpath}/sensor/ch1 1
-      ${sct_controller} poll ${scobj_hpath}/sensor/ch2 1
-      ${sct_controller} poll ${scobj_hpath}/sensor/ch3 1
-      ${sct_controller} poll ${scobj_hpath}/sensor/ch4 1
-      ${sct_controller} poll ${scobj_hpath}/sensor/ch5 1
-      ${sct_controller} poll ${scobj_hpath}/sensor/ch6 1
-      ${sct_controller} poll ${scobj_hpath}/sensor/ch7 1
      ${sct_controller} poll ${scobj_hpath}/sensor/ch8 1
    } else {
      ::scobj::lakeshore_218::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for lakeshore_218"
    }
+    hsetprop ${scobj_hpath}/sensor data "true"
+    hsetprop ${scobj_hpath}/sensor klass "@none"
+    hsetprop ${scobj_hpath}/sensor type "part"
    hsetprop ${scobj_hpath} klass ${device_class}
    hsetprop ${scobj_hpath} data true
    hsetprop ${scobj_hpath} debug_threshold 5
--- a/site_ansto/instrument/config/environment/temperature/mercury_base_sct.tcl
+++ b/site_ansto/instrument/config/environment/temperature/mercury_base_sct.tcl
@@ -279,9 +279,7 @@ proc ::scobj::mercury_base::mkDriver { sct_controller name device_class simulati
    set scobj_hpath /sics/${name}

    hfactory ${scobj_hpath}/Loop1 plain spy none
-    hsetprop ${scobj_hpath}/Loop1 data "true"
-    hsetprop ${scobj_hpath}/Loop1 klass "@none"
-    hsetprop ${scobj_hpath}/Loop1 type "part"
+

    hfactory ${scobj_hpath}/Loop1/nick plain user text
    hsetprop ${scobj_hpath}/Loop1/nick read ${ns}::getValue ${scobj_hpath} rdText {READ:DEV:MB1.T1:TEMP:NICK}
@@ -296,6 +294,13 @@ proc ::scobj::mercury_base::mkDriver { sct_controller name device_class simulati
    hsetprop ${scobj_hpath}/Loop1/nick type "part"
    hsetprop ${scobj_hpath}/Loop1/nick nxalias "${name}_Loop1_nick"

+    if {[string equal -nocase "${simulation_flag}" "false"]} {
+      ${sct_controller} poll ${scobj_hpath}/Loop1/nick 15
+    } else {
+      ::scobj::mercury_base::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_base"
+    }
+
+
    hfactory ${scobj_hpath}/Loop1/power plain user float
    hsetprop ${scobj_hpath}/Loop1/power read ${ns}::getValue ${scobj_hpath} rdValue {READ:DEV:MB0.H1:HTR:SIG:POWR}
    hsetprop ${scobj_hpath}/Loop1/power rdValue ${ns}::rdValue ${scobj_hpath}
@@ -309,6 +314,13 @@ proc ::scobj::mercury_base::mkDriver { sct_controller name device_class simulati
    hsetprop ${scobj_hpath}/Loop1/power type "part"
    hsetprop ${scobj_hpath}/Loop1/power nxalias "${name}_Loop1_power"

+    if {[string equal -nocase "${simulation_flag}" "false"]} {
+      ${sct_controller} poll ${scobj_hpath}/Loop1/power 5
+    } else {
+      ::scobj::mercury_base::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_base"
+    }
+
+
    hfactory ${scobj_hpath}/Loop1/sensor plain user float
    hsetprop ${scobj_hpath}/Loop1/sensor read ${ns}::getValue ${scobj_hpath} rdValue {READ:DEV:MB1.T1:TEMP:SIG:TEMP}
    hsetprop ${scobj_hpath}/Loop1/sensor rdValue ${ns}::rdValue ${scobj_hpath}
@@ -324,6 +336,13 @@ proc ::scobj::mercury_base::mkDriver { sct_controller name device_class simulati
    hsetprop ${scobj_hpath}/Loop1/sensor type "part"
    hsetprop ${scobj_hpath}/Loop1/sensor nxalias "${name}_Loop1_sensor"

+    if {[string equal -nocase "${simulation_flag}" "false"]} {
+      ${sct_controller} poll ${scobj_hpath}/Loop1/sensor 1
+    } else {
+      ::scobj::mercury_base::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_base"
+    }
+
+
    hfactory ${scobj_hpath}/Loop1/setpoint plain user float
    hsetprop ${scobj_hpath}/Loop1/setpoint read ${ns}::getValue ${scobj_hpath} rdValue {READ:DEV:MB1.T1:TEMP:LOOP:TSET}
    hsetprop ${scobj_hpath}/Loop1/setpoint rdValue ${ns}::rdValue ${scobj_hpath}
@@ -352,19 +371,18 @@ proc ::scobj::mercury_base::mkDriver { sct_controller name device_class simulati
    hsetprop ${scobj_hpath}/Loop1/setpoint nxalias "${name}_Loop1_setpoint"

    if {[string equal -nocase "${simulation_flag}" "false"]} {
-      ${sct_controller} poll ${scobj_hpath}/Loop1/nick 15
-      ${sct_controller} poll ${scobj_hpath}/Loop1/power 5
-      ${sct_controller} poll ${scobj_hpath}/Loop1/sensor 1
      ${sct_controller} poll ${scobj_hpath}/Loop1/setpoint 5
      ${sct_controller} write ${scobj_hpath}/Loop1/setpoint
    } else {
      ::scobj::mercury_base::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_base"
    }
+    hsetprop ${scobj_hpath}/Loop1 data "true"
+    hsetprop ${scobj_hpath}/Loop1 klass "@none"
+    hsetprop ${scobj_hpath}/Loop1 type "part"
+    ansto_makesctdrive ${name}_Loop1_setpoint ${scobj_hpath}/Loop1/setpoint ${scobj_hpath}/Loop1/sensor ${sct_controller}

    hfactory ${scobj_hpath}/Loop2 plain spy none
-    hsetprop ${scobj_hpath}/Loop2 data "true"
-    hsetprop ${scobj_hpath}/Loop2 klass "@none"
-    hsetprop ${scobj_hpath}/Loop2 type "part"
+

    hfactory ${scobj_hpath}/Loop2/nick plain user text
    hsetprop ${scobj_hpath}/Loop2/nick read ${ns}::getValue ${scobj_hpath} rdText {READ:DEV:DB6.T1:TEMP:NICK}
@@ -379,6 +397,13 @@ proc ::scobj::mercury_base::mkDriver { sct_controller name device_class simulati
    hsetprop ${scobj_hpath}/Loop2/nick type "part"
    hsetprop ${scobj_hpath}/Loop2/nick nxalias "${name}_Loop2_nick"

+    if {[string equal -nocase "${simulation_flag}" "false"]} {
+      ${sct_controller} poll ${scobj_hpath}/Loop2/nick 15
+    } else {
+      ::scobj::mercury_base::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_base"
+    }
+
+
    hfactory ${scobj_hpath}/Loop2/power plain user float
    hsetprop ${scobj_hpath}/Loop2/power read ${ns}::getValue ${scobj_hpath} rdValue {READ:DEV:DB1.H1:HTR:SIG:POWR}
    hsetprop ${scobj_hpath}/Loop2/power rdValue ${ns}::rdValue ${scobj_hpath}
@@ -392,6 +417,13 @@ proc ::scobj::mercury_base::mkDriver { sct_controller name device_class simulati
    hsetprop ${scobj_hpath}/Loop2/power type "part"
    hsetprop ${scobj_hpath}/Loop2/power nxalias "${name}_Loop2_power"

+    if {[string equal -nocase "${simulation_flag}" "false"]} {
+      ${sct_controller} poll ${scobj_hpath}/Loop2/power 5
+    } else {
+      ::scobj::mercury_base::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_base"
+    }
+
+
    hfactory ${scobj_hpath}/Loop2/sensor plain user float
    hsetprop ${scobj_hpath}/Loop2/sensor read ${ns}::getValue ${scobj_hpath} rdValue {READ:DEV:DB6.T1:TEMP:SIG:TEMP}
    hsetprop ${scobj_hpath}/Loop2/sensor rdValue ${ns}::rdValue ${scobj_hpath}
@@ -407,6 +439,13 @@ proc ::scobj::mercury_base::mkDriver { sct_controller name device_class simulati
    hsetprop ${scobj_hpath}/Loop2/sensor type "part"
    hsetprop ${scobj_hpath}/Loop2/sensor nxalias "${name}_Loop2_sensor"

+    if {[string equal -nocase "${simulation_flag}" "false"]} {
+      ${sct_controller} poll ${scobj_hpath}/Loop2/sensor 1
+    } else {
+      ::scobj::mercury_base::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_base"
+    }
+
+
    hfactory ${scobj_hpath}/Loop2/setpoint plain user float
    hsetprop ${scobj_hpath}/Loop2/setpoint read ${ns}::getValue ${scobj_hpath} rdValue {READ:DEV:DB6.T1:TEMP:LOOP:TSET}
    hsetprop ${scobj_hpath}/Loop2/setpoint rdValue ${ns}::rdValue ${scobj_hpath}
@@ -435,19 +474,18 @@ proc ::scobj::mercury_base::mkDriver { sct_controller name device_class simulati
    hsetprop ${scobj_hpath}/Loop2/setpoint nxalias "${name}_Loop2_setpoint"

    if {[string equal -nocase "${simulation_flag}" "false"]} {
-      ${sct_controller} poll ${scobj_hpath}/Loop2/nick 15
-      ${sct_controller} poll ${scobj_hpath}/Loop2/power 5
-      ${sct_controller} poll ${scobj_hpath}/Loop2/sensor 1
      ${sct_controller} poll ${scobj_hpath}/Loop2/setpoint 5
      ${sct_controller} write ${scobj_hpath}/Loop2/setpoint
    } else {
      ::scobj::mercury_base::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_base"
    }
+    hsetprop ${scobj_hpath}/Loop2 data "true"
+    hsetprop ${scobj_hpath}/Loop2 klass "@none"
+    hsetprop ${scobj_hpath}/Loop2 type "part"
+    ansto_makesctdrive ${name}_Loop2_setpoint ${scobj_hpath}/Loop2/setpoint ${scobj_hpath}/Loop2/sensor ${sct_controller}

    hfactory ${scobj_hpath}/Loop3 plain spy none
-    hsetprop ${scobj_hpath}/Loop3 data "true"
-    hsetprop ${scobj_hpath}/Loop3 klass "@none"
-    hsetprop ${scobj_hpath}/Loop3 type "part"
+

    hfactory ${scobj_hpath}/Loop3/nick plain user text
    hsetprop ${scobj_hpath}/Loop3/nick read ${ns}::getValue ${scobj_hpath} rdText {READ:DEV:DB7.T1:TEMP:NICK}
@@ -462,6 +500,13 @@ proc ::scobj::mercury_base::mkDriver { sct_controller name device_class simulati
    hsetprop ${scobj_hpath}/Loop3/nick type "part"
    hsetprop ${scobj_hpath}/Loop3/nick nxalias "${name}_Loop3_nick"

+    if {[string equal -nocase "${simulation_flag}" "false"]} {
+      ${sct_controller} poll ${scobj_hpath}/Loop3/nick 15
+    } else {
+      ::scobj::mercury_base::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_base"
+    }
+
+
    hfactory ${scobj_hpath}/Loop3/power plain user float
    hsetprop ${scobj_hpath}/Loop3/power read ${ns}::getValue ${scobj_hpath} rdValue {READ:DEV:DB2.H1:HTR:SIG:POWR}
    hsetprop ${scobj_hpath}/Loop3/power rdValue ${ns}::rdValue ${scobj_hpath}
@@ -475,6 +520,13 @@ proc ::scobj::mercury_base::mkDriver { sct_controller name device_class simulati
    hsetprop ${scobj_hpath}/Loop3/power type "part"
    hsetprop ${scobj_hpath}/Loop3/power nxalias "${name}_Loop3_power"

+    if {[string equal -nocase "${simulation_flag}" "false"]} {
+      ${sct_controller} poll ${scobj_hpath}/Loop3/power 5
+    } else {
+      ::scobj::mercury_base::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_base"
+    }
+
+
    hfactory ${scobj_hpath}/Loop3/sensor plain user float
    hsetprop ${scobj_hpath}/Loop3/sensor read ${ns}::getValue ${scobj_hpath} rdValue {READ:DEV:DB7.T1:TEMP:SIG:TEMP}
    hsetprop ${scobj_hpath}/Loop3/sensor rdValue ${ns}::rdValue ${scobj_hpath}
@@ -490,6 +542,13 @@ proc ::scobj::mercury_base::mkDriver { sct_controller name device_class simulati
    hsetprop ${scobj_hpath}/Loop3/sensor type "part"
    hsetprop ${scobj_hpath}/Loop3/sensor nxalias "${name}_Loop3_sensor"

+    if {[string equal -nocase "${simulation_flag}" "false"]} {
+      ${sct_controller} poll ${scobj_hpath}/Loop3/sensor 1
+    } else {
+      ::scobj::mercury_base::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_base"
+    }
+
+
    hfactory ${scobj_hpath}/Loop3/setpoint plain user float
    hsetprop ${scobj_hpath}/Loop3/setpoint read ${ns}::getValue ${scobj_hpath} rdValue {READ:DEV:DB7.T1:TEMP:LOOP:TSET}
    hsetprop ${scobj_hpath}/Loop3/setpoint rdValue ${ns}::rdValue ${scobj_hpath}
@@ -518,22 +577,18 @@ proc ::scobj::mercury_base::mkDriver { sct_controller name device_class simulati
    hsetprop ${scobj_hpath}/Loop3/setpoint nxalias "${name}_Loop3_setpoint"

    if {[string equal -nocase "${simulation_flag}" "false"]} {
-      ${sct_controller} poll ${scobj_hpath}/Loop3/nick 15
-      ${sct_controller} poll ${scobj_hpath}/Loop3/power 5
-      ${sct_controller} poll ${scobj_hpath}/Loop3/sensor 1
      ${sct_controller} poll ${scobj_hpath}/Loop3/setpoint 5
      ${sct_controller} write ${scobj_hpath}/Loop3/setpoint
    } else {
      ::scobj::mercury_base::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_base"
    }
+    hsetprop ${scobj_hpath}/Loop3 data "true"
+    hsetprop ${scobj_hpath}/Loop3 klass "@none"
+    hsetprop ${scobj_hpath}/Loop3 type "part"
+    ansto_makesctdrive ${name}_Loop3_setpoint ${scobj_hpath}/Loop3/setpoint ${scobj_hpath}/Loop3/sensor ${sct_controller}
    hsetprop ${scobj_hpath} klass ${device_class}
    hsetprop ${scobj_hpath} data true
    hsetprop ${scobj_hpath} debug_threshold 5
-    if {[string equal -nocase "${simulation_flag}" "false"]} {
-      ansto_makesctdrive ${name}_Loop1_setpoint ${scobj_hpath}/Loop1/setpoint ${scobj_hpath}/Loop1/sensor ${sct_controller}
-      ansto_makesctdrive ${name}_Loop2_setpoint ${scobj_hpath}/Loop2/setpoint ${scobj_hpath}/Loop2/sensor ${sct_controller}
-      ansto_makesctdrive ${name}_Loop3_setpoint ${scobj_hpath}/Loop3/setpoint ${scobj_hpath}/Loop3/sensor ${sct_controller}
-    }
 # mkDriver hook code goes here
  } catch_message ]
  handle_exception ${catch_status} ${catch_message}
--- a/site_ansto/instrument/config/environment/temperature/mercury_level_sct.tcl
+++ b/site_ansto/instrument/config/environment/temperature/mercury_level_sct.tcl
@@ -150,9 +150,7 @@ proc ::scobj::mercury_level::mkDriver { sct_controller name device_class simulat
    set scobj_hpath /sics/${name}

    hfactory ${scobj_hpath}/Level plain spy none
-    hsetprop ${scobj_hpath}/Level data "true"
-    hsetprop ${scobj_hpath}/Level klass "@none"
-    hsetprop ${scobj_hpath}/Level type "part"
+

    hfactory ${scobj_hpath}/Level/Helium plain user float
    hsetprop ${scobj_hpath}/Level/Helium read ${ns}::getValue ${scobj_hpath} rdValue {READ:DEV:DB5.L1:LVL:SIG:HEL:LEV}
@@ -169,6 +167,13 @@ proc ::scobj::mercury_level::mkDriver { sct_controller name device_class simulat
    hsetprop ${scobj_hpath}/Level/Helium type "part"
    hsetprop ${scobj_hpath}/Level/Helium nxalias "${name}_Level_Helium"

+    if {[string equal -nocase "${simulation_flag}" "false"]} {
+      ${sct_controller} poll ${scobj_hpath}/Level/Helium 15
+    } else {
+      ::scobj::mercury_level::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_level"
+    }
+
+
    hfactory ${scobj_hpath}/Level/Nitrogen plain user float
    hsetprop ${scobj_hpath}/Level/Nitrogen read ${ns}::getValue ${scobj_hpath} rdValue {READ:DEV:DB5.L1:LVL:SIG:NIT:LEV}
    hsetprop ${scobj_hpath}/Level/Nitrogen rdValue ${ns}::rdValue ${scobj_hpath}
@@ -185,11 +190,13 @@ proc ::scobj::mercury_level::mkDriver { sct_controller name device_class simulat
    hsetprop ${scobj_hpath}/Level/Nitrogen nxalias "${name}_Level_Nitrogen"

    if {[string equal -nocase "${simulation_flag}" "false"]} {
-      ${sct_controller} poll ${scobj_hpath}/Level/Helium 15
      ${sct_controller} poll ${scobj_hpath}/Level/Nitrogen 15
    } else {
      ::scobj::mercury_level::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_level"
    }
+    hsetprop ${scobj_hpath}/Level data "true"
+    hsetprop ${scobj_hpath}/Level klass "@none"
+    hsetprop ${scobj_hpath}/Level type "part"
    hsetprop ${scobj_hpath} klass ${device_class}
    hsetprop ${scobj_hpath} data true
    hsetprop ${scobj_hpath} debug_threshold 5
--- a/site_ansto/instrument/config/environment/temperature/mercury_pres_sct.tcl
+++ b/site_ansto/instrument/config/environment/temperature/mercury_pres_sct.tcl
@@ -285,9 +285,7 @@ proc ::scobj::mercury_pres::mkDriver { sct_controller name device_class simulati
    set scobj_hpath /sics/${name}

    hfactory ${scobj_hpath}/Loop8 plain spy none
-    hsetprop ${scobj_hpath}/Loop8 data "true"
-    hsetprop ${scobj_hpath}/Loop8 klass "@none"
-    hsetprop ${scobj_hpath}/Loop8 type "part"
+

    hfactory ${scobj_hpath}/Loop8/nick plain user text
    hsetprop ${scobj_hpath}/Loop8/nick read ${ns}::getValue ${scobj_hpath} rdText {READ:DEV:DB8.P1:PRES:NICK}
@@ -302,6 +300,13 @@ proc ::scobj::mercury_pres::mkDriver { sct_controller name device_class simulati
    hsetprop ${scobj_hpath}/Loop8/nick type "part"
    hsetprop ${scobj_hpath}/Loop8/nick nxalias "${name}_Loop8_nick"

+    if {[string equal -nocase "${simulation_flag}" "false"]} {
+      ${sct_controller} poll ${scobj_hpath}/Loop8/nick 15
+    } else {
+      ::scobj::mercury_pres::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_pres"
+    }
+
+
    hfactory ${scobj_hpath}/Loop8/sensor plain user float
    hsetprop ${scobj_hpath}/Loop8/sensor read ${ns}::getValue ${scobj_hpath} rdValue {READ:DEV:DB8.P1:PRES:SIG:PRES}
    hsetprop ${scobj_hpath}/Loop8/sensor rdValue ${ns}::rdValue ${scobj_hpath}
@@ -318,6 +323,13 @@ proc ::scobj::mercury_pres::mkDriver { sct_controller name device_class simulati
    hsetprop ${scobj_hpath}/Loop8/sensor type "part"
    hsetprop ${scobj_hpath}/Loop8/sensor nxalias "${name}_Loop8_sensor"

+    if {[string equal -nocase "${simulation_flag}" "false"]} {
+      ${sct_controller} poll ${scobj_hpath}/Loop8/sensor 1
+    } else {
+      ::scobj::mercury_pres::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_pres"
+    }
+
+
    hfactory ${scobj_hpath}/Loop8/setpoint plain user float
    hsetprop ${scobj_hpath}/Loop8/setpoint read ${ns}::getValue ${scobj_hpath} rdValue {READ:DEV:DB8.P1:PRES:LOOP:TSET}
    hsetprop ${scobj_hpath}/Loop8/setpoint rdValue ${ns}::rdValue ${scobj_hpath}
@@ -347,19 +359,18 @@ proc ::scobj::mercury_pres::mkDriver { sct_controller name device_class simulati
    hsetprop ${scobj_hpath}/Loop8/setpoint nxalias "${name}_Loop8_setpoint"

    if {[string equal -nocase "${simulation_flag}" "false"]} {
-      ${sct_controller} poll ${scobj_hpath}/Loop8/nick 15
-      ${sct_controller} poll ${scobj_hpath}/Loop8/sensor 1
      ${sct_controller} poll ${scobj_hpath}/Loop8/setpoint 5
      ${sct_controller} write ${scobj_hpath}/Loop8/setpoint
    } else {
      ::scobj::mercury_pres::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_pres"
    }
+    hsetprop ${scobj_hpath}/Loop8 data "true"
+    hsetprop ${scobj_hpath}/Loop8 klass "@none"
+    hsetprop ${scobj_hpath}/Loop8 type "part"
+    ansto_makesctdrive ${name}_Loop8_setpoint ${scobj_hpath}/Loop8/setpoint ${scobj_hpath}/Loop8/sensor ${sct_controller}
    hsetprop ${scobj_hpath} klass ${device_class}
    hsetprop ${scobj_hpath} data true
    hsetprop ${scobj_hpath} debug_threshold 5
-    if {[string equal -nocase "${simulation_flag}" "false"]} {
-      ansto_makesctdrive ${name}_Loop8_setpoint ${scobj_hpath}/Loop8/setpoint ${scobj_hpath}/Loop8/sensor ${sct_controller}
-    }
 # mkDriver hook code goes here
  } catch_message ]
  handle_exception ${catch_status} ${catch_message}
--- a/site_ansto/instrument/config/environment/temperature/mercury_scpi_sct.tcl
+++ b/site_ansto/instrument/config/environment/temperature/mercury_scpi_sct.tcl
@@ -313,9 +313,7 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name device_class simulati
    set scobj_hpath /sics/${name}

    hfactory ${scobj_hpath}/Level plain spy none
-    hsetprop ${scobj_hpath}/Level data "true"
-    hsetprop ${scobj_hpath}/Level klass "@none"
-    hsetprop ${scobj_hpath}/Level type "part"
+

    hfactory ${scobj_hpath}/Level/Helium plain user float
    hsetprop ${scobj_hpath}/Level/Helium read ${ns}::getValue ${scobj_hpath} rdValue {READ:DEV:DB5.L1:LVL:SIG:HEL:LEV}
@@ -332,6 +330,13 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name device_class simulati
    hsetprop ${scobj_hpath}/Level/Helium type "part"
    hsetprop ${scobj_hpath}/Level/Helium nxalias "${name}_Level_Helium"

+    if {[string equal -nocase "${simulation_flag}" "false"]} {
+      ${sct_controller} poll ${scobj_hpath}/Level/Helium 15
+    } else {
+      ::scobj::mercury_scpi::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_scpi"
+    }
+
+
    hfactory ${scobj_hpath}/Level/Nitrogen plain user float
    hsetprop ${scobj_hpath}/Level/Nitrogen read ${ns}::getValue ${scobj_hpath} rdValue {READ:DEV:DB5.L1:LVL:SIG:NIT:LEV}
    hsetprop ${scobj_hpath}/Level/Nitrogen rdValue ${ns}::rdValue ${scobj_hpath}
@@ -348,16 +353,16 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name device_class simulati
    hsetprop ${scobj_hpath}/Level/Nitrogen nxalias "${name}_Level_Nitrogen"

    if {[string equal -nocase "${simulation_flag}" "false"]} {
-      ${sct_controller} poll ${scobj_hpath}/Level/Helium 15
      ${sct_controller} poll ${scobj_hpath}/Level/Nitrogen 15
    } else {
      ::scobj::mercury_scpi::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_scpi"
    }
+    hsetprop ${scobj_hpath}/Level data "true"
+    hsetprop ${scobj_hpath}/Level klass "@none"
+    hsetprop ${scobj_hpath}/Level type "part"

    hfactory ${scobj_hpath}/Loop1 plain spy none
-    hsetprop ${scobj_hpath}/Loop1 data "true"
-    hsetprop ${scobj_hpath}/Loop1 klass "@none"
-    hsetprop ${scobj_hpath}/Loop1 type "part"
+

    hfactory ${scobj_hpath}/Loop1/nick plain user text
    hsetprop ${scobj_hpath}/Loop1/nick read ${ns}::getValue ${scobj_hpath} rdText {READ:DEV:MB1.T1:TEMP:NICK}
@@ -372,6 +377,13 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name device_class simulati
    hsetprop ${scobj_hpath}/Loop1/nick type "part"
    hsetprop ${scobj_hpath}/Loop1/nick nxalias "${name}_Loop1_nick"

+    if {[string equal -nocase "${simulation_flag}" "false"]} {
+      ${sct_controller} poll ${scobj_hpath}/Loop1/nick 15
+    } else {
+      ::scobj::mercury_scpi::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_scpi"
+    }
+
+
    hfactory ${scobj_hpath}/Loop1/power plain user float
    hsetprop ${scobj_hpath}/Loop1/power read ${ns}::getValue ${scobj_hpath} rdValue {READ:DEV:MB0.H1:HTR:SIG:POWR}
    hsetprop ${scobj_hpath}/Loop1/power rdValue ${ns}::rdValue ${scobj_hpath}
@@ -385,6 +397,13 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name device_class simulati
    hsetprop ${scobj_hpath}/Loop1/power type "part"
    hsetprop ${scobj_hpath}/Loop1/power nxalias "${name}_Loop1_power"

+    if {[string equal -nocase "${simulation_flag}" "false"]} {
+      ${sct_controller} poll ${scobj_hpath}/Loop1/power 5
+    } else {
+      ::scobj::mercury_scpi::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_scpi"
+    }
+
+
    hfactory ${scobj_hpath}/Loop1/sensor plain user float
    hsetprop ${scobj_hpath}/Loop1/sensor read ${ns}::getValue ${scobj_hpath} rdValue {READ:DEV:MB1.T1:TEMP:SIG:TEMP}
    hsetprop ${scobj_hpath}/Loop1/sensor rdValue ${ns}::rdValue ${scobj_hpath}
@@ -400,6 +419,13 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name device_class simulati
    hsetprop ${scobj_hpath}/Loop1/sensor type "part"
    hsetprop ${scobj_hpath}/Loop1/sensor nxalias "${name}_Loop1_sensor"

+    if {[string equal -nocase "${simulation_flag}" "false"]} {
+      ${sct_controller} poll ${scobj_hpath}/Loop1/sensor 1
+    } else {
+      ::scobj::mercury_scpi::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_scpi"
+    }
+
+
    hfactory ${scobj_hpath}/Loop1/setpoint plain user float
    hsetprop ${scobj_hpath}/Loop1/setpoint read ${ns}::getValue ${scobj_hpath} rdValue {READ:DEV:MB1.T1:TEMP:LOOP:TSET}
    hsetprop ${scobj_hpath}/Loop1/setpoint rdValue ${ns}::rdValue ${scobj_hpath}
@@ -428,19 +454,18 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name device_class simulati
    hsetprop ${scobj_hpath}/Loop1/setpoint nxalias "${name}_Loop1_setpoint"

    if {[string equal -nocase "${simulation_flag}" "false"]} {
-      ${sct_controller} poll ${scobj_hpath}/Loop1/nick 15
-      ${sct_controller} poll ${scobj_hpath}/Loop1/power 5
-      ${sct_controller} poll ${scobj_hpath}/Loop1/sensor 1
      ${sct_controller} poll ${scobj_hpath}/Loop1/setpoint 5
      ${sct_controller} write ${scobj_hpath}/Loop1/setpoint
    } else {
      ::scobj::mercury_scpi::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_scpi"
    }
+    hsetprop ${scobj_hpath}/Loop1 data "true"
+    hsetprop ${scobj_hpath}/Loop1 klass "@none"
+    hsetprop ${scobj_hpath}/Loop1 type "part"
+    ansto_makesctdrive ${name}_Loop1_setpoint ${scobj_hpath}/Loop1/setpoint ${scobj_hpath}/Loop1/sensor ${sct_controller}

    hfactory ${scobj_hpath}/Loop2 plain spy none
-    hsetprop ${scobj_hpath}/Loop2 data "true"
-    hsetprop ${scobj_hpath}/Loop2 klass "@none"
-    hsetprop ${scobj_hpath}/Loop2 type "part"
+

    hfactory ${scobj_hpath}/Loop2/nick plain user text
    hsetprop ${scobj_hpath}/Loop2/nick read ${ns}::getValue ${scobj_hpath} rdText {READ:DEV:DB6.T1:TEMP:NICK}
@@ -455,6 +480,13 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name device_class simulati
    hsetprop ${scobj_hpath}/Loop2/nick type "part"
    hsetprop ${scobj_hpath}/Loop2/nick nxalias "${name}_Loop2_nick"

+    if {[string equal -nocase "${simulation_flag}" "false"]} {
+      ${sct_controller} poll ${scobj_hpath}/Loop2/nick 15
+    } else {
+      ::scobj::mercury_scpi::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_scpi"
+    }
+
+
    hfactory ${scobj_hpath}/Loop2/power plain user float
    hsetprop ${scobj_hpath}/Loop2/power read ${ns}::getValue ${scobj_hpath} rdValue {READ:DEV:DB1.H1:HTR:SIG:POWR}
    hsetprop ${scobj_hpath}/Loop2/power rdValue ${ns}::rdValue ${scobj_hpath}
@@ -468,6 +500,13 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name device_class simulati
    hsetprop ${scobj_hpath}/Loop2/power type "part"
    hsetprop ${scobj_hpath}/Loop2/power nxalias "${name}_Loop2_power"

+    if {[string equal -nocase "${simulation_flag}" "false"]} {
+      ${sct_controller} poll ${scobj_hpath}/Loop2/power 5
+    } else {
+      ::scobj::mercury_scpi::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_scpi"
+    }
+
+
    hfactory ${scobj_hpath}/Loop2/sensor plain user float
    hsetprop ${scobj_hpath}/Loop2/sensor read ${ns}::getValue ${scobj_hpath} rdValue {READ:DEV:DB6.T1:TEMP:SIG:TEMP}
    hsetprop ${scobj_hpath}/Loop2/sensor rdValue ${ns}::rdValue ${scobj_hpath}
@@ -483,6 +522,13 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name device_class simulati
    hsetprop ${scobj_hpath}/Loop2/sensor type "part"
    hsetprop ${scobj_hpath}/Loop2/sensor nxalias "${name}_Loop2_sensor"

+    if {[string equal -nocase "${simulation_flag}" "false"]} {
+      ${sct_controller} poll ${scobj_hpath}/Loop2/sensor 1
+    } else {
+      ::scobj::mercury_scpi::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_scpi"
+    }
+
+
    hfactory ${scobj_hpath}/Loop2/setpoint plain user float
    hsetprop ${scobj_hpath}/Loop2/setpoint read ${ns}::getValue ${scobj_hpath} rdValue {READ:DEV:DB6.T1:TEMP:LOOP:TSET}
    hsetprop ${scobj_hpath}/Loop2/setpoint rdValue ${ns}::rdValue ${scobj_hpath}
@@ -511,19 +557,18 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name device_class simulati
    hsetprop ${scobj_hpath}/Loop2/setpoint nxalias "${name}_Loop2_setpoint"

    if {[string equal -nocase "${simulation_flag}" "false"]} {
-      ${sct_controller} poll ${scobj_hpath}/Loop2/nick 15
-      ${sct_controller} poll ${scobj_hpath}/Loop2/power 5
-      ${sct_controller} poll ${scobj_hpath}/Loop2/sensor 1
      ${sct_controller} poll ${scobj_hpath}/Loop2/setpoint 5
      ${sct_controller} write ${scobj_hpath}/Loop2/setpoint
    } else {
      ::scobj::mercury_scpi::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_scpi"
    }
+    hsetprop ${scobj_hpath}/Loop2 data "true"
+    hsetprop ${scobj_hpath}/Loop2 klass "@none"
+    hsetprop ${scobj_hpath}/Loop2 type "part"
+    ansto_makesctdrive ${name}_Loop2_setpoint ${scobj_hpath}/Loop2/setpoint ${scobj_hpath}/Loop2/sensor ${sct_controller}

    hfactory ${scobj_hpath}/Loop3 plain spy none
-    hsetprop ${scobj_hpath}/Loop3 data "true"
-    hsetprop ${scobj_hpath}/Loop3 klass "@none"
-    hsetprop ${scobj_hpath}/Loop3 type "part"
+

    hfactory ${scobj_hpath}/Loop3/nick plain user text
    hsetprop ${scobj_hpath}/Loop3/nick read ${ns}::getValue ${scobj_hpath} rdText {READ:DEV:DB7.T1:TEMP:NICK}
@@ -538,6 +583,13 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name device_class simulati
    hsetprop ${scobj_hpath}/Loop3/nick type "part"
    hsetprop ${scobj_hpath}/Loop3/nick nxalias "${name}_Loop3_nick"

+    if {[string equal -nocase "${simulation_flag}" "false"]} {
+      ${sct_controller} poll ${scobj_hpath}/Loop3/nick 15
+    } else {
+      ::scobj::mercury_scpi::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_scpi"
+    }
+
+
    hfactory ${scobj_hpath}/Loop3/power plain user float
    hsetprop ${scobj_hpath}/Loop3/power read ${ns}::getValue ${scobj_hpath} rdValue {READ:DEV:DB2.H1:HTR:SIG:POWR}
    hsetprop ${scobj_hpath}/Loop3/power rdValue ${ns}::rdValue ${scobj_hpath}
@@ -551,6 +603,13 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name device_class simulati
    hsetprop ${scobj_hpath}/Loop3/power type "part"
    hsetprop ${scobj_hpath}/Loop3/power nxalias "${name}_Loop3_power"

+    if {[string equal -nocase "${simulation_flag}" "false"]} {
+      ${sct_controller} poll ${scobj_hpath}/Loop3/power 5
+    } else {
+      ::scobj::mercury_scpi::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_scpi"
+    }
+
+
    hfactory ${scobj_hpath}/Loop3/sensor plain user float
    hsetprop ${scobj_hpath}/Loop3/sensor read ${ns}::getValue ${scobj_hpath} rdValue {READ:DEV:DB7.T1:TEMP:SIG:TEMP}
    hsetprop ${scobj_hpath}/Loop3/sensor rdValue ${ns}::rdValue ${scobj_hpath}
@@ -566,6 +625,13 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name device_class simulati
    hsetprop ${scobj_hpath}/Loop3/sensor type "part"
    hsetprop ${scobj_hpath}/Loop3/sensor nxalias "${name}_Loop3_sensor"

+    if {[string equal -nocase "${simulation_flag}" "false"]} {
+      ${sct_controller} poll ${scobj_hpath}/Loop3/sensor 1
+    } else {
+      ::scobj::mercury_scpi::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_scpi"
+    }
+
+
    hfactory ${scobj_hpath}/Loop3/setpoint plain user float
    hsetprop ${scobj_hpath}/Loop3/setpoint read ${ns}::getValue ${scobj_hpath} rdValue {READ:DEV:DB7.T1:TEMP:LOOP:TSET}
    hsetprop ${scobj_hpath}/Loop3/setpoint rdValue ${ns}::rdValue ${scobj_hpath}
@@ -594,19 +660,18 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name device_class simulati
    hsetprop ${scobj_hpath}/Loop3/setpoint nxalias "${name}_Loop3_setpoint"

    if {[string equal -nocase "${simulation_flag}" "false"]} {
-      ${sct_controller} poll ${scobj_hpath}/Loop3/nick 15
-      ${sct_controller} poll ${scobj_hpath}/Loop3/power 5
-      ${sct_controller} poll ${scobj_hpath}/Loop3/sensor 1
      ${sct_controller} poll ${scobj_hpath}/Loop3/setpoint 5
      ${sct_controller} write ${scobj_hpath}/Loop3/setpoint
    } else {
      ::scobj::mercury_scpi::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_scpi"
    }
+    hsetprop ${scobj_hpath}/Loop3 data "true"
+    hsetprop ${scobj_hpath}/Loop3 klass "@none"
+    hsetprop ${scobj_hpath}/Loop3 type "part"
+    ansto_makesctdrive ${name}_Loop3_setpoint ${scobj_hpath}/Loop3/setpoint ${scobj_hpath}/Loop3/sensor ${sct_controller}

    hfactory ${scobj_hpath}/Loop4 plain spy none
-    hsetprop ${scobj_hpath}/Loop4 data "true"
-    hsetprop ${scobj_hpath}/Loop4 klass "@none"
-    hsetprop ${scobj_hpath}/Loop4 type "part"
+

    hfactory ${scobj_hpath}/Loop4/nick plain user text
    hsetprop ${scobj_hpath}/Loop4/nick read ${ns}::getValue ${scobj_hpath} rdText {READ:DEV:DB8.T1:TEMP:NICK}
@@ -621,6 +686,13 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name device_class simulati
    hsetprop ${scobj_hpath}/Loop4/nick type "part"
    hsetprop ${scobj_hpath}/Loop4/nick nxalias "${name}_Loop4_nick"

+    if {[string equal -nocase "${simulation_flag}" "false"]} {
+      ${sct_controller} poll ${scobj_hpath}/Loop4/nick 15
+    } else {
+      ::scobj::mercury_scpi::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_scpi"
+    }
+
+
    hfactory ${scobj_hpath}/Loop4/power plain user float
    hsetprop ${scobj_hpath}/Loop4/power read ${ns}::getValue ${scobj_hpath} rdValue {READ:DEV:DB3.H1:HTR:SIG:POWR}
    hsetprop ${scobj_hpath}/Loop4/power rdValue ${ns}::rdValue ${scobj_hpath}
@@ -634,6 +706,13 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name device_class simulati
    hsetprop ${scobj_hpath}/Loop4/power type "part"
    hsetprop ${scobj_hpath}/Loop4/power nxalias "${name}_Loop4_power"

+    if {[string equal -nocase "${simulation_flag}" "false"]} {
+      ${sct_controller} poll ${scobj_hpath}/Loop4/power 5
+    } else {
+      ::scobj::mercury_scpi::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_scpi"
+    }
+
+
    hfactory ${scobj_hpath}/Loop4/sensor plain user float
    hsetprop ${scobj_hpath}/Loop4/sensor read ${ns}::getValue ${scobj_hpath} rdValue {READ:DEV:DB8.T1:TEMP:SIG:TEMP}
    hsetprop ${scobj_hpath}/Loop4/sensor rdValue ${ns}::rdValue ${scobj_hpath}
@@ -649,6 +728,13 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name device_class simulati
    hsetprop ${scobj_hpath}/Loop4/sensor type "part"
    hsetprop ${scobj_hpath}/Loop4/sensor nxalias "${name}_Loop4_sensor"

+    if {[string equal -nocase "${simulation_flag}" "false"]} {
+      ${sct_controller} poll ${scobj_hpath}/Loop4/sensor 1
+    } else {
+      ::scobj::mercury_scpi::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_scpi"
+    }
+
+
    hfactory ${scobj_hpath}/Loop4/setpoint plain user float
    hsetprop ${scobj_hpath}/Loop4/setpoint read ${ns}::getValue ${scobj_hpath} rdValue {READ:DEV:DB8.T1:TEMP:LOOP:TSET}
    hsetprop ${scobj_hpath}/Loop4/setpoint rdValue ${ns}::rdValue ${scobj_hpath}
@@ -677,19 +763,18 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name device_class simulati
    hsetprop ${scobj_hpath}/Loop4/setpoint nxalias "${name}_Loop4_setpoint"

    if {[string equal -nocase "${simulation_flag}" "false"]} {
-      ${sct_controller} poll ${scobj_hpath}/Loop4/nick 15
-      ${sct_controller} poll ${scobj_hpath}/Loop4/power 5
-      ${sct_controller} poll ${scobj_hpath}/Loop4/sensor 1
      ${sct_controller} poll ${scobj_hpath}/Loop4/setpoint 5
      ${sct_controller} write ${scobj_hpath}/Loop4/setpoint
    } else {
      ::scobj::mercury_scpi::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_scpi"
    }
+    hsetprop ${scobj_hpath}/Loop4 data "true"
+    hsetprop ${scobj_hpath}/Loop4 klass "@none"
+    hsetprop ${scobj_hpath}/Loop4 type "part"
+    ansto_makesctdrive ${name}_Loop4_setpoint ${scobj_hpath}/Loop4/setpoint ${scobj_hpath}/Loop4/sensor ${sct_controller}

    hfactory ${scobj_hpath}/Valve plain spy none
-    hsetprop ${scobj_hpath}/Valve data "true"
-    hsetprop ${scobj_hpath}/Valve klass "@none"
-    hsetprop ${scobj_hpath}/Valve type "part"
+

    hfactory ${scobj_hpath}/Valve/sensor plain user float
    hsetprop ${scobj_hpath}/Valve/sensor read ${ns}::getValue ${scobj_hpath} rdValue {READ:DEV:DB4.G1:AUX:SIG:OPEN}
@@ -706,6 +791,13 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name device_class simulati
    hsetprop ${scobj_hpath}/Valve/sensor type "part"
    hsetprop ${scobj_hpath}/Valve/sensor nxalias "${name}_Valve_sensor"

+    if {[string equal -nocase "${simulation_flag}" "false"]} {
+      ${sct_controller} poll ${scobj_hpath}/Valve/sensor 5
+    } else {
+      ::scobj::mercury_scpi::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_scpi"
+    }
+
+
    hfactory ${scobj_hpath}/Valve/setpoint plain user float
    hsetprop ${scobj_hpath}/Valve/setpoint write ${ns}::setValve ${scobj_hpath} noResponse {SET:DEV:DB4.G1:AUX:SIG:OPEN:}
    hsetprop ${scobj_hpath}/Valve/setpoint noResponse ${ns}::noResponse ${scobj_hpath}
@@ -732,21 +824,17 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name device_class simulati
    hsetprop ${scobj_hpath}/Valve/setpoint nxalias "${name}_Valve_setpoint"

    if {[string equal -nocase "${simulation_flag}" "false"]} {
-      ${sct_controller} poll ${scobj_hpath}/Valve/sensor 5
      ${sct_controller} write ${scobj_hpath}/Valve/setpoint
    } else {
      ::scobj::mercury_scpi::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_scpi"
    }
+    hsetprop ${scobj_hpath}/Valve data "true"
+    hsetprop ${scobj_hpath}/Valve klass "@none"
+    hsetprop ${scobj_hpath}/Valve type "part"
+    ansto_makesctdrive ${name}_Valve_setpoint ${scobj_hpath}/Valve/setpoint ${scobj_hpath}/Valve/sensor ${sct_controller}
    hsetprop ${scobj_hpath} klass ${device_class}
    hsetprop ${scobj_hpath} data true
    hsetprop ${scobj_hpath} debug_threshold 5
-    if {[string equal -nocase "${simulation_flag}" "false"]} {
-      ansto_makesctdrive ${name}_Loop1_setpoint ${scobj_hpath}/Loop1/setpoint ${scobj_hpath}/Loop1/sensor ${sct_controller}
-      ansto_makesctdrive ${name}_Loop2_setpoint ${scobj_hpath}/Loop2/setpoint ${scobj_hpath}/Loop2/sensor ${sct_controller}
-      ansto_makesctdrive ${name}_Loop3_setpoint ${scobj_hpath}/Loop3/setpoint ${scobj_hpath}/Loop3/sensor ${sct_controller}
-      ansto_makesctdrive ${name}_Loop4_setpoint ${scobj_hpath}/Loop4/setpoint ${scobj_hpath}/Loop4/sensor ${sct_controller}
-      ansto_makesctdrive ${name}_Valve_setpoint ${scobj_hpath}/Valve/setpoint ${scobj_hpath}/Valve/sensor ${sct_controller}
-    }
 # mkDriver hook code goes here
  } catch_message ]
  handle_exception ${catch_status} ${catch_message}
--- a/site_ansto/instrument/config/environment/temperature/mercury_temp_sct.tcl
+++ b/site_ansto/instrument/config/environment/temperature/mercury_temp_sct.tcl
@@ -279,9 +279,7 @@ proc ::scobj::mercury_temp::mkDriver { sct_controller name device_class simulati
    set scobj_hpath /sics/${name}

    hfactory ${scobj_hpath}/Loop4 plain spy none
-    hsetprop ${scobj_hpath}/Loop4 data "true"
-    hsetprop ${scobj_hpath}/Loop4 klass "@none"
-    hsetprop ${scobj_hpath}/Loop4 type "part"
+

    hfactory ${scobj_hpath}/Loop4/nick plain user text
    hsetprop ${scobj_hpath}/Loop4/nick read ${ns}::getValue ${scobj_hpath} rdText {READ:DEV:DB8.T1:TEMP:NICK}
@@ -296,6 +294,13 @@ proc ::scobj::mercury_temp::mkDriver { sct_controller name device_class simulati
    hsetprop ${scobj_hpath}/Loop4/nick type "part"
    hsetprop ${scobj_hpath}/Loop4/nick nxalias "${name}_Loop4_nick"

+    if {[string equal -nocase "${simulation_flag}" "false"]} {
+      ${sct_controller} poll ${scobj_hpath}/Loop4/nick 15
+    } else {
+      ::scobj::mercury_temp::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_temp"
+    }
+
+
    hfactory ${scobj_hpath}/Loop4/power plain user float
    hsetprop ${scobj_hpath}/Loop4/power read ${ns}::getValue ${scobj_hpath} rdValue {READ:DEV:DB3.H1:HTR:SIG:POWR}
    hsetprop ${scobj_hpath}/Loop4/power rdValue ${ns}::rdValue ${scobj_hpath}
@@ -309,6 +314,13 @@ proc ::scobj::mercury_temp::mkDriver { sct_controller name device_class simulati
    hsetprop ${scobj_hpath}/Loop4/power type "part"
    hsetprop ${scobj_hpath}/Loop4/power nxalias "${name}_Loop4_power"

+    if {[string equal -nocase "${simulation_flag}" "false"]} {
+      ${sct_controller} poll ${scobj_hpath}/Loop4/power 5
+    } else {
+      ::scobj::mercury_temp::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_temp"
+    }
+
+
    hfactory ${scobj_hpath}/Loop4/sensor plain user float
    hsetprop ${scobj_hpath}/Loop4/sensor read ${ns}::getValue ${scobj_hpath} rdValue {READ:DEV:DB8.T1:TEMP:SIG:TEMP}
    hsetprop ${scobj_hpath}/Loop4/sensor rdValue ${ns}::rdValue ${scobj_hpath}
@@ -324,6 +336,13 @@ proc ::scobj::mercury_temp::mkDriver { sct_controller name device_class simulati
    hsetprop ${scobj_hpath}/Loop4/sensor type "part"
    hsetprop ${scobj_hpath}/Loop4/sensor nxalias "${name}_Loop4_sensor"

+    if {[string equal -nocase "${simulation_flag}" "false"]} {
+      ${sct_controller} poll ${scobj_hpath}/Loop4/sensor 1
+    } else {
+      ::scobj::mercury_temp::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_temp"
+    }
+
+
    hfactory ${scobj_hpath}/Loop4/setpoint plain user float
    hsetprop ${scobj_hpath}/Loop4/setpoint read ${ns}::getValue ${scobj_hpath} rdValue {READ:DEV:DB8.T1:TEMP:LOOP:TSET}
    hsetprop ${scobj_hpath}/Loop4/setpoint rdValue ${ns}::rdValue ${scobj_hpath}
@@ -352,20 +371,18 @@ proc ::scobj::mercury_temp::mkDriver { sct_controller name device_class simulati
    hsetprop ${scobj_hpath}/Loop4/setpoint nxalias "${name}_Loop4_setpoint"

    if {[string equal -nocase "${simulation_flag}" "false"]} {
-      ${sct_controller} poll ${scobj_hpath}/Loop4/nick 15
-      ${sct_controller} poll ${scobj_hpath}/Loop4/power 5
-      ${sct_controller} poll ${scobj_hpath}/Loop4/sensor 1
      ${sct_controller} poll ${scobj_hpath}/Loop4/setpoint 5
      ${sct_controller} write ${scobj_hpath}/Loop4/setpoint
    } else {
      ::scobj::mercury_temp::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_temp"
    }
+    hsetprop ${scobj_hpath}/Loop4 data "true"
+    hsetprop ${scobj_hpath}/Loop4 klass "@none"
+    hsetprop ${scobj_hpath}/Loop4 type "part"
+    ansto_makesctdrive ${name}_Loop4_setpoint ${scobj_hpath}/Loop4/setpoint ${scobj_hpath}/Loop4/sensor ${sct_controller}
    hsetprop ${scobj_hpath} klass ${device_class}
    hsetprop ${scobj_hpath} data true
    hsetprop ${scobj_hpath} debug_threshold 5
-    if {[string equal -nocase "${simulation_flag}" "false"]} {
-      ansto_makesctdrive ${name}_Loop4_setpoint ${scobj_hpath}/Loop4/setpoint ${scobj_hpath}/Loop4/sensor ${sct_controller}
-    }
 # mkDriver hook code goes here
  } catch_message ]
  handle_exception ${catch_status} ${catch_message}
--- a/site_ansto/instrument/config/environment/temperature/mercury_valve_sct.tcl
+++ b/site_ansto/instrument/config/environment/temperature/mercury_valve_sct.tcl
@@ -257,9 +257,7 @@ proc ::scobj::mercury_valve::mkDriver { sct_controller name device_class simulat
    set scobj_hpath /sics/${name}

    hfactory ${scobj_hpath}/Valve plain spy none
-    hsetprop ${scobj_hpath}/Valve data "true"
-    hsetprop ${scobj_hpath}/Valve klass "@none"
-    hsetprop ${scobj_hpath}/Valve type "part"
+

    hfactory ${scobj_hpath}/Valve/sensor plain user float
    hsetprop ${scobj_hpath}/Valve/sensor read ${ns}::getValue ${scobj_hpath} rdValue {READ:DEV:DB4.G1:AUX:SIG:OPEN}
@@ -276,6 +274,13 @@ proc ::scobj::mercury_valve::mkDriver { sct_controller name device_class simulat
    hsetprop ${scobj_hpath}/Valve/sensor type "part"
    hsetprop ${scobj_hpath}/Valve/sensor nxalias "${name}_Valve_sensor"

+    if {[string equal -nocase "${simulation_flag}" "false"]} {
+      ${sct_controller} poll ${scobj_hpath}/Valve/sensor 5
+    } else {
+      ::scobj::mercury_valve::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_valve"
+    }
+
+
    hfactory ${scobj_hpath}/Valve/setpoint plain user float
    hsetprop ${scobj_hpath}/Valve/setpoint write ${ns}::setValve ${scobj_hpath} noResponse {SET:DEV:DB4.G1:AUX:SIG:OPEN:}
    hsetprop ${scobj_hpath}/Valve/setpoint noResponse ${ns}::noResponse ${scobj_hpath}
@@ -302,17 +307,17 @@ proc ::scobj::mercury_valve::mkDriver { sct_controller name device_class simulat
    hsetprop ${scobj_hpath}/Valve/setpoint nxalias "${name}_Valve_setpoint"

    if {[string equal -nocase "${simulation_flag}" "false"]} {
-      ${sct_controller} poll ${scobj_hpath}/Valve/sensor 5
      ${sct_controller} write ${scobj_hpath}/Valve/setpoint
    } else {
      ::scobj::mercury_valve::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_valve"
    }
+    hsetprop ${scobj_hpath}/Valve data "true"
+    hsetprop ${scobj_hpath}/Valve klass "@none"
+    hsetprop ${scobj_hpath}/Valve type "part"
+    ansto_makesctdrive ${name}_Valve_setpoint ${scobj_hpath}/Valve/setpoint ${scobj_hpath}/Valve/sensor ${sct_controller}
    hsetprop ${scobj_hpath} klass ${device_class}
    hsetprop ${scobj_hpath} data true
    hsetprop ${scobj_hpath} debug_threshold 5
-    if {[string equal -nocase "${simulation_flag}" "false"]} {
-      ansto_makesctdrive ${name}_Valve_setpoint ${scobj_hpath}/Valve/setpoint ${scobj_hpath}/Valve/sensor ${sct_controller}
-    }
 # mkDriver hook code goes here
  } catch_message ]
  handle_exception ${catch_status} ${catch_message}
--- a/site_ansto/instrument/config/environment/temperature/pfeiffer_hg_sct.tcl
+++ b/site_ansto/instrument/config/environment/temperature/pfeiffer_hg_sct.tcl
@@ -384,6 +384,7 @@ proc ::scobj::pfeiffer_hg::mkDriver { sct_controller name device_class simulatio

    set scobj_hpath /sics/${name}

+
    hfactory ${scobj_hpath}/status plain user int
    hsetprop ${scobj_hpath}/status control true
    hsetprop ${scobj_hpath}/status data true
@@ -400,9 +401,7 @@ proc ::scobj::pfeiffer_hg::mkDriver { sct_controller name device_class simulatio
    hsetprop ${scobj_hpath} type "part"

    hfactory ${scobj_hpath}/pressure plain spy none
-    hsetprop ${scobj_hpath}/pressure data "true"
-    hsetprop ${scobj_hpath}/pressure klass "@none"
-    hsetprop ${scobj_hpath}/pressure type "part"
+

    hfactory ${scobj_hpath}/pressure/sensor plain user float
    hsetprop ${scobj_hpath}/pressure/sensor read ${ns}::sendPR1 ${scobj_hpath} readPR1 {PR1}
@@ -428,6 +427,13 @@ proc ::scobj::pfeiffer_hg::mkDriver { sct_controller name device_class simulatio
    hsetprop ${scobj_hpath}/pressure/sensor type "part"
    hsetprop ${scobj_hpath}/pressure/sensor nxalias "${name}_pressure_sensor"

+    if {[string equal -nocase "${simulation_flag}" "false"]} {
+      ${sct_controller} poll ${scobj_hpath}/pressure/sensor 1
+    } else {
+      ::scobj::pfeiffer_hg::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for pfeiffer_hg"
+    }
+
+
    hfactory ${scobj_hpath}/pressure/setpoint plain user float
    hsetprop ${scobj_hpath}/pressure/setpoint write ${ns}::setPoint ${scobj_hpath} noResponse {@}
    hsetprop ${scobj_hpath}/pressure/setpoint noResponse ${ns}::noResponse ${scobj_hpath}
@@ -454,17 +460,17 @@ proc ::scobj::pfeiffer_hg::mkDriver { sct_controller name device_class simulatio
    hsetprop ${scobj_hpath}/pressure/setpoint nxalias "${name}_pressure_setpoint"

    if {[string equal -nocase "${simulation_flag}" "false"]} {
-      ${sct_controller} poll ${scobj_hpath}/pressure/sensor 1
      ${sct_controller} write ${scobj_hpath}/pressure/setpoint
    } else {
      ::scobj::pfeiffer_hg::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for pfeiffer_hg"
    }
+    hsetprop ${scobj_hpath}/pressure data "true"
+    hsetprop ${scobj_hpath}/pressure klass "@none"
+    hsetprop ${scobj_hpath}/pressure type "part"
+    ansto_makesctdrive ${name}_pressure_setpoint ${scobj_hpath}/pressure/setpoint ${scobj_hpath}/pressure/sensor ${sct_controller}
    hsetprop ${scobj_hpath} klass ${device_class}
    hsetprop ${scobj_hpath} data true
    hsetprop ${scobj_hpath} debug_threshold 5
-    if {[string equal -nocase "${simulation_flag}" "false"]} {
-      ansto_makesctdrive ${name}_pressure_setpoint ${scobj_hpath}/pressure/setpoint ${scobj_hpath}/pressure/sensor ${sct_controller}
-    }
 # mkDriver hook code starts
    hsetprop ${scobj_hpath}/pressure/sensor read ${ns}::sendPR1 ${scobj_hpath} ack_enq {PR1}
    hsetprop ${scobj_hpath}/pressure/sensor ack_enq ${ns}::ack_enq ${scobj_hpath}
--- a/site_ansto/instrument/config/environment/temperature/west_6100_sct.tcl
+++ b/site_ansto/instrument/config/environment/temperature/west_6100_sct.tcl
@@ -274,6 +274,7 @@ proc ::scobj::west_6100::mkDriver { sct_controller name device_class simulation_

    set scobj_hpath /sics/${name}

+
    hfactory ${scobj_hpath}/alarm1 plain user float
    hsetprop ${scobj_hpath}/alarm1 read ${ns}::getDecimal ${scobj_hpath} rdDecimal {13}
    hsetprop ${scobj_hpath}/alarm1 rdDecimal ${ns}::rdDecimal ${scobj_hpath}
@@ -290,6 +291,14 @@ proc ::scobj::west_6100::mkDriver { sct_controller name device_class simulation_
    hsetprop ${scobj_hpath}/alarm1 type "part"
    hsetprop ${scobj_hpath}/alarm1 nxalias "${name}_alarm1"

+    if {[string equal -nocase "${simulation_flag}" "false"]} {
+      ${sct_controller} poll ${scobj_hpath}/alarm1 1
+      ${sct_controller} write ${scobj_hpath}/alarm1
+    } else {
+      ::scobj::west_6100::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for west_6100"
+    }
+
+
    hfactory ${scobj_hpath}/alarm2 plain user float
    hsetprop ${scobj_hpath}/alarm2 read ${ns}::getDecimal ${scobj_hpath} rdDecimal {14}
    hsetprop ${scobj_hpath}/alarm2 rdDecimal ${ns}::rdDecimal ${scobj_hpath}
@@ -306,6 +315,14 @@ proc ::scobj::west_6100::mkDriver { sct_controller name device_class simulation_
    hsetprop ${scobj_hpath}/alarm2 type "part"
    hsetprop ${scobj_hpath}/alarm2 nxalias "${name}_alarm2"

+    if {[string equal -nocase "${simulation_flag}" "false"]} {
+      ${sct_controller} poll ${scobj_hpath}/alarm2 1
+      ${sct_controller} write ${scobj_hpath}/alarm2
+    } else {
+      ::scobj::west_6100::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for west_6100"
+    }
+
+
    hfactory ${scobj_hpath}/power plain user int
    hsetprop ${scobj_hpath}/power read ${ns}::getInteger ${scobj_hpath} rdInteger {3}
    hsetprop ${scobj_hpath}/power rdInteger ${ns}::rdInteger ${scobj_hpath}
@@ -319,6 +336,13 @@ proc ::scobj::west_6100::mkDriver { sct_controller name device_class simulation_
    hsetprop ${scobj_hpath}/power type "part"
    hsetprop ${scobj_hpath}/power nxalias "${name}_power"

+    if {[string equal -nocase "${simulation_flag}" "false"]} {
+      ${sct_controller} poll ${scobj_hpath}/power 1
+    } else {
+      ::scobj::west_6100::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for west_6100"
+    }
+
+
    hfactory ${scobj_hpath}/powermax plain user int
    hsetprop ${scobj_hpath}/powermax read ${ns}::getInteger ${scobj_hpath} rdInteger {20}
    hsetprop ${scobj_hpath}/powermax rdInteger ${ns}::rdInteger ${scobj_hpath}
@@ -335,6 +359,14 @@ proc ::scobj::west_6100::mkDriver { sct_controller name device_class simulation_
    hsetprop ${scobj_hpath}/powermax type "part"
    hsetprop ${scobj_hpath}/powermax nxalias "${name}_powermax"

+    if {[string equal -nocase "${simulation_flag}" "false"]} {
+      ${sct_controller} poll ${scobj_hpath}/powermax 1
+      ${sct_controller} write ${scobj_hpath}/powermax
+    } else {
+      ::scobj::west_6100::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for west_6100"
+    }
+
+
    hfactory ${scobj_hpath}/ramprate plain user float
    hsetprop ${scobj_hpath}/ramprate read ${ns}::getDecimal ${scobj_hpath} rdDecimal {24}
    hsetprop ${scobj_hpath}/ramprate rdDecimal ${ns}::rdDecimal ${scobj_hpath}
@@ -351,6 +383,14 @@ proc ::scobj::west_6100::mkDriver { sct_controller name device_class simulation_
    hsetprop ${scobj_hpath}/ramprate type "part"
    hsetprop ${scobj_hpath}/ramprate nxalias "${name}_ramprate"

+    if {[string equal -nocase "${simulation_flag}" "false"]} {
+      ${sct_controller} poll ${scobj_hpath}/ramprate 1
+      ${sct_controller} write ${scobj_hpath}/ramprate
+    } else {
+      ::scobj::west_6100::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for west_6100"
+    }
+
+
    hfactory ${scobj_hpath}/sensor plain user float
    hsetprop ${scobj_hpath}/sensor read ${ns}::getDecimal ${scobj_hpath} rdDecimal {1}
    hsetprop ${scobj_hpath}/sensor rdDecimal ${ns}::rdDecimal ${scobj_hpath}
@@ -364,6 +404,13 @@ proc ::scobj::west_6100::mkDriver { sct_controller name device_class simulation_
    hsetprop ${scobj_hpath}/sensor type "part"
    hsetprop ${scobj_hpath}/sensor nxalias "${name}_sensor"

+    if {[string equal -nocase "${simulation_flag}" "false"]} {
+      ${sct_controller} poll ${scobj_hpath}/sensor 1
+    } else {
+      ::scobj::west_6100::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for west_6100"
+    }
+
+
    hfactory ${scobj_hpath}/setpoint plain user float
    hsetprop ${scobj_hpath}/setpoint read ${ns}::getDecimal ${scobj_hpath} rdDecimal {2}
    hsetprop ${scobj_hpath}/setpoint rdDecimal ${ns}::rdDecimal ${scobj_hpath}
@@ -380,6 +427,14 @@ proc ::scobj::west_6100::mkDriver { sct_controller name device_class simulation_
    hsetprop ${scobj_hpath}/setpoint type "part"
    hsetprop ${scobj_hpath}/setpoint nxalias "${name}_setpoint"

+    if {[string equal -nocase "${simulation_flag}" "false"]} {
+      ${sct_controller} poll ${scobj_hpath}/setpoint 1
+      ${sct_controller} write ${scobj_hpath}/setpoint
+    } else {
+      ::scobj::west_6100::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for west_6100"
+    }
+
+
    hfactory ${scobj_hpath}/w_sp plain user float
    hsetprop ${scobj_hpath}/w_sp read ${ns}::getDecimal ${scobj_hpath} rdDecimal {21}
    hsetprop ${scobj_hpath}/w_sp rdDecimal ${ns}::rdDecimal ${scobj_hpath}
@@ -396,33 +451,19 @@ proc ::scobj::west_6100::mkDriver { sct_controller name device_class simulation_
    hsetprop ${scobj_hpath}/w_sp type "part"
    hsetprop ${scobj_hpath}/w_sp nxalias "${name}_w_sp"

-    hsetprop ${scobj_hpath} data "true"
-    hsetprop ${scobj_hpath} klass "@none"
-    hsetprop ${scobj_hpath} type "part"
-
    if {[string equal -nocase "${simulation_flag}" "false"]} {
-      ${sct_controller} poll ${scobj_hpath}/alarm1 1
-      ${sct_controller} poll ${scobj_hpath}/alarm2 1
-      ${sct_controller} poll ${scobj_hpath}/power 1
-      ${sct_controller} poll ${scobj_hpath}/powermax 1
-      ${sct_controller} poll ${scobj_hpath}/ramprate 1
-      ${sct_controller} poll ${scobj_hpath}/sensor 1
-      ${sct_controller} poll ${scobj_hpath}/setpoint 1
      ${sct_controller} poll ${scobj_hpath}/w_sp 1
-      ${sct_controller} write ${scobj_hpath}/alarm1
-      ${sct_controller} write ${scobj_hpath}/alarm2
-      ${sct_controller} write ${scobj_hpath}/powermax
-      ${sct_controller} write ${scobj_hpath}/ramprate
-      ${sct_controller} write ${scobj_hpath}/setpoint
      ${sct_controller} write ${scobj_hpath}/w_sp
    } else {
      ::scobj::west_6100::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for west_6100"
    }

+    hsetprop ${scobj_hpath} data "true"
+    hsetprop ${scobj_hpath} klass "@none"
+    hsetprop ${scobj_hpath} type "part"
+
    hfactory ${scobj_hpath}/aux plain spy none
-    hsetprop ${scobj_hpath}/aux data "false"
-    hsetprop ${scobj_hpath}/aux klass "@none"
-    hsetprop ${scobj_hpath}/aux type "part"
+

    hfactory ${scobj_hpath}/aux/decimal plain user int
    hsetprop ${scobj_hpath}/aux/decimal read ${ns}::getInteger ${scobj_hpath} rdInteger {18}
@@ -437,6 +478,13 @@ proc ::scobj::west_6100::mkDriver { sct_controller name device_class simulation_
    hsetprop ${scobj_hpath}/aux/decimal type "part"
    hsetprop ${scobj_hpath}/aux/decimal nxalias "${name}_aux_decimal"

+    if {[string equal -nocase "${simulation_flag}" "false"]} {
+      ${sct_controller} poll ${scobj_hpath}/aux/decimal 2
+    } else {
+      ::scobj::west_6100::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for west_6100"
+    }
+
+
    hfactory ${scobj_hpath}/aux/instatus plain user int
    hsetprop ${scobj_hpath}/aux/instatus read ${ns}::getInteger ${scobj_hpath} rdInteger {133}
    hsetprop ${scobj_hpath}/aux/instatus rdInteger ${ns}::rdInteger ${scobj_hpath}
@@ -449,6 +497,13 @@ proc ::scobj::west_6100::mkDriver { sct_controller name device_class simulation_
    hsetprop ${scobj_hpath}/aux/instatus type "part"
    hsetprop ${scobj_hpath}/aux/instatus nxalias "${name}_aux_instatus"

+    if {[string equal -nocase "${simulation_flag}" "false"]} {
+      ${sct_controller} poll ${scobj_hpath}/aux/instatus 2
+    } else {
+      ::scobj::west_6100::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for west_6100"
+    }
+
+
    hfactory ${scobj_hpath}/aux/model plain user int
    hsetprop ${scobj_hpath}/aux/model read ${ns}::getInteger ${scobj_hpath} rdInteger {122}
    hsetprop ${scobj_hpath}/aux/model rdInteger ${ns}::rdInteger ${scobj_hpath}
@@ -462,12 +517,13 @@ proc ::scobj::west_6100::mkDriver { sct_controller name device_class simulation_
    hsetprop ${scobj_hpath}/aux/model nxalias "${name}_aux_model"

    if {[string equal -nocase "${simulation_flag}" "false"]} {
-      ${sct_controller} poll ${scobj_hpath}/aux/decimal 2
-      ${sct_controller} poll ${scobj_hpath}/aux/instatus 2
      ${sct_controller} poll ${scobj_hpath}/aux/model 2
    } else {
      ::scobj::west_6100::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for west_6100"
    }
+    hsetprop ${scobj_hpath}/aux data "false"
+    hsetprop ${scobj_hpath}/aux klass "@none"
+    hsetprop ${scobj_hpath}/aux type "part"
    hsetprop ${scobj_hpath} klass ${device_class}
    hsetprop ${scobj_hpath} data true
    hsetprop ${scobj_hpath} debug_threshold 5