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

Merge changes made in-situ.

Browse Source 
r2842 | ffr | 2009-12-10 14:57:53 +1100 (Thu, 10 Dec 2009) | 2 lines
This commit is contained in:
Ferdi Franceschini
2009-12-10 14:57:53 +11:00
committed by Douglas Clowes
parent f494ece7e7
commit b6ed01fc13
8 changed files with 96 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
site_ansto/instrument/sans/config/hmm/detector_ordela.tcl
View File

@@ -2,7 +2,8 @@
proc ord_get_pot { potxy potnumber } {
for { set rsp "Bad" } { $rsp == "Bad" } { } {
set potname [ format "%s%d" $potxy $potnumber ]
set potname [ format "%s%d" $potxy [expr $potnumber ^ 3] ]
# set rspall [ dhv1 cmd P $potname ]
set rspall [ sct_dhv1 transact "P $potname" ]
set rsp [lindex [split $rspall " "] 1]
}
@@ -11,7 +12,8 @@ proc ord_get_pot { potxy potnumber } {
Publish ord_get_pot User
proc ord_set_pot { potxy potnumber potvalue } {
set potname [ format "%s%d" $potxy $potnumber ]
set potname [ format "%s%d" $potxy [expr $potnumber ^ 3] ]
# set rsp [ dhv1 cmd p $potname $potvalue ]
set rsp [ sct_dhv1 transact "p $potname $potvalue" ]
return $rsp
}
@@ -456,7 +458,7 @@ Publish ord_calibrate User
proc ord_calibrate_auto { CP_divider desiredpotsmidrange_x desiredpotsmidrange_y resetallpotsmidrange iterations acqtime } {
#
if { $resetallpotsmidrange == 1 } {
clientput [ord_set_pot_all_const $desiredpotsmidrange_x $desiredpotsmidrange_y ]
clientput [ord_set_pot_all_const_xy $desiredpotsmidrange_x $desiredpotsmidrange_y ]
} else {
clientput [ord_get_pot_all]
}