From e3b583150e26021acd6c210b91f4c4c30914ee6d Mon Sep 17 00:00:00 2001 From: Douglas Clowes Date: Wed, 23 Jul 2014 14:32:26 +1000 Subject: [PATCH] SICS-696 Explicity include the namespace on mk_sct_ calls --- .../config/environment/magneticField/sct_bruker_BEC1.tcl | 2 +- .../config/environment/magneticField/sct_lakeshore_460.tcl | 4 ++-- .../config/environment/magneticField/sct_oxford_ips.tcl | 4 ++-- site_ansto/instrument/config/environment/sct_autolab.tcl | 4 ++-- site_ansto/instrument/config/environment/sct_cybaman.tcl | 4 ++-- .../instrument/config/environment/sct_keithley_2700.tcl | 4 ++-- site_ansto/instrument/config/environment/sct_mvp.tcl | 4 ++-- site_ansto/instrument/config/environment/sct_syr.tcl | 4 ++-- .../config/environment/temperature/sct_eurotherm_2000.tcl | 4 ++-- .../config/environment/temperature/sct_julabo_lh45.tcl | 2 +- .../config/environment/temperature/sct_lakeshore_370.tcl | 4 ++-- .../config/environment/temperature/sct_oxford_itc.tcl | 4 ++-- .../instrument/config/environment/temperature/sct_qlink.tcl | 4 ++-- .../config/environment/temperature/sct_watlow_pm.tcl | 4 ++-- .../config/environment/temperature/sct_watlow_rm.tcl | 4 ++-- .../config/environment/temperature/sct_watlow_st4.tcl | 4 ++-- site_ansto/instrument/config/robots/sct_pickandplace.tcl | 4 ++-- 17 files changed, 32 insertions(+), 32 deletions(-) diff --git a/site_ansto/instrument/config/environment/magneticField/sct_bruker_BEC1.tcl b/site_ansto/instrument/config/environment/magneticField/sct_bruker_BEC1.tcl index fa1dc6fd..33c64176 100644 --- a/site_ansto/instrument/config/environment/magneticField/sct_bruker_BEC1.tcl +++ b/site_ansto/instrument/config/environment/magneticField/sct_bruker_BEC1.tcl @@ -1360,7 +1360,7 @@ proc add_bruker_bec1 {name IP port {_tol 0.1} {CID 1} {CTYPE B} } { # Command terminator for Bruker unit is always carriage return without linefeed '\r' makesctcontroller sct_bruker_BEC1_$name astvelsel ${IP}:$port "\r" # proc mk_sct_bruker_BEC1 (sct_controller klasse tempobj tol) - mk_sct_bruker_BEC1 sct_bruker_BEC1_$name environment $name $_tol $CID $CTYPE + ::scobj::bruker_BEC1::mk_sct_bruker_BEC1 sct_bruker_BEC1_$name environment $name $_tol $CID $CTYPE makesctemon $name /sics/$name/emon/mon_mode /sics/$name/emon/is_in_tolerance /sics/$name/emon/errhandler } message ] handle_exception $catch_status $message "In subroutine add_bruker_bec1()." diff --git a/site_ansto/instrument/config/environment/magneticField/sct_lakeshore_460.tcl b/site_ansto/instrument/config/environment/magneticField/sct_lakeshore_460.tcl index f861dfd9..32ca7afd 100644 --- a/site_ansto/instrument/config/environment/magneticField/sct_lakeshore_460.tcl +++ b/site_ansto/instrument/config/environment/magneticField/sct_lakeshore_460.tcl @@ -458,8 +458,8 @@ proc add_ls460 {name IP port terminator {_tol 5.0}} { puts $fd "makesctcontroller sct_ls460 std ${IP}:$port" makesctcontroller sct_ls460 std ${IP}:$port $terminator } - puts $fd "mk_sct_lakeshore_ls460 sct_ls460 environment $name $_tol" - mk_sct_lakeshore_ls460 sct_ls460 environment $name $_tol + puts $fd "::scobj::ls460::mk_sct_lakeshore_ls460 sct_ls460 environment $name $_tol" + ::scobj::ls460::mk_sct_lakeshore_ls460 sct_ls460 environment $name $_tol puts $fd "makesctemon $name /sics/$name/emon/monmode /sics/$name/emon/isintol /sics/$name/emon/errhandler" makesctemon $name /sics/$name/emon/monmode /sics/$name/emon/isintol /sics/$name/emon/errhandler close $fd diff --git a/site_ansto/instrument/config/environment/magneticField/sct_oxford_ips.tcl b/site_ansto/instrument/config/environment/magneticField/sct_oxford_ips.tcl index 009bf32f..7c34644d 100644 --- a/site_ansto/instrument/config/environment/magneticField/sct_oxford_ips.tcl +++ b/site_ansto/instrument/config/environment/magneticField/sct_oxford_ips.tcl @@ -749,8 +749,8 @@ proc add_ips120 {name IP port {_tol 5.0}} { puts $fd "makesctcontroller sct_ips120 oxford ${IP}:$port" makesctcontroller sct_ips120 oxford ${IP}:$port } - puts $fd "mk_sct_oxford_ips120 sct_ips120 environment $name $_tol" - mk_sct_oxford_ips120 sct_ips120 environment $name $_tol + puts $fd "::scobj::ips120::mk_sct_oxford_ips120 sct_ips120 environment $name $_tol" + ::scobj::ips120::mk_sct_oxford_ips120 sct_ips120 environment $name $_tol puts $fd "makesctemon $name /sics/$name/emon/monmode /sics/$name/emon/isintol /sics/$name/emon/errhandler" makesctemon $name /sics/$name/emon/monmode /sics/$name/emon/isintol /sics/$name/emon/errhandler close $fd diff --git a/site_ansto/instrument/config/environment/sct_autolab.tcl b/site_ansto/instrument/config/environment/sct_autolab.tcl index 0cc20017..4eccc132 100755 --- a/site_ansto/instrument/config/environment/sct_autolab.tcl +++ b/site_ansto/instrument/config/environment/sct_autolab.tcl @@ -408,8 +408,8 @@ proc add_autolab {name IP port } { if {[SplitReply [environment_simulation]]=="false"} { makesctcontroller sct_autolab std ${IP}:$port [binary format cc 0x0D 0x0A] 5.0 } - puts $fd "mk_sct_autolab sct_autolab environment $name" - mk_sct_autolab sct_autolab environment $name + puts $fd "::scobj::autolab::mk_sct_autolab sct_autolab environment $name" + ::scobj::autolab::mk_sct_autolab sct_autolab environment $name close $fd } diff --git a/site_ansto/instrument/config/environment/sct_cybaman.tcl b/site_ansto/instrument/config/environment/sct_cybaman.tcl index fa56ad7a..744523d2 100644 --- a/site_ansto/instrument/config/environment/sct_cybaman.tcl +++ b/site_ansto/instrument/config/environment/sct_cybaman.tcl @@ -1127,8 +1127,8 @@ proc add_cybaman {name IP port terminator {_tol 1.0}} { puts $fd "makesctcontroller sct_cybaman std ${IP}:$port" makesctcontroller sct_cybaman std ${IP}:$port $terminator } - puts $fd "mk_sct_cybaman sct_cybaman environment $name $_tol" - mk_sct_cybaman sct_cybaman environment $name $_tol + puts $fd "::scobj::cybaman::mk_sct_cybaman sct_cybaman environment $name $_tol" + ::scobj::cybaman::mk_sct_cybaman sct_cybaman environment $name $_tol close $fd } diff --git a/site_ansto/instrument/config/environment/sct_keithley_2700.tcl b/site_ansto/instrument/config/environment/sct_keithley_2700.tcl index 8005978f..431931bd 100644 --- a/site_ansto/instrument/config/environment/sct_keithley_2700.tcl +++ b/site_ansto/instrument/config/environment/sct_keithley_2700.tcl @@ -669,8 +669,8 @@ proc add_keithley_2700 {name IP port terminator {_tol 1.0} {CID 1} {CTYPE V} } { puts $fd "makesctcontroller sct_k2700 std ${IP}:$port" makesctcontroller sct_k2700 std ${IP}:$port $terminator } - puts $fd "mk_sct_keithley_2700 sct_k2700 environment $name $_tol" - mk_sct_keithley_2700 sct_k2700 environment $name $_tol $CID $CTYPE + puts $fd "::scobj::k2700::mk_sct_keithley_2700 sct_k2700 environment $name $_tol" + ::scobj::k2700::mk_sct_keithley_2700 sct_k2700 environment $name $_tol $CID $CTYPE close $fd } diff --git a/site_ansto/instrument/config/environment/sct_mvp.tcl b/site_ansto/instrument/config/environment/sct_mvp.tcl index 36e12f43..9a5c679e 100755 --- a/site_ansto/instrument/config/environment/sct_mvp.tcl +++ b/site_ansto/instrument/config/environment/sct_mvp.tcl @@ -513,8 +513,8 @@ proc add_mvp {name IP port dev} { if {[SplitReply [environment_simulation]]=="false"} { makesctcontroller sct_mvp hamilton ${IP}:$port "\r" } - puts $fd "mk_sct_mvp sct_mvp environment $name" - mk_sct_mvp sct_mvp environment $name $dev + puts $fd "::scobj::mvp::mk_sct_mvp sct_mvp environment $name" + ::scobj::mvp::mk_sct_mvp sct_mvp environment $name $dev close $fd } diff --git a/site_ansto/instrument/config/environment/sct_syr.tcl b/site_ansto/instrument/config/environment/sct_syr.tcl index ceda135b..32361faa 100755 --- a/site_ansto/instrument/config/environment/sct_syr.tcl +++ b/site_ansto/instrument/config/environment/sct_syr.tcl @@ -614,8 +614,8 @@ proc add_syr {name IP port} { if {[SplitReply [environment_simulation]]=="false"} { makesctcontroller sct_syr syringe ${IP}:$port "\r" } - puts $fd "mk_sct_syr sct_syr environment $name" - mk_sct_syr sct_syr environment $name + puts $fd "::scobj::syr::mk_sct_syr sct_syr environment $name" + ::scobj::syr::mk_sct_syr sct_syr environment $name close $fd } diff --git a/site_ansto/instrument/config/environment/temperature/sct_eurotherm_2000.tcl b/site_ansto/instrument/config/environment/temperature/sct_eurotherm_2000.tcl index 3c12aa1a..770d2317 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_eurotherm_2000.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_eurotherm_2000.tcl @@ -353,8 +353,8 @@ proc add_eurotherm_2000 {name IP port dev_id {_tol 5.0} {CID 1} {CTYPE T}} { puts $fd "makesctcontroller sct_${name} modbus ${IP}:$port" makesctcontroller sct_${name} modbus ${IP}:$port } - puts $fd "mk_sct_eurotherm_et2000 sct_${name} environment $name $dev_id $_tol" - mk_sct_eurotherm_et2000 sct_${name} environment $name $dev_id $_tol $CID $CTYPE + puts $fd "::scobj::et2000::mk_sct_eurotherm_et2000 sct_${name} environment $name $dev_id $_tol" + ::scobj::et2000::mk_sct_eurotherm_et2000 sct_${name} environment $name $dev_id $_tol $CID $CTYPE puts $fd "makesctemon $name /sics/$name/emon/monmode /sics/$name/emon/isintol /sics/$name/emon/errhandler" makesctemon $name /sics/$name/emon/monmode /sics/$name/emon/isintol /sics/$name/emon/errhandler close $fd diff --git a/site_ansto/instrument/config/environment/temperature/sct_julabo_lh45.tcl b/site_ansto/instrument/config/environment/temperature/sct_julabo_lh45.tcl index 9dfb08ca..096e47c2 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_julabo_lh45.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_julabo_lh45.tcl @@ -424,7 +424,7 @@ proc add_julabo_lh45 { name IP port {sensor "bath"} {_tol 5.0} {CID 1} {CTYPE T} makesctcontroller sct_${name} std ${IP}:$port "\r" } } - mk_sct_julabo_lh45 sct_${name} environment $name $_tol $CID $CTYPE + ::scobj::lh45::mk_sct_julabo_lh45 sct_${name} environment $name $_tol $CID $CTYPE set scobj_hpath /sics/$name switch $sensor { "bath" { diff --git a/site_ansto/instrument/config/environment/temperature/sct_lakeshore_370.tcl b/site_ansto/instrument/config/environment/temperature/sct_lakeshore_370.tcl index 6b4750c0..f189438a 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_lakeshore_370.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_lakeshore_370.tcl @@ -915,8 +915,8 @@ namespace eval ::scobj::[set vendor]_[set device] { makesctcontroller sct_ls370_$name std ${IP}:$port $terminator } } - debug_log 1 "mk_sct_driver sct_ls370_${name} environment ${name} ${_tol}" - mk_sct_driver sct_ls370_${name} environment ${name} ${_tol} + debug_log 1 "::scobj::[set vendor]_[set device]::mk_sct_driver sct_ls370_${name} environment ${name} ${_tol}" + ::scobj::[set vendor]_[set device]::mk_sct_driver sct_ls370_${name} environment ${name} ${_tol} } diff --git a/site_ansto/instrument/config/environment/temperature/sct_oxford_itc.tcl b/site_ansto/instrument/config/environment/temperature/sct_oxford_itc.tcl index 3e35ce10..3e5c9619 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_oxford_itc.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_oxford_itc.tcl @@ -530,8 +530,8 @@ proc add_itc500 {name IP port {_tol 5.0} {addr "@1"} } { puts $fd "makesctcontroller sct_itc500 oxford ${IP}:$port \"\r\"" makesctcontroller sct_itc500 oxford ${IP}:$port "\r" } - puts $fd "mk_sct_oxford_itc500 sct_itc500 environment $name $_tol $addr" - mk_sct_oxford_itc500 sct_itc500 environment $name $_tol $addr + puts $fd "::scobj::itc500::mk_sct_oxford_itc500 sct_itc500 environment $name $_tol $addr" + ::scobj::itc500::mk_sct_oxford_itc500 sct_itc500 environment $name $_tol $addr puts $fd "makesctemon $name /sics/$name/emon/monmode /sics/$name/emon/isintol /sics/$name/emon/errhandler" makesctemon $name /sics/$name/emon/monmode /sics/$name/emon/isintol /sics/$name/emon/errhandler close $fd diff --git a/site_ansto/instrument/config/environment/temperature/sct_qlink.tcl b/site_ansto/instrument/config/environment/temperature/sct_qlink.tcl index 1d1c3bec..9883566f 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_qlink.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_qlink.tcl @@ -120,8 +120,8 @@ proc add_qlink {name IP port {_tol 5.0}} { puts $fd "makesctcontroller sct_qlink std ${IP}:$port" makesctcontroller sct_qlink std ${IP}:$port } - puts $fd "mk_sct_qlink sct_qlink environment $name $_tol" - mk_sct_qlink sct_qlink environment $name $_tol + puts $fd "::scobj::qlink::mk_sct_qlink sct_qlink environment $name $_tol" + ::scobj::qlink::mk_sct_qlink sct_qlink environment $name $_tol close $fd } diff --git a/site_ansto/instrument/config/environment/temperature/sct_watlow_pm.tcl b/site_ansto/instrument/config/environment/temperature/sct_watlow_pm.tcl index 698e4d10..abfd4087 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_watlow_pm.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_watlow_pm.tcl @@ -527,8 +527,8 @@ proc add_watlow_pm {name IP port dev_id {_tol 5.0} {CID 1} {CTYPE T}} { puts $fd "makesctcontroller sct_${name} modbus ${IP}:$port" makesctcontroller sct_${name} modbus ${IP}:$port } - puts $fd "mk_sct_watlow_pm sct_${name} environment $name $dev_id $_tol" - mk_sct_watlow_pm sct_${name} environment $name $dev_id $_tol $CID $CTYPE + puts $fd "::scobj::watlow_pm::mk_sct_watlow_pm sct_${name} environment $name $dev_id $_tol" + ::scobj::watlow_pm::mk_sct_watlow_pm sct_${name} environment $name $dev_id $_tol $CID $CTYPE puts $fd "makesctemon $name /sics/$name/emon/monmode /sics/$name/emon/isintol /sics/$name/emon/errhandler" makesctemon $name /sics/$name/emon/monmode /sics/$name/emon/isintol /sics/$name/emon/errhandler close $fd diff --git a/site_ansto/instrument/config/environment/temperature/sct_watlow_rm.tcl b/site_ansto/instrument/config/environment/temperature/sct_watlow_rm.tcl index 7ee618c6..9fc59b12 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_watlow_rm.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_watlow_rm.tcl @@ -557,8 +557,8 @@ proc add_watlow_rm {name IP port dev_id {_tol 5.0} {CID 1} {CTYPE T}} { puts $fd "makesctcontroller sct_${name} modbus ${IP}:$port" makesctcontroller sct_${name} modbus ${IP}:$port } - puts $fd "mk_sct_watlow_rm sct_${name} environment $name $dev_id $_tol" - mk_sct_watlow_rm sct_${name} environment $name $dev_id $_tol $CID $CTYPE + puts $fd "::scobj::watlow_rm::mk_sct_watlow_rm sct_${name} environment $name $dev_id $_tol" + ::scobj::watlow_rm::mk_sct_watlow_rm sct_${name} environment $name $dev_id $_tol $CID $CTYPE puts $fd "makesctemon $name /sics/$name/emon/monmode /sics/$name/emon/isintol /sics/$name/emon/errhandler" makesctemon $name /sics/$name/emon/monmode /sics/$name/emon/isintol /sics/$name/emon/errhandler close $fd diff --git a/site_ansto/instrument/config/environment/temperature/sct_watlow_st4.tcl b/site_ansto/instrument/config/environment/temperature/sct_watlow_st4.tcl index d933b8d1..6e4eba33 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_watlow_st4.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_watlow_st4.tcl @@ -768,8 +768,8 @@ proc add_watlow_st4 {name IP port dev_id {_tol 5.0} {CID 1} {CTYPE T}} { puts $fd "makesctcontroller sct_${name} modbus ${IP}:$port" makesctcontroller sct_${name} modbus ${IP}:$port } - puts $fd "mk_sct_watlow_st sct_${name} environment $name $dev_id $_tol" - mk_sct_watlow_st sct_${name} environment $name $dev_id $_tol $CID $CTYPE + puts $fd "::scobj::watlow_st::mk_sct_watlow_st sct_${name} environment $name $dev_id $_tol" + ::scobj::watlow_st::mk_sct_watlow_st sct_${name} environment $name $dev_id $_tol $CID $CTYPE puts $fd "makesctemon $name /sics/$name/emon/monmode /sics/$name/emon/isintol /sics/$name/emon/errhandler" makesctemon $name /sics/$name/emon/monmode /sics/$name/emon/isintol /sics/$name/emon/errhandler close $fd diff --git a/site_ansto/instrument/config/robots/sct_pickandplace.tcl b/site_ansto/instrument/config/robots/sct_pickandplace.tcl index b7d300bb..3fdfe2bb 100644 --- a/site_ansto/instrument/config/robots/sct_pickandplace.tcl +++ b/site_ansto/instrument/config/robots/sct_pickandplace.tcl @@ -477,8 +477,8 @@ proc add_robot {name IP port } { puts $fd "makesctcontroller sct_robot_pp std ${IP}:$port" makesctcontroller sct_robot_pp std ${IP}:$port [binary format cc 0x0D 0x0A] 5.0 } - puts $fd "mk_sct_robot_pp sct_robot environment $name" - mk_sct_robot_pp sct_robot_pp environment $name + puts $fd "::scobj::robot_pp::mk_sct_robot_pp sct_robot environment $name" + ::scobj::robot_pp::mk_sct_robot_pp sct_robot_pp environment $name close $fd }