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

Reverted hipadaba paths to original settings.

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

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

@@ -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/1/horizontal left\
ss1ho offset slits/one/horizontal left\ ss1ho offset slits/1/horizontal left\
ss1vg gap slits/one/vertical top\ ss1vg gap slits/1/vertical top\
ss1vo offset slits/one/vertical top\ ss1vo offset slits/1/vertical top\
ss2hg gap slits/two/horizontal left\ ss2hg gap slits/2/horizontal left\
ss2ho offset slits/two/horizontal left\ ss2ho offset slits/2/horizontal left\
ss2vg gap slits/two/vertical top\ ss2vg gap slits/2/vertical top\
ss2vo offset slits/two/vertical top\ ss2vo offset slits/2/vertical top\
ss3hg gap slits/three/horizontal left\ ss3hg gap slits/3/horizontal left\
ss3ho offset slits/three/horizontal left\ ss3ho offset slits/3/horizontal left\
ss3vg gap slits/three/vertical top\ ss3vg gap slits/3/vertical top\
ss3vo offset slits/three/vertical top\ ss3vo offset slits/3/vertical top\
ss4hg gap slits/four/horizontal left\ ss4hg gap slits/4/horizontal left\
ss4ho offset slits/four/horizontal left\ ss4ho offset slits/4/horizontal left\
ss4vg gap slits/four/vertical top\ ss4vg gap slits/4/vertical top\
ss4vo offset slits/four/vertical top] ss4vo offset slits/4/vertical top]

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

@@ -1,5 +1,5 @@
# $Revision: 1.10 $ # $Revision: 1.11 $
# $Date: 2007-04-16 04:46:49 $ # $Date: 2007-04-16 06:16:57 $
# Author: Ferdi Franceschini (ffr@ansto.gov.au) # Author: Ferdi Franceschini (ffr@ansto.gov.au)
# Last revision by: $Author: ffr $ # Last revision by: $Author: ffr $
@@ -155,8 +155,8 @@ Motor bz DMC2280 [params \
absEnc 1\ absEnc 1\
absEncHome $bz_home\ absEncHome $bz_home\
cntsPerX [expr -8192.0/6.0]] cntsPerX [expr -8192.0/6.0]]
bz part aperture bz part detector
bz long_name beam_shade bz long_name shade
bz softlowerlim 0 bz softlowerlim 0
bz softupperlim 275 bz softupperlim 275
bz home 0 bz home 0
@@ -178,7 +178,7 @@ Motor c1ht DMC2280 [params \
absEncHome $c1ht_home\ absEncHome $c1ht_home\
cntsPerX [expr -8192.0/5.0]] cntsPerX [expr -8192.0/5.0]]
c1ht part collimator c1ht part collimator
c1ht long_name x_translation c1ht long_name translation
c1ht softlowerlim 0 c1ht softlowerlim 0
c1ht softupperlim 1065 c1ht softupperlim 1065
c1ht home 0 c1ht home 0
@@ -200,7 +200,7 @@ Motor m1ro DMC2280 [params \
absEncHome $m1ro_home\ absEncHome $m1ro_home\
cntsPerX [expr -262144.0/360.0]] cntsPerX [expr -262144.0/360.0]]
m1ro part collimator m1ro part collimator
m1ro long_name tilt m1ro long_name rotation
m1ro softlowerlim -3.5 m1ro softlowerlim -3.5
m1ro softupperlim 3.5 m1ro softupperlim 3.5
m1ro home 0 m1ro home 0
@@ -243,8 +243,8 @@ Motor st3vt DMC2280 [params \
absEnc 1\ absEnc 1\
absEncHome $st3vt_home\ absEncHome $st3vt_home\
cntsPerX -8192] cntsPerX -8192]
st3vt part aperture.three/vertical st3vt part aperture.3/vertical
st3vt long_name tower_translation st3vt long_name st3vt
st3vt softlowerlim 0 st3vt softlowerlim 0
st3vt softupperlim 253 st3vt softupperlim 253
st3vt home 0 st3vt home 0
@@ -265,8 +265,8 @@ Motor st4vt DMC2280 [params \
absEnc 1\ absEnc 1\
absEncHome $st4vt_home\ absEncHome $st4vt_home\
cntsPerX -8192] cntsPerX -8192]
st4vt part aperture.four/vertical st4vt part aperture.4/vertical
st4vt long_name tower_translation st4vt long_name st4vt
st4vt softlowerlim 0 st4vt softlowerlim 0
st4vt softupperlim 249 st4vt softupperlim 249
st4vt home 0 st4vt home 0
@@ -296,7 +296,7 @@ Motor sth DMC2280 [params \
absEncHome $sth_home\ absEncHome $sth_home\
cntsPerX 8192] cntsPerX 8192]
sth part sample sth part sample
sth long_name upper_tilt sth long_name sth
setHomeandRange -motor sth -home 0 -lowrange 5 -uprange 5 setHomeandRange -motor sth -home 0 -lowrange 5 -uprange 5
sth speed 1 sth speed 1
sth precision 0.01 sth precision 0.01
@@ -318,7 +318,7 @@ Motor sphi DMC2280 [params \
absEncHome $sphi_home\ absEncHome $sphi_home\
cntsPerX -8192] cntsPerX -8192]
sphi part sample sphi part sample
sphi long_name lower_tilt sphi long_name sphi
setHomeandRange -motor sphi -home 0 -lowrange 5 -uprange 5 setHomeandRange -motor sphi -home 0 -lowrange 5 -uprange 5
sphi speed 1 sphi speed 1
sphi precision 0.01 sphi precision 0.01
@@ -340,7 +340,7 @@ Motor sx DMC2280 [params \
absEncHome $sx_home\ absEncHome $sx_home\
cntsPerX [expr 8192.0/5.0]] cntsPerX [expr 8192.0/5.0]]
sx part sample sx part sample
sx long_name x_translation sx long_name translate_x
sx softlowerlim 0 sx softlowerlim 0
sx softupperlim 730 sx softupperlim 730
sx home 0 sx home 0
@@ -384,7 +384,7 @@ Motor sz DMC2280 [params \
absEncHome $sz_home\ absEncHome $sz_home\
cntsPerX $szCountRate] cntsPerX $szCountRate]
sz part sample sz part sample
sz long_name z_translation sz long_name translate_z
sz softlowerlim 0 sz softlowerlim 0
sz softupperlim 280.0 sz softupperlim 280.0
sz home 0 sz home 0
@@ -428,7 +428,7 @@ Motor dz DMC2280 [params \
absEncHome $dz_home\ absEncHome $dz_home\
cntsPerX [expr -8192.0/5.0]] cntsPerX [expr -8192.0/5.0]]
dz part detector dz part detector
dz long_name z_translation dz long_name detector
dz softlowerlim 0 dz softlowerlim 0
dz softupperlim 1351 dz softupperlim 1351
dz home 0 dz home 0
@@ -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/horizontal ss1l part aperture.1/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/horizontal ss1r part aperture.1/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/vertical ss1u part aperture.1/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/vertical ss1d part aperture.1/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/horizontal ss2l part aperture.2/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/horizontal ss2r part aperture.2/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/vertical ss2u part aperture.2/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/vertical ss2d part aperture.2/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/vertical ss3d part aperture.3/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/vertical ss3u part aperture.3/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/horizontal ss3l part aperture.3/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/horizontal ss3r part aperture.3/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/vertical ss4d part aperture.4/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/vertical ss4u part aperture.4/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/horizontal ss4l part aperture.4/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/horizontal ss4r part aperture.4/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