Driver changes made on ics1-wombat-test.

site_ansto/instrument/config/environment/magneticField/sct_oxford_labview.tcl

@@ -517,8 +517,8 @@ proc ::scobj::oxford_labview::sics_log {debug_level debug_string} {
   } catch_message ]
 }
 
-clientput "file evaluation of sct_lakeshore_336.tcl"
+clientput "file evaluation of sct_oxford_labview.tcl"
-::scobj::lakeshore_336::sics_log 9 "file evaluation of sct_lakeshore_336.tcl"
+::scobj::oxford_labview::sics_log 9 "file evaluation of sct_oxford_labview.tcl"
 
 proc ::scobj::oxford_labview::read_config {} {
   set catch_status [ catch {
@@ -538,7 +538,9 @@ proc ::scobj::oxford_labview::read_config {} {
         if { !([dict exists $v "driver"]) } {
           continue
         }
-        if { [string equal -nocase [dict get $v "driver"] "lakeshore_336"] } {
+        if { [string equal -nocase [dict get $v "driver"] "oxford_labview"] } {
+          set driver [dict get $v driver]
+          ${ns}::sics_log 9 "Found ${name}: $driver"
           if { [string equal -nocase $enabled "true" ] || [string equal -nocase $enabled "always"] } {
             if { ![string equal -nocase [SplitReply [environment_simulation]] "false"] } {
               set asyncqueue "null"
@@ -550,6 +552,7 @@ proc ::scobj::oxford_labview::read_config {} {
                 set asyncprotocol [dict get $v "asyncprotocol"]
               } else {
                 set asyncprotocol ${name}_protocol
+                ${ns}::sics_log 9 "${name}:${driver}: MakeAsyncProtocol ${asyncprotocol}"
                 MakeAsyncProtocol ${asyncprotocol}
                 if { [dict exists $v "terminator"] } {
                   ${asyncprotocol} sendterminator "[dict get $v "terminator"]"
@@ -559,6 +562,7 @@ proc ::scobj::oxford_labview::read_config {} {
               set asyncqueue ${name}_queue
               set IP [dict get $v ip]
               set PORT [dict get $v port]
+              ${ns}::sics_log 9 "${name}:${driver}: MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${IP} ${PORT}"
               MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${IP} ${PORT}
               if { [dict exists $v "timeout"] } {
                 ${asyncqueue} timeout "[dict get $v "timeout"]"
@@ -573,6 +577,7 @@ proc ::scobj::oxford_labview::read_config {} {
                 error "Missing configuration value $arg"
               }
             }
+            ${ns}::sics_log 9 "add_oxford_labview ${name} aqadapter ${asyncqueue} {*}$arg_list"
             add_oxford_labview ${name} "aqadapter" ${asyncqueue} {*}$arg_list
           }
         }

site_ansto/instrument/config/environment/sct_protek_common.tcl

@@ -197,6 +197,9 @@ proc ::scobj::add_protekmm::read_config {} {
         set name [dict get $v name]
         set enabled [string tolower [dict get $v "enabled"]]
         set implementation [dict get $v "implementation"]
+        if [dict exists $v "datype"] {
+          set datype [dict get $v "datype"]
+        }
         if { !([dict exists $::config_dict $implementation]) } {
           continue
         }
@@ -205,6 +208,8 @@ proc ::scobj::add_protekmm::read_config {} {
           continue
         }
         if { [string equal -nocase [dict get $v "driver"] "protekmm"] } {
+          set driver [dict get $v driver]
+          ${ns}::sics_log 9 "Found ${name}: $driver"
           if { [string equal -nocase $enabled "true" ] || [string equal -nocase $enabled "always"] } {
             if { ![string equal -nocase [SplitReply [environment_simulation]] "false"] } {
               set asyncqueue "null"
@@ -216,6 +221,7 @@ proc ::scobj::add_protekmm::read_config {} {
                 set asyncprotocol [dict get $v "asyncprotocol"]
               } else {
                 set asyncprotocol ${name}_protocol
+                ${ns}::sics_log 9 "${name}:${driver}: MakeAsyncProtocol ${asyncprotocol}"
                 MakeAsyncProtocol ${asyncprotocol}
                 if { [dict exists $v "terminator"] } {
                   ${asyncprotocol} sendterminator "[dict get $v "terminator"]"
@@ -225,13 +231,14 @@ proc ::scobj::add_protekmm::read_config {} {
               set asyncqueue ${name}_queue
               set IP [dict get $v ip]
               set PORT [dict get $v port]
+              ${ns}::sics_log 9 "${name}:${driver}: MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${IP} ${PORT}"
               MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${IP} ${PORT}
               if { [dict exists $v "timeout"] } {
                 ${asyncqueue} timeout "[dict get $v "timeout"]"
               }
             }
             set arg_list [list]
-            foreach arg {name ip port datype id scale offset interval} {
+            foreach arg {id} {
               if {[dict exists $v $arg]} {
                 lappend arg_list "[dict get $v $arg]"
               } else {
@@ -239,6 +246,7 @@ proc ::scobj::add_protekmm::read_config {} {
                 error "Missing configuration value $arg"
               }
             }
+            ${ns}:sics_log 9 "add_protekmm ${name} aqadapter ${asyncqueue} {*}$arg_list"
             add_protekmm ${name} "aqadapter" ${asyncqueue} {*}$arg_list
           }
         }

site_ansto/instrument/config/environment/temperature/sct_lakeshore_336.tcl

@@ -1896,10 +1896,10 @@ proc add_lakeshore_336 {name IP port {terminator \r\n} {_tol1 1.0} {_tol2 1.0} {
   if {[ catch {
     if {[string equal -nocase "aqadapter" "${IP}"]} {
       # dcl 2013-05-27: in this case the port is the name of the AsyncQueue
-      clientput "\add_lakeshore_336: makesctcontroller sct_ls336_$name aqadapter ${port} for Lakeshore model 336"
+      clientput "add_lakeshore_336: makesctcontroller sct_ls336_$name aqadapter ${port} for Lakeshore model 336"
       makesctcontroller sct_ls336_$name aqadapter ${port}
     } else {
-    clientput "\add_lakeshore_336: makesctcontroller sct_ls336_$name std ${IP}:$port $terminator for Lakeshore model 336"
+    clientput "add_lakeshore_336: makesctcontroller sct_ls336_$name std ${IP}:$port $terminator for Lakeshore model 336"
       makesctcontroller sct_ls336_$name std ${IP}:$port $terminator
     }
     ::scobj::ls336::mk_sct_lakeshore_336 sct_ls336_$name environment $name $CID $CTYPE $_tol1 $_tol2 $_verbose
@@ -1945,6 +1945,8 @@ proc ::scobj::lakeshore_336::read_config {} {
           continue
         }
         if { [string equal -nocase [dict get $v "driver"] "lakeshore_336"] } {
+          set driver [dict get $v driver]
+          ${ns}::sics_log 9 "Found ${name}: $driver"
           if { [string equal -nocase $enabled "true" ] || [string equal -nocase $enabled "always"] } {
             if { ![string equal -nocase [SplitReply [environment_simulation]] "false"] } {
               set asyncqueue "null"
@@ -1956,6 +1958,7 @@ proc ::scobj::lakeshore_336::read_config {} {
                 set asyncprotocol [dict get $v "asyncprotocol"]
               } else {
                 set asyncprotocol ${name}_protocol
+                ${ns}::sics_log 9 "${name}:${driver}: MakeAsyncProtocol ${asyncprotocol}"
                 MakeAsyncProtocol ${asyncprotocol}
                 if { [dict exists $v "terminator"] } {
                   ${asyncprotocol} sendterminator "[dict get $v "terminator"]"
@@ -1965,6 +1968,7 @@ proc ::scobj::lakeshore_336::read_config {} {
               set asyncqueue ${name}_queue
               set IP [dict get $v ip]
               set PORT [dict get $v port]
+              ${ns}::sics_log 9 "${name}:${driver}: MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${IP} ${PORT}"
               MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${IP} ${PORT}
               if { [dict exists $v "timeout"] } {
                 ${asyncqueue} timeout "[dict get $v "timeout"]"
@@ -1979,6 +1983,7 @@ proc ::scobj::lakeshore_336::read_config {} {
                 error "Missing configuration value $arg"
               }
             }
+            ${ns}::sics_log 9 "add_lakeshore_336 ${name} aqadapter ${asyncqueue} {*}$arg_list"
             add_lakeshore_336 ${name} "aqadapter" ${asyncqueue} {*}$arg_list
           }
         }

site_ansto/instrument/config/environment/temperature/sct_lakeshore_340.tcl

@@ -2100,10 +2100,10 @@ proc add_lakeshore_340 {name IP port {terminator \r\n} {_tol1 1.0} {_tol2 1.0} {
   if {[ catch {
     set _ls340_LSmodel 340
     if {[string equal -nocase "aqadapter" "${IP}"]} {
-      clientput "\add_lakeshore_340: makesctcontroller sct_ls340_$name aqadapter ${port} for Lakeshore model 340"
+      clientput "add_lakeshore_340: makesctcontroller sct_ls340_$name aqadapter ${port} for Lakeshore model 340"
       makesctcontroller sct_ls340_$name aqadapter ${port}
     } else {
-      clientput "\add_lakeshore_340: makesctcontroller sct_ls340_$name std ${IP}:$port $terminator for Lakeshore model 340"
+      clientput "add_lakeshore_340: makesctcontroller sct_ls340_$name std ${IP}:$port $terminator for Lakeshore model 340"
       makesctcontroller sct_ls340_$name std ${IP}:$port $terminator
     }
     ::scobj::ls340::mk_sct_lakeshore_340 sct_ls340_$name environment $name $CID $CTYPE $_ls340_LSmodel $_tol1 $_tol2 $_verbose
@@ -2127,8 +2127,8 @@ proc ::scobj::lakeshore_340::sics_log {debug_level debug_string} {
   } catch_message ]
 }
 
-clientput "file evaluation of sct_lakeshore_336.tcl"
+clientput "file evaluation of sct_lakeshore_340.tcl"
-::scobj::lakeshore_336::sics_log 9 "file evaluation of sct_lakeshore_336.tcl"
+::scobj::lakeshore_340::sics_log 9 "file evaluation of sct_lakeshore_340.tcl"
 
 proc ::scobj::lakeshore_340::read_config {} {
   set catch_status [ catch {
@@ -2149,6 +2149,8 @@ proc ::scobj::lakeshore_340::read_config {} {
           continue
         }
         if { [string equal -nocase [dict get $v "driver"] "lakeshore_340"] } {
+          set driver [dict get $v driver]
+          ${ns}::sics_log 9 "Found ${name}: $driver"
           if { [string equal -nocase $enabled "true" ] || [string equal -nocase $enabled "always"] } {
             if { ![string equal -nocase [SplitReply [environment_simulation]] "false"] } {
               set asyncqueue "null"
@@ -2160,6 +2162,7 @@ proc ::scobj::lakeshore_340::read_config {} {
                 set asyncprotocol [dict get $v "asyncprotocol"]
               } else {
                 set asyncprotocol ${name}_protocol
+                ${ns}::sics_log 9 "${name}:${driver}: MakeAsyncProtocol ${asyncprotocol}"
                 MakeAsyncProtocol ${asyncprotocol}
                 if { [dict exists $v "terminator"] } {
                   ${asyncprotocol} sendterminator "[dict get $v "terminator"]"
@@ -2169,6 +2172,7 @@ proc ::scobj::lakeshore_340::read_config {} {
               set asyncqueue ${name}_queue
               set IP [dict get $v ip]
               set PORT [dict get $v port]
+              ${ns}::sics_log 9 "${name}:${driver}: MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${IP} ${PORT}"
               MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${IP} ${PORT}
               if { [dict exists $v "timeout"] } {
                 ${asyncqueue} timeout "[dict get $v "timeout"]"
@@ -2183,6 +2187,7 @@ proc ::scobj::lakeshore_340::read_config {} {
                 error "Missing configuration value $arg"
               }
             }
+            ${ns}::sics_log 9 "add_lakeshore_340 ${name} aqadapter ${asyncqueue} {*}$arg_list"
             add_lakeshore_340 ${name} "aqadapter" ${asyncqueue} {*}$arg_list
           }
         }

site_ansto/instrument/hipd/util/sics_config.ini

@@ -1,3 +1,87 @@
+[12tmagnet_setup]
+cascade = B1:12tmagnet_oxford,sample_stage:12tmagnet_sample_insert,T1:mercury_scpi_01
+enabled = False
+[CF1]
+cascade = T1:CF1_ls340,sample_stage:normal_sample_stage
+enabled = False
+[Default]
+cascade = sample_stage:normal_sample_stage
+enabled = True
+[B1]
+enabled = False
+id = 1
+implementation = none
+name = magnet1
+optype = magnetic_field
+[I1]
+datype = I
+enabled = False
+id = 1
+implementation = none
+name = curr1
+optype = multimeter
+[I2]
+datype = I
+enabled = False
+id = 2
+implementation = none
+name = curr2
+optype = multimeter
+[T1]
+enabled = False
+id = 1
+implementation = none
+name = tc1
+optype = temperature
+[T2]
+enabled = False
+id = 2
+implementation = none
+name = tc2
+optype = temperature
+[T3]
+enabled = False
+id = 3
+implementation = none
+name = tc3
+optype = temperature
+[T4]
+enabled = False
+id = 4
+implementation = none
+name = tc4
+optype = temperature
+[T5]
+enabled = False
+id = 5
+implementation = none
+name = tc5
+optype = temperature
+[T6]
+enabled = False
+id = 6
+implementation = none
+name = tc6
+optype = temperature
+[V1]
+datype = V
+enabled = False
+id = 1
+implementation = none
+name = volts1
+optype = multimeter
+[V2]
+datype = V
+enabled = False
+id = 2
+implementation = none
+name = volts2
+optype = multimeter
+[sample_stage]
+enabled = Always
+implementation = normal_sample_stage
+name = sample_stage
+optype = motion_axis
 [12tmagnet_oxford]
 desc = "12 Tesla Oxford Magnet"
 driver = "oxford_labview"
@@ -10,21 +94,6 @@ port = 55001
 desc = "som will be redefined as the magnet sample insert rotation. Sample stage will be renamed to somss"
 imptype = motion_axis
 
-[12tmagnet_setup]
-cascade = B1:12tmagnet_oxford,sample_stage:12tmagnet_sample_insert,T1:mercury_scpi_01
-enabled = False
-
-[B1]
-enabled = False
-id = 1
-implementation = 12tmagnet_oxford
-name = magnet1
-optype = magnetic_field
-
-[CF1]
-cascade = T1:CF1_ls340,sample_stage:normal_sample_stage
-enabled = False
-
 [CF1_ls340]
 desc = "cf1: Bottom loading cryofurnace"
 driver = "lakeshore_340"
@@ -35,63 +104,6 @@ terminator = \r\n
 tol1 = 1.0
 tol2 = 1.0
 
-[Default]
-cascade = sample_stage:normal_sample_stage
-enabled = True
-
-[I1]
-datype = I
-enabled = False
-id = 1
-implementation = protek_01
-name = curr1
-optype = multimeter
-
-[I2]
-datype = I
-enabled = False
-id = 2
-implementation = protek_02
-name = curr2
-optype = multimeter
-
-[T1]
-enabled = False
-id = 1
-implementation = mercury_scpi_01
-name = tc1
-optype = temperature
-
-[T2]
-enabled = False
-id = 2
-implementation = ls340_01
-name = tc2
-optype = temperature
-
-[T3]
-enabled = False
-id = 3
-implementation = ls340_02
-name = tc3
-optype = temperature
-
-[V1]
-datype = V
-enabled = False
-id = 1
-implementation = none
-name = volts1
-optype = multimeter
-
-[V2]
-datype = V
-enabled = False
-id = 2
-implementation = none
-name = volts2
-optype = multimeter
-
 [eularian_cradle]
 desc = "Load the Eulerian cradle configuration"
 imptype = motion_axis
@@ -207,7 +219,7 @@ imptype = motion_axis
 
 [protek_01]
 desc = "Protek Multimeter"
-driver = "protek"
+driver = "protekmm"
 id = 1
 imptype = multimeter
 ip = 10.157.205.36
@@ -215,18 +227,12 @@ port = 4001
 
 [protek_02]
 desc = "Protek Multimeter"
-driver = "protek"
+driver = "protekmm"
 id = 2
 imptype = multimeter
 ip = 10.157.205.37
 port = 4001
 
-[sample_stage]
-enabled = Always
-implementation = normal_sample_stage
-name = sample_stage
-optype = motion_axis
-
 [small_omega]
 desc = "Load the small omega configuration"
 imptype = motion_axis