Merging release 2.0 branch with CVS trunk

r2601 | ffr | 2008-05-30 10:26:57 +1000 (Fri, 30 May 2008) | 2 lines
This commit is contained in:
Ferdi Franceschini
2008-05-30 10:26:57 +10:00
committed by Douglas Clowes
parent 4a937e1608
commit 0749b0effa
125 changed files with 8541 additions and 1810 deletions

View File

@@ -1,9 +1,9 @@
# Some useful functions for SICS motor configuration.
# $Revision: 1.1 $
# $Date: 2007-10-29 02:58:12 $
# $Revision: 1.2 $
# $Date: 2008-05-30 00:26:57 $
# Author: Douglas Clowes (dcl@ansto.gov.au)
# Last revision by $Author: dcl $
# Last revision by $Author: ffr $
# Functions for the slit motors (echidna, wombat, platypus, ...)
#
@@ -60,10 +60,12 @@ sicslist setatt $vm1 units $aunits
sicslist setatt $vm1 klass aperture
sicslist setatt $vm1 long_name $vm1_name
sicslist setatt $vm1 group $agroup
sicslist setatt $vm1 hdbchain $m1,$m2
sicslist setatt $vm2 units $aunits
sicslist setatt $vm2 klass aperture
sicslist setatt $vm2 long_name $vm2_name
sicslist setatt $vm2 group $agroup
sicslist setatt $vm2 hdbchain $m1,$m2
}
# Functions for motors with defined positions (quokka, platypus)
@@ -106,6 +108,7 @@ proc make_coll_motor_1 { vm1 vm1_name pm1 aunits } {
sicslist setatt $vm1 units $aunits
sicslist setatt $vm1 klass collimator
sicslist setatt $vm1 long_name $vm1_name
sicslist setatt $vm1 hdbchain $pm1
}
proc make_coll_motor_2 { vm1 vm1_name pm1 pm2 aunits } {
@@ -118,6 +121,7 @@ proc make_coll_motor_2 { vm1 vm1_name pm1 pm2 aunits } {
sicslist setatt $vm1 units $aunits
sicslist setatt $vm1 klass collimator
sicslist setatt $vm1 long_name $vm1_name
sicslist setatt $vm1 hdbchain $pm1,$pm2
}