diff --git a/site_ansto/instrument/bilby/config/chopper/astrium_chopper_sct.tcl b/site_ansto/instrument/bilby/config/chopper/astrium_chopper_sct.tcl index 654e89e9..9e0cf9c3 100644 --- a/site_ansto/instrument/bilby/config/chopper/astrium_chopper_sct.tcl +++ b/site_ansto/instrument/bilby/config/chopper/astrium_chopper_sct.tcl @@ -230,8 +230,8 @@ proc ::scobj::astrium_chopper::setValue {tc_root nextState cmd_str} { handle_exception ${catch_status} ${catch_message} } -proc ::scobj::astrium_chopper::mkDriver { sct_controller name } { - ::scobj::astrium_chopper::sics_log 9 "::scobj::astrium_chopper::mkDriver for ${name}" +proc ::scobj::astrium_chopper::mkDriver { sct_controller name ip_address tcp_port } { + ::scobj::astrium_chopper::sics_log 9 "::scobj::astrium_chopper::mkDriver ${sct_controller} ${name} ${ip_address} ${tcp_port}" set ns "[namespace current]" set catch_status [ catch { @@ -577,22 +577,24 @@ namespace eval ::scobj::astrium_chopper { namespace export mkDriver } -proc add_astrium_chopper {name IP port} { +proc add_astrium_chopper {name ip_address tcp_port} { set catch_status [ catch { - ::scobj::astrium_chopper::sics_log 9 "add_astrium_chopper ${name} ${IP} ${port}" + ::scobj::astrium_chopper::sics_log 9 "add_astrium_chopper ${name} ${ip_address} ${tcp_port}" if {[string equal -nocase [SplitReply [chopper_simulation]] "false"]} { - if {[string equal -nocase "aqadapter" "${IP}"]} { - ::scobj::astrium_chopper::sics_log 9 "makesctcontroller sct_${name} aqadapter ${port}" - makesctcontroller sct_${name} aqadapter ${port} + if {[string equal -nocase "aqadapter" "${ip_address}"]} { + ::scobj::astrium_chopper::sics_log 9 "makesctcontroller sct_${name} aqadapter ${tcp_port}" + makesctcontroller sct_${name} aqadapter ${tcp_port} } else { - ::scobj::astrium_chopper::sics_log 9 "makesctcontroller sct_${name} std ${IP}:${port}" - makesctcontroller sct_${name} std ${IP}:${port} + ::scobj::astrium_chopper::sics_log 9 "makesctcontroller sct_${name} std ${ip_address}:${tcp_port}" + makesctcontroller sct_${name} std ${ip_address}:${tcp_port} } } else { - ::scobj::astrium_chopper::sics_log 9 "[chopper_simulation] => No sctcontroller for astrium_chopper" + ::scobj::astrium_chopper::sics_log 9 "[chopper_simulation] => Null sctcontroller for astrium_chopper" + ::scobj::astrium_chopper::sics_log 9 "makesctcontroller sct_${name} aqadapter NULL" + makesctcontroller sct_${name} aqadapter NULL } - ::scobj::astrium_chopper::sics_log 1 "::scobj::astrium_chopper::mkDriver sct_${name} ${name}" - ::scobj::astrium_chopper::mkDriver sct_${name} ${name} + ::scobj::astrium_chopper::sics_log 1 "::scobj::astrium_chopper::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port}" + ::scobj::astrium_chopper::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} } catch_message ] handle_exception ${catch_status} ${catch_message} } @@ -628,8 +630,8 @@ proc ::scobj::astrium_chopper::read_config {} { } elseif { [dict exists $v "asyncqueue"] } { set asyncqueue [dict get $v "asyncqueue"] if { [string equal -nocase ${asyncqueue} "sct"] } { - set IP [dict get $v ip] - set PORT [dict get $v port] + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] } } else { if { [dict exists $v "asyncprotocol"] } { @@ -643,15 +645,15 @@ proc ::scobj::astrium_chopper::read_config {} { } } set asyncqueue ${name}_queue - set IP [dict get $v ip] - set PORT [dict get $v port] - MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${IP} ${PORT} + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] + MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${ip_address} ${tcp_port} if { [dict exists $v "timeout"] } { ${asyncqueue} timeout "[dict get $v "timeout"]" } } if { [string equal -nocase ${asyncqueue} "sct"] } { - add_astrium_chopper ${name} ${IP} ${PORT} + add_astrium_chopper ${name} ${ip_address} ${tcp_port} } else { add_astrium_chopper ${name} "aqadapter" ${asyncqueue} } diff --git a/site_ansto/instrument/bilby/config/motors/shutters_sct.tcl b/site_ansto/instrument/bilby/config/motors/shutters_sct.tcl index 0f3772d3..a369764c 100644 --- a/site_ansto/instrument/bilby/config/motors/shutters_sct.tcl +++ b/site_ansto/instrument/bilby/config/motors/shutters_sct.tcl @@ -294,7 +294,9 @@ proc add_shutters {name ip_address tcp_port} { makesctcontroller sct_${name} dmc2280 ${ip_address}:${tcp_port} } } else { - ::scobj::shutters::sics_log 9 "[motor_simulation] => No sctcontroller for shutters" + ::scobj::shutters::sics_log 9 "[motor_simulation] => Null sctcontroller for shutters" + ::scobj::shutters::sics_log 9 "makesctcontroller sct_${name} aqadapter NULL" + makesctcontroller sct_${name} aqadapter NULL } ::scobj::shutters::sics_log 1 "::scobj::shutters::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port}" ::scobj::shutters::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} diff --git a/site_ansto/instrument/bilby/config/motors/tank_sct.tcl b/site_ansto/instrument/bilby/config/motors/tank_sct.tcl index 88ee1439..fd278ad8 100644 --- a/site_ansto/instrument/bilby/config/motors/tank_sct.tcl +++ b/site_ansto/instrument/bilby/config/motors/tank_sct.tcl @@ -342,7 +342,9 @@ proc add_tank {name ip_address tcp_port} { makesctcontroller sct_${name} dmc2280 ${ip_address}:${tcp_port} } } else { - ::scobj::tank::sics_log 9 "[motor_simulation] => No sctcontroller for tank" + ::scobj::tank::sics_log 9 "[motor_simulation] => Null sctcontroller for tank" + ::scobj::tank::sics_log 9 "makesctcontroller sct_${name} aqadapter NULL" + makesctcontroller sct_${name} aqadapter NULL } ::scobj::tank::sics_log 1 "::scobj::tank::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port}" ::scobj::tank::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} diff --git a/site_ansto/instrument/config/environment/hiden_xcs_sct.tcl b/site_ansto/instrument/config/environment/hiden_xcs_sct.tcl index c71cc718..81c275b6 100644 --- a/site_ansto/instrument/config/environment/hiden_xcs_sct.tcl +++ b/site_ansto/instrument/config/environment/hiden_xcs_sct.tcl @@ -1152,7 +1152,9 @@ proc add_hiden_xcs {name ip_address tcp_port id} { makesctcontroller sct_${name} std ${ip_address}:${tcp_port} } } else { - ::scobj::hiden_xcs::sics_log 9 "[environment_simulation] => No sctcontroller for hiden_xcs" + ::scobj::hiden_xcs::sics_log 9 "[environment_simulation] => Null sctcontroller for hiden_xcs" + ::scobj::hiden_xcs::sics_log 9 "makesctcontroller sct_${name} aqadapter NULL" + makesctcontroller sct_${name} aqadapter NULL } ::scobj::hiden_xcs::sics_log 1 "::scobj::hiden_xcs::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id}" ::scobj::hiden_xcs::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id} diff --git a/site_ansto/instrument/config/environment/huber_pilot_sct.tcl b/site_ansto/instrument/config/environment/huber_pilot_sct.tcl index c1807c57..b50ecd4d 100644 --- a/site_ansto/instrument/config/environment/huber_pilot_sct.tcl +++ b/site_ansto/instrument/config/environment/huber_pilot_sct.tcl @@ -457,7 +457,9 @@ proc add_huber_pilot {name ip_address tcp_port} { makesctcontroller sct_${name} std ${ip_address}:${tcp_port} } } else { - ::scobj::huber_pilot::sics_log 9 "[environment_simulation] => No sctcontroller for huber_pilot" + ::scobj::huber_pilot::sics_log 9 "[environment_simulation] => Null sctcontroller for huber_pilot" + ::scobj::huber_pilot::sics_log 9 "makesctcontroller sct_${name} aqadapter NULL" + makesctcontroller sct_${name} aqadapter NULL } ::scobj::huber_pilot::sics_log 1 "::scobj::huber_pilot::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port}" ::scobj::huber_pilot::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} diff --git a/site_ansto/instrument/config/environment/isotech_ps_sct.tcl b/site_ansto/instrument/config/environment/isotech_ps_sct.tcl index f6bef67d..25c173ea 100644 --- a/site_ansto/instrument/config/environment/isotech_ps_sct.tcl +++ b/site_ansto/instrument/config/environment/isotech_ps_sct.tcl @@ -339,7 +339,9 @@ proc add_isotech_ps {name ip_address tcp_port} { makesctcontroller sct_${name} std ${ip_address}:${tcp_port} "\r" } } else { - ::scobj::isotech_ps::sics_log 9 "[environment_simulation] => No sctcontroller for isotech_ps" + ::scobj::isotech_ps::sics_log 9 "[environment_simulation] => Null sctcontroller for isotech_ps" + ::scobj::isotech_ps::sics_log 9 "makesctcontroller sct_${name} aqadapter NULL" + makesctcontroller sct_${name} aqadapter NULL } ::scobj::isotech_ps::sics_log 1 "::scobj::isotech_ps::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port}" ::scobj::isotech_ps::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} diff --git a/site_ansto/instrument/config/environment/keithley_m2700_sct.tcl b/site_ansto/instrument/config/environment/keithley_m2700_sct.tcl index f3917c11..a6647568 100644 --- a/site_ansto/instrument/config/environment/keithley_m2700_sct.tcl +++ b/site_ansto/instrument/config/environment/keithley_m2700_sct.tcl @@ -67,7 +67,9 @@ proc add_keithley_m2700 {name ip_address tcp_port id datype tol} { makesctcontroller sct_${name} std ${ip_address}:${tcp_port} } } else { - ::scobj::keithley_m2700::sics_log 9 "[environment_simulation] => No sctcontroller for keithley_m2700" + ::scobj::keithley_m2700::sics_log 9 "[environment_simulation] => Null sctcontroller for keithley_m2700" + ::scobj::keithley_m2700::sics_log 9 "makesctcontroller sct_${name} aqadapter NULL" + makesctcontroller sct_${name} aqadapter NULL } ::scobj::keithley_m2700::sics_log 1 "::scobj::keithley_m2700::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id} ${datype} ${tol}" ::scobj::keithley_m2700::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id} ${datype} ${tol} diff --git a/site_ansto/instrument/config/environment/magneticField/oxford12tlv_sct.tcl b/site_ansto/instrument/config/environment/magneticField/oxford12tlv_sct.tcl index dee193f1..f21671de 100644 --- a/site_ansto/instrument/config/environment/magneticField/oxford12tlv_sct.tcl +++ b/site_ansto/instrument/config/environment/magneticField/oxford12tlv_sct.tcl @@ -72,7 +72,9 @@ proc add_oxford12tlv {name ip_address tcp_port id datype interval} { makesctcontroller sct_${name} std ${ip_address}:${tcp_port} } } else { - ::scobj::oxford12tlv::sics_log 9 "[environment_simulation] => No sctcontroller for oxford12tlv" + ::scobj::oxford12tlv::sics_log 9 "[environment_simulation] => Null sctcontroller for oxford12tlv" + ::scobj::oxford12tlv::sics_log 9 "makesctcontroller sct_${name} aqadapter NULL" + makesctcontroller sct_${name} aqadapter NULL } ::scobj::oxford12tlv::sics_log 1 "::scobj::oxford12tlv::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id} ${datype} ${interval}" ::scobj::oxford12tlv::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id} ${datype} ${interval} 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 de460b10..d2200d91 100644 --- a/site_ansto/instrument/config/environment/magneticField/tsi_smc_sct.tcl +++ b/site_ansto/instrument/config/environment/magneticField/tsi_smc_sct.tcl @@ -523,7 +523,9 @@ proc add_tsi_smc {name ip_address tcp_port {id 1}} { makesctcontroller sct_${name} std ${ip_address}:${tcp_port} } } else { - ::scobj::tsi_smc::sics_log 9 "[environment_simulation] => No sctcontroller for tsi_smc" + ::scobj::tsi_smc::sics_log 9 "[environment_simulation] => Null sctcontroller for tsi_smc" + ::scobj::tsi_smc::sics_log 9 "makesctcontroller sct_${name} aqadapter NULL" + makesctcontroller sct_${name} aqadapter NULL } ::scobj::tsi_smc::sics_log 1 "::scobj::tsi_smc::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id}" ::scobj::tsi_smc::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id} diff --git a/site_ansto/instrument/config/environment/nhq_200_sct.tcl b/site_ansto/instrument/config/environment/nhq_200_sct.tcl index f883eacd..5c6b3413 100644 --- a/site_ansto/instrument/config/environment/nhq_200_sct.tcl +++ b/site_ansto/instrument/config/environment/nhq_200_sct.tcl @@ -728,7 +728,9 @@ proc add_nhq_200 {name ip_address tcp_port} { makesctcontroller sct_${name} std ${ip_address}:${tcp_port} } } else { - ::scobj::nhq_200::sics_log 9 "[environment_simulation] => No sctcontroller for nhq_200" + ::scobj::nhq_200::sics_log 9 "[environment_simulation] => Null sctcontroller for nhq_200" + ::scobj::nhq_200::sics_log 9 "makesctcontroller sct_${name} aqadapter NULL" + makesctcontroller sct_${name} aqadapter NULL } ::scobj::nhq_200::sics_log 1 "::scobj::nhq_200::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port}" ::scobj::nhq_200::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} diff --git a/site_ansto/instrument/config/environment/omron_hldc_sct.tcl b/site_ansto/instrument/config/environment/omron_hldc_sct.tcl index 626c44d2..6d9a9667 100644 --- a/site_ansto/instrument/config/environment/omron_hldc_sct.tcl +++ b/site_ansto/instrument/config/environment/omron_hldc_sct.tcl @@ -265,7 +265,9 @@ proc add_omron_hldc {name ip_address tcp_port} { makesctcontroller sct_${name} std ${ip_address}:${tcp_port} } } else { - ::scobj::omron_hldc::sics_log 9 "[environment_simulation] => No sctcontroller for omron_hldc" + ::scobj::omron_hldc::sics_log 9 "[environment_simulation] => Null sctcontroller for omron_hldc" + ::scobj::omron_hldc::sics_log 9 "makesctcontroller sct_${name} aqadapter NULL" + makesctcontroller sct_${name} aqadapter NULL } ::scobj::omron_hldc::sics_log 1 "::scobj::omron_hldc::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port}" ::scobj::omron_hldc::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} diff --git a/site_ansto/instrument/config/environment/protekmm_sct.tcl b/site_ansto/instrument/config/environment/protekmm_sct.tcl index 742204e9..97e409c9 100644 --- a/site_ansto/instrument/config/environment/protekmm_sct.tcl +++ b/site_ansto/instrument/config/environment/protekmm_sct.tcl @@ -67,7 +67,9 @@ proc add_protekmm {name ip_address tcp_port id datype} { makesctcontroller sct_${name} protek608 ${ip_address}:${tcp_port} } } else { - ::scobj::protekmm::sics_log 9 "[environment_simulation] => No sctcontroller for protekmm" + ::scobj::protekmm::sics_log 9 "[environment_simulation] => Null sctcontroller for protekmm" + ::scobj::protekmm::sics_log 9 "makesctcontroller sct_${name} aqadapter NULL" + makesctcontroller sct_${name} aqadapter NULL } ::scobj::protekmm::sics_log 1 "::scobj::protekmm::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id} ${datype}" ::scobj::protekmm::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id} ${datype} diff --git a/site_ansto/instrument/config/environment/temperature/eurotherm_m2000_sct.tcl b/site_ansto/instrument/config/environment/temperature/eurotherm_m2000_sct.tcl index e26df6ea..5d9c1a5a 100644 --- a/site_ansto/instrument/config/environment/temperature/eurotherm_m2000_sct.tcl +++ b/site_ansto/instrument/config/environment/temperature/eurotherm_m2000_sct.tcl @@ -67,7 +67,9 @@ proc add_eurotherm_m2000 {name ip_address tcp_port id datype dev_id tol} { makesctcontroller sct_${name} std ${ip_address}:${tcp_port} } } else { - ::scobj::eurotherm_m2000::sics_log 9 "[environment_simulation] => No sctcontroller for eurotherm_m2000" + ::scobj::eurotherm_m2000::sics_log 9 "[environment_simulation] => Null sctcontroller for eurotherm_m2000" + ::scobj::eurotherm_m2000::sics_log 9 "makesctcontroller sct_${name} aqadapter NULL" + makesctcontroller sct_${name} aqadapter NULL } ::scobj::eurotherm_m2000::sics_log 1 "::scobj::eurotherm_m2000::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id} ${datype} ${dev_id} ${tol}" ::scobj::eurotherm_m2000::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id} ${datype} ${dev_id} ${tol} 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 d7643e56..dd21a940 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 @@ -654,7 +654,9 @@ proc add_julabo_lh45_gen {name ip_address tcp_port {id 1} {ctrl_sensor "bath"} { makesctcontroller sct_${name} std ${ip_address}:${tcp_port} "\r" } } else { - ::scobj::julabo_lh45_gen::sics_log 9 "[environment_simulation] => No sctcontroller for julabo_lh45_gen" + ::scobj::julabo_lh45_gen::sics_log 9 "[environment_simulation] => Null sctcontroller for julabo_lh45_gen" + ::scobj::julabo_lh45_gen::sics_log 9 "makesctcontroller sct_${name} aqadapter NULL" + makesctcontroller sct_${name} aqadapter NULL } ::scobj::julabo_lh45_gen::sics_log 1 "::scobj::julabo_lh45_gen::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id} ${ctrl_sensor} ${tol}" ::scobj::julabo_lh45_gen::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id} ${ctrl_sensor} ${tol} diff --git a/site_ansto/instrument/config/environment/temperature/lakeshore_218_sct.tcl b/site_ansto/instrument/config/environment/temperature/lakeshore_218_sct.tcl index 6cf3ba58..f17ebe12 100644 --- a/site_ansto/instrument/config/environment/temperature/lakeshore_218_sct.tcl +++ b/site_ansto/instrument/config/environment/temperature/lakeshore_218_sct.tcl @@ -340,7 +340,9 @@ proc add_lakeshore_218 {name ip_address tcp_port} { makesctcontroller sct_${name} std ${ip_address}:${tcp_port} } } else { - ::scobj::lakeshore_218::sics_log 9 "[environment_simulation] => No sctcontroller for lakeshore_218" + ::scobj::lakeshore_218::sics_log 9 "[environment_simulation] => Null sctcontroller for lakeshore_218" + ::scobj::lakeshore_218::sics_log 9 "makesctcontroller sct_${name} aqadapter NULL" + makesctcontroller sct_${name} aqadapter NULL } ::scobj::lakeshore_218::sics_log 1 "::scobj::lakeshore_218::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port}" ::scobj::lakeshore_218::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} diff --git a/site_ansto/instrument/config/environment/temperature/lakeshore_m370_sct.tcl b/site_ansto/instrument/config/environment/temperature/lakeshore_m370_sct.tcl index 8e42f927..4169fcae 100644 --- a/site_ansto/instrument/config/environment/temperature/lakeshore_m370_sct.tcl +++ b/site_ansto/instrument/config/environment/temperature/lakeshore_m370_sct.tcl @@ -71,7 +71,9 @@ proc add_lakeshore_m370 {name ip_address tcp_port id tol} { makesctcontroller sct_${name} std ${ip_address}:${tcp_port} } } else { - ::scobj::lakeshore_m370::sics_log 9 "[environment_simulation] => No sctcontroller for lakeshore_m370" + ::scobj::lakeshore_m370::sics_log 9 "[environment_simulation] => Null sctcontroller for lakeshore_m370" + ::scobj::lakeshore_m370::sics_log 9 "makesctcontroller sct_${name} aqadapter NULL" + makesctcontroller sct_${name} aqadapter NULL } ::scobj::lakeshore_m370::sics_log 1 "::scobj::lakeshore_m370::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id} ${tol}" ::scobj::lakeshore_m370::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id} ${tol} diff --git a/site_ansto/instrument/config/environment/temperature/ls336_sct.tcl b/site_ansto/instrument/config/environment/temperature/ls336_sct.tcl index 95b30e6a..f7f97b40 100644 --- a/site_ansto/instrument/config/environment/temperature/ls336_sct.tcl +++ b/site_ansto/instrument/config/environment/temperature/ls336_sct.tcl @@ -67,7 +67,9 @@ proc add_ls336 {name ip_address tcp_port id datype {tol1 1.0} {tol2 1.0}} { makesctcontroller sct_${name} std ${ip_address}:${tcp_port} } } else { - ::scobj::ls336::sics_log 9 "[environment_simulation] => No sctcontroller for ls336" + ::scobj::ls336::sics_log 9 "[environment_simulation] => Null sctcontroller for ls336" + ::scobj::ls336::sics_log 9 "makesctcontroller sct_${name} aqadapter NULL" + makesctcontroller sct_${name} aqadapter NULL } ::scobj::ls336::sics_log 1 "::scobj::ls336::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id} ${datype} ${tol1} ${tol2}" ::scobj::ls336::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id} ${datype} ${tol1} ${tol2} diff --git a/site_ansto/instrument/config/environment/temperature/ls340_sct.tcl b/site_ansto/instrument/config/environment/temperature/ls340_sct.tcl index b5588efe..ea13283c 100644 --- a/site_ansto/instrument/config/environment/temperature/ls340_sct.tcl +++ b/site_ansto/instrument/config/environment/temperature/ls340_sct.tcl @@ -67,7 +67,9 @@ proc add_ls340 {name ip_address tcp_port id datype {tol1 1.0} {tol2 1.0}} { makesctcontroller sct_${name} std ${ip_address}:${tcp_port} } } else { - ::scobj::ls340::sics_log 9 "[environment_simulation] => No sctcontroller for ls340" + ::scobj::ls340::sics_log 9 "[environment_simulation] => Null sctcontroller for ls340" + ::scobj::ls340::sics_log 9 "makesctcontroller sct_${name} aqadapter NULL" + makesctcontroller sct_${name} aqadapter NULL } ::scobj::ls340::sics_log 1 "::scobj::ls340::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id} ${datype} ${tol1} ${tol2}" ::scobj::ls340::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id} ${datype} ${tol1} ${tol2} 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 79395f00..178d4e07 100644 --- a/site_ansto/instrument/config/environment/temperature/mercury_base_sct.tcl +++ b/site_ansto/instrument/config/environment/temperature/mercury_base_sct.tcl @@ -558,7 +558,9 @@ proc add_mercury_base {name ip_address tcp_port {id 99} {tol 1}} { makesctcontroller sct_${name} std ${ip_address}:${tcp_port} } } else { - ::scobj::mercury_base::sics_log 9 "[environment_simulation] => No sctcontroller for mercury_base" + ::scobj::mercury_base::sics_log 9 "[environment_simulation] => Null sctcontroller for mercury_base" + ::scobj::mercury_base::sics_log 9 "makesctcontroller sct_${name} aqadapter NULL" + makesctcontroller sct_${name} aqadapter NULL } ::scobj::mercury_base::sics_log 1 "::scobj::mercury_base::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id} ${tol}" ::scobj::mercury_base::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id} ${tol} diff --git a/site_ansto/instrument/config/environment/temperature/mercury_level_sct.tcl b/site_ansto/instrument/config/environment/temperature/mercury_level_sct.tcl index ef8e0961..e46fdbba 100644 --- a/site_ansto/instrument/config/environment/temperature/mercury_level_sct.tcl +++ b/site_ansto/instrument/config/environment/temperature/mercury_level_sct.tcl @@ -217,7 +217,9 @@ proc add_mercury_level {name ip_address tcp_port {id 99}} { makesctcontroller sct_${name} std ${ip_address}:${tcp_port} } } else { - ::scobj::mercury_level::sics_log 9 "[environment_simulation] => No sctcontroller for mercury_level" + ::scobj::mercury_level::sics_log 9 "[environment_simulation] => Null sctcontroller for mercury_level" + ::scobj::mercury_level::sics_log 9 "makesctcontroller sct_${name} aqadapter NULL" + makesctcontroller sct_${name} aqadapter NULL } ::scobj::mercury_level::sics_log 1 "::scobj::mercury_level::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id}" ::scobj::mercury_level::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id} 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 076736ef..d6b86b7a 100644 --- a/site_ansto/instrument/config/environment/temperature/mercury_pres_sct.tcl +++ b/site_ansto/instrument/config/environment/temperature/mercury_pres_sct.tcl @@ -384,7 +384,9 @@ proc add_mercury_pres {name ip_address tcp_port {id 99} {tol 1}} { makesctcontroller sct_${name} std ${ip_address}:${tcp_port} } } else { - ::scobj::mercury_pres::sics_log 9 "[environment_simulation] => No sctcontroller for mercury_pres" + ::scobj::mercury_pres::sics_log 9 "[environment_simulation] => Null sctcontroller for mercury_pres" + ::scobj::mercury_pres::sics_log 9 "makesctcontroller sct_${name} aqadapter NULL" + makesctcontroller sct_${name} aqadapter NULL } ::scobj::mercury_pres::sics_log 1 "::scobj::mercury_pres::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id} ${tol}" ::scobj::mercury_pres::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id} ${tol} 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 0ead24d9..04f6e2f4 100644 --- a/site_ansto/instrument/config/environment/temperature/mercury_scpi_sct.tcl +++ b/site_ansto/instrument/config/environment/temperature/mercury_scpi_sct.tcl @@ -771,7 +771,9 @@ proc add_mercury_scpi {name ip_address tcp_port {id 99} {permlink LT} {tol 1} {v makesctcontroller sct_${name} std ${ip_address}:${tcp_port} } } else { - ::scobj::mercury_scpi::sics_log 9 "[environment_simulation] => No sctcontroller for mercury_scpi" + ::scobj::mercury_scpi::sics_log 9 "[environment_simulation] => Null sctcontroller for mercury_scpi" + ::scobj::mercury_scpi::sics_log 9 "makesctcontroller sct_${name} aqadapter NULL" + makesctcontroller sct_${name} aqadapter NULL } ::scobj::mercury_scpi::sics_log 1 "::scobj::mercury_scpi::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id} ${permlink} ${tol} ${valve_tol}" ::scobj::mercury_scpi::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id} ${permlink} ${tol} ${valve_tol} 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 a61ac6b1..d8b2e3e4 100644 --- a/site_ansto/instrument/config/environment/temperature/mercury_temp_sct.tcl +++ b/site_ansto/instrument/config/environment/temperature/mercury_temp_sct.tcl @@ -390,7 +390,9 @@ proc add_mercury_temp {name ip_address tcp_port {id 99} {tol 1}} { makesctcontroller sct_${name} std ${ip_address}:${tcp_port} } } else { - ::scobj::mercury_temp::sics_log 9 "[environment_simulation] => No sctcontroller for mercury_temp" + ::scobj::mercury_temp::sics_log 9 "[environment_simulation] => Null sctcontroller for mercury_temp" + ::scobj::mercury_temp::sics_log 9 "makesctcontroller sct_${name} aqadapter NULL" + makesctcontroller sct_${name} aqadapter NULL } ::scobj::mercury_temp::sics_log 1 "::scobj::mercury_temp::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id} ${tol}" ::scobj::mercury_temp::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id} ${tol} 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 cfe19ad2..0c3bf363 100644 --- a/site_ansto/instrument/config/environment/temperature/mercury_valve_sct.tcl +++ b/site_ansto/instrument/config/environment/temperature/mercury_valve_sct.tcl @@ -337,7 +337,9 @@ proc add_mercury_valve {name ip_address tcp_port {id 99} {valve_tol 2}} { makesctcontroller sct_${name} std ${ip_address}:${tcp_port} } } else { - ::scobj::mercury_valve::sics_log 9 "[environment_simulation] => No sctcontroller for mercury_valve" + ::scobj::mercury_valve::sics_log 9 "[environment_simulation] => Null sctcontroller for mercury_valve" + ::scobj::mercury_valve::sics_log 9 "makesctcontroller sct_${name} aqadapter NULL" + makesctcontroller sct_${name} aqadapter NULL } ::scobj::mercury_valve::sics_log 1 "::scobj::mercury_valve::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id} ${valve_tol}" ::scobj::mercury_valve::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id} ${valve_tol} diff --git a/site_ansto/instrument/config/environment/temperature/nprvasm2_sct.tcl b/site_ansto/instrument/config/environment/temperature/nprvasm2_sct.tcl index dd14687d..2e67fff6 100644 --- a/site_ansto/instrument/config/environment/temperature/nprvasm2_sct.tcl +++ b/site_ansto/instrument/config/environment/temperature/nprvasm2_sct.tcl @@ -67,7 +67,9 @@ proc add_nprvasm2 {name ip_address tcp_port {tol 1.0}} { makesctcontroller sct_${name} std ${ip_address}:${tcp_port} } } else { - ::scobj::nprvasm2::sics_log 9 "[environment_simulation] => No sctcontroller for nprvasm2" + ::scobj::nprvasm2::sics_log 9 "[environment_simulation] => Null sctcontroller for nprvasm2" + ::scobj::nprvasm2::sics_log 9 "makesctcontroller sct_${name} aqadapter NULL" + makesctcontroller sct_${name} aqadapter NULL } ::scobj::nprvasm2::sics_log 1 "::scobj::nprvasm2::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${tol}" ::scobj::nprvasm2::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${tol} 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 aec721bf..a59d6768 100644 --- a/site_ansto/instrument/config/environment/temperature/pfeiffer_hg_sct.tcl +++ b/site_ansto/instrument/config/environment/temperature/pfeiffer_hg_sct.tcl @@ -492,7 +492,9 @@ proc add_pfeiffer_hg {name ip_address tcp_port} { makesctcontroller sct_${name} std ${ip_address}:${tcp_port} } } else { - ::scobj::pfeiffer_hg::sics_log 9 "[environment_simulation] => No sctcontroller for pfeiffer_hg" + ::scobj::pfeiffer_hg::sics_log 9 "[environment_simulation] => Null sctcontroller for pfeiffer_hg" + ::scobj::pfeiffer_hg::sics_log 9 "makesctcontroller sct_${name} aqadapter NULL" + makesctcontroller sct_${name} aqadapter NULL } ::scobj::pfeiffer_hg::sics_log 1 "::scobj::pfeiffer_hg::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port}" ::scobj::pfeiffer_hg::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} diff --git a/site_ansto/instrument/config/environment/temperature/watlow_mpm_sct.tcl b/site_ansto/instrument/config/environment/temperature/watlow_mpm_sct.tcl index 62e2e7f1..9c525646 100644 --- a/site_ansto/instrument/config/environment/temperature/watlow_mpm_sct.tcl +++ b/site_ansto/instrument/config/environment/temperature/watlow_mpm_sct.tcl @@ -67,7 +67,9 @@ proc add_watlow_mpm {name ip_address tcp_port id datype dev_id tol} { makesctcontroller sct_${name} std ${ip_address}:${tcp_port} } } else { - ::scobj::watlow_mpm::sics_log 9 "[environment_simulation] => No sctcontroller for watlow_mpm" + ::scobj::watlow_mpm::sics_log 9 "[environment_simulation] => Null sctcontroller for watlow_mpm" + ::scobj::watlow_mpm::sics_log 9 "makesctcontroller sct_${name} aqadapter NULL" + makesctcontroller sct_${name} aqadapter NULL } ::scobj::watlow_mpm::sics_log 1 "::scobj::watlow_mpm::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id} ${datype} ${dev_id} ${tol}" ::scobj::watlow_mpm::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id} ${datype} ${dev_id} ${tol} diff --git a/site_ansto/instrument/config/environment/temperature/watlow_mrm_sct.tcl b/site_ansto/instrument/config/environment/temperature/watlow_mrm_sct.tcl index 1196d27b..f29f87db 100644 --- a/site_ansto/instrument/config/environment/temperature/watlow_mrm_sct.tcl +++ b/site_ansto/instrument/config/environment/temperature/watlow_mrm_sct.tcl @@ -67,7 +67,9 @@ proc add_watlow_mrm {name ip_address tcp_port id datype dev_id tol} { makesctcontroller sct_${name} std ${ip_address}:${tcp_port} } } else { - ::scobj::watlow_mrm::sics_log 9 "[environment_simulation] => No sctcontroller for watlow_mrm" + ::scobj::watlow_mrm::sics_log 9 "[environment_simulation] => Null sctcontroller for watlow_mrm" + ::scobj::watlow_mrm::sics_log 9 "makesctcontroller sct_${name} aqadapter NULL" + makesctcontroller sct_${name} aqadapter NULL } ::scobj::watlow_mrm::sics_log 1 "::scobj::watlow_mrm::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id} ${datype} ${dev_id} ${tol}" ::scobj::watlow_mrm::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id} ${datype} ${dev_id} ${tol} diff --git a/site_ansto/instrument/config/environment/temperature/watlow_mst4_sct.tcl b/site_ansto/instrument/config/environment/temperature/watlow_mst4_sct.tcl index 81760afd..e3584526 100644 --- a/site_ansto/instrument/config/environment/temperature/watlow_mst4_sct.tcl +++ b/site_ansto/instrument/config/environment/temperature/watlow_mst4_sct.tcl @@ -67,7 +67,9 @@ proc add_watlow_mst4 {name ip_address tcp_port id datype dev_id tol} { makesctcontroller sct_${name} std ${ip_address}:${tcp_port} } } else { - ::scobj::watlow_mst4::sics_log 9 "[environment_simulation] => No sctcontroller for watlow_mst4" + ::scobj::watlow_mst4::sics_log 9 "[environment_simulation] => Null sctcontroller for watlow_mst4" + ::scobj::watlow_mst4::sics_log 9 "makesctcontroller sct_${name} aqadapter NULL" + makesctcontroller sct_${name} aqadapter NULL } ::scobj::watlow_mst4::sics_log 1 "::scobj::watlow_mst4::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id} ${datype} ${dev_id} ${tol}" ::scobj::watlow_mst4::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id} ${datype} ${dev_id} ${tol} diff --git a/site_ansto/instrument/config/source/reactor_status_sct.tcl b/site_ansto/instrument/config/source/reactor_status_sct.tcl index fdacae9a..09ce38c8 100644 --- a/site_ansto/instrument/config/source/reactor_status_sct.tcl +++ b/site_ansto/instrument/config/source/reactor_status_sct.tcl @@ -333,7 +333,9 @@ proc add_reactor_status {name ip_address tcp_port} { makesctcontroller sct_${name} std ${ip_address}:${tcp_port} } } else { - ::scobj::reactor_status::sics_log 9 "[opal_simulation] => No sctcontroller for reactor_status" + ::scobj::reactor_status::sics_log 9 "[opal_simulation] => Null sctcontroller for reactor_status" + ::scobj::reactor_status::sics_log 9 "makesctcontroller sct_${name} aqadapter NULL" + makesctcontroller sct_${name} aqadapter NULL } ::scobj::reactor_status::sics_log 1 "::scobj::reactor_status::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port}" ::scobj::reactor_status::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port}