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

Added scan point start time for each nexus file entry.

Browse Source 
r1556 | ffr | 2007-02-26 13:23:00 +1100 (Mon, 26 Feb 2007) | 2 lines
This commit is contained in:
Ferdi Franceschini
2007-02-26 13:23:00 +11:00
committed by Douglas Clowes
parent 75711dde2a
commit 70873d959c
1 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
site_ansto/instrument/hipd/config/scan/scan.tcl
View File

@@ -7,8 +7,6 @@ variable scanVariable scan_var scanVarStart 0 scanVarStep 1
variable scanVariable; variable scanVariable;
nxcreatefile; nxcreatefile;
nxscript updatedictvar entryName start;
nxscript puttext estart [sicstime];
nxclosefile; nxclosefile;
# stdscan prepare $sobj $uobj; # stdscan prepare $sobj $uobj;
set vlist [split [$sobj getvarpar 0] = ]; set vlist [split [$sobj getvarpar 0] = ];
@@ -18,6 +16,13 @@ variable scanVariable scan_var scanVarStart 0 scanVarStep 1
hs_prepare $sobj $uobj hs_prepare $sobj $uobj
} }
proc scan_count {sobj uobj point mode preset} {
variable scan_pt_start_time
set scan_pt_start_time [sicstime]
hs_count_bm_controlled $sobj $uobj $point $mode $preset;
}
proc hm_scan_finish {sobj uobj} { proc hm_scan_finish {sobj uobj} {
hs_finish $sobj $uobj; hs_finish $sobj $uobj;
nxreopenfile; nxreopenfile;
@@ -42,25 +47,27 @@ variable scanVariable scan_var scanVarStart 0 scanVarStep 1
variable scanVarStart; variable scanVarStart;
variable scanVarStep; variable scanVarStep;
variable scanVariable; variable scanVariable;
variable scan_pt_start_time;
set scanVarPos [expr $scanVarStart + $pt * $scanVarStep]; set scanVarPos [expr $scanVarStart + $pt * $scanVarStep];
nxreopenfile; nxreopenfile;
addnxentry nxscript scan_[format "%05d" $pt] $scanVariable $scanVarPos $scanVarStep; addnxentry nxscript scan_[format "%05d" $pt] $scanVariable $scanVarPos $scanVarStep $scan_pt_start_time;
nxclosefile nxclosefile
} }
proc donothing {args} {} proc donothing {args} {}
proc bmcount {sobj uobj pt mode preset} { proc bmcount {sobj uobj pt mode preset} {
bm setmode $mode variable scan_pt_start_time
bm count $preset; set scan_pt_start_time [sicstime]
} bm setmode $mode
bm count $preset;
}
proc bm_scan_prepare {sobj uobj} { proc bm_scan_prepare {sobj uobj} {
variable scanVarStart; variable scanVarStart;
variable scanVarStep; variable scanVarStep;
variable scanVariable; variable scanVariable;
nxcreatefile; nxcreatefile;
nxscript updatedictvar entryName start;
nxscript puttext estart [sicstime];
nxclosefile; nxclosefile;
set vlist [split [$sobj getvarpar 0] = ]; set vlist [split [$sobj getvarpar 0] = ];
set scanVariable [string trim [lindex [split [lindex $vlist 0] . ] 1]]; set scanVariable [string trim [lindex [split [lindex $vlist 0] . ] 1]];
@@ -68,17 +75,21 @@ proc bmcount {sobj uobj pt mode preset} {
set scanVarStep [lindex $vlist 2]; set scanVarStep [lindex $vlist 2];
stdscan prepare $sobj $uobj; stdscan prepare $sobj $uobj;
} }
proc bm_nxaddpoint {sobj uobj pt} { proc bm_nxaddpoint {sobj uobj pt} {
variable scanVarStart; variable scanVarStart;
variable scanVarStep; variable scanVarStep;
variable scanVariable; variable scanVariable;
variable scan_pt_start_time;
set scanVarPos [expr $scanVarStart + $pt * $scanVarStep]; set scanVarPos [expr $scanVarStart + $pt * $scanVarStep];
nxreopenfile; nxreopenfile;
bm_addnxentry nxscript scan_$pt $scanVariable $scanVarPos $scanVarStep; bm_addnxentry nxscript scan_$pt $scanVariable $scanVarPos $scanVarStep $scan_pt_start_time;
nxclosefile nxclosefile
} }
} }
publish ::scanCommand::scan_count user
publish ::scanCommand::scan_prepare user publish ::scanCommand::scan_prepare user
publish ::scanCommand::hm_scan_finish user publish ::scanCommand::hm_scan_finish user
publish ::scanCommand::nxaddpoint user publish ::scanCommand::nxaddpoint user
@@ -98,6 +109,7 @@ hmscan 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 count ::scanCommand::scan_count
hmscan function writepoint ::scanCommand::nxaddpoint hmscan function writepoint ::scanCommand::nxaddpoint
hmscan function prepare ::scanCommand::scan_prepare hmscan function prepare ::scanCommand::scan_prepare
hmscan function finish ::scanCommand::hm_scan_finish hmscan function finish ::scanCommand::hm_scan_finish