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

Copied changes made on ics1-kowari.

Browse Source
This commit is contained in:
Ferdi Franceschini
2014-03-26 09:05:54 +11:00
parent fbf1f7bbf9
commit a7f3b54a2f
4 changed files with 61 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
site_ansto/instrument/rsd/config/motors/euler_configuration.tcl
View File

@ -7,7 +7,7 @@
# this is the Big Huber Eulerian C shaped cradle EC2
#
set eom_Home 23165406
set ephi_Home 6489396
set ephi_Home 26573867
set echi_Home 24224404
set eom_stepsPerX [expr -25000.0]
@ -32,7 +32,7 @@ Motor eom $motor_driver_type [params \
absEnc 1\
absEncHome 20060684\
cntsPerX [expr -8192.0*(360.0/360.0)]]
setHomeandRange -motor som -home 0 -lowrange 178 -uprange 178
setHomeandRange -motor eom -home 0 -lowrange 178 -uprange 178
eom Backlash_offset -0.5
eom speed 2
eom accel 0.1
@ -83,7 +83,6 @@ Motor ephi $motor_driver_type [params \
setHomeandRange -motor ephi -home 0 -lowrange 400 -uprange 400
ephi softlowerlim -400
ephi softupperlim 400
ephi home 182.5
ephi speed 3
ephi movecount $move_count
ephi precision 0.01

18
site_ansto/instrument/rsd/config/motors/motor_configuration.tcl
View File

@ -10,7 +10,9 @@
# 0: Secondary slit configuration
# 1: Big Huber cradle
# 2: Tiny black cradle
set axis_config 0
# 3: Second sample stage
# 4: Loads config from /usr/local/sics/spare_motor_configuration.tcl
set axis_config 2
set animal kowari
set sim_mode [SplitReply [motor_simulation]]
@ -38,8 +40,8 @@ set mtth_Home 11701800
#
set sz_home 2147456531
#
set sx_Home 9052833
set sy_Home 18812526
set sx_Home 9053571
set sy_Home 18812120
#
# swapped sx with sy after rotation of vertical stage
set sx_pitch 4.9995324
@ -54,7 +56,8 @@ set sy_pitch 5.0
#set som_Home 26472736
#set som_Home 25275865
#set som_Home 25234969
set som_Home 25177194
#set som_Home 25177194
set som_Home 25366950
#set stth_Home 28686300
#set stth_Home 29446192
@ -65,7 +68,8 @@ set stth_pitch 0.99946
#
#set psho_home 542093
set psho_home 7576691
#set psho_home 7576691
set psho_home 7739630
#set psp_home 2040518
#set psp_home 3479157
#set psp_home 3783500
@ -98,6 +102,8 @@ switch $axis_config {
0 { fileeval $cfPath(motors)/secondary_slit_configuration.tcl }
1 { fileeval $cfPath(motors)/euler_configuration.tcl }
2 { fileeval $cfPath(motors)/tiny_black_euler_configuration.tcl }
3 { fileeval $cfPath(motors)/second_sample_stage_configuration.tcl }
4 { fileeval $cfPath(motors)/spare_motor_configuration.tcl }
}
############################
@ -455,7 +461,7 @@ Motor stth $motor_driver_type [params \
asyncqueue mc2\
axis F\
units degrees\
hardlowerlim 30\
hardlowerlim 25\
hardupperlim 119.6\
maxSpeed 0.5\
maxAccel 0.1\

26
site_ansto/instrument/rsd/config/motors/secondary_slit_configuration.tcl
View File

@ -1,4 +1,4 @@
set ssw_home 8216527
set ssw_home 8202207
# Secondary Slit, width
Motor ssw $motor_driver_type [params \
@ -19,3 +19,27 @@ ssw Backlash_offset 0.3
ssw part slits
ssw long_name secondary_ssw
setHomeandRange -motor ssw -home 0 -lowrange 0 -uprange 30
Motor eom2 $motor_driver_type [params \
asyncqueue mc4\
axis G\
units degrees\
hardlowerlim -360\
hardupperlim 360\
maxSpeed 10\
maxAccel 0.5\
maxDecel 0.5\
stepsPerX 25000\
absEnc 1\
absEncHome 19785674\
cntsPerX 8192]
setHomeandRange -motor eom2 -home 0 -lowrange -360 -uprange 360
eom2 softlowerlim -360
eom2 softupperlim 360
eom2 home 0
eom2 speed 5
#eom2 movecount $move_count
eom2 precision 0.01
eom2 part sample
eom2 long_name eom2

33
site_ansto/instrument/rsd/config/motors/tiny_black_euler_configuration.tcl
View File

@ -6,18 +6,29 @@
#
# this is our own tiny black cradle
#
set eom_Home 23165406
set ephi_Home 6405803
set echi_Home 24224350
set eom_Home 16062300
set ephi_Home 20363820
set echi_Home 26192788
set eom_stepsPerX [expr -25000.0]
set eom_cntsPerX [expr 8192.0]
set ephi_stepsPerX [expr 12500.0]
set ephi_cntsPerX [expr 4096.0]
set ephi_stepsPerX [expr -25000.0]
set ephi_cntsPerX [expr 8192.0]
set echi_stepsPerX [expr -25000.0]
set echi_cntsPerX [expr 8192.0]
#set eom_stepsPerX [expr -25000.0]
#set eom_cntsPerX [expr 8192.0]
#set ephi_stepsPerX [expr 12500.0]
#set ephi_cntsPerX [expr 4096.0]
set echi_stepsPerX [expr 25000.0]
set echi_cntsPerX [expr -8192.0]
#set echi_stepsPerX [expr 25000.0]
#set echi_cntsPerX [expr -8192.0]
Motor eom $motor_driver_type [params \
@ -31,9 +42,9 @@ Motor eom $motor_driver_type [params \
maxDecel 5\
stepsPerX [expr -25000.0*(360.0/360.0)]\
absEnc 1\
absEncHome 20060684\
absEncHome $eom_Home\
cntsPerX [expr -8192.0*(360.0/360.0)]]
setHomeandRange -motor som -home 0 -lowrange 178 -uprange 178
setHomeandRange -motor eom -home 0 -lowrange 178 -uprange 178
eom Backlash_offset -0.5
eom speed 2
eom accel 0.1
@ -59,7 +70,7 @@ Motor echi $motor_driver_type [params \
cntsPerX $echi_cntsPerX ]
setHomeandRange -motor echi -home 0 -lowrange -390 -uprange 390
echi softlowerlim -10
echi softupperlim 90
echi softupperlim 100
echi home 0
echi speed 3
echi movecount $move_count
@ -84,7 +95,7 @@ Motor ephi $motor_driver_type [params \
setHomeandRange -motor ephi -home 0 -lowrange 400 -uprange 400
ephi softlowerlim -400
ephi softupperlim 400
ephi home 182.5
ephi home 0
ephi speed 3
ephi movecount $move_count
ephi precision 0.01