WIP refinements

r3551 | dcl | 2012-05-24 10:12:10 +1000 (Thu, 24 May 2012) | 1 line
This commit is contained in:
Douglas Clowes
2012-05-24 10:12:10 +10:00
parent 201f9104b3
commit b497feba9f

View File

@@ -127,7 +127,7 @@ Motor ptz $motor_driver_type [params \
units mm\
hardlowerlim -264\
hardupperlim 187\
maxSpeed [expr { 300000.0 / $ptzStepRate }]\
maxSpeed [expr { 200000.0 / $ptzStepRate }]\
maxAccel [expr { 150000.0 / $ptzStepRate }]\
maxDecel [expr { 150000.0 / $ptzStepRate }]\
stepsPerX -$ptzStepRate\
@@ -158,7 +158,7 @@ Motor ftz $motor_driver_type [params \
units mm\
hardlowerlim -280\
hardupperlim 160\
maxSpeed [expr { 300000.0 / $ftzStepRate }]\
maxSpeed [expr { 200000.0 / $ftzStepRate }]\
maxAccel [expr { 150000.0 / $ftzStepRate }]\
maxDecel [expr { 150000.0 / $ftzStepRate }]\
stepsPerX -$ftzStepRate\
@@ -215,26 +215,26 @@ Motor stth $motor_driver_type [params \
port pmc1-pelican\
axis F\
units degrees\
hardlowerlim -50\
hardupperlim 60\
maxSpeed [expr { 50000.0 / $stthStepRate }]\
hardlowerlim -60\
hardupperlim 65\
maxSpeed [expr { 25000.0 / $stthStepRate }]\
maxAccel [expr { 5000.0 / $stthStepRate }]\
maxDecel [expr { 5000.0 / $stthStepRate }]\
stepsPerX [expr {0.8 * $stthStepRate}]\
stepsPerX [expr {0.75 * $stthStepRate}]\
absEnc 1\
absEncHome $stth_Home\
cntsPerX -[expr { 8192.0 / 360.0 }]]
stth part detector
stth long_name stth
stth softlowerlim -50
stth softupperlim 60
stth softlowerlim -60
stth softupperlim 65
stth home 0
stth Blockage_Thresh 2.000000
stth Blockage_Ratio 5.000000
stth Blockage_Thresh 5.0
stth Blockage_Ratio 50.0
stth Backlash_offset -0.100000
stth MotOffDelay 2000
stth creep_offset 1
stth creep_precision 0.022
stth creep_precision 0.05
# mc1: Instrument Drive System (Main Drive) (Flight Tube)
#set mtthStepRate 222222.222
@@ -255,7 +255,7 @@ Motor mtth $motor_driver_type [params \
absEnc 1\
absEncHome $mtth_Home\
cntsPerX -[expr { (1<<25)/360.0 }]]
mtth part detector
mtth part crystal
mtth long_name mtth
mtth softlowerlim 43
mtth softupperlim 134
@@ -296,6 +296,7 @@ sv1 long_name sv1
sv1 softlowerlim -0.2
sv1 softupperlim 116
sv1 home 0
sv1 Blockage_Thresh 1.0
# mc2: Slits Set AB2- (After Beryllium Filter) (2 blades and 1 Motor & Encoder set)
set sh1StepRate [expr { 25000 / 0.635 / 2.0 }]
@@ -320,6 +321,7 @@ sh1 long_name sh1
sh1 softlowerlim -3
sh1 softupperlim 90
sh1 home 0
sh1 Blockage_Thresh 1.0
# mc2: Slits Set AF1- (After Fermi Chopper) (2 blades and 1 Motor & Encoder set)
set sv2StepRate [expr { 25000 / 0.635 / 2.0 }]
@@ -344,6 +346,7 @@ sv2 long_name sv2
sv2 softlowerlim -2
sv2 softupperlim 80
sv2 home 0
sv2 Blockage_Thresh 1.0
# mc2: Slits Set AF2- (After Fermi Chopper) (2 blades and 1 Motor & Encoder set)
set sh2StepRate [expr { 25000 / 0.635 / 2.0 }]
@@ -368,6 +371,7 @@ sh2 long_name sh2
sh2 softlowerlim -0.5
sh2 softupperlim 50
sh2 home 0
sh2 Blockage_Thresh 1.0
# mc2: Graphite filter rotation stage (post 1st slit and post 1st Fermi chopper)
set gomStepRate [expr { 25000.0 / 2.0 }]
@@ -890,6 +894,6 @@ proc make_virtual_motor_1 { vm1 vm1_name pm1 aunits klass } {
}
make_virtual_motor_1 vrcz RCollZ rcz count collimator
make_virtual_motor_1 vptz PolarizerZ ptz count thing
make_virtual_motor_1 vftz FilterZ ftz count thing
make_virtual_motor_1 vgv GateValve gv1 count thing
make_virtual_motor_1 vptz PolarizerZ ptz count crystal
make_virtual_motor_1 vftz FilterZ ftz count crystal
make_virtual_motor_1 vgv GateValve gv1 count sample