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

SICS-709: Refresh the count status whenever the current counts are fetched (eg before saving data).

Browse Source 
This was broken as a side effect of SICS-664 (ie removing the unnecessary hmcontrol object).
This commit is contained in:
Ferdi Franceschini
2013-12-10 20:13:31 +11:00
parent 03c00623ee
commit e27aea0169
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
site_ansto/instrument/config/counter/counter_common_1.tcl
View File

@ -7,6 +7,7 @@ namespace eval counter {
proc ::counter::transferscript {} { proc ::counter::transferscript {} {
variable isc_numchannels variable isc_numchannels
bm status
set val [SplitReply [bm1 gettime]] set val [SplitReply [bm1 gettime]]
for {set i 1} {$i <= $isc_numchannels} {incr i} { for {set i 1} {$i <= $isc_numchannels} {incr i} {
append val " [SplitReply [bm$i getcounts] ]" append val " [SplitReply [bm$i getcounts] ]"
@ -60,6 +61,7 @@ proc ::counter::ic_initialize {} {
::utility::macro::getset float monitor_counts {} { ::utility::macro::getset float monitor_counts {} {
bm status
return "monitor_counts = [SplitReply [bm getcounts]]" return "monitor_counts = [SplitReply [bm getcounts]]"
} }
sicslist setatt monitor_counts klass monitor sicslist setatt monitor_counts klass monitor
@ -67,6 +69,7 @@ proc ::counter::ic_initialize {} {
sicslist setatt monitor_counts mutable true sicslist setatt monitor_counts mutable true
::utility::macro::getset float monitor_time {} { ::utility::macro::getset float monitor_time {} {
bm status
return "monitor_time = [SplitReply [bm gettime]]" return "monitor_time = [SplitReply [bm gettime]]"
} }
sicslist setatt monitor_time klass monitor sicslist setatt monitor_time klass monitor
@ -77,6 +80,7 @@ proc ::counter::ic_initialize {} {
set bm_counts bm${bm_num}_counts set bm_counts bm${bm_num}_counts
set bmon bm${bm_num} set bmon bm${bm_num}
::utility::macro::getset int $bm_counts {} [subst -nocommands { ::utility::macro::getset int $bm_counts {} [subst -nocommands {
$bmon status
return "[$bmon getcounts]" return "[$bmon getcounts]"
}] }]
sicslist setatt $bm_counts klass monitor sicslist setatt $bm_counts klass monitor
@ -86,6 +90,7 @@ proc ::counter::ic_initialize {} {
set bm_time bm${bm_num}_time set bm_time bm${bm_num}_time
set bmon bm${bm_num} set bmon bm${bm_num}
::utility::macro::getset float $bm_time {} [subst -nocommands { ::utility::macro::getset float $bm_time {} [subst -nocommands {
$bmon status
return "[$bmon gettime]" return "[$bmon gettime]"
}] }]
sicslist setatt $bm_time klass monitor sicslist setatt $bm_time klass monitor