From 7f066d75d78179f87305423dd2cde8d55d09547f Mon Sep 17 00:00:00 2001 From: Douglas Clowes Date: Thu, 22 Jan 2015 13:19:05 +1100 Subject: [PATCH] Remove RELEASE-3_1 artifacts --- .../environment/magneticField/sct_bruker.tcl | 131 ------------- .../config/environment/sct_syringe_pump.tcl | 180 ------------------ .../environment/sct_antonparr_MCR500.tcl | 110 ----------- 3 files changed, 421 deletions(-) delete mode 100644 site_ansto/instrument/config/environment/magneticField/sct_bruker.tcl delete mode 100644 site_ansto/instrument/config/environment/sct_syringe_pump.tcl delete mode 100644 site_ansto/instrument/sans/config/environment/sct_antonparr_MCR500.tcl diff --git a/site_ansto/instrument/config/environment/magneticField/sct_bruker.tcl b/site_ansto/instrument/config/environment/magneticField/sct_bruker.tcl deleted file mode 100644 index e86bab65..00000000 --- a/site_ansto/instrument/config/environment/magneticField/sct_bruker.tcl +++ /dev/null @@ -1,131 +0,0 @@ -# Generated driver for bruker -# vim: ft=tcl tabstop=8 softtabstop=2 shiftwidth=2 nocindent smartindent -# - -namespace eval ::scobj::bruker { - set debug_threshold 5 -} - -proc ::scobj::bruker::debug_log {tc_root debug_level debug_string} { - set catch_status [ catch { - set debug_threshold [hgetpropval ${tc_root} debug_threshold] - if {${debug_level} >= ${debug_threshold}} { - set now [clock seconds] - set ts [clock format ${now} -format "%Y%m%d"] - set log_file_name "../log/bruker_[basename ${tc_root}]_${ts}.log" - set fd [open "${log_file_name}" "a"] - set ts [clock format ${now} -format "%T"] - puts ${fd} "${ts} ${debug_string}" - close ${fd} - } - } catch_message ] -} - -proc ::scobj::bruker::sics_log {debug_level debug_string} { - set catch_status [ catch { - set debug_threshold ${::scobj::bruker::debug_threshold} - if {${debug_level} >= ${debug_threshold}} { - sicslog "::scobj::bruker::${debug_string}" - } - } catch_message ] -} - -proc ::scobj::bruker::mkDriver { sct_controller name device_class simulation_flag ip_address tcp_port id datype tol } { - ::scobj::bruker::sics_log 9 "::scobj::bruker::mkDriver ${sct_controller} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} ${id} ${datype} ${tol}" - set ns "[namespace current]" - set catch_status [ catch { - -# mkWrapper hook code starts - add_bruker_bec1 $name $ip_address $tcp_port $tol $id $datype -# mkWrapper hook code ends - } catch_message ] - handle_exception ${catch_status} ${catch_message} -} - -proc ::scobj::bruker::add_driver {name device_class simulation_flag ip_address tcp_port id datype {tol 0.1}} { - set catch_status [ catch { - ::scobj::bruker::sics_log 9 "::scobj::bruker::add_driver ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} ${id} ${datype} ${tol}" - ::scobj::bruker::sics_log 9 "No sctcontroller for bruker" - ::scobj::bruker::sics_log 1 "::scobj::bruker::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} ${id} ${datype} ${tol}" - ::scobj::bruker::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} ${id} ${datype} ${tol} - } catch_message ] - handle_exception ${catch_status} ${catch_message} -} - -namespace eval ::scobj::bruker { - namespace export debug_threshold - namespace export debug_log - namespace export sics_log - namespace export mkDriver - namespace export add_driver -} - -proc add_bruker {name ip_address tcp_port id datype {tol 0.1}} { - set simulation_flag "[string tolower [SplitReply [environment_simulation]]]" - ::scobj::bruker::add_driver ${name} "environment" ${simulation_flag} ${ip_address} ${tcp_port} ${id} ${datype} ${tol} -} - -clientput "file evaluation of sct_bruker.tcl" -::scobj::bruker::sics_log 9 "file evaluation of sct_bruker.tcl" - -proc ::scobj::bruker::read_config {} { - set catch_status [ catch { - set ns "::scobj::bruker" - dict for {k u} $::config_dict { - if { [dict exists $u "implementation"] } { - set simulation_flag "[string tolower [SplitReply [environment_simulation]]]" - set device_class "environment" - if { !([dict exists $u "name"] && [dict exists $u "enabled"]) } { - continue - } - set enabled [string tolower [dict get $u "enabled"]] - if { ! ([string equal -nocase $enabled "true" ] || [string equal -nocase $enabled "always"]) } { - continue - } - if { [dict exists $u "simulation_group"] } { - set simulation_flag [SplitReply [[string tolower [dict get $u "simulation_group"]]]] - } - if { [dict exists $u "device_class"] } { - set device_class "[dict get $u "device_class"]" - } - set name [dict get $u name] - set implementation [dict get $u "implementation"] - if { !([dict exists $::config_dict $implementation]) } { - continue - } - set v [dict get $::config_dict $implementation] - if { !([dict exists $v "driver"]) } { - continue - } - if { [string equal -nocase [dict get $v "driver"] "bruker"] } { - ::scobj::bruker::sics_log 9 "No sctcontroller for bruker" - set ip_address [dict get $v ip] - set tcp_port [dict get $v port] - set arg_list [list] - set missing_list [list] - foreach arg {id datype tol} { - if {[dict exists $u $arg]} { - lappend arg_list "[dict get $u $arg]" - } elseif {[dict exists $v $arg]} { - lappend arg_list "[dict get $v $arg]" - } else { - ${ns}::sics_log 9 "Missing configuration value $arg" - lappend missing_list $arg - } - } - if { [llength $missing_list] > 0 } { - error "$name is missing configuration values $missing_list" - } - ${ns}::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} {*}$arg_list - } - } - } - } catch_message ] - handle_exception ${catch_status} ${catch_message} -} - -if { [info exists ::config_dict] } { - ::scobj::bruker::read_config -} else { - ::scobj::bruker::sics_log 5 "No config dict" -} diff --git a/site_ansto/instrument/config/environment/sct_syringe_pump.tcl b/site_ansto/instrument/config/environment/sct_syringe_pump.tcl deleted file mode 100644 index 3388b868..00000000 --- a/site_ansto/instrument/config/environment/sct_syringe_pump.tcl +++ /dev/null @@ -1,180 +0,0 @@ -# Generated driver for syringe_pump -# vim: ft=tcl tabstop=8 softtabstop=2 shiftwidth=2 nocindent smartindent -# - -namespace eval ::scobj::syringe_pump { - set debug_threshold 5 -} - -proc ::scobj::syringe_pump::debug_log {tc_root debug_level debug_string} { - set catch_status [ catch { - set debug_threshold [hgetpropval ${tc_root} debug_threshold] - if {${debug_level} >= ${debug_threshold}} { - set now [clock seconds] - set ts [clock format ${now} -format "%Y%m%d"] - set log_file_name "../log/syringe_pump_[basename ${tc_root}]_${ts}.log" - set fd [open "${log_file_name}" "a"] - set ts [clock format ${now} -format "%T"] - puts ${fd} "${ts} ${debug_string}" - close ${fd} - } - } catch_message ] -} - -proc ::scobj::syringe_pump::sics_log {debug_level debug_string} { - set catch_status [ catch { - set debug_threshold ${::scobj::syringe_pump::debug_threshold} - if {${debug_level} >= ${debug_threshold}} { - sicslog "::scobj::syringe_pump::${debug_string}" - } - } catch_message ] -} - -proc ::scobj::syringe_pump::mkDriver { sct_controller name device_class simulation_flag ip_address tcp_port id datype } { - ::scobj::syringe_pump::sics_log 9 "::scobj::syringe_pump::mkDriver ${sct_controller} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} ${id} ${datype}" - set ns "[namespace current]" - set catch_status [ catch { - -# mkWrapper hook code starts - ::scobj::syr::mk_sct_syr $sct_controller environment $name -# mkWrapper hook code ends - } catch_message ] - handle_exception ${catch_status} ${catch_message} -} - -proc ::scobj::syringe_pump::add_driver {name device_class simulation_flag ip_address tcp_port id datype} { - set catch_status [ catch { - ::scobj::syringe_pump::sics_log 9 "::scobj::syringe_pump::add_driver ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} ${id} ${datype}" - if {[string equal -nocase "${simulation_flag}" "false"]} { - if {[string equal -nocase "aqadapter" "${ip_address}"]} { - ::scobj::syringe_pump::sics_log 9 "makesctcontroller sct_${name} aqadapter ${tcp_port}" - makesctcontroller sct_${name} aqadapter ${tcp_port} - } else { - ::scobj::syringe_pump::sics_log 9 "makesctcontroller sct_${name} syringe ${ip_address}:${tcp_port}" - makesctcontroller sct_${name} syringe ${ip_address}:${tcp_port} - } - } else { - ::scobj::syringe_pump::sics_log 9 "simulation_flag=${simulation_flag} => Null sctcontroller for syringe_pump" - ::scobj::syringe_pump::sics_log 9 "makesctcontroller sct_${name} aqadapter NULL" - makesctcontroller sct_${name} aqadapter NULL - } - ::scobj::syringe_pump::sics_log 1 "::scobj::syringe_pump::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} ${id} ${datype}" - ::scobj::syringe_pump::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} ${id} ${datype} - } catch_message ] - handle_exception ${catch_status} ${catch_message} -} - -namespace eval ::scobj::syringe_pump { - namespace export debug_threshold - namespace export debug_log - namespace export sics_log - namespace export mkDriver - namespace export add_driver -} - -proc add_syringe_pump {name ip_address tcp_port id datype} { - set simulation_flag "[string tolower [SplitReply [environment_simulation]]]" - ::scobj::syringe_pump::add_driver ${name} "environment" ${simulation_flag} ${ip_address} ${tcp_port} ${id} ${datype} -} - -clientput "file evaluation of sct_syringe_pump.tcl" -::scobj::syringe_pump::sics_log 9 "file evaluation of sct_syringe_pump.tcl" - -proc ::scobj::syringe_pump::read_config {} { - set catch_status [ catch { - set ns "::scobj::syringe_pump" - dict for {k u} $::config_dict { - if { [dict exists $u "implementation"] } { - set simulation_flag "[string tolower [SplitReply [environment_simulation]]]" - set device_class "environment" - if { !([dict exists $u "name"] && [dict exists $u "enabled"]) } { - continue - } - set enabled [string tolower [dict get $u "enabled"]] - if { ! ([string equal -nocase $enabled "true" ] || [string equal -nocase $enabled "always"]) } { - continue - } - if { [dict exists $u "simulation_group"] } { - set simulation_flag [SplitReply [[string tolower [dict get $u "simulation_group"]]]] - } - if { [dict exists $u "device_class"] } { - set device_class "[dict get $u "device_class"]" - } - set name [dict get $u name] - set implementation [dict get $u "implementation"] - if { !([dict exists $::config_dict $implementation]) } { - continue - } - set v [dict get $::config_dict $implementation] - if { !([dict exists $v "driver"]) } { - continue - } - if { [string equal -nocase [dict get $v "driver"] "syringe_pump"] } { - if { ![string equal -nocase "${simulation_flag}" "false"] } { - set asyncqueue "null" - ${ns}::sics_log 9 "simulation_flag=${simulation_flag} => using null asyncqueue" - ${ns}::sics_log 9 "makesctcontroller sct_${name} aqadapter NULL" - makesctcontroller sct_${name} aqadapter NULL - } elseif { [dict exists $v "asyncqueue"] } { - set asyncqueue [dict get $v "asyncqueue"] - if { [string equal -nocase ${asyncqueue} "sct"] } { - set ip_address [dict get $v ip] - set tcp_port [dict get $v port] - makesctcontroller sct_${name} syringe ${ip_address}:${tcp_port} - } else { - makesctcontroller sct_${name} aqadapter ${asyncqueue} - } - } else { - if { [dict exists $v "asyncprotocol"] } { - set asyncprotocol [dict get $v "asyncprotocol"] - } else { - set asyncprotocol ${name}_protocol - MakeAsyncProtocol ${asyncprotocol} - if { [dict exists $v "sendterminator"] } { - ${asyncprotocol} sendterminator "[dict get $v "sendterminator"]" - } elseif { [dict exists $v "terminator"] } { - ${asyncprotocol} sendterminator "[dict get $v "terminator"]" - } - if { [dict exists $v "replyterminator"] } { - ${asyncprotocol} replyterminator "[dict get $v "replyterminator"]" - } elseif { [dict exists $v "terminator"] } { - ${asyncprotocol} replyterminator "[dict get $v "terminator"]" - } - } - set asyncqueue ${name}_queue - set ip_address [dict get $v ip] - set tcp_port [dict get $v port] - MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${ip_address} ${tcp_port} - if { [dict exists $v "timeout"] } { - ${asyncqueue} timeout "[dict get $v "timeout"]" - } - makesctcontroller sct_${name} aqadapter ${asyncqueue} - } - set arg_list [list] - set missing_list [list] - foreach arg {id datype} { - if {[dict exists $u $arg]} { - lappend arg_list "[dict get $u $arg]" - } elseif {[dict exists $v $arg]} { - lappend arg_list "[dict get $v $arg]" - } else { - ${ns}::sics_log 9 "Missing configuration value $arg" - lappend missing_list $arg - } - } - if { [llength $missing_list] > 0 } { - error "$name is missing configuration values $missing_list" - } - ${ns}::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} {*}$arg_list - } - } - } - } catch_message ] - handle_exception ${catch_status} ${catch_message} -} - -if { [info exists ::config_dict] } { - ::scobj::syringe_pump::read_config -} else { - ::scobj::syringe_pump::sics_log 5 "No config dict" -} diff --git a/site_ansto/instrument/sans/config/environment/sct_antonparr_MCR500.tcl b/site_ansto/instrument/sans/config/environment/sct_antonparr_MCR500.tcl deleted file mode 100644 index bd93bd8c..00000000 --- a/site_ansto/instrument/sans/config/environment/sct_antonparr_MCR500.tcl +++ /dev/null @@ -1,110 +0,0 @@ -# Generated driver for antonparr_MCR500 -# vim: ft=tcl tabstop=8 softtabstop=2 shiftwidth=2 nocindent smartindent -# - -namespace eval ::scobj::antonparr_MCR500 { - set debug_threshold 5 -} - -proc ::scobj::antonparr_MCR500::debug_log {tc_root debug_level debug_string} { - set catch_status [ catch { - set debug_threshold [hgetpropval ${tc_root} debug_threshold] - if {${debug_level} >= ${debug_threshold}} { - set fd [open "../log/antonparr_MCR500_[basename ${tc_root}].log" "a"] - set line "[clock format [clock seconds] -format "%T"] ${debug_string}" - puts ${fd} "${line}" - close ${fd} - } - } catch_message ] -} - -proc ::scobj::antonparr_MCR500::sics_log {debug_level debug_string} { - set catch_status [ catch { - set debug_threshold ${::scobj::antonparr_MCR500::debug_threshold} - if {${debug_level} >= ${debug_threshold}} { - sicslog "::scobj::antonparr_MCR500::${debug_string}" - } - } catch_message ] -} - -proc ::scobj::antonparr_MCR500::mkDriver { speed_name torque_name tol settle } { - ::scobj::antonparr_MCR500::sics_log 9 "::scobj::antonparr_MCR500::mkDriver ${speed_name} ${torque_name} ${tol} ${settle}" - set ns "[namespace current]" - set catch_status [ catch { - -# mkDriver hook code starts - add_rheo $speed_name $tol $settle - add_rheo $torque_name $tol $settle -# mkDriver hook code ends - } catch_message ] - handle_exception ${catch_status} ${catch_message} -} - -namespace eval ::scobj::antonparr_MCR500 { - namespace export debug_threshold - namespace export debug_log - namespace export sics_log - namespace export mkDriver -} - -proc add_antonparr_MCR500 {speed_name torque_name tol settle} { - set catch_status [ catch { - ::scobj::antonparr_MCR500::sics_log 9 "add_antonparr_MCR500 ${speed_name} ${torque_name} ${tol} ${settle}" - ::scobj::antonparr_MCR500::sics_log 1 "::scobj::antonparr_MCR500::mkDriver ${speed_name} ${torque_name} ${tol} ${settle}" - ::scobj::antonparr_MCR500::mkDriver ${speed_name} ${torque_name} ${tol} ${settle} - } catch_message ] - handle_exception ${catch_status} ${catch_message} -} - -clientput "file evaluation of sct_antonparr_MCR500.tcl" -::scobj::antonparr_MCR500::sics_log 9 "file evaluation of sct_antonparr_MCR500.tcl" - -proc ::scobj::antonparr_MCR500::read_config {} { - set catch_status [ catch { - set ns "::scobj::antonparr_MCR500" - dict for {k u} $::config_dict { - if { [dict exists $u "implementation"] } { - if { ![dict exists $u "enabled"] } { - continue - } - set enabled [string tolower [dict get $u "enabled"]] - if { ! ([string equal -nocase $enabled "true" ] || [string equal -nocase $enabled "always"]) } { - continue - } - set implementation [dict get $u "implementation"] - if { !([dict exists $::config_dict $implementation]) } { - continue - } - set v [dict get $::config_dict $implementation] - if { !([dict exists $v "driver"]) } { - continue - } - if { [string equal -nocase [dict get $v "driver"] "antonparr_MCR500"] } { - set arg_list [list] - set missing_list [list] - foreach arg {speed_name torque_name tol settle} { - if {[dict exists $u $arg]} { - lappend arg_list "[dict get $u $arg]" - } elseif {[dict exists $v $arg]} { - lappend arg_list "[dict get $v $arg]" - } else { - ${ns}::sics_log 9 "Missing configuration value $arg" - lappend missing_list $arg - } - } - if { [llength $missing_list] > 0 } { - error "Rheometer is missing configuration values $missing_list" - } - add_antonparr_MCR500 {*}$arg_list - } - } - } - } catch_message ] - handle_exception ${catch_status} ${catch_message} -} - -if { [info exists ::config_dict] } { - ::scobj::antonparr_MCR500::read_config -} else { - ::scobj::antonparr_MCR500::sics_log 5 "No config dict" -}