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

Refactoring: for new utility.tcl:getinfo

Browse Source 
Use consistent naming scheme for scancommand variables

r1646 | ffr | 2007-03-14 08:26:05 +1100 (Wed, 14 Mar 2007) | 3 lines
This commit is contained in:
Ferdi Franceschini
2007-03-14 08:26:05 +11:00
committed by Douglas Clowes
parent e508c8c351
commit 1adad6351f
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
site_ansto/instrument/config/scan/scan_common_1.tcl
View File

@@ -30,7 +30,7 @@ VarMake hmscan_np_target Int User
VarMake hmscan_point_current Int User VarMake hmscan_point_current Int User
variable scanVariable scan_var scanVarStart 0 scanVarStep 1 variable scanVariable scan_var scanVarStart 0 scanVarStep 1
proc scan_prepare {sobj uobj} { proc hmm_scan_prepare {sobj uobj} {
variable scanVarStart; variable scanVarStart;
variable scanVarStep; variable scanVarStep;
variable scanVariable; variable scanVariable;
@@ -50,7 +50,7 @@ variable scanVariable scan_var scanVarStart 0 scanVarStep 1
::histogram_memory::hs_prepare $sobj $uobj ::histogram_memory::hs_prepare $sobj $uobj
} }
proc hm_count {sobj uobj point mode preset} { proc hmm_count {sobj uobj point mode preset} {
variable scan_pt_start_time variable scan_pt_start_time
set scan_pt_start_time [sicstime] set scan_pt_start_time [sicstime]
hmscan_point_current $point; hmscan_point_current $point;
@@ -62,7 +62,7 @@ variable scanVariable scan_var scanVarStart 0 scanVarStep 1
} }
proc hm_scan_finish {sobj uobj} { proc hmm_scan_finish {sobj uobj} {
::histogram_memory::hs_finish $sobj $uobj; ::histogram_memory::hs_finish $sobj $uobj;
nxreopenfile; nxreopenfile;
nxclosefile; nxclosefile;
@@ -73,7 +73,7 @@ variable scanVariable scan_var scanVarStart 0 scanVarStep 1
nxreopenfile; nxreopenfile;
nxclosefile; nxclosefile;
} }
#proc hm_scan_finish {sobj uobj} { #proc hmm_scan_finish {sobj uobj} {
# nxclosefile; # nxclosefile;
#} #}
@@ -99,13 +99,13 @@ variable scanVariable scan_var scanVarStart 0 scanVarStep 1
} }
#TODO Feedback for Histogram memory scan #TODO Feedback for Histogram memory scan
proc hm_writepoint {sobj uobj pt} { proc hmm_writepoint {sobj uobj pt} {
write_nxentry addnxscanentry $pt; write_nxentry addnxscanentry $pt;
} }
proc donothing {args} {} proc donothing {args} {}
proc bmcount {sobj uobj point mode preset} { proc bm_count {sobj uobj point mode preset} {
variable scan_pt_start_time variable scan_pt_start_time
set scan_pt_start_time [sicstime] set scan_pt_start_time [sicstime]
@@ -234,29 +234,29 @@ variable scanVariable scan_var scanVarStart 0 scanVarStep 1
} }
publish ::scancommand::write_nxentry user publish ::scancommand::write_nxentry user
publish ::scancommand::hm_count user publish ::scancommand::hmm_count user
publish ::scancommand::scan_prepare user publish ::scancommand::hmm_scan_prepare user
publish ::scancommand::hm_scan_finish user publish ::scancommand::hmm_scan_finish user
publish ::scancommand::hm_writepoint user publish ::scancommand::hmm_writepoint user
publish ::scancommand::donothing user publish ::scancommand::donothing user
publish ::scancommand::bm_scan_prepare user publish ::scancommand::bm_scan_prepare user
publish ::scancommand::bm_scan_finish user publish ::scancommand::bm_scan_finish user
publish ::scancommand::bm_writepoint user publish ::scancommand::bm_writepoint user
publish ::scancommand::bmcount user publish ::scancommand::bm_count user
MakeScanCommand bmonscan bm $cfPath(scan)/scan_common_1.hdd recover.bin MakeScanCommand bmonscan bm $cfPath(scan)/scan_common_1.hdd recover.bin
bmonscan configure script bmonscan configure script
bmonscan function writeheader ::scancommand::donothing bmonscan function writeheader ::scancommand::donothing
bmonscan function writepoint ::scancommand::bm_writepoint bmonscan function writepoint ::scancommand::bm_writepoint
bmonscan function count ::scancommand::bmcount bmonscan function count ::scancommand::bm_count
bmonscan function prepare ::scancommand::bm_scan_prepare bmonscan function prepare ::scancommand::bm_scan_prepare
bmonscan function finish ::scancommand::bm_scan_finish bmonscan function finish ::scancommand::bm_scan_finish
#scan2 function writeheader ::scancommand::donothing #scan2 function writeheader ::scancommand::donothing
#scan2 function writepoint ::scancommand::nxaddpoint #scan2 function writepoint ::scancommand::nxaddpoint
#scan2 function prepare ::scancommand::scan_prepare #scan2 function prepare ::scancommand::hmm_scan_prepare
# Configure script mode, then we can configure all the scan callbacks. # Configure script mode, then we can configure all the scan callbacks.
# The scan list command can be used to check that the callbacks # The scan list command can be used to check that the callbacks
# are properly defined. # are properly defined.
@@ -273,10 +273,10 @@ scan2 configure script
#hmscan function prepare hdbprepare #hmscan function prepare hdbprepare
#hmscan function collect hdbcollect #hmscan function collect hdbcollect
hmscan function writeheader ::scancommand::donothing hmscan function writeheader ::scancommand::donothing
hmscan function writepoint ::scancommand::hm_writepoint hmscan function writepoint ::scancommand::hmm_writepoint
hmscan function count ::scancommand::hm_count hmscan function count ::scancommand::hmm_count
hmscan function prepare ::scancommand::scan_prepare hmscan function prepare ::scancommand::hmm_scan_prepare
hmscan function finish ::scancommand::hm_scan_finish hmscan function finish ::scancommand::hmm_scan_finish
# Wombat proc hdb_hmscan {scanvar scanstart scanincr scanend mode preset} { # Wombat proc hdb_hmscan {scanvar scanstart scanincr scanend mode preset} {
proc hdb_bmonscan {scanvar scanstart scanincr np mode preset} { proc hdb_bmonscan {scanvar scanstart scanincr np mode preset} {
bmonscan clear bmonscan clear