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

PSI UPDATE

Browse Source 
r2720 | ffr | 2008-10-13 15:40:07 +1100 (Mon, 13 Oct 2008) | 2 lines
This commit is contained in:
Ferdi Franceschini
2008-10-13 15:40:07 +11:00
committed by Douglas Clowes
parent f0973c6196 4baffb9b7a
commit 0adecdcec9
183 changed files with 20455 additions and 3661 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
site_ansto/instrument/hipd/config/motors/motor_configuration.tcl
View File

@@ -111,6 +111,28 @@ set move_count 10
#:TP at HOME
#
# Dummy motor based on Monochromator phi, Tilt 1, upper
Motor dummy_motor asim [params \
asyncqueue mc1\
axis A\
units degrees\
hardlowerlim -169\
hardupperlim 169\
maxSpeed 1\
maxAccel 1\
maxDecel 1\
stepsPerX -25000\
absEnc 1\
absEncHome $mphi_Home\
cntsPerX -8192]
setHomeandRange -motor dummy_motor -home 0 -lowrange 169 -uprange 169
dummy_motor speed 1
dummy_motor movecount $move_count
dummy_motor precision 0.01
dummy_motor part crystal
dummy_motor long_name dummy_motor
# Monochromator phi, Tilt 1, upper
Motor mphi $motor_driver_type [params \
asyncqueue mc1\

2
site_ansto/instrument/hrpd/config/hmm/hmm_configuration.tcl
View File

@@ -13,7 +13,7 @@ proc ::histogram_memory::init_OAT_TABLE {} {
OAT_TABLE Y -setdata BMIN -0.5
OAT_TABLE Y -setdata BMAX 511.5
OAT_TABLE -set X { 127.5 126.5 } NXC 128 Y { -0.5 3.5 } NYC 128 T { 0 100000 } NTC 1
OAT_TABLE -set X { 127.5 126.5 } NXC 128 Y { -0.5 3.5 } NYC 128 T { 0 20000 } NTC 1
} message ] {
if {$::errorCode=="NONE"} {return $message}
return -code error $message

25
site_ansto/instrument/reflectometer/config/motors/motor_configuration.tcl
View File

@@ -200,6 +200,31 @@ set move_count 100
#:TP at HOME
#
# Dummy motor based on Sample Tilt 1, upper (1 degree/turn)
Motor dummy_motor asim [params \
asyncqueue mc2\
axis A\
units degrees\
hardlowerlim -169\
hardupperlim 169\
maxSpeed 1\
maxAccel 1\
maxDecel 1\
stepsPerX 25000\
backlash_offset -0.25\
absEnc 1\
absEncHome $sth_home\
cntsPerX 8192]
dummy_motor part sample
dummy_motor long_name dummy_motor
setHomeandRange -motor dummy_motor -home 0 -lowrange 169 -uprange 169
dummy_motor speed 1
dummy_motor backlash_offset -0.1
dummy_motor creep_offset 0.05
dummy_motor creep_precision 0.0005
dummy_motor precision 0.001
# Beam Shade Vertical Translation (6mm/T double helix, 500mm)
Motor bz $motor_driver_type [params \
asyncqueue mc1\

22
site_ansto/instrument/rsd/config/motors/motor_configuration.tcl
View File

@@ -120,6 +120,28 @@ set echi_Home 8919319
#:TP at HOME
# :TP 7830625, 7492855, 7432174, 7894708, 28473827, 11465496, 0, 0
# Dummy motor based on Monochromator phi, Tilt 1, upper
Motor dummy_motor asim [params \
asyncqueue mc1\
axis A\
units degrees\
hardlowerlim -169\
hardupperlim 169\
maxSpeed 1\
maxAccel 1\
maxDecel 1\
stepsPerX 25000\
absEnc 1\
absEncHome $mphi_Home\
cntsPerX 8192]
setHomeandRange -motor dummy_motor -home 0 -lowrange 169 uprange 169
dummy_motor speed 1
dummy_motor movecount $move_count
dummy_motor precision 0.01
dummy_motor part crystal
dummy_motor long_name dummy_motor
# Monochromator phi, Tilt 1, upper
Motor mphi $motor_driver_type [params \
asyncqueue mc1\

15
site_ansto/instrument/util/extra_utility.tcl
View File

@@ -63,9 +63,18 @@ proc errorInfowrite {args} {
}
}
trace add variable errorInfo write errorInfowrite
trace add execution catch enter entercatch
trace add execution catch leave leavecatch
proc callStack {enable} {
if {$enable} {
set trace_opt "add"
} else {
set trace_opt "remove"
}
trace $trace_opt variable errorInfo write errorInfowrite
trace $trace_opt execution catch enter entercatch
trace $trace_opt execution catch leave leavecatch
}
publish callStack mugger
callStack true
# LIST FUNCTIONS

6
site_ansto/instrument/util/utility.tcl
View File

@@ -1,7 +1,7 @@
# Some useful functions for SICS configuration.
# $Revision: 1.18 $
# $Date: 2008-10-01 04:10:50 $
# $Revision: 1.19 $
# $Date: 2008-10-13 04:40:06 $
# Author: Ferdi Franceschini (ffr@ansto.gov.au)
# Last revision by $Author: ffr $
@@ -512,7 +512,7 @@ proc ::utility::hgetplainprop {hpath prop} {
}
proc ::utility::hlistplainprop {hpath} {
if [ catch {
return [string trim [join [split [hlistprop $hpath] =] ]]
return [string trim [join [split [string map {" " _} [hlistprop $hpath]] =] ]]
} message ] {
if {$::errorCode=="NONE"} {return $message}
return -code error $message