Commissioning iteration
r2176 | dcl | 2007-10-04 09:15:02 +1000 (Thu, 04 Oct 2007) | 2 lines
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
# $Revision: 1.7 $
|
# $Revision: 1.8 $
|
||||||
# $Date: 2007-10-02 01:31:00 $
|
# $Date: 2007-10-03 23:15:02 $
|
||||||
# Author: Ferdi Franceschini (ffr@ansto.gov.au)
|
# Author: Ferdi Franceschini (ffr@ansto.gov.au)
|
||||||
# Last revision by: $Author: dcl $
|
# Last revision by: $Author: dcl $
|
||||||
|
|
||||||
@@ -40,7 +40,7 @@ set samy_Home 7101486
|
|||||||
set samz_Home 9944901
|
set samz_Home 9944901
|
||||||
set samthet_Home 22997883
|
set samthet_Home 22997883
|
||||||
set det_Home 7047593
|
set det_Home 7047593
|
||||||
set detoff_Home 7227034
|
set detoff_Home 6932100
|
||||||
|
|
||||||
set pent_Home 8123563
|
set pent_Home 8123563
|
||||||
#set srce_Home 7868762
|
#set srce_Home 7868762
|
||||||
@@ -51,8 +51,8 @@ set apx_Home 7500000
|
|||||||
set apz_Home 7500000
|
set apz_Home 7500000
|
||||||
set att_Home 7500000
|
set att_Home 7500000
|
||||||
|
|
||||||
set bsx_Home 7500000
|
set bsx_Home 22358693
|
||||||
set bsz_Home 7500000
|
set bsz_Home 7882500
|
||||||
set bs5_Home 7500000
|
set bs5_Home 7500000
|
||||||
set bs4_Home 7500000
|
set bs4_Home 7500000
|
||||||
set bs3_Home 7500000
|
set bs3_Home 7500000
|
||||||
@@ -162,6 +162,7 @@ set coll_StepsPerX [expr -25000.0/6.0]
|
|||||||
set coll_CntsPerX [expr 8192.0/6.0]
|
set coll_CntsPerX [expr 8192.0/6.0]
|
||||||
|
|
||||||
#Measured or computed step rate for samz (Sample Raise)
|
#Measured or computed step rate for samz (Sample Raise)
|
||||||
|
#Copied from Reflectometer then divided by 2.0 for SANS
|
||||||
# Motor:25000/turn, gear:1/25, screw:5mm/turn
|
# Motor:25000/turn, gear:1/25, screw:5mm/turn
|
||||||
set samzStepRate [expr -((25000.0*25.0)/5.0)/2.0]
|
set samzStepRate [expr -((25000.0*25.0)/5.0)/2.0]
|
||||||
#set samzCountRate [expr -(8192.0/5.0/0.932)]
|
#set samzCountRate [expr -(8192.0/5.0/0.932)]
|
||||||
@@ -302,10 +303,10 @@ Motor samthet $motor_driver_type [params \
|
|||||||
maxSpeed 10\
|
maxSpeed 10\
|
||||||
maxAccel 1\
|
maxAccel 1\
|
||||||
maxDecel 10\
|
maxDecel 10\
|
||||||
stepsPerX 25000\
|
stepsPerX [expr 25000.0/2.0]\
|
||||||
absEnc 1\
|
absEnc 1\
|
||||||
absEncHome $samthet_Home\
|
absEncHome $samthet_Home\
|
||||||
cntsPerX 8192]
|
cntsPerX [expr 8192.0/2.0]]
|
||||||
samthet part sample
|
samthet part sample
|
||||||
samthet long_name sample_theta
|
samthet long_name sample_theta
|
||||||
samthet softlowerlim 0
|
samthet softlowerlim 0
|
||||||
@@ -330,7 +331,7 @@ Motor det $motor_driver_type [params \
|
|||||||
axis G\
|
axis G\
|
||||||
units mm\
|
units mm\
|
||||||
hardlowerlim -10\
|
hardlowerlim -10\
|
||||||
hardupperlim 20000\
|
hardupperlim 19000\
|
||||||
maxSpeed 40\
|
maxSpeed 40\
|
||||||
maxAccel 5\
|
maxAccel 5\
|
||||||
maxDecel 10\
|
maxDecel 10\
|
||||||
@@ -341,7 +342,7 @@ Motor det $motor_driver_type [params \
|
|||||||
det part detector
|
det part detector
|
||||||
det long_name detector_y
|
det long_name detector_y
|
||||||
det softlowerlim 0
|
det softlowerlim 0
|
||||||
det softupperlim 19000
|
det softupperlim 18990
|
||||||
det home 0
|
det home 0
|
||||||
det speed 20
|
det speed 20
|
||||||
|
|
||||||
@@ -357,10 +358,10 @@ Motor detoff $motor_driver_type [params \
|
|||||||
maxSpeed 10\
|
maxSpeed 10\
|
||||||
maxAccel 1\
|
maxAccel 1\
|
||||||
maxDecel 10\
|
maxDecel 10\
|
||||||
stepsPerX -25000\
|
stepsPerX [expr -(25000.0*3.0)/5.0]\
|
||||||
absEnc 1\
|
absEnc 1\
|
||||||
absEncHome $detoff_Home\
|
absEncHome $detoff_Home\
|
||||||
cntsPerX 8192]
|
cntsPerX [expr 8192.0/5.0]]
|
||||||
detoff part detector
|
detoff part detector
|
||||||
detoff long_name detector_x
|
detoff long_name detector_x
|
||||||
detoff softlowerlim -50
|
detoff softlowerlim -50
|
||||||
|
|||||||
Reference in New Issue
Block a user