Incorporated changes made in-situ

r2728 | ffr | 2008-10-31 16:02:33 +1100 (Fri, 31 Oct 2008) | 2 lines
This commit is contained in:
Ferdi Franceschini
2008-10-31 16:02:33 +11:00
committed by Douglas Clowes
parent 04e2e75d80
commit ae09c27329

View File

@ -476,10 +476,11 @@ Motor stth $motor_driver_type [params \
stth softlowerlim 0
stth softupperlim 120
stth home 0
stth speed 0.5
stth speed 0.2
stth motOffDelay 15000
stth movecount $move_count
stth precision 0.01
stth precision 0.005
stth maxretry 6
stth part sample
stth long_name azimuthal_angle
stth Backlash_offset 0.3
@ -497,24 +498,28 @@ Motor mf1 $motor_driver_type [params \
asyncqueue mc3\
axis A\
units degrees\
hardlowerlim 0\
hardupperlim 1\
hardlowerlim 0.15\
hardupperlim 0.9\
maxSpeed 1\
maxAccel 1\
maxDecel 1\
stepsPerX 1000000\
absEnc 1\
absEncHome 0\
bias_bias -4200\
bias_bias 0\
bias_bits 14\
cntsPerX 10000]
setHomeandRange -motor mf1 -home 0 -lowrange 0 -uprange 1
#setHomeandRange -motor mf1 -home 0 -lowrange 0 -uprange 1
mf1 home 0
mf1 softlowerlimit 0.15
mf1 softupperlimit 0.9
mf1 speed 0.1
mf1 movecount $move_count
mf1 precision 0.01
mf1 part monochromator.focus
mf1 long_name horizontal
mf1 creep_offset 1
mf1 Backlash_offset -0.04
# Monochromator Focusing (Ge)
Motor mf2 $motor_driver_type [params \
@ -528,8 +533,8 @@ Motor mf2 $motor_driver_type [params \
maxDecel 1\
stepsPerX -1000000\
absEnc 1\
absEncHome 0\
bias_bias -4000\
absEncHome 2048\
bias_bias 0\
bias_bits 14\
cntsPerX 12000]
setHomeandRange -motor mf2 -home 0 -lowrange 0 -uprange 1