The prepare count_with_bm and finish functions can now be used independently of scans.
Added count_with_bm and save commands r1716 | ffr | 2007-03-24 19:12:51 +1100 (Sat, 24 Mar 2007) | 3 lines
This commit is contained in:

committed by
Douglas Clowes

parent
4568b365a6
commit
8ee21d58f4
@ -1,5 +1,5 @@
|
||||
# $Revision: 1.3 $
|
||||
# $Date: 2007-03-20 00:50:11 $
|
||||
# $Revision: 1.4 $
|
||||
# $Date: 2007-03-24 08:12:51 $
|
||||
# Author: Mark Lesha (mle@ansto.gov.au)
|
||||
# Last revision by: $Author: ffr $
|
||||
|
||||
@ -270,7 +270,7 @@ proc savehistodata {histomem filename} {
|
||||
# We use it to pause the histogram server, in order to commence the DAQ.
|
||||
# This 'primes' the DAE also (i.e. device drivers reboot the hardware,
|
||||
# buffering processes are started, etc.)
|
||||
proc hs_prepare {scanobjectname userobjectname} {
|
||||
proc prepare {} {
|
||||
#clientput "Enter prepare" value
|
||||
#
|
||||
# Before configuring the bm, do a short count.
|
||||
@ -298,7 +298,7 @@ proc hs_prepare {scanobjectname userobjectname} {
|
||||
# The count_bm_controlled callback gets called at the start of dataset acquisition.
|
||||
# We use it to perform the dataset acquisition, via the hmc object.
|
||||
# Note we do NOT call stdscan count, since we don't need to run the bm counter twice.
|
||||
proc hs_count_bm_controlled {scanobjectname userobjectname point mode preset} {
|
||||
proc count_bm_controlled {mode preset} {
|
||||
#clientput "Enter count" value
|
||||
#stdscan count $scanobjectname $userobjectname $point $mode $preset
|
||||
# Start the acquisition, runs till the beam monitor terminates
|
||||
@ -367,7 +367,7 @@ proc hs_collect {scanobjectname userobjectname point} {
|
||||
|
||||
# The finish callback gets called at the end of the scan.
|
||||
# We use it to stop the histogram server, terminating the dataset.
|
||||
proc hs_finish {scanobjectname userobjectname} {
|
||||
proc finish {} {
|
||||
#clientput "Enter finish" value
|
||||
# stdscan finish $scanobjectname $userobjectname
|
||||
#clientput "hmm stop being done..." value
|
||||
@ -383,6 +383,13 @@ proc hs_finish {scanobjectname userobjectname} {
|
||||
#clientput "Exit finish" value
|
||||
return
|
||||
}
|
||||
|
||||
proc count_withbm {mode preset} {
|
||||
prepare;
|
||||
count_bm_controlled $mode $preset;
|
||||
finish;
|
||||
}
|
||||
|
||||
proc init {} {
|
||||
}
|
||||
proc graphics_hpath_setup {parent} {
|
||||
@ -393,14 +400,22 @@ proc hs_finish {scanobjectname userobjectname} {
|
||||
}
|
||||
proc experiment_hpath_setup {parent} {
|
||||
}
|
||||
|
||||
proc save {} {
|
||||
nxcreatefile nexus_hmscan.dic;
|
||||
hmm_save nxscript entry1;
|
||||
nxclosefile;
|
||||
}
|
||||
}
|
||||
|
||||
publish ::histogram_memory::hs_finish user
|
||||
publish ::histogram_memory::finish user
|
||||
#publish ::histogram_memory::hs_collect user
|
||||
publish ::histogram_memory::hs_count_hs_controlled user
|
||||
publish ::histogram_memory::hs_count_bm_controlled user
|
||||
publish ::histogram_memory::hs_prepare user
|
||||
publish ::histogram_memory::count_bm_controlled user
|
||||
publish ::histogram_memory::prepare user
|
||||
publish ::histogram_memory::set_oat_offset user
|
||||
publish ::histogram_memory::scan2_runb user
|
||||
publish ::histogram_memory::scan2_runa user
|
||||
publish ::histogram_memory::returnconfigfile user
|
||||
publish ::histogram_memory::count_withbm user
|
||||
publish ::histogram_memory::save user
|
||||
|
Reference in New Issue
Block a user