hmm_configuration_common_1.tcl

Set histmem view mag to auto
Workaround for SICS-204 hmc sets bm preset to 0

hrpd/config/count/counter.tcl
reflectometer/config/count/counter.tcl
echidna only has two beam monitors enabled
SICS should not start or stop the third beam monitor on platypus

config/scan/scan_common_1.tcl
Show counts from available beam monitors during scans

r2649 | ffr | 2008-07-14 15:15:58 +1000 (Mon, 14 Jul 2008) | 12 lines
This commit is contained in:
Ferdi Franceschini
2008-07-14 15:15:58 +10:00
committed by Douglas Clowes
parent 7431af42d9
commit dd927d18af
4 changed files with 20 additions and 16 deletions

View File

@@ -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