refactor SZ steps and counts equations

r2170 | dcl | 2007-10-02 12:43:43 +1000 (Tue, 02 Oct 2007) | 2 lines
This commit is contained in:
Douglas Clowes
2007-10-02 12:43:43 +10:00
parent dc266a1c92
commit 67810158ee

View File

@@ -1,5 +1,5 @@
# $Revision: 1.19 $ # $Revision: 1.20 $
# $Date: 2007-09-25 23:31:44 $ # $Date: 2007-10-02 02:43:43 $
# Author: Ferdi Franceschini (ffr@ansto.gov.au) # Author: Ferdi Franceschini (ffr@ansto.gov.au)
# Last revision by: $Author: dcl $ # Last revision by: $Author: dcl $
@@ -48,11 +48,11 @@ set dy_home 7500000
set dz_home 7805000 set dz_home 7805000
#Measured or computed step rate for sz (Sample Raise) #Measured or computed step rate for sz (Sample Raise)
#set szStepRate -116500 # Motor:25000/turn, gear:1/25, screw:5mm/turn
set szStepRate -125000 set szStepRate [expr -(25000.0*25.0)/5.0]
#set szCountRate [expr -(8192.0/5.0/0.932)] #set szCountRate [expr -(8192.0/5.0/0.932)]
# 8192 count encoder, 5mm/Turn screw, 14:15 gearing? # 8192 count encoder, 5mm/Turn screw, 14:15 gearing?
set szCountRate [expr -(8192.0/5.0/(14.0/15.0))] set szCountRate [expr -(8192.0/5.0)/(14.0/15.0)]
#Measured or computed slit motor steps per millimetre #Measured or computed slit motor steps per millimetre
# 2mm per turn pitch, # 2mm per turn pitch,