From e27aea0169a7457cad5dda7ffa8cadb7f503685e Mon Sep 17 00:00:00 2001 From: Ferdi Franceschini Date: Tue, 10 Dec 2013 20:13:31 +1100 Subject: [PATCH] SICS-709: Refresh the count status whenever the current counts are fetched (eg before saving data). This was broken as a side effect of SICS-664 (ie removing the unnecessary hmcontrol object). --- site_ansto/instrument/config/counter/counter_common_1.tcl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/site_ansto/instrument/config/counter/counter_common_1.tcl b/site_ansto/instrument/config/counter/counter_common_1.tcl index a44c0027..3294642d 100644 --- a/site_ansto/instrument/config/counter/counter_common_1.tcl +++ b/site_ansto/instrument/config/counter/counter_common_1.tcl @@ -7,6 +7,7 @@ namespace eval counter { proc ::counter::transferscript {} { variable isc_numchannels + bm status set val [SplitReply [bm1 gettime]] for {set i 1} {$i <= $isc_numchannels} {incr i} { append val " [SplitReply [bm$i getcounts] ]" @@ -60,6 +61,7 @@ proc ::counter::ic_initialize {} { ::utility::macro::getset float monitor_counts {} { + bm status return "monitor_counts = [SplitReply [bm getcounts]]" } sicslist setatt monitor_counts klass monitor @@ -67,6 +69,7 @@ proc ::counter::ic_initialize {} { sicslist setatt monitor_counts mutable true ::utility::macro::getset float monitor_time {} { + bm status return "monitor_time = [SplitReply [bm gettime]]" } sicslist setatt monitor_time klass monitor @@ -77,6 +80,7 @@ proc ::counter::ic_initialize {} { set bm_counts bm${bm_num}_counts set bmon bm${bm_num} ::utility::macro::getset int $bm_counts {} [subst -nocommands { + $bmon status return "[$bmon getcounts]" }] sicslist setatt $bm_counts klass monitor @@ -86,6 +90,7 @@ proc ::counter::ic_initialize {} { set bm_time bm${bm_num}_time set bmon bm${bm_num} ::utility::macro::getset float $bm_time {} [subst -nocommands { + $bmon status return "[$bmon gettime]" }] sicslist setatt $bm_time klass monitor