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

Merge changes made in-situ.

Browse Source 
r2842 | ffr | 2009-12-10 14:57:53 +1100 (Thu, 10 Dec 2009) | 2 lines
This commit is contained in:
Ferdi Franceschini
2009-12-10 14:57:53 +11:00
committed by Douglas Clowes
parent f494ece7e7
commit b6ed01fc13
8 changed files with 96 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

138
site_ansto/instrument/sans/config/motors/motor_configuration.tcl
View File

@@ -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)]