From 05dc1958ffbc7a64f8a5990445d11b698a5bb9ff Mon Sep 17 00:00:00 2001
From: Douglas Clowes <dcl@ansto.gov.au>
Date: Thu, 31 Jul 2014 11:36:22 +1000
Subject: [PATCH] SICS-696 Explicity include the namespace on mk_sct_ calls

---
 .../config/environment/pressure/sct_pfeiffer_tpg261.tcl       | 2 +-
 .../instrument/config/environment/temperature/sct_rvasm2.tcl  | 4 ++--
 site_ansto/instrument/config/motors/sct_aerotech_soloist.tcl  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/site_ansto/instrument/config/environment/pressure/sct_pfeiffer_tpg261.tcl b/site_ansto/instrument/config/environment/pressure/sct_pfeiffer_tpg261.tcl
index f600f79a..2634e29c 100644
--- a/site_ansto/instrument/config/environment/pressure/sct_pfeiffer_tpg261.tcl
+++ b/site_ansto/instrument/config/environment/pressure/sct_pfeiffer_tpg261.tcl
@@ -126,7 +126,7 @@ namespace eval ::scobj::tpg261 {
         if {[SplitReply [environment_simulation]]=="false"} {
             makesctcontroller sct_tpg261_$name std ${IP}:$port "\r\n"
         }
-                mk_sct_pfeiffer_tpg261 sct_tpg261_$name environment $name $filename
+                ::scobj::tpg261::mk_sct_pfeiffer_tpg261 sct_tpg261_$name environment $name $filename
         }
 }
 publish ::scobj::tpg261::add_tpg261 user
diff --git a/site_ansto/instrument/config/environment/temperature/sct_rvasm2.tcl b/site_ansto/instrument/config/environment/temperature/sct_rvasm2.tcl
index 0ec95faa..fb04ea74 100644
--- a/site_ansto/instrument/config/environment/temperature/sct_rvasm2.tcl
+++ b/site_ansto/instrument/config/environment/temperature/sct_rvasm2.tcl
@@ -1075,8 +1075,8 @@ proc add_newport_rva {name IP port {_tol 1.0}} {
     puts $fd "makesctcontroller sct_${name} newport ${IP}:$port"
     makesctcontroller sct_${name} newport ${IP}:$port
   }
-puts $fd "mk_sct_newport_rva sct_${name} environment $name $_tol"
-mk_sct_newport_rva sct_${name} environment $name $_tol
+  puts $fd "mk_sct_newport_rva sct_${name} environment $name $_tol"
+  ::scobj::newport_rva::mk_sct_newport_rva sct_${name} 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/motors/sct_aerotech_soloist.tcl b/site_ansto/instrument/config/motors/sct_aerotech_soloist.tcl
index c4dd4a1c..b1357eca 100644
--- a/site_ansto/instrument/config/motors/sct_aerotech_soloist.tcl
+++ b/site_ansto/instrument/config/motors/sct_aerotech_soloist.tcl
@@ -303,7 +303,7 @@ namespace eval ::scobj::[set vendor]_[set device] {
   }
 
 
-  namespace export add_[set vendor]_[set device]
+  ::scobj::[set vendor]_[set device]::namespace export add_[set vendor]_[set device]
 }
 
 namespace import ::scobj::[set vendor]_[set device]::*