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

Kookaburra local changes

Browse Source 
Conflicts:
	sics/site_ansto/instrument/config/hmm/hmm_configuration_common_1.tcl
This commit is contained in:
Douglas Clowes
2014-09-09 16:50:08 +10:00
parent c608e5e641
commit d0d2b38177
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -232,7 +232,8 @@ Motor m1chi $motor_driver_type [params \
stepsPerX -$m1chiSetRate\ stepsPerX -$m1chiSetRate\
absEnc 1\ absEnc 1\
absEncHome $m1chi_Home\ absEncHome $m1chi_Home\
cntsPerX [expr 131072*100.0/68.681] ] cntsPerX [expr 131072*100.0/68.681]\
nopowersave 1]
m1chi precision 0.001 m1chi precision 0.001
m1chi speed 0.200 m1chi speed 0.200
m1chi part crystal m1chi part crystal
@ -317,7 +318,7 @@ Motor ss1u $motor_driver_type [params \
axis D\ axis D\
units mm\ units mm\
hardlowerlim -33.5\ hardlowerlim -33.5\
hardupperlim 37.8\ hardupperlim 35.9\
maxSpeed [expr $maxSpeedSlit/$ss1uSetRate]\ maxSpeed [expr $maxSpeedSlit/$ss1uSetRate]\
maxAccel [expr 5000.0/$ss1uSetRate/0.5]\ maxAccel [expr 5000.0/$ss1uSetRate/0.5]\
maxDecel [expr 5000.0/$ss1uSetRate/0.5]\ maxDecel [expr 5000.0/$ss1uSetRate/0.5]\
@ -585,7 +586,8 @@ Motor m2chi $motor_driver_type [params \
stepsPerX -$m2chiSetRate\ stepsPerX -$m2chiSetRate\
absEnc 1\ absEnc 1\
absEncHome $m2chi_Home\ absEncHome $m2chi_Home\
cntsPerX [expr 131072*100.0/68.681]] cntsPerX [expr 131072*100.0/68.681]\
nopowersave 1]
m2chi precision 0.001 m2chi precision 0.001
m2chi speed 0.200 m2chi speed 0.200
m2chi part crystal m2chi part crystal
@ -686,6 +688,12 @@ m2y softupperlim 355
m2y home 0 m2y home 0
make_gap_motors ss1vg ss1vg ss1vo ss1vo ss1u ss1d mm gaps
make_gap_motors ss1hg ss1hg ss1ho ss1ho ss1r ss1l mm gaps
make_gap_motors ss2vg ss2vg ss2vo ss2vo ss2u ss2d mm gaps
make_gap_motors ss2hg ss2hg ss2ho ss2ho ss2r ss2l mm gaps
proc motor_set_sobj_attributes {} { proc motor_set_sobj_attributes {} {
} }

4
site_ansto/instrument/kookaburra/hostport_config.tcl
View File

@ -12,9 +12,7 @@ foreach {mc host port} {
# BEAM MONITOR HOST AND PORT # BEAM MONITOR HOST AND PORT
foreach {bm host port} { foreach {bm host port} {
MONITOR_1 das1-kookaburra 30000 MONITOR_1 137.157.205.24 30000
MONITOR_2 das1-kookaburra 30001
MONITOR_3 das1-kookaburra 30002
} { } {
dict set MONITOR_HOSTPORT $bm HOST $host dict set MONITOR_HOSTPORT $bm HOST $host
dict set MONITOR_HOSTPORT $bm PORT $port dict set MONITOR_HOSTPORT $bm PORT $port