Minimal scan.tcl and dingo_configuration.tcl
FIX: The scan fails to update the motor positions in the camera server meta data.
This commit is contained in:
Ferdi Franceschini
@ -1,154 +1,30 @@
|
|||||||
source $cfPath(scan)/scan_common_1.tcl
|
namespace eval ::scan { }
|
||||||
proc ::scan::pre_hmm_scan_prepare {} {}
|
|
||||||
|
proc scan_file { fname {description ""} } {
|
||||||
|
set file_cmd "set file,path=D:\Data,basename=${fname},startnumber=1,imageformat=tif,experimentdetail=${description}"
|
||||||
|
cmserver send $file_cmd
|
||||||
|
}
|
||||||
|
publish scan_file user
|
||||||
|
|
||||||
proc ::scan::cm_count {sobj uobj point mode preset} {
|
proc ::scan::cm_count {sobj uobj point mode preset} {
|
||||||
# send "clear meta" command to the camera server
|
cm1 send "clear meta"
|
||||||
clientput "sending clear meta"
|
|
||||||
set cmd "clear meta\r\n"
|
|
||||||
cm1 send $cmd
|
|
||||||
# send motor position
|
|
||||||
foreach m "[sicslist type motor]" {
|
foreach m "[sicslist type motor]" {
|
||||||
if {$m == "motor" || $m == "dummy_motor"} {
|
if {$m != "dummy_motor"} {
|
||||||
# skipit
|
set meta_cmd "set meta,[$m]"
|
||||||
} else {
|
cm1 send $meta_cmd
|
||||||
set cmd "set camera, "
|
|
||||||
append cmd "[$m]"
|
|
||||||
append cmd "\r\n"
|
|
||||||
cm1 send $cmd
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
cm1 count $preset
|
cm1 count $preset
|
||||||
}
|
}
|
||||||
|
|
||||||
proc ::scan::cm_scan_prepare {sobj uobj} {
|
|
||||||
|
|
||||||
variable save_filetype
|
|
||||||
variable check_instrument_ready
|
|
||||||
variable force_scan
|
|
||||||
|
|
||||||
# [::plc::inst_ready]
|
|
||||||
if {$force_scan || $check_instrument_ready} {
|
|
||||||
set force_scan false
|
|
||||||
if [catch {
|
|
||||||
::scan::check_scanvar $sobj $uobj
|
|
||||||
::scan::pre_hmm_scan_prepare
|
|
||||||
}] {
|
|
||||||
return -code error "ISCAN ABORTED: $::errorInfo"
|
|
||||||
}
|
|
||||||
|
|
||||||
# send "shutter auto" command over
|
|
||||||
shutter auto
|
|
||||||
# send "focusflight off" command over
|
|
||||||
focuslight off
|
|
||||||
# send "clear meta" command to the camera server
|
|
||||||
clientput "sending clear meta"
|
|
||||||
set cmd "clear meta\r\n"
|
|
||||||
cm1 send $cmd
|
|
||||||
# send motor position
|
|
||||||
foreach m "[sicslist type motor]" {
|
|
||||||
if {$m == "motor" || $m == "dummy_motor"} {
|
|
||||||
# skipit
|
|
||||||
} else {
|
|
||||||
set cmd "set camera, "
|
|
||||||
append cmd "[$m]"
|
|
||||||
append cmd "\r\n"
|
|
||||||
cm1 send $cmd
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if [catch {
|
|
||||||
#TODO Parameterise varindex in some way
|
|
||||||
set varindex 0;
|
|
||||||
|
|
||||||
set numpoints [SplitReply [$sobj np]]
|
|
||||||
set vlist [split [$sobj getvarpar $varindex] = ]
|
|
||||||
set scanstart [lindex $vlist 1]
|
|
||||||
set scanstep [lindex $vlist 2]
|
|
||||||
#::scan::camscan_cmd -set NP $numpoints
|
|
||||||
#::scan::camscan_cmd -set scan_variable [string trim [lindex [split [lindex $vlist 0] . ] 1]];
|
|
||||||
#::scan::camscan_cmd -set scan_start $scanstart
|
|
||||||
#::scan::camscan_cmd -set scan_increment $scanstep
|
|
||||||
set scanvar_pts [SplitReply [$sobj getvardata $varindex]]
|
|
||||||
|
|
||||||
#::scan::camscan_cmd -set feedback status BUSY
|
|
||||||
clientput "run_mode camscan"
|
|
||||||
run_mode "camscan"
|
|
||||||
|
|
||||||
#::nexus::newfile BEAM_MONITOR $save_filetype
|
|
||||||
stdscan prepare $sobj $uobj;
|
|
||||||
clientput "Scan start: $scanstart, Scan step: $scanstep, Number of points: $numpoints"
|
|
||||||
}] {
|
|
||||||
run_mode "normal"
|
|
||||||
return -code error $::errorInfo
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
return -code error "ISCAN ABORTED: Instrument not ready"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
proc ::scan::cm_scan_collect {sobj uobj point} {
|
|
||||||
set vlist [split [$sobj getvarpar 0] = ];
|
|
||||||
|
|
||||||
set w(NP) $point
|
|
||||||
set sv [string trim [lindex [split [lindex $vlist 0] . ] 1]]
|
|
||||||
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 time [SplitReply [::histogram_memory::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]]"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
publish ::scan::cm_count user
|
publish ::scan::cm_count user
|
||||||
publish ::scan::cm_scan_prepare user
|
|
||||||
publish ::scan::cm_scan_collect user
|
|
||||||
|
|
||||||
proc ::scan::isc_initialize {} {
|
proc ::scan::isc_initialize {} {
|
||||||
#::scan::ic_initialize
|
MakeAsyncQueue cmserver CAMERA [dict get $::CAMERA_HOSTPORT HOST] [dict get $::CAMERA_HOSTPORT PORT]
|
||||||
|
MakeCounter cm1 anstocamera cmserver
|
||||||
if [ catch {
|
|
||||||
variable ic_runscanpar
|
|
||||||
variable ic_hmm_datatype
|
|
||||||
|
|
||||||
set ic_hmm_datatype HISTOGRAM_XYT
|
|
||||||
|
|
||||||
MakeScanCommand camscan cm1 $::cfPath(scan)/scan_common_1.hdd recover.bin
|
|
||||||
|
|
||||||
camscan configure script
|
|
||||||
#camscan function writeheader ::scan::donothing
|
|
||||||
#camscan function writepoint ::scan:cm_writepoint
|
|
||||||
camscan function count ::scan::cm_count
|
|
||||||
#camscan function collect ::scan::cm_scan_collect
|
|
||||||
camscan function prepare ::scan::cm_scan_prepare
|
|
||||||
#camscan function finish ::scan::cm_scan_finish
|
|
||||||
|
|
||||||
# TODO Use ic_runscanpar to create the ::scan::runscan command and
|
|
||||||
# to validate the "runscan" proc parameters.
|
|
||||||
array set ic_runscanpar [subst {
|
|
||||||
scanvar text=drivable
|
|
||||||
start float
|
|
||||||
stop float
|
|
||||||
numpoints int=0,inf
|
|
||||||
mode text=[join [concat [list time unlimited period count frame] $::counter::isc_beam_monitor_list ] , ]
|
|
||||||
preset float=0,inf
|
|
||||||
datatype text=[join [array names ::nexus::histmem_filetype_spec] , ]
|
|
||||||
savetype text=save,nosave
|
|
||||||
force boolean
|
|
||||||
}]
|
|
||||||
#scriptcallback connect hmscan SCANEND ::scan::hmscanend_event
|
|
||||||
#scriptcallback connect bmonscan SCANEND ::scan::bmonscanend_event
|
|
||||||
scriptcallback connect camscan SCANEND ::scan::cmscanend_event
|
|
||||||
} message ] {
|
|
||||||
if {$::errorCode=="NONE"} {return $message}
|
|
||||||
return -code error $message
|
|
||||||
}
|
|
||||||
|
|
||||||
foreach {n v} {
|
foreach {n v} {
|
||||||
|
debug 0
|
||||||
clock 1
|
clock 1
|
||||||
bin 1
|
bin 1
|
||||||
size 2048
|
size 2048
|
||||||
@ -158,12 +34,16 @@ proc ::scan::isc_initialize {} {
|
|||||||
ystart 1
|
ystart 1
|
||||||
xend 2048
|
xend 2048
|
||||||
yend 2048
|
yend 2048
|
||||||
exposure 0.777
|
exposure 60
|
||||||
temperature -50
|
temperature -80
|
||||||
threshold 800
|
threshold 800
|
||||||
shutteropentime 100
|
shutteropentime 100
|
||||||
shutterclosetime 200
|
shutterclosetime 200
|
||||||
} {
|
} {
|
||||||
cm1 setpar $n 0 $v
|
cm1 setpar $n 0 $v
|
||||||
}
|
}
|
||||||
|
|
||||||
|
MakeScanCommand camscan cm1 $::cfPath(scan)/dingo.hdd recover.bin
|
||||||
|
camscan configure script
|
||||||
|
camscan function count ::scan::cm_count
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,8 +1,8 @@
|
|||||||
# Author: Jing Chen (jgn@ansto.gov.au)
|
# Author: Ferdi Franceschini (ffr@ansto.gov.au)
|
||||||
|
|
||||||
# Required by server_config.tcl
|
# Required by server_config.tcl
|
||||||
VarMake Instrument Text Internal
|
VarMake Instrument Text Internal
|
||||||
Instrument dingo
|
Instrument bare_dingo
|
||||||
Instrument lock
|
Instrument lock
|
||||||
|
|
||||||
#START SERVER CONFIGURATION SECTION
|
#START SERVER CONFIGURATION SECTION
|
||||||
@ -14,46 +14,12 @@ MakeDrive
|
|||||||
|
|
||||||
########################################
|
########################################
|
||||||
# INSTRUMENT SPECIFIC CONFIGURATION
|
# INSTRUMENT SPECIFIC CONFIGURATION
|
||||||
|
|
||||||
source $cfPath(hipadaba)/hipadaba_configuration.tcl
|
|
||||||
|
|
||||||
fileeval $cfPath(source)/source.tcl
|
fileeval $cfPath(source)/source.tcl
|
||||||
fileeval $cfPath(motors)/motor_configuration.tcl
|
|
||||||
#fileeval $cfPath(motors)/positmotor_configuration.tcl
|
|
||||||
#fileeval $cfPath(motors)/extraconfig.tcl
|
|
||||||
fileeval $cfPath(plc)/plc.tcl
|
fileeval $cfPath(plc)/plc.tcl
|
||||||
fileeval $cfPath(counter)/counter.tcl
|
fileeval $cfPath(motors)/motor_configuration.tcl
|
||||||
fileeval $cfPath(hmm)/hmm_configuration.tcl
|
|
||||||
fileeval $cfPath(nexus)/nxscripts.tcl
|
|
||||||
fileeval $cfPath(scan)/scan.tcl
|
fileeval $cfPath(scan)/scan.tcl
|
||||||
fileeval $cfPath(commands)/commands.tcl
|
|
||||||
fileeval $cfPath(commands)/pulser.tcl
|
|
||||||
fileeval $cfPath(commands)/hvcommands.tcl
|
|
||||||
fileeval $cfPath(anticollider)/anticollider.tcl
|
|
||||||
|
|
||||||
source gumxml.tcl
|
|
||||||
|
|
||||||
#::utility::mkVar ::anticollider::protect_detector text manager protect_detector false detector true false
|
|
||||||
#::anticollider::protect_detector "true"
|
|
||||||
|
|
||||||
# fix all motors
|
|
||||||
if {1} {
|
|
||||||
set motorlist "[sicslist type motor]"
|
|
||||||
puts $motorlist
|
|
||||||
foreach m $motorlist {
|
|
||||||
if {$m == "motor" || $m == "dummy_motor"} {
|
|
||||||
# skipit
|
|
||||||
} else {
|
|
||||||
$m fixed 1
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
server_init
|
server_init
|
||||||
|
exe batchpath ../batch
|
||||||
|
exe syspath ../batch
|
||||||
clientput "serverport [get_portnum $::serverport]"
|
clientput "serverport [get_portnum $::serverport]"
|
||||||
|
|
||||||
###########################################
|
|
||||||
# WARNING: Do not add any code below server_init, if you do SICS may fail to initialise properly.
|
|
||||||
|
|
||||||
# You can add extra-configuration code in ../extraconfig.tcl
|
|
||||||
|
|||||||
Reference in New Issue
Block a user