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

Added part and type info to motors and modified hpaths to work with new hipadaba config code.

Browse Source 
r1858 | ffr | 2007-04-16 14:46:49 +1000 (Mon, 16 Apr 2007) | 2 lines
This commit is contained in:
Ferdi Franceschini
2007-04-16 14:46:49 +10:00
committed by Douglas Clowes
parent 487f370d5e
commit 784b391415
2 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
site_ansto/instrument/reflectometer/config/hipadaba/hpaths.tcl
View File

@@ -3,7 +3,7 @@ set hpaths [list experiment ]
# Maps devices (eg motors) to hipadaba paths. # Maps devices (eg motors) to hipadaba paths.
# obj name path # obj name path
set motor_hpath [list \ set motor_hpath [list \
aperture aperture \ aperture slits \
attenuator attenuator \ attenuator attenuator \
collimator collimator \ collimator collimator \
detector detector \ detector detector \
@@ -14,20 +14,20 @@ sample sample ]
# Configurable virtual motors # Configurable virtual motors
# obj name path master_obj # obj name path master_obj
set cvirtmotor_hpath [list \ set cvirtmotor_hpath [list \
ss1hg gap /slits/one/horizontal left\ ss1hg gap slits/one/horizontal left\
ss1ho offset /slits/one/horizontal left\ ss1ho offset slits/one/horizontal left\
ss1vg gap /slits/one/vertical top\ ss1vg gap slits/one/vertical top\
ss1vo offset /slits/one/vertical top\ ss1vo offset slits/one/vertical top\
ss2hg gap /slits/two/horizontal left\ ss2hg gap slits/two/horizontal left\
ss2ho offset /slits/two/horizontal left\ ss2ho offset slits/two/horizontal left\
ss2vg gap /slits/two/vertical top\ ss2vg gap slits/two/vertical top\
ss2vo offset /slits/two/vertical top\ ss2vo offset slits/two/vertical top\
ss3hg gap /slits/three/horizontal left\ ss3hg gap slits/three/horizontal left\
ss3ho offset /slits/three/horizontal left\ ss3ho offset slits/three/horizontal left\
ss3vg gap /slits/three/vertical top\ ss3vg gap slits/three/vertical top\
ss3vo offset /slits/three/vertical top\ ss3vo offset slits/three/vertical top\
ss4hg gap /slits/four/horizontal left\ ss4hg gap slits/four/horizontal left\
ss4ho offset /slits/four/horizontal left\ ss4ho offset slits/four/horizontal left\
ss4vg gap /slits/four/vertical top\ ss4vg gap slits/four/vertical top\
ss4vo offset /slits/four/vertical top] ss4vo offset slits/four/vertical top]

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

@@ -1,5 +1,5 @@
# $Revision: 1.9 $ # $Revision: 1.10 $
# $Date: 2007-04-13 06:33:48 $ # $Date: 2007-04-16 04:46:49 $
# Author: Ferdi Franceschini (ffr@ansto.gov.au) # Author: Ferdi Franceschini (ffr@ansto.gov.au)
# Last revision by: $Author: ffr $ # Last revision by: $Author: ffr $
@@ -243,7 +243,7 @@ Motor st3vt DMC2280 [params \
absEnc 1\ absEnc 1\
absEncHome $st3vt_home\ absEncHome $st3vt_home\
cntsPerX -8192] cntsPerX -8192]
st3vt part aperture.three st3vt part aperture.three/vertical
st3vt long_name tower_translation st3vt long_name tower_translation
st3vt softlowerlim 0 st3vt softlowerlim 0
st3vt softupperlim 253 st3vt softupperlim 253
@@ -265,7 +265,7 @@ Motor st4vt DMC2280 [params \
absEnc 1\ absEnc 1\
absEncHome $st4vt_home\ absEncHome $st4vt_home\
cntsPerX -8192] cntsPerX -8192]
st4vt part aperture.four st4vt part aperture.four/vertical
st4vt long_name tower_translation st4vt long_name tower_translation
st4vt softlowerlim 0 st4vt softlowerlim 0
st4vt softupperlim 249 st4vt softupperlim 249
@@ -454,7 +454,7 @@ Motor ss1l DMC2280 [params \
maxDecel 1\ maxDecel 1\
stepsPerX $slitStepRate\ stepsPerX $slitStepRate\
motorHome $ss1l_Home] motorHome $ss1l_Home]
ss1l part aperture.one ss1l part aperture.one/horizontal
ss1l long_name left ss1l long_name left
ss1l softlowerlim $ss1l_LoRange ss1l softlowerlim $ss1l_LoRange
ss1l softupperlim $ss1l_HiRange ss1l softupperlim $ss1l_HiRange
@@ -474,7 +474,7 @@ Motor ss1r DMC2280 [params \
maxDecel 1\ maxDecel 1\
stepsPerX -$slitStepRate\ stepsPerX -$slitStepRate\
motorHome $ss1r_Home] motorHome $ss1r_Home]
ss1r part aperture.one ss1r part aperture.one/horizontal
ss1r long_name right ss1r long_name right
ss1r softlowerlim $ss1r_LoRange ss1r softlowerlim $ss1r_LoRange
ss1r softupperlim $ss1r_HiRange ss1r softupperlim $ss1r_HiRange
@@ -494,7 +494,7 @@ Motor ss1u DMC2280 [params \
maxDecel 1\ maxDecel 1\
stepsPerX -$slitStepRate\ stepsPerX -$slitStepRate\
motorHome $ss1u_Home] motorHome $ss1u_Home]
ss1u part aperture.one ss1u part aperture.one/vertical
ss1u long_name upper ss1u long_name upper
ss1u softlowerlim $ss1u_LoRange ss1u softlowerlim $ss1u_LoRange
ss1u softupperlim $ss1u_HiRange ss1u softupperlim $ss1u_HiRange
@@ -514,7 +514,7 @@ Motor ss1d DMC2280 [params \
maxDecel 1\ maxDecel 1\
stepsPerX $slitStepRate\ stepsPerX $slitStepRate\
motorHome $ss1d_Home] motorHome $ss1d_Home]
ss1d part aperture.one ss1d part aperture.one/vertical
ss1d long_name lower ss1d long_name lower
ss1d softlowerlim $ss1d_LoRange ss1d softlowerlim $ss1d_LoRange
ss1d softupperlim $ss1d_HiRange ss1d softupperlim $ss1d_HiRange
@@ -534,7 +534,7 @@ Motor ss2l DMC2280 [params \
maxDecel 1\ maxDecel 1\
stepsPerX $slitStepRate\ stepsPerX $slitStepRate\
motorHome $ss2l_Home] motorHome $ss2l_Home]
ss2l part aperture.two ss2l part aperture.two/horizontal
ss2l long_name left ss2l long_name left
ss2l softlowerlim $ss2l_LoRange ss2l softlowerlim $ss2l_LoRange
ss2l softupperlim $ss2l_HiRange ss2l softupperlim $ss2l_HiRange
@@ -554,7 +554,7 @@ Motor ss2r DMC2280 [params \
maxDecel 1\ maxDecel 1\
stepsPerX -$slitStepRate\ stepsPerX -$slitStepRate\
motorHome $ss2r_Home] motorHome $ss2r_Home]
ss2r part aperture.two ss2r part aperture.two/horizontal
ss2r long_name right ss2r long_name right
ss2r softlowerlim $ss2r_LoRange ss2r softlowerlim $ss2r_LoRange
ss2r softupperlim $ss2r_HiRange ss2r softupperlim $ss2r_HiRange
@@ -574,7 +574,7 @@ Motor ss2u DMC2280 [params \
maxDecel 1\ maxDecel 1\
stepsPerX -$slitStepRate\ stepsPerX -$slitStepRate\
motorHome $ss2u_Home] motorHome $ss2u_Home]
ss2u part aperture.two ss2u part aperture.two/vertical
ss2u long_name upper ss2u long_name upper
ss2u softlowerlim $ss2u_LoRange ss2u softlowerlim $ss2u_LoRange
ss2u softupperlim $ss2u_HiRange ss2u softupperlim $ss2u_HiRange
@@ -594,7 +594,7 @@ Motor ss2d DMC2280 [params \
maxDecel 1\ maxDecel 1\
stepsPerX $slitStepRate\ stepsPerX $slitStepRate\
motorHome $ss2d_Home] motorHome $ss2d_Home]
ss2d part aperture.two ss2d part aperture.two/vertical
ss2d long_name lower ss2d long_name lower
ss2d softlowerlim $ss2d_LoRange ss2d softlowerlim $ss2d_LoRange
ss2d softupperlim $ss2d_HiRange ss2d softupperlim $ss2d_HiRange
@@ -621,7 +621,7 @@ Motor ss3d DMC2280 [params \
maxDecel 1\ maxDecel 1\
stepsPerX $slitStepRate\ stepsPerX $slitStepRate\
motorHome $ss3d_Home] motorHome $ss3d_Home]
ss3d part aperture.three ss3d part aperture.three/vertical
ss3d long_name lower ss3d long_name lower
ss3d softlowerlim $ss3d_LoRange ss3d softlowerlim $ss3d_LoRange
ss3d softupperlim $ss3d_HiRange ss3d softupperlim $ss3d_HiRange
@@ -641,7 +641,7 @@ Motor ss3u DMC2280 [params \
maxDecel 1\ maxDecel 1\
stepsPerX -$slitStepRate\ stepsPerX -$slitStepRate\
motorHome $ss3u_Home] motorHome $ss3u_Home]
ss3u part aperture.three ss3u part aperture.three/vertical
ss3u long_name upper ss3u long_name upper
ss3u softlowerlim $ss3u_LoRange ss3u softlowerlim $ss3u_LoRange
ss3u softupperlim $ss3u_HiRange ss3u softupperlim $ss3u_HiRange
@@ -661,7 +661,7 @@ Motor ss3l DMC2280 [params \
maxDecel 1\ maxDecel 1\
stepsPerX $slitStepRate\ stepsPerX $slitStepRate\
motorHome $ss3l_Home] motorHome $ss3l_Home]
ss3l part aperture.three ss3l part aperture.three/horizontal
ss3l long_name left ss3l long_name left
ss3l softlowerlim $ss3l_LoRange ss3l softlowerlim $ss3l_LoRange
ss3l softupperlim $ss3l_HiRange ss3l softupperlim $ss3l_HiRange
@@ -681,7 +681,7 @@ Motor ss3r DMC2280 [params \
maxDecel 1\ maxDecel 1\
stepsPerX -$slitStepRate\ stepsPerX -$slitStepRate\
motorHome $ss3r_Home] motorHome $ss3r_Home]
ss3r part aperture.three ss3r part aperture.three/horizontal
ss3r long_name right ss3r long_name right
ss3r softlowerlim $ss3r_LoRange ss3r softlowerlim $ss3r_LoRange
ss3r softupperlim $ss3r_HiRange ss3r softupperlim $ss3r_HiRange
@@ -701,7 +701,7 @@ Motor ss4d DMC2280 [params \
maxDecel 1\ maxDecel 1\
stepsPerX $slitStepRate\ stepsPerX $slitStepRate\
motorHome $ss4d_Home] motorHome $ss4d_Home]
ss4d part aperture.four ss4d part aperture.four/vertical
ss4d long_name lower ss4d long_name lower
ss4d softlowerlim $ss4d_LoRange ss4d softlowerlim $ss4d_LoRange
ss4d softupperlim $ss4d_HiRange ss4d softupperlim $ss4d_HiRange
@@ -721,7 +721,7 @@ Motor ss4u DMC2280 [params \
maxDecel 1\ maxDecel 1\
stepsPerX -$slitStepRate\ stepsPerX -$slitStepRate\
motorHome $ss4u_Home] motorHome $ss4u_Home]
ss4u part aperture.four ss4u part aperture.four/vertical
ss4u long_name upper ss4u long_name upper
ss4u softlowerlim $ss4u_LoRange ss4u softlowerlim $ss4u_LoRange
ss4u softupperlim $ss4u_HiRange ss4u softupperlim $ss4u_HiRange
@@ -741,7 +741,7 @@ Motor ss4l DMC2280 [params \
maxDecel 1\ maxDecel 1\
stepsPerX $slitStepRate\ stepsPerX $slitStepRate\
motorHome $ss4l_Home] motorHome $ss4l_Home]
ss4l part aperture.four ss4l part aperture.four/horizontal
ss4l long_name left ss4l long_name left
ss4l softlowerlim $ss4l_LoRange ss4l softlowerlim $ss4l_LoRange
ss4l softupperlim $ss4l_HiRange ss4l softupperlim $ss4l_HiRange
@@ -761,7 +761,7 @@ Motor ss4r DMC2280 [params \
maxDecel 1\ maxDecel 1\
stepsPerX -$slitStepRate\ stepsPerX -$slitStepRate\
motorHome $ss4r_Home] motorHome $ss4r_Home]
ss4r part aperture.four ss4r part aperture.four/horizontal
ss4r long_name right ss4r long_name right
ss4r softlowerlim $ss4r_LoRange ss4r softlowerlim $ss4r_LoRange
ss4r softupperlim $ss4r_HiRange ss4r softupperlim $ss4r_HiRange