linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pull back changes from Dingo

Browse Source
This commit is contained in:
Douglas Clowes
2014-07-09 15:01:21 +10:00
parent cc5400c595
commit f6dfc76ada
7 changed files with 373 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
site_ansto/instrument/dingo/config/counter/counter.tcl
View File

@@ -19,9 +19,16 @@ proc ::counter::cm_initialize {} {
variable isc_cm_address
variable isc_cm_port
MakeAsyncQueue cmserver CAMERA $isc_cm_address $isc_cm_port
MakeCounter cm1 anstocamera cmserver
# HACK: The ::montor::count command requires a bm in commands_common
MakeCounter bm SIM 0.0
set sim_mode [SplitReply [counter_simulation]]
if {$sim_mode == "true"} {
MakeCounter cm1 SIM 0.0
} else {
MakeAsyncQueue cmserver CAMERA $isc_cm_address $isc_cm_port
MakeCounter cm1 anstocamera cmserver
}
set isc_beam_monitor_list { cm1 }
sicslist setatt cm1 privilege internal
::utility::macro::getset text cm1_mode {} {
@@ -60,9 +67,6 @@ proc ::counter::cm_initialize {} {
publish ::counter::cm_initialize user
proc ::counter::isc_initialize {} {
if [SplitReply [counter_simulation]] {
return
}
if [catch {
variable isc_numchannels
variable isc_monitor_address