diff --git a/site_ansto/instrument/config/hmm/hmm_configuration_common_1.tcl b/site_ansto/instrument/config/hmm/hmm_configuration_common_1.tcl index 6241d00a..5800e5dd 100644 --- a/site_ansto/instrument/config/hmm/hmm_configuration_common_1.tcl +++ b/site_ansto/instrument/config/hmm/hmm_configuration_common_1.tcl @@ -1,5 +1,5 @@ -# $Revision: 1.35 $ -# $Date: 2008-07-11 02:15:55 $ +# $Revision: 1.36 $ +# $Date: 2008-07-14 05:15:58 $ # Author: Ferdi Franceschini # Based on the examples in the hs_test.tcl sample configuration by Mark Lesha. # http://gumtree.ansto.gov.au:9080/nbicms/bragg-systems/histogram-server/hs_test.tcl/view @@ -920,7 +920,7 @@ proc CAT_TABLE {args} { # proc FAT_TABLE {args} { if [ catch { - set attributes { FRAME_FREQUENCY SIZE_PERIOD COUNT_METHOD COUNT_SIZE READ_DATA_TYPE } + set attributes { FRAME_FREQUENCY SIZE_PERIOD COUNT_METHOD COUNT_SIZE READ_DATA_TYPE VIEW_MAG_X VIEW_MAG_Y} set elements {{ }} set tag FAT @@ -1611,7 +1611,7 @@ proc ::histogram_memory::ic_initialize {} { ::histogram_memory::x_pixel_offset -boundaries ::histogram_memory::time_channel -boundaries ::histogram_memory::clear_tables - #XXX ::histogram_memory::upload_config Filler_defaults + FAT_TABLE -set VIEW_MAG_X -1 VIEW_MAG_Y -1 foreach hm_obj [sicslist type histmem] { $hm_obj configure hmaddress http://das1-[instname].nbi.ansto.gov.au:8080 @@ -1671,6 +1671,8 @@ proc ::histogram_memory::post_count {} {} if {$monitor_controlled == "true"} { hmm count } else { + bm setmode timer + bm setpreset 32000000 hmc start 1000000000 timer pause 1 } set reply [SplitReply [hmm configure daq]] diff --git a/site_ansto/instrument/config/scan/scan_common_1.tcl b/site_ansto/instrument/config/scan/scan_common_1.tcl index 297c1b30..9c0bc946 100644 --- a/site_ansto/instrument/config/scan/scan_common_1.tcl +++ b/site_ansto/instrument/config/scan/scan_common_1.tcl @@ -39,16 +39,16 @@ proc ::scan::bm_scan_collect {sobj uobj point} { set w(NP) $point set sv [string trim [lindex [split [lindex $vlist 0] . ] 1]] - set header [format "%-4.4s %-9.9s %-14s %-11s %-11s %-11s %-7.7s" NP $sv Counts Channel0 Channel1 Channel2 Time] + set header [format "%-4.4s %-9.9s %-14s %-7.7s" NP $sv Counts Time] set varval [SplitReply [$sv]] set counts [SplitReply [bm getcounts]] - set mon1 [SplitReply [bm getmonitor 0]] - set mon2 [SplitReply [bm getmonitor 1]] - set mon3 [SplitReply [bm getmonitor 2]] set time [SplitReply [bm gettime]] - set data [format "%-4d %-9.3f %-14d %-11d %-11d %-11d %-7.2f" $point $varval $counts $mon1 $mon2 $mon3 $time] + set data [format "%-4d %-9.3f %-14d %-7.2f" $point $varval $counts $time] clientput $header clientput $data + for {set chn 0} {$chn < $::counter::isc_numchannels} {incr chn} { + clientput "Channel $chn [SplitReply [bm getmonitor $chn]]" + } } proc ::scan::hmm_scan_collect {sobj uobj point} { @@ -56,17 +56,19 @@ proc ::scan::hmm_scan_collect {sobj uobj point} { set w(NP) $point set sv [string trim [lindex [split [lindex $vlist 0] . ] 1]] - set header [format "%-4.4s %-9.9s %-14s %-11s %-11s %-11s %-7.7s" NP $sv Counts Monitor1 Monitor2 Monitor3 Time] + set header [format "%-4.4s %-9.9s %-14s %-7.7s" NP $sv Counts Time] set varval [SplitReply [$sv]] set counts [SplitReply [::histogram_memory::total_counts]] - set mon1 [SplitReply [bm1 getcounts]] - set mon2 [SplitReply [bm2 getcounts]] - set mon3 [SplitReply [bm3 getcounts]] set time [SplitReply [::histogram_memory::time]] - set data [format "%-4d %-9.3f %-14d %-11d %-11d %-11d %-7.2f" $point $varval $counts $mon1 $mon2 $mon3 $time] + set data [format "%-4d %-9.3f %-14d %-7.2f" $point $varval $counts $time] clientput $header clientput $data + for {set bmn 1} {$bmn <= $::counter::isc_numchannels} {incr bmn} { + set bmon bm$bmn + clientput "Monitor $bmn [SplitReply [$bmon getcounts]]" + } } + proc ::scan::ic_initialize {} { if [ catch { variable ic_runscanpar diff --git a/site_ansto/instrument/hrpd/config/counter/counter.tcl b/site_ansto/instrument/hrpd/config/counter/counter.tcl index 3ae86d84..22419975 100644 --- a/site_ansto/instrument/hrpd/config/counter/counter.tcl +++ b/site_ansto/instrument/hrpd/config/counter/counter.tcl @@ -15,7 +15,7 @@ proc ::counter::isc_initialize {} { variable isc_numchannels variable isc_monitor_address variable isc_portlist - variable isc_beam_monitor_list {MONITOR_1 MONITOR_2 MONITOR_3} + variable isc_beam_monitor_list {MONITOR_1 MONITOR_2} set isc_monitor_address "das1-[SplitReply [instrument]]" set isc_portlist [list 30000 30001 30002 30003 30004 30005 30006 30007] diff --git a/site_ansto/instrument/reflectometer/config/counter/counter.tcl b/site_ansto/instrument/reflectometer/config/counter/counter.tcl index 3ae86d84..22419975 100644 --- a/site_ansto/instrument/reflectometer/config/counter/counter.tcl +++ b/site_ansto/instrument/reflectometer/config/counter/counter.tcl @@ -15,7 +15,7 @@ proc ::counter::isc_initialize {} { variable isc_numchannels variable isc_monitor_address variable isc_portlist - variable isc_beam_monitor_list {MONITOR_1 MONITOR_2 MONITOR_3} + variable isc_beam_monitor_list {MONITOR_1 MONITOR_2} set isc_monitor_address "das1-[SplitReply [instrument]]" set isc_portlist [list 30000 30001 30002 30003 30004 30005 30006 30007]