From 6f5892f07d08f207237855ff4db906af4a26b1c3 Mon Sep 17 00:00:00 2001
From: Douglas Clowes <dcl@ansto.gov.au>
Date: Tue, 19 Aug 2014 11:27:43 +1000
Subject: [PATCH] Change SCT wrappers to use ip_address and tcp_port

---
 .../instrument/config/environment/agilent_33220A.sct       | 3 +++
 .../environment/magneticField/green_magnet_labview.sct     | 4 ++--
 .../instrument/config/environment/temperature/west4100.sct | 7 ++++---
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/site_ansto/instrument/config/environment/agilent_33220A.sct b/site_ansto/instrument/config/environment/agilent_33220A.sct
index 35497eaa..cc01f389 100644
--- a/site_ansto/instrument/config/environment/agilent_33220A.sct
+++ b/site_ansto/instrument/config/environment/agilent_33220A.sct
@@ -1,8 +1,11 @@
 # vim: ts=8 sts=2 sw=2 expandtab autoindent smartindent nocindent
 driver agilent_33220A = {
+  wrapper_property nosctcontroller = True
   protocol = std
   class = environment
   simulation_group = environment_simulation
   code mkWrapper = {%%
+  ${ns}::sics_log 9 "makesctcontroller sct_${name} std ${ip_address}:${tcp_port}"
+  makesctcontroller sct_${name} std ${ip_address}:${tcp_port}
   %%}
 }
diff --git a/site_ansto/instrument/config/environment/magneticField/green_magnet_labview.sct b/site_ansto/instrument/config/environment/magneticField/green_magnet_labview.sct
index 0b042071..0d13368a 100644
--- a/site_ansto/instrument/config/environment/magneticField/green_magnet_labview.sct
+++ b/site_ansto/instrument/config/environment/magneticField/green_magnet_labview.sct
@@ -9,8 +9,8 @@ driver green_magnet_labview = {
 # TCL code
   ::scobj::green::mkGreen {
     name "green_magnet"
-    IP 137.157.201.88
-    PORT 5001
+    IP ${ip_address}
+    PORT ${tcp_port}
     tuning 1
     interval 3
   }
diff --git a/site_ansto/instrument/config/environment/temperature/west4100.sct b/site_ansto/instrument/config/environment/temperature/west4100.sct
index f3ea5279..11e0a199 100644
--- a/site_ansto/instrument/config/environment/temperature/west4100.sct
+++ b/site_ansto/instrument/config/environment/temperature/west4100.sct
@@ -3,9 +3,10 @@ driver west4100 = {
   protocol = std
   class = environment
   simulation_group = environment_simulation
+  wrapper_property nosctcontroller = True
   add_args = 'dev_id'
-  make_args = 'IP dev_id'
-  code mkDriver = {%%
-    ::environment::temperature::mkwest400 $name $IP $dev_id
+  make_args = 'dev_id'
+  code mkWrapper = {%%
+    ::environment::temperature::mkwest400 ${name} ${ip_address} ${dev_id}
   %%}
 }