calibrate slit gaps (roughly), move to correct axis, correct offset calculation.
r1668 | dcl | 2007-03-19 14:08:13 +1100 (Mon, 19 Mar 2007) | 2 lines
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
# $Revision: 1.12 $
|
||||
# $Date: 2007-03-19 03:06:13 $
|
||||
# $Revision: 1.13 $
|
||||
# $Date: 2007-03-19 03:08:13 $
|
||||
# Author: Ferdi Franceschini (ffr@ansto.gov.au)
|
||||
# Last revision by: $Author: dcl $
|
||||
|
||||
@@ -49,15 +49,15 @@ set dz_home 7805000
|
||||
set slitStepRate 20125
|
||||
|
||||
#Measured slit gap, in units, after homing on limit switches
|
||||
set ss1h_Gap 52.5
|
||||
set ss1v_Gap 205.9
|
||||
set ss2h_Gap 51.3
|
||||
set ss2v_Gap 203.8
|
||||
set ss1h_Gap 56.7
|
||||
set ss1v_Gap 54.5
|
||||
set ss2h_Gap 9.1
|
||||
set ss2v_Gap 23.1
|
||||
|
||||
set ss3h_Gap 7.5
|
||||
set ss3v_Gap 28.5
|
||||
set ss4h_Gap 12.0
|
||||
set ss4v_Gap 24.0
|
||||
set ss3h_Gap 7.4
|
||||
set ss3v_Gap 28.6
|
||||
set ss4h_Gap 12.1
|
||||
set ss4v_Gap 23.6
|
||||
|
||||
set ss1r_Home [expr $ss1h_Gap/2*$slitStepRate]
|
||||
set ss1l_Home [expr $ss1h_Gap/2*$slitStepRate]
|
||||
@@ -352,7 +352,7 @@ dz home 0
|
||||
# Slit 1, lower
|
||||
Motor ss1d DMC2280 [params \
|
||||
multichan dmc_mc3\
|
||||
axis A\
|
||||
axis D\
|
||||
units mm\
|
||||
hardlowerlim [expr $vertSlitHome - $vertSlitLowRange]\
|
||||
hardupperlim [expr $vertSlitHome + $vertSlitUpRange]\
|
||||
@@ -368,7 +368,7 @@ ss1d home 0
|
||||
# Slit 1, upper
|
||||
Motor ss1u DMC2280 [params \
|
||||
multichan dmc_mc3\
|
||||
axis B\
|
||||
axis C\
|
||||
units mm\
|
||||
hardlowerlim [expr $vertSlitHome - $vertSlitLowRange]\
|
||||
hardupperlim [expr $vertSlitHome + $vertSlitUpRange]\
|
||||
@@ -384,7 +384,7 @@ ss1u home 0
|
||||
# Slit 1, left
|
||||
Motor ss1l DMC2280 [params \
|
||||
multichan dmc_mc3\
|
||||
axis C\
|
||||
axis A\
|
||||
units mm\
|
||||
hardlowerlim [expr $horSlitHome - $horSlitLowRange]\
|
||||
hardupperlim [expr $horSlitHome + $horSlitUpRange]\
|
||||
@@ -400,7 +400,7 @@ ss1l home 0
|
||||
# Slit 1, right
|
||||
Motor ss1r DMC2280 [params \
|
||||
multichan dmc_mc3\
|
||||
axis D\
|
||||
axis B\
|
||||
units mm\
|
||||
hardlowerlim [expr $horSlitHome - $horSlitLowRange]\
|
||||
hardupperlim [expr $horSlitHome + $horSlitUpRange]\
|
||||
@@ -416,7 +416,7 @@ ss1r home 0
|
||||
# Slit 2, lower
|
||||
Motor ss2d DMC2280 [params \
|
||||
multichan dmc_mc3\
|
||||
axis E\
|
||||
axis H\
|
||||
units mm\
|
||||
hardlowerlim [expr $vertSlitHome - $vertSlitLowRange]\
|
||||
hardupperlim [expr $vertSlitHome + $vertSlitUpRange]\
|
||||
@@ -432,7 +432,7 @@ ss2d home 0
|
||||
# Slit 2, upper
|
||||
Motor ss2u DMC2280 [params \
|
||||
multichan dmc_mc3\
|
||||
axis F\
|
||||
axis G\
|
||||
units mm\
|
||||
hardlowerlim [expr $vertSlitHome - $vertSlitLowRange]\
|
||||
hardupperlim [expr $vertSlitHome + $vertSlitUpRange]\
|
||||
@@ -448,7 +448,7 @@ ss2u home 0
|
||||
# Slit 2, left
|
||||
Motor ss2l DMC2280 [params \
|
||||
multichan dmc_mc3\
|
||||
axis G\
|
||||
axis E\
|
||||
units mm\
|
||||
hardlowerlim [expr $horSlitHome - $horSlitLowRange]\
|
||||
hardupperlim [expr $horSlitHome + $horSlitUpRange]\
|
||||
@@ -464,7 +464,7 @@ ss2l home 0
|
||||
# Slit 2, right
|
||||
Motor ss2r DMC2280 [params \
|
||||
multichan dmc_mc3\
|
||||
axis H\
|
||||
axis F\
|
||||
units mm\
|
||||
hardlowerlim [expr $horSlitHome - $horSlitLowRange]\
|
||||
hardupperlim [expr $horSlitHome + $horSlitUpRange]\
|
||||
@@ -670,8 +670,8 @@ proc set_gap_offset {m1 m2 val} {
|
||||
set S2 [SplitReply [$m2]]
|
||||
set currentoffset [expr ($S1 + $S2)/2.0 ]
|
||||
set diff [expr $val - $currentoffset]
|
||||
set newD1R [expr $S1 + $diff/2]
|
||||
set newD1L [expr $S2 + $diff/2]
|
||||
set newD1R [expr $S1 + $diff]
|
||||
set newD1L [expr $S2 + $diff]
|
||||
return "$m1=$newD1R,$m2=$newD1L"
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user