common_instrument_dictionary.tcl

instrument/slits is now an NXaperture and collects all 'slits' objects.

instdict_specification.tcl
Added 'slits' to sobj_klass_list

motor_configuration.tcl files
Reverted 18/09/08

r2701 | ffr | 2008-09-24 08:44:01 +1000 (Wed, 24 Sep 2008) | 9 lines
This commit is contained in:
Ferdi Franceschini
2008-09-24 08:44:01 +10:00
committed by Douglas Clowes
parent e1c9d6348d
commit e1cea8763e
7 changed files with 101 additions and 101 deletions

View File

@@ -468,8 +468,8 @@ ss1r softlowerlim $ss1r_LoRange
ss1r softupperlim $ss1r_HiRange
ss1r home 0
ss1r movecount $move_count
ss1r part aperture
ss1r long_name first_right
ss1r part slits.first
ss1r long_name right
# Slit 1, left
Motor ss1l $motor_driver_type [params \
@@ -487,8 +487,8 @@ ss1l softlowerlim $ss1l_LoRange
ss1l softupperlim $ss1l_HiRange
ss1l home 0
ss1l movecount $move_count
ss1l part aperture
ss1l long_name first_left
ss1l part slits.first
ss1l long_name left
# Slit 1, up
Motor ss1u $motor_driver_type [params \
@@ -506,8 +506,8 @@ ss1u softlowerlim $ss1u_LoRange
ss1u softupperlim $ss1u_HiRange
ss1u home 0
ss1u movecount $move_count
ss1u part aperture
ss1u long_name first_top
ss1u part slits.first
ss1u long_name top
# Slit 1, down
Motor ss1d $motor_driver_type [params \
@@ -525,8 +525,8 @@ ss1d softlowerlim $ss1d_LoRange
ss1d softupperlim $ss1d_HiRange
ss1d home 0
ss1d movecount $move_count
ss1d part aperture
ss1d long_name first_bottom
ss1d part slits.first
ss1d long_name bottom
############################
# Motor Controller 4
@@ -551,8 +551,8 @@ ss2r softlowerlim $ss2r_LoRange
ss2r softupperlim $ss2r_HiRange
ss2r home 0
ss2r movecount $move_count
ss2r part aperture
ss2r long_name second_right
ss2r part slits.second
ss2r long_name right
# Slit 2, left
Motor ss2l $motor_driver_type [params \
@@ -570,8 +570,8 @@ ss2l softlowerlim $ss2l_LoRange
ss2l softupperlim $ss2l_HiRange
ss2l home 0
ss2l movecount $move_count
ss2l part aperture
ss2l long_name second_left
ss2l part slits.second
ss2l long_name left
# Slit 2, up
Motor ss2u $motor_driver_type [params \
@@ -589,8 +589,8 @@ ss2u softlowerlim $ss2u_LoRange
ss2u softupperlim $ss2u_HiRange
ss2u home 0
ss2u movecount $move_count
ss2u part aperture
ss2u long_name second_top
ss2u part slits.second
ss2u long_name top
# Slit 2, down
Motor ss2d $motor_driver_type [params \
@@ -608,8 +608,8 @@ ss2d softlowerlim $ss2d_LoRange
ss2d softupperlim $ss2d_HiRange
ss2d home 0
ss2d movecount $move_count
ss2d part aperture
ss2d long_name second_bottom
ss2d part slits.second
ss2d long_name bottom
proc mthGet {} { return [expr [SplitReply [mtth]]/2.0]}
proc mthSet {val} { return "mtth=[SplitReply [mtth]]"}