Merge changes made in-situ.
r2842 | ffr | 2009-12-10 14:57:53 +1100 (Thu, 10 Dec 2009) | 2 lines
This commit is contained in:
Ferdi Franceschini
committed by
Douglas Clowes
Douglas Clowes
parent
f494ece7e7
commit
b6ed01fc13
@@ -11,7 +11,7 @@
|
||||
|
||||
|
||||
#-----------monochromator rotation---------------
|
||||
for mom forbid {0 48}
|
||||
for mom forbid {0 43}
|
||||
#----------primary collimator translation--------
|
||||
for pcx forbid {80 130}
|
||||
#----------primary collimator rotation-----------
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# $Revision: 1.36 $
|
||||
# $Date: 2009-11-24 22:56:47 $
|
||||
# $Revision: 1.37 $
|
||||
# $Date: 2009-12-10 03:57:53 $
|
||||
# Author: Ferdi Franceschini (ffr@ansto.gov.au)
|
||||
# Last revision by: $Author: ffr $
|
||||
|
||||
@@ -32,16 +32,19 @@ if {$sim_mode == "true"} {
|
||||
}
|
||||
|
||||
#Measured absolute encoder reading at home position
|
||||
set mphi_Home 11839906
|
||||
set mchi_Home 8417936
|
||||
#set mphi_Home 11839906
|
||||
set mphi_Home 7800343
|
||||
set mchi_Home 8255816
|
||||
set my_Home 7781389
|
||||
set mx_Home 7580366
|
||||
#set mx_Home 7580366
|
||||
set mx_Home 6654296
|
||||
#set mom_Home 13442930
|
||||
set mom_Home 13447313
|
||||
set mtth_Home 11534660
|
||||
set pcx_Home 8345600
|
||||
set pcr_Home 5440000
|
||||
set scr_Home 31734679
|
||||
#set scr_Home 31734679
|
||||
set scr_Home 31742770
|
||||
set sphi_Home 7924507
|
||||
set schi_Home 7542917
|
||||
set sy_Home 7626584
|
||||
@@ -163,7 +166,7 @@ Motor mchi $motor_driver_type [params \
|
||||
axis B\
|
||||
units degrees\
|
||||
hardlowerlim -2\
|
||||
hardupperlim 92\
|
||||
hardupperlim 2\
|
||||
maxSpeed 1\
|
||||
maxAccel 1\
|
||||
maxDecel 1\
|
||||
@@ -172,7 +175,7 @@ Motor mchi $motor_driver_type [params \
|
||||
absEncHome $mchi_Home\
|
||||
cntsPerX 8192]
|
||||
mchi softlowerlim -2
|
||||
mchi softupperlim 92
|
||||
mchi softupperlim 2
|
||||
mchi speed 1
|
||||
mchi movecount $move_count
|
||||
mchi precision 0.01
|
||||
@@ -226,7 +229,7 @@ Motor mom $motor_driver_type [params \
|
||||
asyncqueue mc1\
|
||||
axis E\
|
||||
units degrees\
|
||||
hardlowerlim -1\
|
||||
hardlowerlim 43\
|
||||
hardupperlim 140\
|
||||
maxSpeed 1\
|
||||
maxAccel 1\
|
||||
@@ -290,7 +293,7 @@ Motor pcx $motor_driver_type [params \
|
||||
asyncqueue mc1\
|
||||
axis G\
|
||||
units mm\
|
||||
hardlowerlim 0\
|
||||
hardlowerlim -3\
|
||||
hardupperlim 154.2\
|
||||
maxSpeed 10\
|
||||
maxAccel 1\
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# $Revision: 1.37 $
|
||||
# $Date: 2009-11-24 22:56:47 $
|
||||
# $Revision: 1.38 $
|
||||
# $Date: 2009-12-10 03:57:53 $
|
||||
# Author: Ferdi Franceschini (ffr@ansto.gov.au)
|
||||
# Last revision by: $Author: ffr $
|
||||
|
||||
@@ -46,8 +46,8 @@ source gumxml.tcl
|
||||
# ::environment::temperature::add_ls340t tc1 1
|
||||
# ::environment::temperature::add_ls340t tc2 2
|
||||
|
||||
# ::environment::temperature::add_west400
|
||||
::robot::add_robby
|
||||
# ::environment::temperature::add_west400 137.157.201.14
|
||||
::robot::add_robby
|
||||
server_init
|
||||
###########################################
|
||||
# WARNING: Do not add any code below server_init, if you do SICS may fail to initialise properly.
|
||||
|
||||
@@ -4,9 +4,9 @@
|
||||
# Home value for Eulerian cradle
|
||||
#
|
||||
#
|
||||
set eom_Home 23329261
|
||||
set eom_Home 23165406
|
||||
set ephi_Home 6647676
|
||||
set echi_Home 8919319
|
||||
set echi_Home 8919336
|
||||
|
||||
# Sample Tilt 1, euler omega stage -> exchange with ssw further down
|
||||
Motor eom $motor_driver_type [params \
|
||||
@@ -22,8 +22,10 @@ Motor eom $motor_driver_type [params \
|
||||
absEnc 1\
|
||||
absEncHome $eom_Home\
|
||||
cntsPerX 8192]
|
||||
setHomeandRange -motor eom -home 0 -lowrange -390 -uprange 390
|
||||
eom speed 1
|
||||
eom softlowerlim -390
|
||||
eom softupperlim 390
|
||||
eom home 0
|
||||
eom movecount $move_count
|
||||
eom precision 0.01
|
||||
eom part sample
|
||||
@@ -34,16 +36,15 @@ Motor echi $motor_driver_type [params \
|
||||
asyncqueue mc2\
|
||||
axis G\
|
||||
units degrees\
|
||||
hardlowerlim -10\
|
||||
hardupperlim 95\
|
||||
maxSpeed 3\
|
||||
maxAccel 1\
|
||||
maxDecel 1\
|
||||
stepsPerX -25000\
|
||||
hardlowerlim -390\
|
||||
hardupperlim 390\
|
||||
maxSpeed 5\
|
||||
maxAccel 3\
|
||||
maxDecel 3\
|
||||
stepsPerX [expr -25000 ]\
|
||||
absEnc 1\
|
||||
absEncHome $echi_Home\
|
||||
cntsPerX 8192]
|
||||
setHomeandRange -motor echi -home 0 -lowrange 10 -uprange 95
|
||||
cntsPerX [expr 8192 ] ]
|
||||
echi softlowerlim -10
|
||||
echi softupperlim 90
|
||||
echi home 0
|
||||
|
||||
@@ -65,8 +65,10 @@ set sz_home 2147456656
|
||||
#
|
||||
# set new value after repoistioning of encoders after cable chain installation
|
||||
# set sx_Home 9044450
|
||||
set sx_Home 9041997
|
||||
|
||||
#set sx_Home 9041997
|
||||
# value after dismanteling the table
|
||||
# parameter sz=419.01 - mtth=79
|
||||
set sx_Home 9050918
|
||||
|
||||
|
||||
#set sy_Home 7230717
|
||||
@@ -78,7 +80,11 @@ set sx_Home 9041997
|
||||
#set sy_Home 18773863
|
||||
# set new value after repoistioning of encoders after cable chain installation
|
||||
# set sy_Home 18785483
|
||||
set sy_Home 18784175
|
||||
#set sy_Home 18784175
|
||||
# value after dismanteling the table
|
||||
# parameter sz=419.01 - mtth=79
|
||||
#set sy_Home 18814870
|
||||
set sy_Home 18815280
|
||||
|
||||
# swapped sx with sy after rotation of vertical stage
|
||||
set sx_pitch 4.9995324
|
||||
@@ -88,7 +94,9 @@ set sy_pitch 5.0
|
||||
#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 som_Home 25153657
|
||||
#set som_Home 25309227
|
||||
set som_Home 26472736
|
||||
|
||||
#set stth_Home 28686300
|
||||
#set stth_Home 29446192
|
||||
@@ -110,7 +118,10 @@ set psp_home 3977689
|
||||
set psp_home 4084134
|
||||
|
||||
#set psw_home 2040518
|
||||
set psw_home 7784698
|
||||
|
||||
#set psw_home 7784698
|
||||
set psw_home 7789698
|
||||
|
||||
|
||||
#set ssho_home 500000
|
||||
#set ssho_home 7193394
|
||||
@@ -314,7 +325,7 @@ Motor sz $motor_driver_type [params \
|
||||
axis A\
|
||||
units mm\
|
||||
hardlowerlim 0\
|
||||
hardupperlim 750\
|
||||
hardupperlim 460\
|
||||
maxSpeed 2\
|
||||
maxAccel 1\
|
||||
maxDecel 1\
|
||||
@@ -324,7 +335,8 @@ Motor sz $motor_driver_type [params \
|
||||
cntsPerX -[expr (1<<15)/260.165]]
|
||||
setHomeandRange -motor sz -home 0 -lowrange 0 -uprange 350
|
||||
sz speed 1
|
||||
sz softupperlim 600
|
||||
sz softupperlim 460
|
||||
sz softlowerlim 0
|
||||
sz part sample
|
||||
sz backlash_offset -1
|
||||
sz blockage_ratio 5
|
||||
@@ -459,7 +471,7 @@ Motor som $motor_driver_type [params \
|
||||
axis E\
|
||||
units degrees\
|
||||
hardlowerlim -180\
|
||||
hardupperlim 180\
|
||||
hardupperlim 185\
|
||||
maxSpeed 3\
|
||||
maxAccel 5\
|
||||
maxDecel 5\
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
#set ssw_home 2043085
|
||||
set ssw_home 8215625
|
||||
set ssw_home 8220625
|
||||
|
||||
# Secondary Slit, width
|
||||
Motor ssw $motor_driver_type [params \
|
||||
|
||||
@@ -2,7 +2,8 @@
|
||||
|
||||
proc ord_get_pot { potxy potnumber } {
|
||||
for { set rsp "Bad" } { $rsp == "Bad" } { } {
|
||||
set potname [ format "%s%d" $potxy $potnumber ]
|
||||
set potname [ format "%s%d" $potxy [expr $potnumber ^ 3] ]
|
||||
# set rspall [ dhv1 cmd P $potname ]
|
||||
set rspall [ sct_dhv1 transact "P $potname" ]
|
||||
set rsp [lindex [split $rspall " "] 1]
|
||||
}
|
||||
@@ -11,7 +12,8 @@ proc ord_get_pot { potxy potnumber } {
|
||||
Publish ord_get_pot User
|
||||
|
||||
proc ord_set_pot { potxy potnumber potvalue } {
|
||||
set potname [ format "%s%d" $potxy $potnumber ]
|
||||
set potname [ format "%s%d" $potxy [expr $potnumber ^ 3] ]
|
||||
# set rsp [ dhv1 cmd p $potname $potvalue ]
|
||||
set rsp [ sct_dhv1 transact "p $potname $potvalue" ]
|
||||
return $rsp
|
||||
}
|
||||
@@ -456,7 +458,7 @@ Publish ord_calibrate User
|
||||
proc ord_calibrate_auto { CP_divider desiredpotsmidrange_x desiredpotsmidrange_y resetallpotsmidrange iterations acqtime } {
|
||||
#
|
||||
if { $resetallpotsmidrange == 1 } {
|
||||
clientput [ord_set_pot_all_const $desiredpotsmidrange_x $desiredpotsmidrange_y ]
|
||||
clientput [ord_set_pot_all_const_xy $desiredpotsmidrange_x $desiredpotsmidrange_y ]
|
||||
} else {
|
||||
clientput [ord_get_pot_all]
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# $Revision: 1.30 $
|
||||
# $Date: 2009-12-09 06:07:45 $
|
||||
# $Revision: 1.31 $
|
||||
# $Date: 2009-12-10 03:57:53 $
|
||||
# Author: Ferdi Franceschini (ffr@ansto.gov.au)
|
||||
# Last revision by: $Author: ffr $
|
||||
|
||||
@@ -58,30 +58,15 @@ set samy_Home 7101486
|
||||
set samz_Home 9944901
|
||||
set samthet_Home 23004075
|
||||
set det_Home 7055209
|
||||
#set detoff_Home 6932100
|
||||
set detoff_Home 6857213
|
||||
|
||||
set pent_Home 8123563
|
||||
#set srce_Home 7868762
|
||||
#set srce_Home 7871476
|
||||
#set srce_Home 7827384
|
||||
#set srce_Home 7826986
|
||||
#set srce_Home 7518434
|
||||
set srce_Home 7518652
|
||||
set srce_Home 7281463
|
||||
set apx_Home 12965422
|
||||
set apz_Home 7500000
|
||||
set att_Home 24782942
|
||||
|
||||
#set bsx_Home 7831707
|
||||
set bsx_Home 7578346
|
||||
#set bsz_Home 10143000
|
||||
set bsz_Home 10568857
|
||||
#set bs1_Home 13219
|
||||
#set bs2_Home 2506
|
||||
#set bs3_Home 22391
|
||||
#set bs4_Home 15287
|
||||
#set bs5_Home 6283
|
||||
#set bs6_Home 19123
|
||||
|
||||
set bs1_Home 21298
|
||||
set bs2_Home 9942
|
||||
@@ -94,80 +79,35 @@ set bs_cntsPerX [expr 32768.0/360.0]
|
||||
set bs_stepsPerX [expr -25000.0*160.0/360.0]
|
||||
set pol_Home 7500000
|
||||
|
||||
# early Guide mesaurements
|
||||
#set pc1_Home 7967536
|
||||
#set pc2_Home 7180101
|
||||
#set pc3_Home 8209736
|
||||
#set pc4_Home 6082786
|
||||
#set pc5_Home 7584833
|
||||
#set pc6_Home 8520594
|
||||
#set pc7_Home 23885626
|
||||
#set pc8_Home 8022666
|
||||
#
|
||||
#set pc9_Home 7572825
|
||||
#set pc10_Home 25686602
|
||||
#HERE ARE THE LATEST VALUES
|
||||
set pent_Home 8146159
|
||||
# Guide Positions Mirrotron ffr 2009-07-18
|
||||
set pc1_Guide 7995952
|
||||
set pc1_Polarizer 7723328
|
||||
set pc2_Guide 7459329
|
||||
set pc2_Polarizer 7186701
|
||||
set pc3_Guide 8440904
|
||||
set pc4_Guide 6161076
|
||||
set pc5_Guide 7856254
|
||||
set pc6_Guide 8800665
|
||||
set pc7_Guide 24167224
|
||||
set pc8_Guide 8302146
|
||||
set pc9_Guide 7851820
|
||||
set pc10_Guide 25977227
|
||||
|
||||
#set pc1_Home 8130647
|
||||
#set pc2_Home 7593804
|
||||
#set pc3_Home 8441013
|
||||
#set pc4_Home 6160389
|
||||
#if {0} {
|
||||
# 2007-08-29 Guide measurements
|
||||
#set pc1_Home 8130106
|
||||
#set pc2_Home 7595441
|
||||
#set pc3_Home 8441907
|
||||
#set pc4_Home 6161511
|
||||
#set pc5_Home 7856229
|
||||
#set pc6_Home 8798839
|
||||
#set pc7_Home 24164694
|
||||
#set pc8_Home 8302765
|
||||
#set pc9_Home 7852000
|
||||
#set pc10_Home 25977117
|
||||
#}
|
||||
#lens
|
||||
set pc10_Lens 26196301
|
||||
#lens_and_prism
|
||||
set pc10_LensandPrism 25729419
|
||||
|
||||
#Guide Positions 2007-09-04 11:04
|
||||
#================================
|
||||
#
|
||||
#pc1 send TP
|
||||
# 8130115, 7595447, 8441775, 6162749, 7856270, 8800694, 24164697, 8302140
|
||||
#pc9 send TP
|
||||
# 7851835, 25977420, 8035113, 7369888, 0, 0, 9228662, 0
|
||||
#
|
||||
# Guide Positions 2007-09-06 20:08
|
||||
#================================
|
||||
#pc1 send TP
|
||||
# 8130379, 7595711, 8441761, 6162739, 7856261, 8800677, 24167230, 8302153
|
||||
#pc9 send TP
|
||||
# 7851826, 25977221, 7990530, 7191374, 0, 0, 9228662, 0
|
||||
set pc1_Guide 8130379
|
||||
set pc2_Guide 7595711
|
||||
set pc3_Guide 8441761
|
||||
set pc4_Guide 6162739
|
||||
set pc5_Guide 7856261
|
||||
set pc6_Guide 8800677
|
||||
set pc7_Guide 24167230
|
||||
set pc8_Guide 8302153
|
||||
set pc9_Guide 7851826
|
||||
set pc10_Guide 25977221
|
||||
|
||||
set pc1_Polarizer 7858577
|
||||
set pc2_Polarizer 7323919
|
||||
|
||||
#Aperture Position: 2007-09-05 09:08
|
||||
#===================================
|
||||
#pc1 send TP
|
||||
# 8130097, 7595436, 8304247, 6029748, 7728739, 8663027, 24034030, 8169924
|
||||
#pc9 send TP
|
||||
# 7719610, 25835487, 8029231, 7827402, 0, 0, 9228662, 0
|
||||
|
||||
set pc3_Aperture 8304247
|
||||
set pc4_Aperture 6029748
|
||||
set pc5_Aperture 7728739
|
||||
set pc6_Aperture 8663027
|
||||
set pc7_Aperture 24034030
|
||||
set pc8_Aperture 8169924
|
||||
set pc9_Aperture 7719610
|
||||
set pc10_Aperture 25835487
|
||||
set pc3_Aperture 8304893
|
||||
set pc4_Aperture 6029466
|
||||
set pc5_Aperture 7728755
|
||||
set pc6_Aperture 8663189
|
||||
set pc7_Aperture 24036241
|
||||
set pc8_Aperture 8169931
|
||||
set pc9_Aperture 7718840
|
||||
set pc10_Aperture 25835335
|
||||
|
||||
set pc1_Home $pc1_Guide
|
||||
set pc2_Home $pc2_Guide
|
||||
@@ -355,8 +295,8 @@ Motor samthet $motor_driver_type [params \
|
||||
port pmc1-quokka\
|
||||
axis F\
|
||||
units degrees\
|
||||
hardlowerlim 0\
|
||||
hardupperlim 180\
|
||||
hardlowerlim -30\
|
||||
hardupperlim 30\
|
||||
maxSpeed 10\
|
||||
maxAccel 1\
|
||||
maxDecel 10\
|
||||
@@ -366,8 +306,8 @@ Motor samthet $motor_driver_type [params \
|
||||
cntsPerX [expr 8192.0/2.0]]
|
||||
samthet part sample
|
||||
samthet long_name sample_theta
|
||||
samthet softlowerlim 0
|
||||
samthet softupperlim 180
|
||||
samthet softlowerlim -10
|
||||
samthet softupperlim 10
|
||||
samthet home 0
|
||||
|
||||
# Motor feeds 70:1 gearbox to 120mm diameter drive wheel ~= 377mm circumference
|
||||
@@ -432,7 +372,7 @@ detoff home 0
|
||||
############################
|
||||
# Motor Controller 2
|
||||
# Motor Controller 2
|
||||
# Motor Controller 25
|
||||
# Motor Controller 2
|
||||
############################
|
||||
#:TP at HOME
|
||||
#
|
||||
@@ -695,11 +635,11 @@ Motor pc10 $motor_driver_type [params \
|
||||
absEncHome $pc10_Home\
|
||||
cntsPerX $coll_CntsPerX\
|
||||
posit_count 5]
|
||||
pc10 posit_1 26197033
|
||||
pc10 posit_1 [expr $pc10_Lens]
|
||||
pc10 posit_2 [expr $pc10_Empty]
|
||||
pc10 posit_3 [expr $pc10_Guide]
|
||||
pc10 posit_4 [expr $pc10_Aperture]
|
||||
pc10 posit_5 25730100
|
||||
pc10 posit_5 [expr $pc10_LensandPrism]
|
||||
pc10 part collimator
|
||||
pc10 long_name pc10
|
||||
setHomeandRange -motor pc10 -home 0 -lowrange 190 -uprange 190
|
||||
@@ -746,7 +686,9 @@ Motor srce $motor_driver_type [params \
|
||||
posit_count 12]
|
||||
srce part collimator
|
||||
srce long_name srce
|
||||
setHomeandRange -motor srce -home 0 -lowrange 10 -uprange 340
|
||||
srce home 180
|
||||
srce softlowerlim -10
|
||||
srce softupperlim 340
|
||||
srce speed 1
|
||||
srce posit_1 $srce_Home
|
||||
srce posit_2 [expr $srce_Home - (1 * 5 * 8192)]
|
||||
|
||||
Reference in New Issue
Block a user