diff --git a/site_ansto/instrument/bilby/config/chopper/sct_astrium_chopper.tcl b/site_ansto/instrument/bilby/config/chopper/sct_astrium_chopper.tcl index 34de087d..c837bd86 100644 --- a/site_ansto/instrument/bilby/config/chopper/sct_astrium_chopper.tcl +++ b/site_ansto/instrument/bilby/config/chopper/sct_astrium_chopper.tcl @@ -248,6 +248,7 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name device_class simul MakeSICSObj ${name} SCT_OBJECT + sicslist setatt ${name} driver astrium_chopper sicslist setatt ${name} klass ${device_class} sicslist setatt ${name} long_name ${name} @@ -624,6 +625,7 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name device_class simul hsetprop ${scobj_hpath}/disk_4 data "true" hsetprop ${scobj_hpath}/disk_4 klass "@none" hsetprop ${scobj_hpath}/disk_4 type "part" + hsetprop ${scobj_hpath} driver astrium_chopper hsetprop ${scobj_hpath} klass ${device_class} hsetprop ${scobj_hpath} data true hsetprop ${scobj_hpath} debug_threshold 5 diff --git a/site_ansto/instrument/bilby/config/motors/sct_shutters.tcl b/site_ansto/instrument/bilby/config/motors/sct_shutters.tcl index 1c0bbc93..5e5105d6 100644 --- a/site_ansto/instrument/bilby/config/motors/sct_shutters.tcl +++ b/site_ansto/instrument/bilby/config/motors/sct_shutters.tcl @@ -203,6 +203,7 @@ proc ::scobj::shutters::mkDriver { sct_controller name device_class simulation_f MakeSICSObj ${name} SCT_OBJECT + sicslist setatt ${name} driver shutters sicslist setatt ${name} klass ${device_class} sicslist setatt ${name} long_name ${name} @@ -285,6 +286,7 @@ proc ::scobj::shutters::mkDriver { sct_controller name device_class simulation_f hsetprop ${scobj_hpath} klass "@none" hsetprop ${scobj_hpath} nxsave "true" hsetprop ${scobj_hpath} type "part" + hsetprop ${scobj_hpath} driver shutters hsetprop ${scobj_hpath} klass ${device_class} hsetprop ${scobj_hpath} data true hsetprop ${scobj_hpath} debug_threshold 5 diff --git a/site_ansto/instrument/bilby/config/motors/sct_tank.tcl b/site_ansto/instrument/bilby/config/motors/sct_tank.tcl index b03db167..bde865e7 100644 --- a/site_ansto/instrument/bilby/config/motors/sct_tank.tcl +++ b/site_ansto/instrument/bilby/config/motors/sct_tank.tcl @@ -211,6 +211,7 @@ proc ::scobj::tank::mkDriver { sct_controller name device_class simulation_flag MakeSICSObj ${name} SCT_OBJECT + sicslist setatt ${name} driver tank sicslist setatt ${name} klass ${device_class} sicslist setatt ${name} long_name ${name} @@ -334,6 +335,7 @@ proc ::scobj::tank::mkDriver { sct_controller name device_class simulation_flag hsetprop ${scobj_hpath}/switches data "true" hsetprop ${scobj_hpath}/switches klass "@none" hsetprop ${scobj_hpath}/switches type "part" + hsetprop ${scobj_hpath} driver tank hsetprop ${scobj_hpath} klass ${device_class} hsetprop ${scobj_hpath} data true hsetprop ${scobj_hpath} debug_threshold 5 diff --git a/site_ansto/instrument/config/beamline/sct_he3_polanal.tcl b/site_ansto/instrument/config/beamline/sct_he3_polanal.tcl index 89211c28..336a503f 100644 --- a/site_ansto/instrument/config/beamline/sct_he3_polanal.tcl +++ b/site_ansto/instrument/config/beamline/sct_he3_polanal.tcl @@ -207,6 +207,7 @@ proc ::scobj::he3_polanal::mkDriver { sct_controller name device_class simulatio MakeSICSObj ${name} SCT_OBJECT + sicslist setatt ${name} driver he3_polanal sicslist setatt ${name} klass ${device_class} sicslist setatt ${name} long_name ${name} @@ -593,6 +594,7 @@ proc ::scobj::he3_polanal::mkDriver { sct_controller name device_class simulatio hsetprop ${scobj_hpath}/polariser_start klass "@none" hsetprop ${scobj_hpath}/polariser_start type "part" } + hsetprop ${scobj_hpath} driver he3_polanal hsetprop ${scobj_hpath} klass ${device_class} hsetprop ${scobj_hpath} data true hsetprop ${scobj_hpath} debug_threshold 5 diff --git a/site_ansto/instrument/config/environment/magneticField/sct_green_magnet_labview.tcl b/site_ansto/instrument/config/environment/magneticField/sct_green_magnet_labview.tcl index 87111df6..48687068 100644 --- a/site_ansto/instrument/config/environment/magneticField/sct_green_magnet_labview.tcl +++ b/site_ansto/instrument/config/environment/magneticField/sct_green_magnet_labview.tcl @@ -106,6 +106,8 @@ proc ::scobj::green_magnet_labview::read_config {} { } if { [string equal -nocase [dict get $v "driver"] "green_magnet_labview"] } { ::scobj::green_magnet_labview::sics_log 9 "No sctcontroller for green_magnet_labview" + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] ${ns}::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} } } diff --git a/site_ansto/instrument/config/environment/magneticField/sct_oxford12tlv.tcl b/site_ansto/instrument/config/environment/magneticField/sct_oxford12tlv.tcl index 7efab920..5d40e6cf 100644 --- a/site_ansto/instrument/config/environment/magneticField/sct_oxford12tlv.tcl +++ b/site_ansto/instrument/config/environment/magneticField/sct_oxford12tlv.tcl @@ -37,10 +37,12 @@ proc ::scobj::oxford12tlv::mkDriver { sct_controller name device_class simulatio MakeSICSObj ${name} SCT_OBJECT + sicslist setatt ${name} driver oxford12tlv sicslist setatt ${name} klass ${device_class} sicslist setatt ${name} long_name ${name} set scobj_hpath /sics/${name} + hsetprop ${scobj_hpath} driver oxford12tlv hsetprop ${scobj_hpath} klass ${device_class} hsetprop ${scobj_hpath} data true hsetprop ${scobj_hpath} debug_threshold 5 diff --git a/site_ansto/instrument/config/environment/magneticField/sct_tsi_smc.tcl b/site_ansto/instrument/config/environment/magneticField/sct_tsi_smc.tcl index 5a2910aa..13d44544 100644 --- a/site_ansto/instrument/config/environment/magneticField/sct_tsi_smc.tcl +++ b/site_ansto/instrument/config/environment/magneticField/sct_tsi_smc.tcl @@ -278,6 +278,7 @@ proc ::scobj::tsi_smc::mkDriver { sct_controller name device_class simulation_fl MakeSICSObj ${name} SCT_OBJECT + sicslist setatt ${name} driver tsi_smc sicslist setatt ${name} klass ${device_class} sicslist setatt ${name} long_name ${name} @@ -564,6 +565,7 @@ proc ::scobj::tsi_smc::mkDriver { sct_controller name device_class simulation_fl hsetprop ${scobj_hpath}/b data "true" hsetprop ${scobj_hpath}/b klass "@none" hsetprop ${scobj_hpath}/b type "part" + hsetprop ${scobj_hpath} driver tsi_smc hsetprop ${scobj_hpath} klass ${device_class} hsetprop ${scobj_hpath} data true hsetprop ${scobj_hpath} debug_threshold 5 diff --git a/site_ansto/instrument/config/environment/sct_agilent_33220A.tcl b/site_ansto/instrument/config/environment/sct_agilent_33220A.tcl index c410636d..60ff6b36 100644 --- a/site_ansto/instrument/config/environment/sct_agilent_33220A.tcl +++ b/site_ansto/instrument/config/environment/sct_agilent_33220A.tcl @@ -100,6 +100,8 @@ proc ::scobj::agilent_33220A::read_config {} { } if { [string equal -nocase [dict get $v "driver"] "agilent_33220A"] } { ::scobj::agilent_33220A::sics_log 9 "No sctcontroller for agilent_33220A" + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] ${ns}::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} } } diff --git a/site_ansto/instrument/config/environment/sct_hiden_xcs.tcl b/site_ansto/instrument/config/environment/sct_hiden_xcs.tcl index 67164b2e..b9e5b3ed 100644 --- a/site_ansto/instrument/config/environment/sct_hiden_xcs.tcl +++ b/site_ansto/instrument/config/environment/sct_hiden_xcs.tcl @@ -797,6 +797,7 @@ proc ::scobj::hiden_xcs::mkDriver { sct_controller name device_class simulation_ MakeSICSObj ${name} SCT_OBJECT + sicslist setatt ${name} driver hiden_xcs sicslist setatt ${name} klass ${device_class} sicslist setatt ${name} long_name ${name} @@ -1264,6 +1265,7 @@ proc ::scobj::hiden_xcs::mkDriver { sct_controller name device_class simulation_ hsetprop ${scobj_hpath}/humidity nxsave "true" hsetprop ${scobj_hpath}/humidity type "part" ansto_makesctdrive ${name}_humidity_setpoint ${scobj_hpath}/humidity/setpoint ${scobj_hpath}/humidity/sensor ${sct_controller} + hsetprop ${scobj_hpath} driver hiden_xcs hsetprop ${scobj_hpath} klass ${device_class} hsetprop ${scobj_hpath} data true hsetprop ${scobj_hpath} debug_threshold 5 diff --git a/site_ansto/instrument/config/environment/sct_huber_pilot.tcl b/site_ansto/instrument/config/environment/sct_huber_pilot.tcl index b4f6384b..67e4aa1e 100644 --- a/site_ansto/instrument/config/environment/sct_huber_pilot.tcl +++ b/site_ansto/instrument/config/environment/sct_huber_pilot.tcl @@ -304,6 +304,7 @@ proc ::scobj::huber_pilot::mkDriver { sct_controller name device_class simulatio MakeSICSObj ${name} SCT_OBJECT + sicslist setatt ${name} driver huber_pilot sicslist setatt ${name} klass ${device_class} sicslist setatt ${name} long_name ${name} @@ -480,6 +481,7 @@ proc ::scobj::huber_pilot::mkDriver { sct_controller name device_class simulatio 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_int ${sct_controller} + hsetprop ${scobj_hpath} driver huber_pilot hsetprop ${scobj_hpath} klass ${device_class} hsetprop ${scobj_hpath} data true hsetprop ${scobj_hpath} debug_threshold 5 diff --git a/site_ansto/instrument/config/environment/sct_isotech_ps.tcl b/site_ansto/instrument/config/environment/sct_isotech_ps.tcl index 05ddd1e8..bbe994fa 100644 --- a/site_ansto/instrument/config/environment/sct_isotech_ps.tcl +++ b/site_ansto/instrument/config/environment/sct_isotech_ps.tcl @@ -250,6 +250,7 @@ proc ::scobj::isotech_ps::mkDriver { sct_controller name device_class simulation MakeSICSObj ${name} SCT_OBJECT + sicslist setatt ${name} driver isotech_ps sicslist setatt ${name} klass ${device_class} sicslist setatt ${name} long_name ${name} @@ -331,6 +332,7 @@ proc ::scobj::isotech_ps::mkDriver { sct_controller name device_class simulation hsetprop ${scobj_hpath} data "true" hsetprop ${scobj_hpath} klass "@none" hsetprop ${scobj_hpath} type "part" + hsetprop ${scobj_hpath} driver isotech_ps hsetprop ${scobj_hpath} klass ${device_class} hsetprop ${scobj_hpath} data true hsetprop ${scobj_hpath} debug_threshold 5 diff --git a/site_ansto/instrument/config/environment/sct_keithley_m2700.tcl b/site_ansto/instrument/config/environment/sct_keithley_m2700.tcl index 72fda1ad..9d228e27 100644 --- a/site_ansto/instrument/config/environment/sct_keithley_m2700.tcl +++ b/site_ansto/instrument/config/environment/sct_keithley_m2700.tcl @@ -37,10 +37,12 @@ proc ::scobj::keithley_m2700::mkDriver { sct_controller name device_class simula MakeSICSObj ${name} SCT_OBJECT user float + sicslist setatt ${name} driver keithley_m2700 sicslist setatt ${name} klass ${device_class} sicslist setatt ${name} long_name ${name} set scobj_hpath /sics/${name} + hsetprop ${scobj_hpath} driver keithley_m2700 hsetprop ${scobj_hpath} klass ${device_class} hsetprop ${scobj_hpath} data true hsetprop ${scobj_hpath} debug_threshold 5 diff --git a/site_ansto/instrument/config/environment/sct_knauer_pump.tcl b/site_ansto/instrument/config/environment/sct_knauer_pump.tcl index 96debf7b..9c619639 100644 --- a/site_ansto/instrument/config/environment/sct_knauer_pump.tcl +++ b/site_ansto/instrument/config/environment/sct_knauer_pump.tcl @@ -883,6 +883,7 @@ proc ::scobj::knauer_pump::mkDriver { sct_controller name device_class simulatio MakeSICSObj ${name} SCT_OBJECT + sicslist setatt ${name} driver knauer_pump sicslist setatt ${name} klass ${device_class} sicslist setatt ${name} long_name ${name} @@ -1174,6 +1175,7 @@ proc ::scobj::knauer_pump::mkDriver { sct_controller name device_class simulatio hsetprop ${scobj_hpath}/pump/volume klass "@none" hsetprop ${scobj_hpath}/pump/volume type "part" ansto_makesctdrive ${name}_pump_volume_setp ${scobj_hpath}/pump/volume/setp ${scobj_hpath}/pump/volume/pval ${sct_controller} + hsetprop ${scobj_hpath} driver knauer_pump hsetprop ${scobj_hpath} klass ${device_class} hsetprop ${scobj_hpath} data true hsetprop ${scobj_hpath} debug_threshold 5 diff --git a/site_ansto/instrument/config/environment/sct_mvp_valve.tcl b/site_ansto/instrument/config/environment/sct_mvp_valve.tcl index 7fd5c536..13a70180 100644 --- a/site_ansto/instrument/config/environment/sct_mvp_valve.tcl +++ b/site_ansto/instrument/config/environment/sct_mvp_valve.tcl @@ -99,6 +99,8 @@ proc ::scobj::mvp_valve::read_config {} { } if { [string equal -nocase [dict get $v "driver"] "mvp_valve"] } { ::scobj::mvp_valve::sics_log 9 "No sctcontroller for mvp_valve" + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] set arg_list [list] set missing_list [list] foreach arg {id datype} { diff --git a/site_ansto/instrument/config/environment/sct_nhq_200.tcl b/site_ansto/instrument/config/environment/sct_nhq_200.tcl index fad4bcc3..9b8c1850 100644 --- a/site_ansto/instrument/config/environment/sct_nhq_200.tcl +++ b/site_ansto/instrument/config/environment/sct_nhq_200.tcl @@ -284,6 +284,7 @@ proc ::scobj::nhq_200::mkDriver { sct_controller name device_class simulation_fl MakeSICSObj ${name} SCT_OBJECT + sicslist setatt ${name} driver nhq_200 sicslist setatt ${name} klass ${device_class} sicslist setatt ${name} long_name ${name} @@ -860,6 +861,7 @@ proc ::scobj::nhq_200::mkDriver { sct_controller name device_class simulation_fl hsetprop ${scobj_hpath}/ch2 klass "@none" hsetprop ${scobj_hpath}/ch2 type "part" ansto_makesctdrive ${name}_ch2_v_sp ${scobj_hpath}/ch2/v_sp ${scobj_hpath}/ch2/voltage ${sct_controller} + hsetprop ${scobj_hpath} driver nhq_200 hsetprop ${scobj_hpath} klass ${device_class} hsetprop ${scobj_hpath} data true hsetprop ${scobj_hpath} debug_threshold 5 diff --git a/site_ansto/instrument/config/environment/sct_omron_hldc.tcl b/site_ansto/instrument/config/environment/sct_omron_hldc.tcl index ae036bb1..6c51a2bb 100644 --- a/site_ansto/instrument/config/environment/sct_omron_hldc.tcl +++ b/site_ansto/instrument/config/environment/sct_omron_hldc.tcl @@ -200,6 +200,7 @@ proc ::scobj::omron_hldc::mkDriver { sct_controller name device_class simulation MakeSICSObj ${name} SCT_OBJECT + sicslist setatt ${name} driver omron_hldc sicslist setatt ${name} klass ${device_class} sicslist setatt ${name} long_name ${name} @@ -250,6 +251,7 @@ proc ::scobj::omron_hldc::mkDriver { sct_controller name device_class simulation hsetprop ${scobj_hpath} data "true" hsetprop ${scobj_hpath} klass "@none" hsetprop ${scobj_hpath} type "part" + hsetprop ${scobj_hpath} driver omron_hldc hsetprop ${scobj_hpath} klass ${device_class} hsetprop ${scobj_hpath} data true hsetprop ${scobj_hpath} debug_threshold 5 diff --git a/site_ansto/instrument/config/environment/sct_protekmm.tcl b/site_ansto/instrument/config/environment/sct_protekmm.tcl index 27dfa4e3..09edae33 100644 --- a/site_ansto/instrument/config/environment/sct_protekmm.tcl +++ b/site_ansto/instrument/config/environment/sct_protekmm.tcl @@ -37,10 +37,12 @@ proc ::scobj::protekmm::mkDriver { sct_controller name device_class simulation_f MakeSICSObj ${name} SCT_OBJECT user float + sicslist setatt ${name} driver protekmm sicslist setatt ${name} klass ${device_class} sicslist setatt ${name} long_name ${name} set scobj_hpath /sics/${name} + hsetprop ${scobj_hpath} driver protekmm hsetprop ${scobj_hpath} klass ${device_class} hsetprop ${scobj_hpath} data true hsetprop ${scobj_hpath} debug_threshold 5 diff --git a/site_ansto/instrument/config/environment/temperature/sct_eurotherm_3200.tcl b/site_ansto/instrument/config/environment/temperature/sct_eurotherm_3200.tcl index b4e7aea2..c6c25d26 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_eurotherm_3200.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_eurotherm_3200.tcl @@ -239,6 +239,7 @@ proc ::scobj::eurotherm_3200::mkDriver { sct_controller name device_class simula MakeSICSObj ${name} SCT_OBJECT + sicslist setatt ${name} driver eurotherm_3200 sicslist setatt ${name} klass ${device_class} sicslist setatt ${name} long_name ${name} @@ -564,6 +565,7 @@ proc ::scobj::eurotherm_3200::mkDriver { sct_controller name device_class simula hsetprop ${scobj_hpath}/util data "false" hsetprop ${scobj_hpath}/util klass "@none" hsetprop ${scobj_hpath}/util type "part" + hsetprop ${scobj_hpath} driver eurotherm_3200 hsetprop ${scobj_hpath} klass ${device_class} hsetprop ${scobj_hpath} data true hsetprop ${scobj_hpath} debug_threshold 5 diff --git a/site_ansto/instrument/config/environment/temperature/sct_eurotherm_m2000.tcl b/site_ansto/instrument/config/environment/temperature/sct_eurotherm_m2000.tcl index 72775280..19568e9a 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_eurotherm_m2000.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_eurotherm_m2000.tcl @@ -37,10 +37,12 @@ proc ::scobj::eurotherm_m2000::mkDriver { sct_controller name device_class simul MakeSICSObj ${name} SCT_OBJECT user float + sicslist setatt ${name} driver eurotherm_m2000 sicslist setatt ${name} klass ${device_class} sicslist setatt ${name} long_name ${name} set scobj_hpath /sics/${name} + hsetprop ${scobj_hpath} driver eurotherm_m2000 hsetprop ${scobj_hpath} klass ${device_class} hsetprop ${scobj_hpath} data true hsetprop ${scobj_hpath} debug_threshold 5 diff --git a/site_ansto/instrument/config/environment/temperature/sct_julabo_lh45_gen.tcl b/site_ansto/instrument/config/environment/temperature/sct_julabo_lh45_gen.tcl index c098ad67..bf891b47 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_julabo_lh45_gen.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_julabo_lh45_gen.tcl @@ -379,6 +379,7 @@ proc ::scobj::julabo_lh45_gen::mkDriver { sct_controller name device_class simul MakeSICSObj ${name} SCT_OBJECT + sicslist setatt ${name} driver julabo_lh45_gen sicslist setatt ${name} klass ${device_class} sicslist setatt ${name} long_name ${name} @@ -674,6 +675,7 @@ proc ::scobj::julabo_lh45_gen::mkDriver { sct_controller name device_class simul hsetprop ${scobj_hpath}/sensor data "true" hsetprop ${scobj_hpath}/sensor klass "@none" hsetprop ${scobj_hpath}/sensor type "part" + hsetprop ${scobj_hpath} driver julabo_lh45_gen hsetprop ${scobj_hpath} klass ${device_class} hsetprop ${scobj_hpath} data true hsetprop ${scobj_hpath} debug_threshold 5 diff --git a/site_ansto/instrument/config/environment/temperature/sct_lakeshore_218.tcl b/site_ansto/instrument/config/environment/temperature/sct_lakeshore_218.tcl index 2b13d4cb..c6f1a8bf 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_lakeshore_218.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_lakeshore_218.tcl @@ -200,6 +200,7 @@ proc ::scobj::lakeshore_218::mkDriver { sct_controller name device_class simulat MakeSICSObj ${name} SCT_OBJECT + sicslist setatt ${name} driver lakeshore_218 sicslist setatt ${name} klass ${device_class} sicslist setatt ${name} long_name ${name} @@ -419,6 +420,7 @@ proc ::scobj::lakeshore_218::mkDriver { sct_controller name device_class simulat hsetprop ${scobj_hpath}/sensor data "true" hsetprop ${scobj_hpath}/sensor klass "@none" hsetprop ${scobj_hpath}/sensor type "part" + hsetprop ${scobj_hpath} driver lakeshore_218 hsetprop ${scobj_hpath} klass ${device_class} hsetprop ${scobj_hpath} data true hsetprop ${scobj_hpath} debug_threshold 5 diff --git a/site_ansto/instrument/config/environment/temperature/sct_lakeshore_m370.tcl b/site_ansto/instrument/config/environment/temperature/sct_lakeshore_m370.tcl index 2fb85022..ffd51d01 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_lakeshore_m370.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_lakeshore_m370.tcl @@ -37,10 +37,12 @@ proc ::scobj::lakeshore_m370::mkDriver { sct_controller name device_class simula MakeSICSObj ${name} SCT_OBJECT user none + sicslist setatt ${name} driver lakeshore_m370 sicslist setatt ${name} klass ${device_class} sicslist setatt ${name} long_name ${name} set scobj_hpath /sics/${name} + hsetprop ${scobj_hpath} driver lakeshore_m370 hsetprop ${scobj_hpath} klass ${device_class} hsetprop ${scobj_hpath} data true hsetprop ${scobj_hpath} debug_threshold 5 diff --git a/site_ansto/instrument/config/environment/temperature/sct_ls336.tcl b/site_ansto/instrument/config/environment/temperature/sct_ls336.tcl index fcbfd4aa..e21922fd 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_ls336.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_ls336.tcl @@ -37,10 +37,12 @@ proc ::scobj::ls336::mkDriver { sct_controller name device_class simulation_flag MakeSICSObj ${name} SCT_OBJECT + sicslist setatt ${name} driver ls336 sicslist setatt ${name} klass ${device_class} sicslist setatt ${name} long_name ${name} set scobj_hpath /sics/${name} + hsetprop ${scobj_hpath} driver ls336 hsetprop ${scobj_hpath} klass ${device_class} hsetprop ${scobj_hpath} data true hsetprop ${scobj_hpath} debug_threshold 5 diff --git a/site_ansto/instrument/config/environment/temperature/sct_ls340.tcl b/site_ansto/instrument/config/environment/temperature/sct_ls340.tcl index fd49c355..2bbfc27d 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_ls340.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_ls340.tcl @@ -37,10 +37,12 @@ proc ::scobj::ls340::mkDriver { sct_controller name device_class simulation_flag MakeSICSObj ${name} SCT_OBJECT + sicslist setatt ${name} driver ls340 sicslist setatt ${name} klass ${device_class} sicslist setatt ${name} long_name ${name} set scobj_hpath /sics/${name} + hsetprop ${scobj_hpath} driver ls340 hsetprop ${scobj_hpath} klass ${device_class} hsetprop ${scobj_hpath} data true hsetprop ${scobj_hpath} debug_threshold 5 diff --git a/site_ansto/instrument/config/environment/temperature/sct_mercury_base.tcl b/site_ansto/instrument/config/environment/temperature/sct_mercury_base.tcl index 6e3c8e2b..3d73d850 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_mercury_base.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_mercury_base.tcl @@ -281,6 +281,7 @@ proc ::scobj::mercury_base::mkDriver { sct_controller name device_class simulati MakeSICSObj ${name} SCT_OBJECT + sicslist setatt ${name} driver mercury_base sicslist setatt ${name} klass ${device_class} sicslist setatt ${name} long_name ${name} @@ -606,6 +607,7 @@ proc ::scobj::mercury_base::mkDriver { sct_controller name device_class simulati 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} driver mercury_base hsetprop ${scobj_hpath} klass ${device_class} hsetprop ${scobj_hpath} data true hsetprop ${scobj_hpath} debug_threshold 5 diff --git a/site_ansto/instrument/config/environment/temperature/sct_mercury_level.tcl b/site_ansto/instrument/config/environment/temperature/sct_mercury_level.tcl index aba8da0e..d6327ec8 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_mercury_level.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_mercury_level.tcl @@ -147,6 +147,7 @@ proc ::scobj::mercury_level::mkDriver { sct_controller name device_class simulat MakeSICSObj ${name} SCT_OBJECT + sicslist setatt ${name} driver mercury_level sicslist setatt ${name} klass ${device_class} sicslist setatt ${name} long_name ${name} @@ -202,6 +203,7 @@ proc ::scobj::mercury_level::mkDriver { sct_controller name device_class simulat hsetprop ${scobj_hpath}/Level data "true" hsetprop ${scobj_hpath}/Level klass "@none" hsetprop ${scobj_hpath}/Level type "part" + hsetprop ${scobj_hpath} driver mercury_level hsetprop ${scobj_hpath} klass ${device_class} hsetprop ${scobj_hpath} data true hsetprop ${scobj_hpath} debug_threshold 5 diff --git a/site_ansto/instrument/config/environment/temperature/sct_mercury_pres.tcl b/site_ansto/instrument/config/environment/temperature/sct_mercury_pres.tcl index 26bcb2f9..9d99c234 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_mercury_pres.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_mercury_pres.tcl @@ -287,6 +287,7 @@ proc ::scobj::mercury_pres::mkDriver { sct_controller name device_class simulati MakeSICSObj ${name} SCT_OBJECT + sicslist setatt ${name} driver mercury_pres sicslist setatt ${name} klass ${device_class} sicslist setatt ${name} long_name ${name} @@ -379,6 +380,7 @@ proc ::scobj::mercury_pres::mkDriver { sct_controller name device_class simulati 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} driver mercury_pres hsetprop ${scobj_hpath} klass ${device_class} hsetprop ${scobj_hpath} data true hsetprop ${scobj_hpath} debug_threshold 5 diff --git a/site_ansto/instrument/config/environment/temperature/sct_mercury_scpi.tcl b/site_ansto/instrument/config/environment/temperature/sct_mercury_scpi.tcl index ad1618f9..abb2691c 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_mercury_scpi.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_mercury_scpi.tcl @@ -315,6 +315,7 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name device_class simulati MakeSICSObj ${name} SCT_OBJECT + sicslist setatt ${name} driver mercury_scpi sicslist setatt ${name} klass ${device_class} sicslist setatt ${name} long_name ${name} @@ -860,6 +861,7 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name device_class simulati 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} driver mercury_scpi hsetprop ${scobj_hpath} klass ${device_class} hsetprop ${scobj_hpath} data true hsetprop ${scobj_hpath} debug_threshold 5 diff --git a/site_ansto/instrument/config/environment/temperature/sct_mercury_temp.tcl b/site_ansto/instrument/config/environment/temperature/sct_mercury_temp.tcl index d4d54adb..739a8eba 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_mercury_temp.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_mercury_temp.tcl @@ -281,6 +281,7 @@ proc ::scobj::mercury_temp::mkDriver { sct_controller name device_class simulati MakeSICSObj ${name} SCT_OBJECT + sicslist setatt ${name} driver mercury_temp sicslist setatt ${name} klass ${device_class} sicslist setatt ${name} long_name ${name} @@ -392,6 +393,7 @@ proc ::scobj::mercury_temp::mkDriver { sct_controller name device_class simulati 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} driver mercury_temp hsetprop ${scobj_hpath} klass ${device_class} hsetprop ${scobj_hpath} data true hsetprop ${scobj_hpath} debug_threshold 5 diff --git a/site_ansto/instrument/config/environment/temperature/sct_mercury_valve.tcl b/site_ansto/instrument/config/environment/temperature/sct_mercury_valve.tcl index 099d7e09..33d70c61 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_mercury_valve.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_mercury_valve.tcl @@ -259,6 +259,7 @@ proc ::scobj::mercury_valve::mkDriver { sct_controller name device_class simulat MakeSICSObj ${name} SCT_OBJECT + sicslist setatt ${name} driver mercury_valve sicslist setatt ${name} klass ${device_class} sicslist setatt ${name} long_name ${name} @@ -325,6 +326,7 @@ proc ::scobj::mercury_valve::mkDriver { sct_controller name device_class simulat 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} driver mercury_valve hsetprop ${scobj_hpath} klass ${device_class} hsetprop ${scobj_hpath} data true hsetprop ${scobj_hpath} debug_threshold 5 diff --git a/site_ansto/instrument/config/environment/temperature/sct_nprvasm2.tcl b/site_ansto/instrument/config/environment/temperature/sct_nprvasm2.tcl index cc3ca0b4..45dee7fb 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_nprvasm2.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_nprvasm2.tcl @@ -37,10 +37,12 @@ proc ::scobj::nprvasm2::mkDriver { sct_controller name device_class simulation_f MakeSICSObj ${name} SCT_OBJECT + sicslist setatt ${name} driver nprvasm2 sicslist setatt ${name} klass ${device_class} sicslist setatt ${name} long_name ${name} set scobj_hpath /sics/${name} + hsetprop ${scobj_hpath} driver nprvasm2 hsetprop ${scobj_hpath} klass ${device_class} hsetprop ${scobj_hpath} data true hsetprop ${scobj_hpath} debug_threshold 5 diff --git a/site_ansto/instrument/config/environment/temperature/sct_oxford_mercury.tcl b/site_ansto/instrument/config/environment/temperature/sct_oxford_mercury.tcl index 4b0651f9..3c74e0e4 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_oxford_mercury.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_oxford_mercury.tcl @@ -431,6 +431,7 @@ proc ::scobj::oxford_mercury::mkDriver { sct_controller name device_class simula MakeSICSObj ${name} SCT_OBJECT + sicslist setatt ${name} driver oxford_mercury sicslist setatt ${name} klass ${device_class} sicslist setatt ${name} long_name ${name} @@ -1993,6 +1994,7 @@ proc ::scobj::oxford_mercury::mkDriver { sct_controller name device_class simula hsetprop ${scobj_hpath}/valve klass "@none" hsetprop ${scobj_hpath}/valve type "part" } + hsetprop ${scobj_hpath} driver oxford_mercury hsetprop ${scobj_hpath} klass ${device_class} hsetprop ${scobj_hpath} data true hsetprop ${scobj_hpath} debug_threshold 5 diff --git a/site_ansto/instrument/config/environment/temperature/sct_pfeiffer_hg.tcl b/site_ansto/instrument/config/environment/temperature/sct_pfeiffer_hg.tcl index 72343960..66136f78 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_pfeiffer_hg.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_pfeiffer_hg.tcl @@ -387,6 +387,7 @@ proc ::scobj::pfeiffer_hg::mkDriver { sct_controller name device_class simulatio MakeSICSObj ${name} SCT_OBJECT + sicslist setatt ${name} driver pfeiffer_hg sicslist setatt ${name} klass ${device_class} sicslist setatt ${name} long_name ${name} @@ -477,6 +478,7 @@ proc ::scobj::pfeiffer_hg::mkDriver { sct_controller name device_class simulatio 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} driver pfeiffer_hg hsetprop ${scobj_hpath} klass ${device_class} hsetprop ${scobj_hpath} data true hsetprop ${scobj_hpath} debug_threshold 5 diff --git a/site_ansto/instrument/config/environment/temperature/sct_srs_sr630.tcl b/site_ansto/instrument/config/environment/temperature/sct_srs_sr630.tcl index da3e1158..fa341f1a 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_srs_sr630.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_srs_sr630.tcl @@ -201,6 +201,7 @@ proc ::scobj::srs_sr630::mkDriver { sct_controller name device_class simulation_ MakeSICSObj ${name} SCT_OBJECT + sicslist setatt ${name} driver srs_sr630 sicslist setatt ${name} klass ${device_class} sicslist setatt ${name} long_name ${name} @@ -399,6 +400,7 @@ proc ::scobj::srs_sr630::mkDriver { sct_controller name device_class simulation_ hsetprop ${scobj_hpath} data "true" hsetprop ${scobj_hpath} klass "@none" hsetprop ${scobj_hpath} type "part" + hsetprop ${scobj_hpath} driver srs_sr630 hsetprop ${scobj_hpath} klass ${device_class} hsetprop ${scobj_hpath} data true hsetprop ${scobj_hpath} debug_threshold 5 diff --git a/site_ansto/instrument/config/environment/temperature/sct_watlow_mpm.tcl b/site_ansto/instrument/config/environment/temperature/sct_watlow_mpm.tcl index f0d92d9d..ccff095e 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_watlow_mpm.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_watlow_mpm.tcl @@ -37,10 +37,12 @@ proc ::scobj::watlow_mpm::mkDriver { sct_controller name device_class simulation MakeSICSObj ${name} SCT_OBJECT user float + sicslist setatt ${name} driver watlow_mpm sicslist setatt ${name} klass ${device_class} sicslist setatt ${name} long_name ${name} set scobj_hpath /sics/${name} + hsetprop ${scobj_hpath} driver watlow_mpm hsetprop ${scobj_hpath} klass ${device_class} hsetprop ${scobj_hpath} data true hsetprop ${scobj_hpath} debug_threshold 5 diff --git a/site_ansto/instrument/config/environment/temperature/sct_watlow_mrm.tcl b/site_ansto/instrument/config/environment/temperature/sct_watlow_mrm.tcl index 6addd245..a2030e9b 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_watlow_mrm.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_watlow_mrm.tcl @@ -37,10 +37,12 @@ proc ::scobj::watlow_mrm::mkDriver { sct_controller name device_class simulation MakeSICSObj ${name} SCT_OBJECT user float + sicslist setatt ${name} driver watlow_mrm sicslist setatt ${name} klass ${device_class} sicslist setatt ${name} long_name ${name} set scobj_hpath /sics/${name} + hsetprop ${scobj_hpath} driver watlow_mrm hsetprop ${scobj_hpath} klass ${device_class} hsetprop ${scobj_hpath} data true hsetprop ${scobj_hpath} debug_threshold 5 diff --git a/site_ansto/instrument/config/environment/temperature/sct_watlow_mst4.tcl b/site_ansto/instrument/config/environment/temperature/sct_watlow_mst4.tcl index 7d786863..763ced0c 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_watlow_mst4.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_watlow_mst4.tcl @@ -37,10 +37,12 @@ proc ::scobj::watlow_mst4::mkDriver { sct_controller name device_class simulatio MakeSICSObj ${name} SCT_OBJECT user float + sicslist setatt ${name} driver watlow_mst4 sicslist setatt ${name} klass ${device_class} sicslist setatt ${name} long_name ${name} set scobj_hpath /sics/${name} + hsetprop ${scobj_hpath} driver watlow_mst4 hsetprop ${scobj_hpath} klass ${device_class} hsetprop ${scobj_hpath} data true hsetprop ${scobj_hpath} debug_threshold 5 diff --git a/site_ansto/instrument/config/environment/temperature/sct_west4100.tcl b/site_ansto/instrument/config/environment/temperature/sct_west4100.tcl index 94dda30a..7d656ef2 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_west4100.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_west4100.tcl @@ -99,6 +99,8 @@ proc ::scobj::west4100::read_config {} { } if { [string equal -nocase [dict get $v "driver"] "west4100"] } { ::scobj::west4100::sics_log 9 "No sctcontroller for west4100" + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] set arg_list [list] set missing_list [list] foreach arg {dev_id} { diff --git a/site_ansto/instrument/config/environment/temperature/sct_west_6100.tcl b/site_ansto/instrument/config/environment/temperature/sct_west_6100.tcl index 5a818e53..2b8ff35e 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_west_6100.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_west_6100.tcl @@ -350,6 +350,7 @@ proc ::scobj::west_6100::mkDriver { sct_controller name device_class simulation_ MakeSICSObj ${name} SCT_OBJECT + sicslist setatt ${name} driver west_6100 sicslist setatt ${name} klass ${device_class} sicslist setatt ${name} long_name ${name} @@ -630,6 +631,7 @@ proc ::scobj::west_6100::mkDriver { sct_controller name device_class simulation_ hsetprop ${scobj_hpath}/aux data "false" hsetprop ${scobj_hpath}/aux klass "@none" hsetprop ${scobj_hpath}/aux type "part" + hsetprop ${scobj_hpath} driver west_6100 hsetprop ${scobj_hpath} klass ${device_class} hsetprop ${scobj_hpath} data true hsetprop ${scobj_hpath} debug_threshold 5 diff --git a/site_ansto/instrument/config/robots/sct_epson_pandp.tcl b/site_ansto/instrument/config/robots/sct_epson_pandp.tcl index ae97c235..8fd3c362 100644 --- a/site_ansto/instrument/config/robots/sct_epson_pandp.tcl +++ b/site_ansto/instrument/config/robots/sct_epson_pandp.tcl @@ -100,6 +100,8 @@ proc ::scobj::epson_pandp::read_config {} { } if { [string equal -nocase [dict get $v "driver"] "epson_pandp"] } { ::scobj::epson_pandp::sics_log 9 "No sctcontroller for epson_pandp" + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] set arg_list [list] set missing_list [list] foreach arg {robot_name} { diff --git a/site_ansto/instrument/config/source/sct_reactor_status.tcl b/site_ansto/instrument/config/source/sct_reactor_status.tcl index 292c8a57..9a350de3 100644 --- a/site_ansto/instrument/config/source/sct_reactor_status.tcl +++ b/site_ansto/instrument/config/source/sct_reactor_status.tcl @@ -226,6 +226,7 @@ proc ::scobj::reactor_status::mkDriver { sct_controller name device_class simula MakeSICSObj ${name} SCT_OBJECT + sicslist setatt ${name} driver reactor_status sicslist setatt ${name} klass ${device_class} sicslist setatt ${name} long_name ${name} @@ -310,6 +311,7 @@ proc ::scobj::reactor_status::mkDriver { sct_controller name device_class simula hsetprop ${scobj_hpath} data "true" hsetprop ${scobj_hpath} klass "@none" hsetprop ${scobj_hpath} type "part" + hsetprop ${scobj_hpath} driver reactor_status hsetprop ${scobj_hpath} klass ${device_class} hsetprop ${scobj_hpath} data true hsetprop ${scobj_hpath} debug_threshold 5