Merges from ics1-wombat

r2834 | ffr | 2009-12-09 17:07:45 +1100 (Wed, 09 Dec 2009) | 2 lines
This commit is contained in:
Ferdi Franceschini
2009-12-09 17:07:45 +11:00
committed by Douglas Clowes
parent 64ab146a44
commit c73c4c85c8
15 changed files with 3779 additions and 209 deletions

View File

@@ -1,5 +1,5 @@
# $Revision: 1.29 $
# $Date: 2009-12-03 02:04:57 $
# $Revision: 1.30 $
# $Date: 2009-12-09 06:07:45 $
# Author: Ferdi Franceschini (ffr@ansto.gov.au)
# Last revision by: $Author: ffr $
@@ -76,12 +76,20 @@ set att_Home 24782942
set bsx_Home 7578346
#set bsz_Home 10143000
set bsz_Home 10568857
set bs1_Home 13219
set bs2_Home 2506
set bs3_Home 22391
set bs4_Home 15287
set bs5_Home 6283
set bs6_Home 19123
#set bs1_Home 13219
#set bs2_Home 2506
#set bs3_Home 22391
#set bs4_Home 15287
#set bs5_Home 6283
#set bs6_Home 19123
set bs1_Home 21298
set bs2_Home 9942
set bs3_Home 30928
set bs4_Home 22111
set bs5_Home 14558
set bs6_Home 27251
set bs_cntsPerX [expr 32768.0/360.0]
set bs_stepsPerX [expr -25000.0*160.0/360.0]
set pol_Home 7500000
@@ -406,8 +414,8 @@ Motor detoff $motor_driver_type [params \
port pmc1-quokka\
axis H\
units mm\
hardlowerlim -50\
hardupperlim 500\
hardlowerlim -9\
hardupperlim 465\
maxSpeed 10\
maxAccel 1\
maxDecel 10\
@@ -417,14 +425,14 @@ Motor detoff $motor_driver_type [params \
cntsPerX [expr 8192.0/5.08]]
detoff part detector
detoff long_name detector_x
detoff softlowerlim -50
detoff softupperlim 500
detoff softlowerlim 0
detoff softupperlim 450
detoff home 0
############################
# Motor Controller 2
# Motor Controller 2
# Motor Controller 2
# Motor Controller 25
############################
#:TP at HOME
#
@@ -834,7 +842,7 @@ Motor bsx $motor_driver_type [params \
axis A\
units mm\
hardlowerlim 0\
hardupperlim 500\
hardupperlim 317\
maxSpeed 5\
maxAccel 2\
maxDecel 5\
@@ -845,7 +853,7 @@ Motor bsx $motor_driver_type [params \
bsx part detector
bsx long_name bsx
bsx softlowerlim 0
bsx softupperlim 500
bsx softupperlim 310
bsx speed 5
bsx home 0
@@ -857,7 +865,7 @@ Motor bsz $motor_driver_type [params \
axis B\
units mm\
hardlowerlim 0\
hardupperlim 400\
hardupperlim 280\
maxSpeed 5\
maxAccel 1\
maxDecel 5\
@@ -868,7 +876,7 @@ Motor bsz $motor_driver_type [params \
bsz part detector
bsz long_name bsz
bsz softlowerlim 0
bsz softupperlim 400
bsz softupperlim 275
bsz home 0
# Largest beamstop
@@ -876,8 +884,8 @@ Motor bs1 $motor_driver_type [params \
asyncqueue mc4\
axis C\
units degrees\
hardlowerlim 0\
hardupperlim 100\
hardlowerlim 9\
hardupperlim 95\
maxSpeed 2\
maxAccel 1\
maxDecel 1\
@@ -887,9 +895,9 @@ Motor bs1 $motor_driver_type [params \
cntsPerX $bs_cntsPerX]
bs1 part detector
bs1 long_name bs1
bs1 softlowerlim 0
bs1 softupperlim 100
bs1 home 0
bs1 softlowerlim 11
bs1 softupperlim 95
bs1 home 90
bs1 precision 0.05
sicslist setatt bs1 link parameters_group
@@ -897,8 +905,8 @@ Motor bs2 $motor_driver_type [params \
asyncqueue mc4\
axis D\
units degrees\
hardlowerlim 0\
hardupperlim 100\
hardlowerlim 6\
hardupperlim 95\
maxSpeed 2\
maxAccel 1\
maxDecel 1\
@@ -908,9 +916,9 @@ Motor bs2 $motor_driver_type [params \
cntsPerX $bs_cntsPerX]
bs2 part detector
bs2 long_name bs2
bs2 softlowerlim 0
bs2 softupperlim 100
bs2 home 0
bs2 softlowerlim 7
bs2 softupperlim 95
bs2 home 90
bs2 precision 0.05
sicslist setatt bs2 link parameters_group
@@ -918,8 +926,8 @@ Motor bs3 $motor_driver_type [params \
asyncqueue mc4\
axis E\
units degrees\
hardlowerlim 0\
hardupperlim 100\
hardlowerlim 9\
hardupperlim 95\
maxSpeed 2\
maxAccel 1\
maxDecel 1\
@@ -929,9 +937,9 @@ Motor bs3 $motor_driver_type [params \
cntsPerX $bs_cntsPerX]
bs3 part detector
bs3 long_name bs3
bs3 softlowerlim 0
bs3 softupperlim 100
bs3 home 0
bs3 softlowerlim 11
bs3 softupperlim 95
bs3 home 90
bs3 precision 0.05
sicslist setatt bs3 link parameters_group
@@ -939,8 +947,8 @@ Motor bs4 $motor_driver_type [params \
asyncqueue mc4\
axis F\
units degrees\
hardlowerlim 0\
hardupperlim 100\
hardlowerlim 6\
hardupperlim 95\
maxSpeed 2\
maxAccel 1\
maxDecel 1\
@@ -950,9 +958,9 @@ Motor bs4 $motor_driver_type [params \
cntsPerX $bs_cntsPerX]
bs4 part detector
bs4 long_name bs4
bs4 softlowerlim 0
bs4 softupperlim 100
bs4 home 0
bs4 softlowerlim 7
bs4 softupperlim 95
bs4 home 90
bs4 precision 0.05
sicslist setatt bs4 link parameters_group
@@ -960,8 +968,8 @@ Motor bs5 $motor_driver_type [params \
asyncqueue mc4\
axis G\
units degrees\
hardlowerlim 0\
hardupperlim 100\
hardlowerlim 9\
hardupperlim 95\
maxSpeed 2\
maxAccel 1\
maxDecel 1\
@@ -971,9 +979,9 @@ Motor bs5 $motor_driver_type [params \
cntsPerX $bs_cntsPerX]
bs5 part detector
bs5 long_name bs5
bs5 softlowerlim 0
bs5 softupperlim 100
bs5 home 0
bs5 softlowerlim 11
bs5 softupperlim 95
bs5 home 90
bs5 precision 0.05
sicslist setatt bs5 link parameters_group
@@ -981,8 +989,8 @@ Motor bs6 $motor_driver_type [params \
asyncqueue mc4\
axis H\
units degrees\
hardlowerlim 0\
hardupperlim 100\
hardlowerlim 6\
hardupperlim 95\
maxSpeed 2\
maxAccel 1\
maxDecel 1\
@@ -992,9 +1000,9 @@ Motor bs6 $motor_driver_type [params \
cntsPerX $bs_cntsPerX]
bs6 part detector
bs6 long_name bs6
bs6 softlowerlim 0
bs6 softupperlim 100
bs6 home 0
bs6 softlowerlim 7
bs6 softupperlim 95
bs6 home 90
bs6 precision 0.05
sicslist setatt bs6 link parameters_group