From 6f5f2b69cf35005dd300f7147b8f937c7c94a6c3 Mon Sep 17 00:00:00 2001
From: Douglas Clowes <dcl@ansto.gov.au>
Date: Mon, 18 Aug 2014 12:42:35 +1000
Subject: [PATCH] Make Agilent use mkWrapper

---
 .../config/environment/agilent_33220A.sct           |  2 +-
 .../config/environment/sct_agilent_33220A.tcl       | 13 ++-----------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/site_ansto/instrument/config/environment/agilent_33220A.sct b/site_ansto/instrument/config/environment/agilent_33220A.sct
index 6f8ba4e3..35497eaa 100644
--- a/site_ansto/instrument/config/environment/agilent_33220A.sct
+++ b/site_ansto/instrument/config/environment/agilent_33220A.sct
@@ -3,6 +3,6 @@ driver agilent_33220A = {
   protocol = std
   class = environment
   simulation_group = environment_simulation
-  code mkDriver = {%%
+  code mkWrapper = {%%
   %%}
 }
diff --git a/site_ansto/instrument/config/environment/sct_agilent_33220A.tcl b/site_ansto/instrument/config/environment/sct_agilent_33220A.tcl
index 4cfaeac1..1f40f4f5 100644
--- a/site_ansto/instrument/config/environment/sct_agilent_33220A.tcl
+++ b/site_ansto/instrument/config/environment/sct_agilent_33220A.tcl
@@ -32,17 +32,8 @@ proc ::scobj::agilent_33220A::mkDriver { sct_controller name } {
   set ns "[namespace current]"
   set catch_status [ catch {
 
-    MakeSICSObj ${name} SCT_OBJECT
-
-    sicslist setatt ${name} klass environment
-    sicslist setatt ${name} long_name ${name}
-
-    set scobj_hpath /sics/${name}
-    hsetprop ${scobj_hpath} klass environment
-    hsetprop ${scobj_hpath} data true
-    hsetprop ${scobj_hpath} debug_threshold 5
-# mkDriver hook code starts
-# mkDriver hook code ends
+# mkWrapper hook code starts
+# mkWrapper hook code ends
   } catch_message ]
   handle_exception ${catch_status} ${catch_message}
 }