linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update motor configuration from ics1-taipan.

Browse Source 
Also put off renaming s1 to ms1 for magnet config.  We need to make sure
that there is a sample/s1 link to sample/ms1 and use ms1 in tasub.
This commit is contained in:
Ferdi Franceschini
2014-09-17 07:47:17 +10:00
parent 85cbe1eb38
commit 0ba5045fd9
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
site_ansto/instrument/tas/config/motors/motor_configuration.tcl
View File

@ -113,12 +113,14 @@ if { [ info exists ::config_dict ] } {
switch $axis_config { switch $axis_config {
0 { 0 {
set use_normal_config "true" set use_normal_config "true"
set tilt_motor_driver_type $motor_driver_type
} }
1 { 1 {
set magmot "ms1" set magmot s1
set magmot_aq "mc2" set magmot_aq "mc2"
set magmot_axis "A" set magmot_axis "A"
set use_normal_config "false" set use_normal_config "false"
set tilt_motor_driver_type asim
fileeval $cfPath(motors)/magnet_configuration.tcl fileeval $cfPath(motors)/magnet_configuration.tcl
} }
} }
@ -183,7 +185,7 @@ Motor mtilt $motor_driver_type [params \
maxDecel 1\ maxDecel 1\
stepsPerX 25000\ stepsPerX 25000\
absEnc 1\ absEnc 1\
absEncHome 79650\ absEncHome 27115\
cntsPerX 4096] cntsPerX 4096]
mtilt part crystal mtilt part crystal
mtilt long_name mtilt mtilt long_name mtilt
@ -206,7 +208,7 @@ Motor mtrans $motor_driver_type [params \
maxDecel 1\ maxDecel 1\
stepsPerX 25000\ stepsPerX 25000\
absEnc 1\ absEnc 1\
absEncHome 469388\ absEncHome 859242\
cntsPerX 4096] cntsPerX 4096]
mtrans part crystal mtrans part crystal
mtrans long_name mtrans mtrans long_name mtrans
@ -534,7 +536,7 @@ Motor mhfocus $motor_driver_type [params \
maxSpeed 3.6\ maxSpeed 3.6\
maxAccel 1.728\ maxAccel 1.728\
maxDecel 1.728\ maxDecel 1.728\
stepsPerX [expr 25000.0 * 50.0 / 360.0]\ stepsPerX [expr -25000.0 * 50.0 / 360.0]\
absEnc 1\ absEnc 1\
bias_bits 12\ bias_bits 12\
bias_bias 1540\ bias_bias 1540\
@ -564,13 +566,13 @@ Motor m1 $motor_driver_type [params \
maxDecel 0.25\ maxDecel 0.25\
stepsPerX 100000\ stepsPerX 100000\
absEnc 1\ absEnc 1\
absEncHome 16323070\ absEncHome 16189898\
cntsPerX -2048] cntsPerX -2048]
m1 part crystal m1 part crystal
m1 long_name m1 m1 long_name m1
m1 softlowerlim 5 m1 softlowerlim 5
m1 softupperlim 40 m1 softupperlim 40
m1 home 20.45933 m1 home 0
m1 backlash_offset -1.0 m1 backlash_offset -1.0
# mc4: Analyzer Tilt 1 -- Two-theta Angle # mc4: Analyzer Tilt 1 -- Two-theta Angle