Merged changes made in-situ
r2768 | ffr | 2009-03-31 17:25:20 +1100 (Tue, 31 Mar 2009) | 2 lines
This commit is contained in:
Ferdi Franceschini
committed by
Douglas Clowes
Douglas Clowes
parent
d2f57e4615
commit
8e5b7842e3
@@ -58,8 +58,8 @@ proc ::histogram_memory::isc_initialize {} {
|
||||
OAT_TABLE -init
|
||||
FAT_TABLE -init
|
||||
|
||||
detector_active_height_mm 280
|
||||
detector_active_width_mm 280
|
||||
detector_active_height_mm 300
|
||||
detector_active_width_mm 300
|
||||
|
||||
::histogram_memory::ic_initialize
|
||||
|
||||
|
||||
@@ -0,0 +1,79 @@
|
||||
# This must be loaded by motor_configuration.tcl
|
||||
|
||||
#
|
||||
# Home value for Eulerian cradle
|
||||
#
|
||||
#
|
||||
set eom_Home 23329261
|
||||
set ephi_Home 6647676
|
||||
set echi_Home 8919319
|
||||
|
||||
# Sample Tilt 1, euler omega stage -> exchange with ssw further down
|
||||
Motor eom $motor_driver_type [params \
|
||||
asyncqueue mc4\
|
||||
axis F\
|
||||
units degrees\
|
||||
hardlowerlim -390\
|
||||
hardupperlim 390\
|
||||
maxSpeed 1\
|
||||
maxAccel 1\
|
||||
maxDecel 1\
|
||||
stepsPerX -25000\
|
||||
absEnc 1\
|
||||
absEncHome $eom_Home\
|
||||
cntsPerX 8192]
|
||||
setHomeandRange -motor eom -home 0 -lowrange -390 -uprange 390
|
||||
eom speed 1
|
||||
eom movecount $move_count
|
||||
eom precision 0.01
|
||||
eom part sample
|
||||
eom long_name eom
|
||||
|
||||
# Sample Tilt 2, euler chi stage -> EC1
|
||||
Motor echi $motor_driver_type [params \
|
||||
asyncqueue mc2\
|
||||
axis G\
|
||||
units degrees\
|
||||
hardlowerlim -10\
|
||||
hardupperlim 95\
|
||||
maxSpeed 3\
|
||||
maxAccel 1\
|
||||
maxDecel 1\
|
||||
stepsPerX -25000\
|
||||
absEnc 1\
|
||||
absEncHome $echi_Home\
|
||||
cntsPerX 8192]
|
||||
setHomeandRange -motor echi -home 0 -lowrange 10 -uprange 95
|
||||
echi softlowerlim -10
|
||||
echi softupperlim 90
|
||||
echi home 0
|
||||
echi speed 3
|
||||
echi movecount $move_count
|
||||
echi precision 0.01
|
||||
echi part sample
|
||||
echi long_name echi
|
||||
|
||||
# Sample Tilt 2, euler phi stage -> EC2
|
||||
Motor ephi $motor_driver_type [params \
|
||||
asyncqueue mc4\
|
||||
axis G\
|
||||
units degrees\
|
||||
hardlowerlim -400\
|
||||
hardupperlim 400\
|
||||
maxSpeed 3\
|
||||
maxAccel 1\
|
||||
maxDecel 1\
|
||||
stepsPerX [expr -25000.0/2.0]\
|
||||
absEnc 1\
|
||||
absEncHome $ephi_Home\
|
||||
cntsPerX [expr -8192.0/2.0]]
|
||||
setHomeandRange -motor ephi -home 0 -lowrange 400 -uprange 400
|
||||
ephi softlowerlim -400
|
||||
ephi softupperlim 400
|
||||
ephi home 0
|
||||
ephi speed 3
|
||||
ephi movecount $move_count
|
||||
ephi precision 0.01
|
||||
ephi part sample
|
||||
ephi long_name ephi
|
||||
|
||||
@@ -5,6 +5,10 @@
|
||||
|
||||
# START MOTOR CONFIGURATION
|
||||
|
||||
##########################################
|
||||
# Set this to 1 to use the eulerian cradle
|
||||
set use_euler 0
|
||||
|
||||
set animal kowari
|
||||
set sim_mode [SplitReply [motor_simulation]]
|
||||
|
||||
@@ -45,7 +49,8 @@ set mom_Home 28473827
|
||||
set mtth_Home 11701800
|
||||
#set sz_home 2147458067
|
||||
#set sz_home 2147457556
|
||||
set sz_home 2147457295
|
||||
#set sz_home 2147457295
|
||||
set sz_home 2147456656
|
||||
|
||||
#
|
||||
# set sx_Home 8405693
|
||||
@@ -56,7 +61,13 @@ set sz_home 2147457295
|
||||
#
|
||||
#set sx_Home 9065892
|
||||
#set sx_Home 9067806
|
||||
set sx_Home 9077566
|
||||
#set sx_Home 9077566
|
||||
#
|
||||
# set new value after repoistioning of encoders after cable chain installation
|
||||
# set sx_Home 9044450
|
||||
set sx_Home 9041997
|
||||
|
||||
|
||||
|
||||
#set sy_Home 7230717
|
||||
# set value from 7223739 to 7224686 after cor 5.12.07
|
||||
@@ -64,10 +75,20 @@ set sx_Home 9077566
|
||||
#set sy_Home 7224686
|
||||
#set sy_Home 18597074
|
||||
#set sy_Home 18782188
|
||||
set sy_Home 18773863
|
||||
#set sy_Home 18773863
|
||||
# set new value after repoistioning of encoders after cable chain installation
|
||||
# set sy_Home 18785483
|
||||
set sy_Home 18784175
|
||||
|
||||
# swapped sx with sy after rotation of vertical stage
|
||||
set sx_pitch 4.9995324
|
||||
set sy_pitch 5.0
|
||||
|
||||
#set som_Home 23164850
|
||||
set som_Home 25063452
|
||||
#set som_Home 25063452
|
||||
# changed from 25063452 to 25137535 on 20.11.2008
|
||||
# changed from 25137535 to 25153657 on 31.03.2009
|
||||
set som_Home 25153657
|
||||
|
||||
#set stth_Home 28686300
|
||||
#set stth_Home 29446192
|
||||
@@ -82,12 +103,11 @@ set psho_home 7576691
|
||||
#set psp_home 2040518
|
||||
#set psp_home 3479157
|
||||
#set psp_home 3783500
|
||||
#
|
||||
#set psp_home 3679100
|
||||
#
|
||||
# set home value to be equal to front limit switch 03.06.2008
|
||||
#
|
||||
set psp_home 3977689
|
||||
# set home value to be equal to front limit switch 28.01.2009, corr. to 50 mm distance to the stits front edge
|
||||
set psp_home 4084134
|
||||
|
||||
#set psw_home 2040518
|
||||
set psw_home 7784698
|
||||
@@ -98,19 +118,16 @@ set ssho_home 6877100
|
||||
#set ssp_home 2043085
|
||||
#set ssp_home 8701689
|
||||
set ssp_home 8701400
|
||||
#set ssw_home 2043085
|
||||
set ssw_home 8215625
|
||||
|
||||
set move_count 10
|
||||
|
||||
|
||||
#
|
||||
# Home value for Eulerian cradle
|
||||
#
|
||||
#
|
||||
set ephi_Home 6647676
|
||||
set echi_Home 8919319
|
||||
|
||||
############################################
|
||||
# SWAP BETWEEN EULER AND SSW CONFIGURATIONS
|
||||
if $use_euler {
|
||||
fileeval $cfPath(motors)/euler_configuration.tcl
|
||||
} else {
|
||||
fileeval $cfPath(motors)/secondary_slit_configuration.tcl
|
||||
}
|
||||
|
||||
############################
|
||||
# Motor Controller 1
|
||||
@@ -301,12 +318,13 @@ Motor sz $motor_driver_type [params \
|
||||
maxSpeed 2\
|
||||
maxAccel 1\
|
||||
maxDecel 1\
|
||||
stepsPerX [expr -25000.0*(24.0/25.0)*50/10.840/1.0]\
|
||||
stepsPerX [expr -25000.0*(24.0/25.0)*50/10.840/1.8]\
|
||||
absenc 1\
|
||||
absenchome $sz_home\
|
||||
cntsPerX -[expr (1<<15)/260.165]]
|
||||
setHomeandRange -motor sz -home 0 -lowrange 0 -uprange 350
|
||||
sz speed 2
|
||||
sz speed 1
|
||||
sz softupperlim 600
|
||||
sz part sample
|
||||
sz backlash_offset -1
|
||||
sz blockage_ratio 5
|
||||
@@ -362,7 +380,7 @@ sz creep_offset 0.1
|
||||
sz long_name sz
|
||||
}
|
||||
|
||||
# Sample Trans 1, upper, x
|
||||
# Sample Trans 1, lower, x
|
||||
#
|
||||
# values for pitch of screw changed from 5
|
||||
# to 4.994810 (vll 16.11.2007)
|
||||
@@ -371,7 +389,6 @@ sz long_name sz
|
||||
# to 4.997291 (v14 05.12.2007) after realignement of x and y table
|
||||
# to 4.99841687 (oki 06.12.2007) after bearing adjustment on x table
|
||||
# to 5.0 09.01.2008
|
||||
set sx_pitch 5.0
|
||||
Motor sx $motor_driver_type [params \
|
||||
asyncqueue mc2\
|
||||
axis C\
|
||||
@@ -381,10 +398,10 @@ Motor sx $motor_driver_type [params \
|
||||
maxSpeed 10\
|
||||
maxAccel 1\
|
||||
maxDecel 1\
|
||||
stepsPerX [expr -2.0*25000.0/$sx_pitch]\
|
||||
stepsPerX [expr 2.0*25000.0/$sx_pitch]\
|
||||
absEnc 1\
|
||||
absEncHome $sx_Home\
|
||||
cntsPerX [expr 8192.0/$sx_pitch]]
|
||||
cntsPerX [expr -8192.0/$sx_pitch]]
|
||||
setHomeandRange -motor sx -home 0 -lowrange 250 -uprange 250
|
||||
sx speed 5
|
||||
sx accel 1.0
|
||||
@@ -393,10 +410,10 @@ sx movecount $move_count
|
||||
sx precision 0.01
|
||||
sx part sample
|
||||
sx long_name sx
|
||||
sx backlash_offset -5
|
||||
sx backlash_offset -1
|
||||
sx creep_offset 0.5
|
||||
|
||||
# Sample Trans2, lower, y
|
||||
# Sample Trans2, upper, y
|
||||
#
|
||||
# values for pitch of screw changed from 5
|
||||
# to 4.9976934 (oki 19.11.2007)
|
||||
@@ -411,7 +428,7 @@ sx creep_offset 0.5
|
||||
#
|
||||
# change hw limits temporarily from -250...250 to -215...285, 4.1.2007
|
||||
#
|
||||
set sy_pitch 4.9995324
|
||||
|
||||
Motor sy $motor_driver_type [params \
|
||||
asyncqueue mc2\
|
||||
axis D\
|
||||
@@ -433,7 +450,7 @@ sy movecount $move_count
|
||||
sy precision 0.01
|
||||
sy part sample
|
||||
sy long_name sy
|
||||
sy backlash_offset -5
|
||||
sy backlash_offset -1
|
||||
sy creep_offset 0.5
|
||||
|
||||
# Sample Omega, rotate
|
||||
@@ -443,7 +460,7 @@ Motor som $motor_driver_type [params \
|
||||
units degrees\
|
||||
hardlowerlim -180\
|
||||
hardupperlim 180\
|
||||
maxSpeed 2\
|
||||
maxSpeed 3\
|
||||
maxAccel 5\
|
||||
maxDecel 5\
|
||||
stepsPerX [expr 25000.0*(383.0/360.0)]\
|
||||
@@ -451,8 +468,8 @@ Motor som $motor_driver_type [params \
|
||||
absEncHome $som_Home\
|
||||
cntsPerX [expr -8192.0*(383.0/360.0)]]
|
||||
setHomeandRange -motor som -home 0 -lowrange 180 -uprange 180
|
||||
som backlash_offset 0.5
|
||||
som speed 1
|
||||
som Backlash_offset -0.5
|
||||
som speed 2
|
||||
som accel 0.1
|
||||
som decel 0.1
|
||||
som precision 0.01
|
||||
@@ -473,9 +490,9 @@ Motor stth $motor_driver_type [params \
|
||||
absEnc 1\
|
||||
absEncHome $stth_Home\
|
||||
cntsPerX [expr -8192.0/$stth_pitch]]
|
||||
stth softlowerlim 0
|
||||
stth softupperlim 120
|
||||
stth home 40
|
||||
stth softlowerlim 40
|
||||
stth softupperlim 119.6
|
||||
stth home 0
|
||||
stth speed 0.2
|
||||
stth motOffDelay 15000
|
||||
stth movecount $move_count
|
||||
@@ -545,32 +562,6 @@ mf2 part monochromator.focus
|
||||
mf2 long_name mf2
|
||||
mf2 creep_offset 1
|
||||
|
||||
## Eulerian-chi
|
||||
#Motor echi $motor_driver_type [params \
|
||||
# asyncqueue mc3\
|
||||
# axis G\
|
||||
# units degrees\
|
||||
# maxSpeed 1\
|
||||
# maxAccel 1\
|
||||
# maxDecel 1\
|
||||
# stepsPerX 25000]
|
||||
#setHomeandRange -motor echi -home 0 -lowrange 0 -uprange 360
|
||||
#echi speed 1
|
||||
#echi precision 0.01
|
||||
|
||||
## Eulerian-phi
|
||||
#Motor ephi $motor_driver_type [params \
|
||||
# asyncqueue mc3\
|
||||
# axis H\
|
||||
# units degrees\
|
||||
# maxSpeed 1\
|
||||
# maxAccel 1\
|
||||
# maxDecel 1\
|
||||
# stepsPerX 25000]
|
||||
#setHomeandRange -motor ephi -home 0 -lowrange 0 -uprange 360
|
||||
#ephi speed 1
|
||||
#ephi precision 0.01
|
||||
|
||||
############################
|
||||
# Motor Controller 4
|
||||
# Motor Controller 4
|
||||
@@ -641,79 +632,6 @@ setHomeandRange -motor psw -home 0 -lowrange 0 -uprange 30
|
||||
#--------------------------------------------------------
|
||||
|
||||
|
||||
|
||||
|
||||
# Sample Tilt 1, euler omega stage
|
||||
#Motor eom $motor_driver_type [params \
|
||||
# asyncqueue mc2\
|
||||
# axis A\
|
||||
# units degrees\
|
||||
# hardlowerlim -35\
|
||||
# hardupperlim 55\
|
||||
# maxSpeed 1\
|
||||
# maxAccel 1\
|
||||
# maxDecel 1\
|
||||
# stepsPerX 25000\
|
||||
# absEnc 1\
|
||||
# absEncHome $eom_Home\
|
||||
# cntsPerX -8192]
|
||||
#setHomeandRange -motor eom -home 0 -lowrange 35 -uprange 55
|
||||
#eom speed 1
|
||||
#eom movecount $move_count
|
||||
#eom precision 0.01
|
||||
#eom part sample
|
||||
#eom long_name eom
|
||||
|
||||
# Sample Tilt 2, euler chi stage
|
||||
#Motor echi $motor_driver_type [params \
|
||||
# asyncqueue mc4\
|
||||
# axis D\
|
||||
# units degrees\
|
||||
# hardlowerlim -10\
|
||||
# hardupperlim 95\
|
||||
# maxSpeed 3\
|
||||
# maxAccel 1\
|
||||
# maxDecel 1\
|
||||
# stepsPerX -25000\
|
||||
# absEnc 1\
|
||||
# absEncHome $echi_Home\
|
||||
# cntsPerX 8192]
|
||||
#setHomeandRange -motor echi -home 0 -lowrange 10 -uprange 95
|
||||
#echi softlowerlim -10
|
||||
#echi softupperlim 90
|
||||
#echi home 0
|
||||
#echi speed 3
|
||||
#echi movecount $move_count
|
||||
#echi precision 0.01
|
||||
#echi part sample
|
||||
#echi long_name echi
|
||||
|
||||
# Sample Tilt 2, euler phi stage
|
||||
#Motor ephi $motor_driver_type [params \
|
||||
# asyncqueue mc4\
|
||||
# axis E\
|
||||
# units degrees\
|
||||
# hardlowerlim -400\
|
||||
# hardupperlim 400\
|
||||
# maxSpeed 3\
|
||||
# maxAccel 1\
|
||||
# maxDecel 1\
|
||||
# stepsPerX [expr -25000.0/2.0]\
|
||||
# absEnc 1\
|
||||
# absEncHome $ephi_Home\
|
||||
# cntsPerX [expr -8192.0/2.0]]
|
||||
#setHomeandRange -motor ephi -home 0 -lowrange 400 -uprange 400
|
||||
#ephi softlowerlim -400
|
||||
#ephi softupperlim 400
|
||||
#ephi home 0
|
||||
#ehpi speed 3
|
||||
#ephi movecount $move_count
|
||||
#ephi precision 0.01
|
||||
#ephi part sample
|
||||
#ephi long_name ephi
|
||||
|
||||
|
||||
|
||||
# Secondary Slit, horizontal offset
|
||||
Motor ssho $motor_driver_type [params \
|
||||
asyncqueue mc4\
|
||||
@@ -754,27 +672,7 @@ ssp part slits.secondary
|
||||
ssp long_name ssp
|
||||
setHomeandRange -motor ssp -home 0 -lowrange 0 -uprange 150
|
||||
|
||||
# Secondary Slit, width
|
||||
Motor ssw $motor_driver_type [params \
|
||||
asyncqueue mc4\
|
||||
axis F\
|
||||
units mm\
|
||||
hardlowerlim 0\
|
||||
hardupperlim 30\
|
||||
maxSpeed 4\
|
||||
maxAccel 1\
|
||||
maxDecel 1\
|
||||
stepsPerX 25000\
|
||||
absenc 1\
|
||||
absenchome $ssw_home\
|
||||
cntsPerX -8192]
|
||||
ssw speed 4
|
||||
ssw Backlash_offset 0.3
|
||||
ssw part slits.secondary
|
||||
ssw long_name ssw
|
||||
setHomeandRange -motor ssw -home 0 -lowrange 0 -uprange 30
|
||||
|
||||
## Primary Slit, height, 0-30mm
|
||||
# Primary Slit, height, 0-30mm
|
||||
#Motor psh $motor_driver_type [params \
|
||||
# asyncqueue mc4\
|
||||
# axis D\
|
||||
|
||||
@@ -0,0 +1,22 @@
|
||||
#set ssw_home 2043085
|
||||
set ssw_home 8215625
|
||||
|
||||
# Secondary Slit, width
|
||||
Motor ssw $motor_driver_type [params \
|
||||
asyncqueue mc4\
|
||||
axis F\
|
||||
units mm\
|
||||
hardlowerlim 0\
|
||||
hardupperlim 30\
|
||||
maxSpeed 4\
|
||||
maxAccel 1\
|
||||
maxDecel 1\
|
||||
stepsPerX 25000\
|
||||
absenc 1\
|
||||
absenchome $ssw_home\
|
||||
cntsPerX -8192]
|
||||
ssw speed 4
|
||||
ssw Backlash_offset 0.3
|
||||
ssw part slits.secondary
|
||||
ssw long_name ssw
|
||||
setHomeandRange -motor ssw -home 0 -lowrange 0 -uprange 30
|
||||
Reference in New Issue
Block a user