Regenerate the 3He driver for the coils

This commit is contained in:
Douglas Clowes
2015-02-16 12:38:43 +11:00
parent f80bec1403
commit cad4f64dcc

View File

@ -72,7 +72,7 @@ proc ::scobj::he3_polanal::chkWrite {tc_root} {
set catch_status [ catch { set catch_status [ catch {
debug_log ${tc_root} 1 "chkWrite tc_root=${tc_root} sct=[sct] resp=[sct result]" debug_log ${tc_root} 1 "chkWrite tc_root=${tc_root} sct=[sct] resp=[sct result]"
# chkWrite hook code starts # chkWrite hook code starts
[namespace current]::rdValue ${tc_root} [namespace current]::read_spin ${tc_root}
clientput [sct result] clientput [sct result]
# chkWrite hook code ends # chkWrite hook code ends
return "idle" return "idle"
@ -80,6 +80,38 @@ proc ::scobj::he3_polanal::chkWrite {tc_root} {
handle_exception ${catch_status} ${catch_message} handle_exception ${catch_status} ${catch_message}
} }
# function to write a parameter value on a device
proc ::scobj::he3_polanal::fetch_magnet {tc_root nextState cmd_str} {
set catch_status [ catch {
debug_log ${tc_root} 1 "fetch_magnet tc_root=${tc_root} sct=[sct] cmd=${cmd_str}"
if { [hpropexists [sct] geterror] } {
hdelprop [sct] geterror
}
set par [sct target]
set cmd "${cmd_str}${par}"
# fetch_magnet hook code starts
# Just do a fetch and go on to the read state
set cmd "${cmd_str}"
set nextState "read_magnet"
# fetch_magnet hook code ends
if { [hpropexists [sct] geterror] } {
debug_log ${tc_root} 9 "[sct] error: [sct geterror]"
error "[sct geterror]"
}
if { [hpropexists [sct] driving] } {
if { [hpropexists [sct] writestatus] && [sct writestatus] == "start" } {
sct driving 1
}
}
debug_log ${tc_root} 1 "fetch_magnet sct send ${cmd}"
if {![string equal -nocase -length 10 ${cmd} "@@NOSEND@@"]} {
sct send "${cmd}"
}
return ${nextState}
} catch_message ]
handle_exception ${catch_status} ${catch_message}
}
# function to request the read of a parameter on a device # function to request the read of a parameter on a device
proc ::scobj::he3_polanal::getValue {tc_root nextState cmd_str} { proc ::scobj::he3_polanal::getValue {tc_root nextState cmd_str} {
set catch_status [ catch { set catch_status [ catch {
@ -122,7 +154,77 @@ proc ::scobj::he3_polanal::rdValue {tc_root} {
sct geterror "${data}" sct geterror "${data}"
error "[sct geterror]" error "[sct geterror]"
} }
# rdValue hook code starts # rdValue hook code goes here
if { ${data} != [sct oldval] } {
debug_log ${tc_root} 1 "[sct] changed to new:${data}, from old:[sct oldval]"
sct oldval ${data}
sct update ${data}
sct utime readtime
}
return ${nextState}
} catch_message ]
handle_exception ${catch_status} ${catch_message}
}
# function to parse the read of a parameter on a device
proc ::scobj::he3_polanal::read_magnet {tc_root} {
set catch_status [ catch {
debug_log ${tc_root} 1 "read_magnet tc_root=${tc_root} sct=[sct] result=[sct result]"
if { [hpropexists [sct] geterror] } {
hdelprop [sct] geterror
}
set data [sct result]
set nextState "idle"
if {[string equal -nocase -length 7 ${data} "ASCERR:"]} {
# the protocol driver has reported an error
sct geterror "${data}"
error "[sct geterror]"
}
# read_magnet hook code starts
set dlist [split [string trim ${data}]]
if {[llength $dlist] != 7} {
error "Syntax error: '${data}'"
}
set index 1
set path [pathname [sct]]
set ns [namespace current]
foreach node {x_voltage x_current y_voltage y_current z_voltage z_current} {
hsetprop ${path}/${node} result [lindex $dlist ${index}]
sct with ${path}/${node} "${ns}::rdValue ${tc_root}"
incr index
}
set data 0
# read_magnet hook code ends
if { [hpropexists [sct] geterror] } {
debug_log ${tc_root} 9 "[sct] error: [sct geterror]"
error "[sct geterror]"
}
if { ${data} != [sct oldval] } {
debug_log ${tc_root} 1 "[sct] changed to new:${data}, from old:[sct oldval]"
sct oldval ${data}
sct update ${data}
sct utime readtime
}
return ${nextState}
} catch_message ]
handle_exception ${catch_status} ${catch_message}
}
# function to parse the read of a parameter on a device
proc ::scobj::he3_polanal::read_spin {tc_root} {
set catch_status [ catch {
debug_log ${tc_root} 1 "read_spin tc_root=${tc_root} sct=[sct] result=[sct result]"
if { [hpropexists [sct] geterror] } {
hdelprop [sct] geterror
}
set data [sct result]
set nextState "idle"
if {[string equal -nocase -length 7 ${data} "ASCERR:"]} {
# the protocol driver has reported an error
sct geterror "${data}"
error "[sct geterror]"
}
# read_spin hook code starts
set dlist [split [string trim ${data}]] set dlist [split [string trim ${data}]]
if {[llength ${dlist}] < 2} { if {[llength ${dlist}] < 2} {
sct geterror "Syntax Error: '${data}'" sct geterror "Syntax Error: '${data}'"
@ -148,7 +250,7 @@ proc ::scobj::he3_polanal::rdValue {tc_root} {
[namespace current]::do_update ${path}/time2 ${dlist} 5 [namespace current]::do_update ${path}/time2 ${dlist} 5
[namespace current]::do_update ${path}/field ${dlist} 6 [namespace current]::do_update ${path}/field ${dlist} 6
hupdateif ${path}/timestamp ${timestamp} hupdateif ${path}/timestamp ${timestamp}
# rdValue hook code ends # read_spin hook code ends
if { [hpropexists [sct] geterror] } { if { [hpropexists [sct] geterror] } {
debug_log ${tc_root} 9 "[sct] error: [sct geterror]" debug_log ${tc_root} 9 "[sct] error: [sct geterror]"
error "[sct geterror]" error "[sct geterror]"
@ -200,8 +302,43 @@ proc ::scobj::he3_polanal::setValue {tc_root nextState cmd_str} {
handle_exception ${catch_status} ${catch_message} handle_exception ${catch_status} ${catch_message}
} }
proc ::scobj::he3_polanal::mkDriver { sct_controller name device_class simulation_flag ip_address tcp_port {has_pol true} {has_anal true} } { # function to write a parameter value on a device
::scobj::he3_polanal::sics_log 9 "::scobj::he3_polanal::mkDriver ${sct_controller} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} ${has_pol} ${has_anal}" proc ::scobj::he3_polanal::write_magnet {tc_root nextState cmd_str} {
set catch_status [ catch {
debug_log ${tc_root} 1 "write_magnet tc_root=${tc_root} sct=[sct] cmd=${cmd_str}"
if { [hpropexists [sct] geterror] } {
hdelprop [sct] geterror
}
set par [sct target]
set cmd "${cmd_str}${par}"
# write_magnet hook code starts
# Just do a fetch and go on to the read state
set path [pathname [sct]]
set cmd "${cmd_str}"
set cmd "${cmd} [hval ${path}/x_current_sp]"
set cmd "${cmd} [hval ${path}/y_current_sp]"
set cmd "${cmd} [hval ${path}/z_current_sp]"
# write_magnet hook code ends
if { [hpropexists [sct] geterror] } {
debug_log ${tc_root} 9 "[sct] error: [sct geterror]"
error "[sct geterror]"
}
if { [hpropexists [sct] driving] } {
if { [hpropexists [sct] writestatus] && [sct writestatus] == "start" } {
sct driving 1
}
}
debug_log ${tc_root} 1 "write_magnet sct send ${cmd}"
if {![string equal -nocase -length 10 ${cmd} "@@NOSEND@@"]} {
sct send "${cmd}"
}
return ${nextState}
} catch_message ]
handle_exception ${catch_status} ${catch_message}
}
proc ::scobj::he3_polanal::mkDriver { sct_controller name device_class simulation_flag ip_address tcp_port {has_pol true} {has_anal true} {has_coil false} } {
::scobj::he3_polanal::sics_log 9 "::scobj::he3_polanal::mkDriver ${sct_controller} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} ${has_pol} ${has_anal} ${has_coil}"
set ns "[namespace current]" set ns "[namespace current]"
set catch_status [ catch { set catch_status [ catch {
@ -264,8 +401,8 @@ proc ::scobj::he3_polanal::mkDriver { sct_controller name device_class simulatio
hsetprop ${scobj_hpath}/analyser/phase nxalias "${name}_analyser_phase" hsetprop ${scobj_hpath}/analyser/phase nxalias "${name}_analyser_phase"
hfactory ${scobj_hpath}/analyser/spin plain user float hfactory ${scobj_hpath}/analyser/spin plain user float
hsetprop ${scobj_hpath}/analyser/spin read ${ns}::getValue ${scobj_hpath} rdValue {analyser} hsetprop ${scobj_hpath}/analyser/spin read ${ns}::getValue ${scobj_hpath} read_spin {analyser}
hsetprop ${scobj_hpath}/analyser/spin rdValue ${ns}::rdValue ${scobj_hpath} hsetprop ${scobj_hpath}/analyser/spin read_spin ${ns}::read_spin ${scobj_hpath}
hsetprop ${scobj_hpath}/analyser/spin write ${ns}::setValue ${scobj_hpath} chkWrite {analyser} hsetprop ${scobj_hpath}/analyser/spin write ${ns}::setValue ${scobj_hpath} chkWrite {analyser}
hsetprop ${scobj_hpath}/analyser/spin chkWrite ${ns}::chkWrite ${scobj_hpath} hsetprop ${scobj_hpath}/analyser/spin chkWrite ${ns}::chkWrite ${scobj_hpath}
hsetprop ${scobj_hpath}/analyser/spin check ${ns}::checkrange ${scobj_hpath} hsetprop ${scobj_hpath}/analyser/spin check ${ns}::checkrange ${scobj_hpath}
@ -404,6 +541,167 @@ proc ::scobj::he3_polanal::mkDriver { sct_controller name device_class simulatio
hsetprop ${scobj_hpath}/analyser_start type "part" hsetprop ${scobj_hpath}/analyser_start type "part"
} }
if {[string equal -nocase ${has_coil} "true"]} {
hfactory ${scobj_hpath}/magnet plain spy none
hsetprop ${scobj_hpath}/magnet data "true"
hsetprop ${scobj_hpath}/magnet klass "@none"
hsetprop ${scobj_hpath}/magnet type "part"
hfactory ${scobj_hpath}/magnet/sense plain spy none
hfactory ${scobj_hpath}/magnet/sense/sense plain user int
hsetprop ${scobj_hpath}/magnet/sense/sense read ${ns}::getValue ${scobj_hpath} read_magnet {magnet_xyz}
hsetprop ${scobj_hpath}/magnet/sense/sense read_magnet ${ns}::read_magnet ${scobj_hpath}
hsetprop ${scobj_hpath}/magnet/sense/sense write ${ns}::fetch_magnet ${scobj_hpath} noResponse {magnet_xyz}
hsetprop ${scobj_hpath}/magnet/sense/sense noResponse ${ns}::noResponse ${scobj_hpath}
hsetprop ${scobj_hpath}/magnet/sense/sense check ${ns}::checkrange ${scobj_hpath}
hsetprop ${scobj_hpath}/magnet/sense/sense control true
hsetprop ${scobj_hpath}/magnet/sense/sense data false
hsetprop ${scobj_hpath}/magnet/sense/sense mutable false
hsetprop ${scobj_hpath}/magnet/sense/sense nxsave false
hsetprop ${scobj_hpath}/magnet/sense/sense oldval 0
hsetprop ${scobj_hpath}/magnet/sense/sense sdsinfo "::nexus::scobj::sdsinfo"
hsetprop ${scobj_hpath}/magnet/sense/sense type "part"
hsetprop ${scobj_hpath}/magnet/sense/sense nxalias "${name}_magnet_sense_sense"
if {[string equal -nocase "${simulation_flag}" "false"]} {
${sct_controller} poll ${scobj_hpath}/magnet/sense/sense 30
${sct_controller} write ${scobj_hpath}/magnet/sense/sense
hsetprop ${scobj_hpath}/magnet/sense/sense simulated false
} else {
::scobj::he3_polanal::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for he3_polanal"
hsetprop ${scobj_hpath}/magnet/sense/sense simulated true
}
hfactory ${scobj_hpath}/magnet/sense/x_current plain user float
hsetprop ${scobj_hpath}/magnet/sense/x_current control true
hsetprop ${scobj_hpath}/magnet/sense/x_current data true
hsetprop ${scobj_hpath}/magnet/sense/x_current mutable true
hsetprop ${scobj_hpath}/magnet/sense/x_current nxsave true
hsetprop ${scobj_hpath}/magnet/sense/x_current oldval 0.0
hsetprop ${scobj_hpath}/magnet/sense/x_current klass "parameter"
hsetprop ${scobj_hpath}/magnet/sense/x_current sdsinfo "::nexus::scobj::sdsinfo"
hsetprop ${scobj_hpath}/magnet/sense/x_current type "part"
hsetprop ${scobj_hpath}/magnet/sense/x_current nxalias "${name}_magnet_sense_x_current"
hfactory ${scobj_hpath}/magnet/sense/x_voltage plain user float
hsetprop ${scobj_hpath}/magnet/sense/x_voltage control true
hsetprop ${scobj_hpath}/magnet/sense/x_voltage data true
hsetprop ${scobj_hpath}/magnet/sense/x_voltage mutable true
hsetprop ${scobj_hpath}/magnet/sense/x_voltage nxsave true
hsetprop ${scobj_hpath}/magnet/sense/x_voltage oldval 0.0
hsetprop ${scobj_hpath}/magnet/sense/x_voltage klass "parameter"
hsetprop ${scobj_hpath}/magnet/sense/x_voltage sdsinfo "::nexus::scobj::sdsinfo"
hsetprop ${scobj_hpath}/magnet/sense/x_voltage type "part"
hsetprop ${scobj_hpath}/magnet/sense/x_voltage nxalias "${name}_magnet_sense_x_voltage"
hfactory ${scobj_hpath}/magnet/sense/y_current plain user float
hsetprop ${scobj_hpath}/magnet/sense/y_current control true
hsetprop ${scobj_hpath}/magnet/sense/y_current data true
hsetprop ${scobj_hpath}/magnet/sense/y_current mutable true
hsetprop ${scobj_hpath}/magnet/sense/y_current nxsave true
hsetprop ${scobj_hpath}/magnet/sense/y_current oldval 0.0
hsetprop ${scobj_hpath}/magnet/sense/y_current klass "parameter"
hsetprop ${scobj_hpath}/magnet/sense/y_current sdsinfo "::nexus::scobj::sdsinfo"
hsetprop ${scobj_hpath}/magnet/sense/y_current type "part"
hsetprop ${scobj_hpath}/magnet/sense/y_current nxalias "${name}_magnet_sense_y_current"
hfactory ${scobj_hpath}/magnet/sense/y_voltage plain user float
hsetprop ${scobj_hpath}/magnet/sense/y_voltage control true
hsetprop ${scobj_hpath}/magnet/sense/y_voltage data true
hsetprop ${scobj_hpath}/magnet/sense/y_voltage mutable true
hsetprop ${scobj_hpath}/magnet/sense/y_voltage nxsave true
hsetprop ${scobj_hpath}/magnet/sense/y_voltage oldval 0.0
hsetprop ${scobj_hpath}/magnet/sense/y_voltage klass "parameter"
hsetprop ${scobj_hpath}/magnet/sense/y_voltage sdsinfo "::nexus::scobj::sdsinfo"
hsetprop ${scobj_hpath}/magnet/sense/y_voltage type "part"
hsetprop ${scobj_hpath}/magnet/sense/y_voltage nxalias "${name}_magnet_sense_y_voltage"
hfactory ${scobj_hpath}/magnet/sense/z_current plain user float
hsetprop ${scobj_hpath}/magnet/sense/z_current control true
hsetprop ${scobj_hpath}/magnet/sense/z_current data true
hsetprop ${scobj_hpath}/magnet/sense/z_current mutable true
hsetprop ${scobj_hpath}/magnet/sense/z_current nxsave true
hsetprop ${scobj_hpath}/magnet/sense/z_current oldval 0.0
hsetprop ${scobj_hpath}/magnet/sense/z_current klass "parameter"
hsetprop ${scobj_hpath}/magnet/sense/z_current sdsinfo "::nexus::scobj::sdsinfo"
hsetprop ${scobj_hpath}/magnet/sense/z_current type "part"
hsetprop ${scobj_hpath}/magnet/sense/z_current nxalias "${name}_magnet_sense_z_current"
hfactory ${scobj_hpath}/magnet/sense/z_voltage plain user float
hsetprop ${scobj_hpath}/magnet/sense/z_voltage control true
hsetprop ${scobj_hpath}/magnet/sense/z_voltage data true
hsetprop ${scobj_hpath}/magnet/sense/z_voltage mutable true
hsetprop ${scobj_hpath}/magnet/sense/z_voltage nxsave true
hsetprop ${scobj_hpath}/magnet/sense/z_voltage oldval 0.0
hsetprop ${scobj_hpath}/magnet/sense/z_voltage klass "parameter"
hsetprop ${scobj_hpath}/magnet/sense/z_voltage sdsinfo "::nexus::scobj::sdsinfo"
hsetprop ${scobj_hpath}/magnet/sense/z_voltage type "part"
hsetprop ${scobj_hpath}/magnet/sense/z_voltage nxalias "${name}_magnet_sense_z_voltage"
hsetprop ${scobj_hpath}/magnet/sense data "true"
hsetprop ${scobj_hpath}/magnet/sense klass "@none"
hsetprop ${scobj_hpath}/magnet/sense type "part"
hfactory ${scobj_hpath}/magnet/setpoint plain spy none
hfactory ${scobj_hpath}/magnet/setpoint/store plain user int
hsetprop ${scobj_hpath}/magnet/setpoint/store write ${ns}::write_magnet ${scobj_hpath} noResponse {magnet_xyz}
hsetprop ${scobj_hpath}/magnet/setpoint/store noResponse ${ns}::noResponse ${scobj_hpath}
hsetprop ${scobj_hpath}/magnet/setpoint/store check ${ns}::checkrange ${scobj_hpath}
hsetprop ${scobj_hpath}/magnet/setpoint/store control true
hsetprop ${scobj_hpath}/magnet/setpoint/store data false
hsetprop ${scobj_hpath}/magnet/setpoint/store mutable false
hsetprop ${scobj_hpath}/magnet/setpoint/store nxsave false
hsetprop ${scobj_hpath}/magnet/setpoint/store oldval 0
hsetprop ${scobj_hpath}/magnet/setpoint/store sdsinfo "::nexus::scobj::sdsinfo"
hsetprop ${scobj_hpath}/magnet/setpoint/store type "part"
hsetprop ${scobj_hpath}/magnet/setpoint/store nxalias "${name}_magnet_setpoint_store"
if {[string equal -nocase "${simulation_flag}" "false"]} {
${sct_controller} write ${scobj_hpath}/magnet/setpoint/store
hsetprop ${scobj_hpath}/magnet/setpoint/store simulated false
} else {
::scobj::he3_polanal::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for he3_polanal"
hsetprop ${scobj_hpath}/magnet/setpoint/store simulated true
}
hfactory ${scobj_hpath}/magnet/setpoint/x_current_sp plain user float
hsetprop ${scobj_hpath}/magnet/setpoint/x_current_sp control true
hsetprop ${scobj_hpath}/magnet/setpoint/x_current_sp data true
hsetprop ${scobj_hpath}/magnet/setpoint/x_current_sp mutable true
hsetprop ${scobj_hpath}/magnet/setpoint/x_current_sp nxsave true
hsetprop ${scobj_hpath}/magnet/setpoint/x_current_sp oldval 0.0
hsetprop ${scobj_hpath}/magnet/setpoint/x_current_sp klass "parameter"
hsetprop ${scobj_hpath}/magnet/setpoint/x_current_sp sdsinfo "::nexus::scobj::sdsinfo"
hsetprop ${scobj_hpath}/magnet/setpoint/x_current_sp type "part"
hsetprop ${scobj_hpath}/magnet/setpoint/x_current_sp nxalias "${name}_magnet_setpoint_x_current_sp"
hfactory ${scobj_hpath}/magnet/setpoint/y_current_sp plain user float
hsetprop ${scobj_hpath}/magnet/setpoint/y_current_sp control true
hsetprop ${scobj_hpath}/magnet/setpoint/y_current_sp data true
hsetprop ${scobj_hpath}/magnet/setpoint/y_current_sp mutable true
hsetprop ${scobj_hpath}/magnet/setpoint/y_current_sp nxsave true
hsetprop ${scobj_hpath}/magnet/setpoint/y_current_sp oldval 0.0
hsetprop ${scobj_hpath}/magnet/setpoint/y_current_sp klass "parameter"
hsetprop ${scobj_hpath}/magnet/setpoint/y_current_sp sdsinfo "::nexus::scobj::sdsinfo"
hsetprop ${scobj_hpath}/magnet/setpoint/y_current_sp type "part"
hsetprop ${scobj_hpath}/magnet/setpoint/y_current_sp nxalias "${name}_magnet_setpoint_y_current_sp"
hfactory ${scobj_hpath}/magnet/setpoint/z_current_sp plain user float
hsetprop ${scobj_hpath}/magnet/setpoint/z_current_sp control true
hsetprop ${scobj_hpath}/magnet/setpoint/z_current_sp data true
hsetprop ${scobj_hpath}/magnet/setpoint/z_current_sp mutable true
hsetprop ${scobj_hpath}/magnet/setpoint/z_current_sp nxsave true
hsetprop ${scobj_hpath}/magnet/setpoint/z_current_sp oldval 0.0
hsetprop ${scobj_hpath}/magnet/setpoint/z_current_sp klass "parameter"
hsetprop ${scobj_hpath}/magnet/setpoint/z_current_sp sdsinfo "::nexus::scobj::sdsinfo"
hsetprop ${scobj_hpath}/magnet/setpoint/z_current_sp type "part"
hsetprop ${scobj_hpath}/magnet/setpoint/z_current_sp nxalias "${name}_magnet_setpoint_z_current_sp"
hsetprop ${scobj_hpath}/magnet/setpoint data "true"
hsetprop ${scobj_hpath}/magnet/setpoint klass "@none"
hsetprop ${scobj_hpath}/magnet/setpoint type "part"
}
if {[string equal -nocase ${has_pol} "true"]} { if {[string equal -nocase ${has_pol} "true"]} {
hfactory ${scobj_hpath}/polariser plain spy none hfactory ${scobj_hpath}/polariser plain spy none
@ -455,8 +753,8 @@ proc ::scobj::he3_polanal::mkDriver { sct_controller name device_class simulatio
hsetprop ${scobj_hpath}/polariser/phase nxalias "${name}_polariser_phase" hsetprop ${scobj_hpath}/polariser/phase nxalias "${name}_polariser_phase"
hfactory ${scobj_hpath}/polariser/spin plain user float hfactory ${scobj_hpath}/polariser/spin plain user float
hsetprop ${scobj_hpath}/polariser/spin read ${ns}::getValue ${scobj_hpath} rdValue {polariser} hsetprop ${scobj_hpath}/polariser/spin read ${ns}::getValue ${scobj_hpath} read_spin {polariser}
hsetprop ${scobj_hpath}/polariser/spin rdValue ${ns}::rdValue ${scobj_hpath} hsetprop ${scobj_hpath}/polariser/spin read_spin ${ns}::read_spin ${scobj_hpath}
hsetprop ${scobj_hpath}/polariser/spin write ${ns}::setValue ${scobj_hpath} chkWrite {polariser} hsetprop ${scobj_hpath}/polariser/spin write ${ns}::setValue ${scobj_hpath} chkWrite {polariser}
hsetprop ${scobj_hpath}/polariser/spin chkWrite ${ns}::chkWrite ${scobj_hpath} hsetprop ${scobj_hpath}/polariser/spin chkWrite ${ns}::chkWrite ${scobj_hpath}
hsetprop ${scobj_hpath}/polariser/spin check ${ns}::checkrange ${scobj_hpath} hsetprop ${scobj_hpath}/polariser/spin check ${ns}::checkrange ${scobj_hpath}
@ -605,7 +903,7 @@ proc ::scobj::he3_polanal::mkDriver { sct_controller name device_class simulatio
proc ::scobj::he3_polanal::add_driver {name device_class simulation_flag ip_address tcp_port} { proc ::scobj::he3_polanal::add_driver {name device_class simulation_flag ip_address tcp_port} {
set catch_status [ catch { set catch_status [ catch {
::scobj::he3_polanal::sics_log 9 "::scobj::he3_polanal::add_driver ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} ${has_pol} ${has_anal}" ::scobj::he3_polanal::sics_log 9 "::scobj::he3_polanal::add_driver ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} ${has_pol} ${has_anal} ${has_coil}"
if {[string equal -nocase "${simulation_flag}" "false"]} { if {[string equal -nocase "${simulation_flag}" "false"]} {
if {[string equal -nocase "aqadapter" "${ip_address}"]} { if {[string equal -nocase "aqadapter" "${ip_address}"]} {
::scobj::he3_polanal::sics_log 9 "makesctcontroller sct_${name} aqadapter ${tcp_port}" ::scobj::he3_polanal::sics_log 9 "makesctcontroller sct_${name} aqadapter ${tcp_port}"
@ -619,8 +917,8 @@ proc ::scobj::he3_polanal::add_driver {name device_class simulation_flag ip_addr
::scobj::he3_polanal::sics_log 9 "makesctcontroller sct_${name} aqadapter NULL" ::scobj::he3_polanal::sics_log 9 "makesctcontroller sct_${name} aqadapter NULL"
makesctcontroller sct_${name} aqadapter NULL makesctcontroller sct_${name} aqadapter NULL
} }
::scobj::he3_polanal::sics_log 1 "::scobj::he3_polanal::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} ${has_pol} ${has_anal}" ::scobj::he3_polanal::sics_log 1 "::scobj::he3_polanal::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} ${has_pol} ${has_anal} ${has_coil}"
::scobj::he3_polanal::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} ${has_pol} ${has_anal} ::scobj::he3_polanal::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} ${has_pol} ${has_anal} ${has_coil}
} catch_message ] } catch_message ]
handle_exception ${catch_status} ${catch_message} handle_exception ${catch_status} ${catch_message}
} }
@ -721,8 +1019,8 @@ proc ::scobj::he3_polanal::read_config {} {
set arg_list [list] set arg_list [list]
set missing_list [list] set missing_list [list]
array unset default_map array unset default_map
array set default_map [list has_pol true has_anal true] array set default_map [list has_pol true has_anal true has_coil false]
foreach arg {has_pol has_anal} { foreach arg {has_pol has_anal has_coil} {
if {[dict exists $u $arg]} { if {[dict exists $u $arg]} {
lappend arg_list "[dict get $u $arg]" lappend arg_list "[dict get $u $arg]"
} elseif {[dict exists $v $arg]} { } elseif {[dict exists $v $arg]} {