Rename Physical Collimator motors from cx to pcx and virtual motors from vc0x to cx

r2184 | dcl | 2007-10-17 08:35:07 +1000 (Wed, 17 Oct 2007) | 2 lines
This commit is contained in:
Douglas Clowes
2007-10-17 08:35:07 +10:00
parent 5d311bf61f
commit 9052167b7f

View File

@@ -1,5 +1,5 @@
# $Revision: 1.9 $ # $Revision: 1.10 $
# $Date: 2007-10-05 01:55:46 $ # $Date: 2007-10-16 22:35:07 $
# Author: Ferdi Franceschini (ffr@ansto.gov.au) # Author: Ferdi Franceschini (ffr@ansto.gov.au)
# Last revision by: $Author: dcl $ # Last revision by: $Author: dcl $
@@ -63,101 +63,101 @@ set bs1_Home 7500000
set pol_Home 7500000 set pol_Home 7500000
# early Guide mesaurements # early Guide mesaurements
#set c1_Home 7967536 #set pc1_Home 7967536
#set c2_Home 7180101 #set pc2_Home 7180101
#set c3_Home 8209736 #set pc3_Home 8209736
#set c4_Home 6082786 #set pc4_Home 6082786
#set c5_Home 7584833 #set pc5_Home 7584833
#set c6_Home 8520594 #set pc6_Home 8520594
#set c7_Home 23885626 #set pc7_Home 23885626
#set c8_Home 8022666 #set pc8_Home 8022666
# #
#set c9_Home 7572825 #set pc9_Home 7572825
#set c10_Home 25686602 #set pc10_Home 25686602
#set c1_Home 8130647 #set pc1_Home 8130647
#set c2_Home 7593804 #set pc2_Home 7593804
#set c3_Home 8441013 #set pc3_Home 8441013
#set c4_Home 6160389 #set pc4_Home 6160389
#if {0} { #if {0} {
# 2007-08-29 Guide measurements # 2007-08-29 Guide measurements
#set c1_Home 8130106 #set pc1_Home 8130106
#set c2_Home 7595441 #set pc2_Home 7595441
#set c3_Home 8441907 #set pc3_Home 8441907
#set c4_Home 6161511 #set pc4_Home 6161511
#set c5_Home 7856229 #set pc5_Home 7856229
#set c6_Home 8798839 #set pc6_Home 8798839
#set c7_Home 24164694 #set pc7_Home 24164694
#set c8_Home 8302765 #set pc8_Home 8302765
#set c9_Home 7852000 #set pc9_Home 7852000
#set c10_Home 25977117 #set pc10_Home 25977117
#} #}
#Guide Positions 2007-09-04 11:04 #Guide Positions 2007-09-04 11:04
#================================ #================================
# #
#c1 send TP #pc1 send TP
# 8130115, 7595447, 8441775, 6162749, 7856270, 8800694, 24164697, 8302140 # 8130115, 7595447, 8441775, 6162749, 7856270, 8800694, 24164697, 8302140
#c9 send TP #pc9 send TP
# 7851835, 25977420, 8035113, 7369888, 0, 0, 9228662, 0 # 7851835, 25977420, 8035113, 7369888, 0, 0, 9228662, 0
# #
# Guide Positions 2007-09-06 20:08 # Guide Positions 2007-09-06 20:08
#================================ #================================
#c1 send TP #pc1 send TP
# 8130379, 7595711, 8441761, 6162739, 7856261, 8800677, 24167230, 8302153 # 8130379, 7595711, 8441761, 6162739, 7856261, 8800677, 24167230, 8302153
#c9 send TP #pc9 send TP
# 7851826, 25977221, 7990530, 7191374, 0, 0, 9228662, 0 # 7851826, 25977221, 7990530, 7191374, 0, 0, 9228662, 0
set c1_Guide 8130379 set pc1_Guide 8130379
set c2_Guide 7595711 set pc2_Guide 7595711
set c3_Guide 8441761 set pc3_Guide 8441761
set c4_Guide 6162739 set pc4_Guide 6162739
set c5_Guide 7856261 set pc5_Guide 7856261
set c6_Guide 8800677 set pc6_Guide 8800677
set c7_Guide 24167230 set pc7_Guide 24167230
set c8_Guide 8302153 set pc8_Guide 8302153
set c9_Guide 7851826 set pc9_Guide 7851826
set c10_Guide 25977221 set pc10_Guide 25977221
set c1_Polarizer 7858577 set pc1_Polarizer 7858577
set c2_Polarizer 7323919 set pc2_Polarizer 7323919
#Aperture Position: 2007-09-05 09:08 #Aperture Position: 2007-09-05 09:08
#=================================== #===================================
#c1 send TP #pc1 send TP
# 8130097, 7595436, 8304247, 6029748, 7728739, 8663027, 24034030, 8169924 # 8130097, 7595436, 8304247, 6029748, 7728739, 8663027, 24034030, 8169924
#c9 send TP #pc9 send TP
# 7719610, 25835487, 8029231, 7827402, 0, 0, 9228662, 0 # 7719610, 25835487, 8029231, 7827402, 0, 0, 9228662, 0
set c3_Aperture 8304247 set pc3_Aperture 8304247
set c4_Aperture 6029748 set pc4_Aperture 6029748
set c5_Aperture 7728739 set pc5_Aperture 7728739
set c6_Aperture 8663027 set pc6_Aperture 8663027
set c7_Aperture 24034030 set pc7_Aperture 24034030
set c8_Aperture 8169924 set pc8_Aperture 8169924
set c9_Aperture 7719610 set pc9_Aperture 7719610
set c10_Aperture 25835487 set pc10_Aperture 25835487
set c1_Home $c1_Guide set pc1_Home $pc1_Guide
set c2_Home $c2_Guide set pc2_Home $pc2_Guide
set c3_Home $c3_Guide set pc3_Home $pc3_Guide
set c4_Home $c4_Guide set pc4_Home $pc4_Guide
set c5_Home $c5_Guide set pc5_Home $pc5_Guide
set c6_Home $c6_Guide set pc6_Home $pc6_Guide
set c7_Home $c7_Guide set pc7_Home $pc7_Guide
set c8_Home $c8_Guide set pc8_Home $pc8_Guide
set c9_Home $c9_Guide set pc9_Home $pc9_Guide
set c10_Home $c10_Guide set pc10_Home $pc10_Guide
set c1_Empty [expr ($c1_Guide + $c1_Polarizer)/2] set pc1_Empty [expr ($pc1_Guide + $pc1_Polarizer)/2]
set c2_Empty [expr ($c2_Guide + $c2_Polarizer)/2] set pc2_Empty [expr ($pc2_Guide + $pc2_Polarizer)/2]
set c3_Empty [expr (2 * $c3_Guide) - $c3_Aperture] set pc3_Empty [expr (2 * $pc3_Guide) - $pc3_Aperture]
set c4_Empty [expr (2 * $c4_Guide) - $c4_Aperture] set pc4_Empty [expr (2 * $pc4_Guide) - $pc4_Aperture]
set c5_Empty [expr (2 * $c5_Guide) - $c5_Aperture] set pc5_Empty [expr (2 * $pc5_Guide) - $pc5_Aperture]
set c6_Empty [expr (2 * $c6_Guide) - $c6_Aperture] set pc6_Empty [expr (2 * $pc6_Guide) - $pc6_Aperture]
set c7_Empty [expr (2 * $c7_Guide) - $c7_Aperture] set pc7_Empty [expr (2 * $pc7_Guide) - $pc7_Aperture]
set c8_Empty [expr (2 * $c8_Guide) - $c8_Aperture] set pc8_Empty [expr (2 * $pc8_Guide) - $pc8_Aperture]
set c9_Empty [expr (2 * $c9_Guide) - $c9_Aperture] set pc9_Empty [expr (2 * $pc9_Guide) - $pc9_Aperture]
set c10_Empty [expr (2 * $c10_Guide) - $c10_Aperture] set pc10_Empty [expr (2 * $pc10_Guide) - $pc10_Aperture]
#Measured or computed step/count rates for collimator translation #Measured or computed step/count rates for collimator translation
set coll_StepsPerX [expr -25000.0/6.0] set coll_StepsPerX [expr -25000.0/6.0]
@@ -379,7 +379,7 @@ detoff home 0
# #
# Collimation motor 1 # Collimation motor 1
Motor c1 $motor_driver_type [params \ Motor pc1 $motor_driver_type [params \
asyncqueue mc2\ asyncqueue mc2\
host mc2-quokka\ host mc2-quokka\
port pmc2-quokka\ port pmc2-quokka\
@@ -392,20 +392,20 @@ Motor c1 $motor_driver_type [params \
maxDecel 1\ maxDecel 1\
stepsPerX $coll_StepsPerX\ stepsPerX $coll_StepsPerX\
absEnc 1\ absEnc 1\
absEncHome $c1_Home\ absEncHome $pc1_Home\
cntsPerX $coll_CntsPerX\ cntsPerX $coll_CntsPerX\
posit_count 3] posit_count 3]
c1 posit_1 [expr $c1_Guide] pc1 posit_1 [expr $pc1_Guide]
c1 posit_2 [expr $c1_Empty] pc1 posit_2 [expr $pc1_Empty]
c1 posit_3 [expr $c1_Polarizer] pc1 posit_3 [expr $pc1_Polarizer]
c1 part collimator pc1 part collimator
c1 long_name c1 pc1 long_name pc1
setHomeandRange -motor c1 -home 0 -lowrange 95 -uprange 95 setHomeandRange -motor pc1 -home 0 -lowrange 95 -uprange 95
c1 speed 3 pc1 speed 3
c1 creep_offset 1 pc1 creep_offset 1
# Collimation motor 2 # Collimation motor 2
Motor c2 $motor_driver_type [params \ Motor pc2 $motor_driver_type [params \
asyncqueue mc2\ asyncqueue mc2\
host mc2-quokka\ host mc2-quokka\
port pmc2-quokka\ port pmc2-quokka\
@@ -418,20 +418,20 @@ Motor c2 $motor_driver_type [params \
maxDecel 1\ maxDecel 1\
stepsPerX $coll_StepsPerX\ stepsPerX $coll_StepsPerX\
absEnc 1\ absEnc 1\
absEncHome $c2_Home\ absEncHome $pc2_Home\
cntsPerX $coll_CntsPerX\ cntsPerX $coll_CntsPerX\
posit_count 3] posit_count 3]
c2 posit_1 [expr $c2_Guide] pc2 posit_1 [expr $pc2_Guide]
c2 posit_2 [expr $c2_Empty] pc2 posit_2 [expr $pc2_Empty]
c2 posit_3 [expr $c2_Polarizer] pc2 posit_3 [expr $pc2_Polarizer]
c2 part collimator pc2 part collimator
c2 long_name c2 pc2 long_name pc2
setHomeandRange -motor c2 -home 0 -lowrange 95 -uprange 95 setHomeandRange -motor pc2 -home 0 -lowrange 95 -uprange 95
c2 speed 6 pc2 speed 6
c2 creep_offset 1 pc2 creep_offset 1
# Collimation motor 3 # Collimation motor 3
Motor c3 $motor_driver_type [params \ Motor pc3 $motor_driver_type [params \
asyncqueue mc2\ asyncqueue mc2\
host mc2-quokka\ host mc2-quokka\
port pmc2-quokka\ port pmc2-quokka\
@@ -444,20 +444,20 @@ Motor c3 $motor_driver_type [params \
maxDecel 1\ maxDecel 1\
stepsPerX $coll_StepsPerX\ stepsPerX $coll_StepsPerX\
absEnc 1\ absEnc 1\
absEncHome $c3_Home\ absEncHome $pc3_Home\
cntsPerX $coll_CntsPerX\ cntsPerX $coll_CntsPerX\
posit_count 3] posit_count 3]
c3 posit_1 [expr $c3_Empty] pc3 posit_1 [expr $pc3_Empty]
c3 posit_2 [expr $c3_Guide] pc3 posit_2 [expr $pc3_Guide]
c3 posit_3 [expr $c3_Aperture] pc3 posit_3 [expr $pc3_Aperture]
c3 part collimator pc3 part collimator
c3 long_name c3 pc3 long_name pc3
setHomeandRange -motor c3 -home 0 -lowrange 190 -uprange 190 setHomeandRange -motor pc3 -home 0 -lowrange 190 -uprange 190
c3 speed 6 pc3 speed 6
c3 creep_offset 1 pc3 creep_offset 1
# Collimation motor 4 # Collimation motor 4
Motor c4 $motor_driver_type [params \ Motor pc4 $motor_driver_type [params \
asyncqueue mc2\ asyncqueue mc2\
host mc2-quokka\ host mc2-quokka\
port pmc2-quokka\ port pmc2-quokka\
@@ -470,20 +470,20 @@ Motor c4 $motor_driver_type [params \
maxDecel 1\ maxDecel 1\
stepsPerX $coll_StepsPerX\ stepsPerX $coll_StepsPerX\
absEnc 1\ absEnc 1\
absEncHome $c4_Home\ absEncHome $pc4_Home\
cntsPerX $coll_CntsPerX\ cntsPerX $coll_CntsPerX\
posit_count 3] posit_count 3]
c4 posit_1 [expr $c4_Empty] pc4 posit_1 [expr $pc4_Empty]
c4 posit_2 [expr $c4_Guide] pc4 posit_2 [expr $pc4_Guide]
c4 posit_3 [expr $c4_Aperture] pc4 posit_3 [expr $pc4_Aperture]
c4 part collimator pc4 part collimator
c4 long_name c4 pc4 long_name pc4
setHomeandRange -motor c4 -home 0 -lowrange 190 -uprange 190 setHomeandRange -motor pc4 -home 0 -lowrange 190 -uprange 190
c4 speed 6 pc4 speed 6
c4 creep_offset 1 pc4 creep_offset 1
# Collimation motor 5 # Collimation motor 5
Motor c5 $motor_driver_type [params \ Motor pc5 $motor_driver_type [params \
asyncqueue mc2\ asyncqueue mc2\
host mc2-quokka\ host mc2-quokka\
port pmc2-quokka\ port pmc2-quokka\
@@ -496,20 +496,20 @@ Motor c5 $motor_driver_type [params \
maxDecel 1\ maxDecel 1\
stepsPerX $coll_StepsPerX\ stepsPerX $coll_StepsPerX\
absEnc 1\ absEnc 1\
absEncHome $c5_Home\ absEncHome $pc5_Home\
cntsPerX $coll_CntsPerX\ cntsPerX $coll_CntsPerX\
posit_count 3] posit_count 3]
c5 posit_1 [expr $c5_Empty] pc5 posit_1 [expr $pc5_Empty]
c5 posit_2 [expr $c5_Guide] pc5 posit_2 [expr $pc5_Guide]
c5 posit_3 [expr $c5_Aperture] pc5 posit_3 [expr $pc5_Aperture]
c5 part collimator pc5 part collimator
c5 long_name c5 pc5 long_name pc5
setHomeandRange -motor c5 -home 0 -lowrange 190 -uprange 190 setHomeandRange -motor pc5 -home 0 -lowrange 190 -uprange 190
c5 speed 6 pc5 speed 6
c5 creep_offset 1 pc5 creep_offset 1
# Collimation motor 6 # Collimation motor 6
Motor c6 $motor_driver_type [params \ Motor pc6 $motor_driver_type [params \
asyncqueue mc2\ asyncqueue mc2\
host mc2-quokka\ host mc2-quokka\
port pmc2-quokka\ port pmc2-quokka\
@@ -522,20 +522,20 @@ Motor c6 $motor_driver_type [params \
maxDecel 1\ maxDecel 1\
stepsPerX $coll_StepsPerX\ stepsPerX $coll_StepsPerX\
absEnc 1\ absEnc 1\
absEncHome $c6_Home\ absEncHome $pc6_Home\
cntsPerX $coll_CntsPerX\ cntsPerX $coll_CntsPerX\
posit_count 3] posit_count 3]
c6 posit_1 [expr $c6_Empty] pc6 posit_1 [expr $pc6_Empty]
c6 posit_2 [expr $c6_Guide] pc6 posit_2 [expr $pc6_Guide]
c6 posit_3 [expr $c6_Aperture] pc6 posit_3 [expr $pc6_Aperture]
c6 part collimator pc6 part collimator
c6 long_name c6 pc6 long_name pc6
setHomeandRange -motor c6 -home 0 -lowrange 190 -uprange 190 setHomeandRange -motor pc6 -home 0 -lowrange 190 -uprange 190
c6 speed 6 pc6 speed 6
c6 creep_offset 1 pc6 creep_offset 1
# Collimation motor 7 # Collimation motor 7
Motor c7 $motor_driver_type [params \ Motor pc7 $motor_driver_type [params \
asyncqueue mc2\ asyncqueue mc2\
host mc2-quokka\ host mc2-quokka\
port pmc2-quokka\ port pmc2-quokka\
@@ -548,20 +548,20 @@ Motor c7 $motor_driver_type [params \
maxDecel 1\ maxDecel 1\
stepsPerX $coll_StepsPerX\ stepsPerX $coll_StepsPerX\
absEnc 1\ absEnc 1\
absEncHome $c7_Home\ absEncHome $pc7_Home\
cntsPerX $coll_CntsPerX\ cntsPerX $coll_CntsPerX\
posit_count 3] posit_count 3]
c7 posit_1 [expr $c7_Empty] pc7 posit_1 [expr $pc7_Empty]
c7 posit_2 [expr $c7_Guide] pc7 posit_2 [expr $pc7_Guide]
c7 posit_3 [expr $c7_Aperture] pc7 posit_3 [expr $pc7_Aperture]
c7 part collimator pc7 part collimator
c7 long_name c7 pc7 long_name pc7
setHomeandRange -motor c7 -home 0 -lowrange 190 -uprange 190 setHomeandRange -motor pc7 -home 0 -lowrange 190 -uprange 190
c7 speed 6 pc7 speed 6
c7 creep_offset 1 pc7 creep_offset 1
# Collimation motor 8 # Collimation motor 8
Motor c8 $motor_driver_type [params \ Motor pc8 $motor_driver_type [params \
asyncqueue mc2\ asyncqueue mc2\
host mc2-quokka\ host mc2-quokka\
port pmc2-quokka\ port pmc2-quokka\
@@ -574,17 +574,17 @@ Motor c8 $motor_driver_type [params \
maxDecel 1\ maxDecel 1\
stepsPerX $coll_StepsPerX\ stepsPerX $coll_StepsPerX\
absEnc 1\ absEnc 1\
absEncHome $c8_Home\ absEncHome $pc8_Home\
cntsPerX $coll_CntsPerX\ cntsPerX $coll_CntsPerX\
posit_count 3] posit_count 3]
c8 posit_1 [expr $c8_Empty] pc8 posit_1 [expr $pc8_Empty]
c8 posit_2 [expr $c8_Guide] pc8 posit_2 [expr $pc8_Guide]
c8 posit_3 [expr $c8_Aperture] pc8 posit_3 [expr $pc8_Aperture]
c8 part collimator pc8 part collimator
c8 long_name c8 pc8 long_name pc8
setHomeandRange -motor c8 -home 0 -lowrange 190 -uprange 190 setHomeandRange -motor pc8 -home 0 -lowrange 190 -uprange 190
c8 speed 6 pc8 speed 6
c8 creep_offset 1 pc8 creep_offset 1
############################ ############################
# Motor Controller 3 # Motor Controller 3
@@ -594,7 +594,7 @@ c8 creep_offset 1
# #
# Collimation motor 9 # Collimation motor 9
Motor c9 $motor_driver_type [params \ Motor pc9 $motor_driver_type [params \
asyncqueue mc3\ asyncqueue mc3\
host mc3-quokka\ host mc3-quokka\
port pmc3-quokka\ port pmc3-quokka\
@@ -607,20 +607,20 @@ Motor c9 $motor_driver_type [params \
maxDecel 1\ maxDecel 1\
stepsPerX $coll_StepsPerX\ stepsPerX $coll_StepsPerX\
absEnc 1\ absEnc 1\
absEncHome $c9_Home\ absEncHome $pc9_Home\
cntsPerX $coll_CntsPerX\ cntsPerX $coll_CntsPerX\
posit_count 3] posit_count 3]
c9 posit_1 [expr $c9_Empty] pc9 posit_1 [expr $pc9_Empty]
c9 posit_2 [expr $c9_Guide] pc9 posit_2 [expr $pc9_Guide]
c9 posit_3 [expr $c9_Aperture] pc9 posit_3 [expr $pc9_Aperture]
c9 part collimator pc9 part collimator
c9 long_name c9 pc9 long_name pc9
setHomeandRange -motor c9 -home 0 -lowrange 190 -uprange 190 setHomeandRange -motor pc9 -home 0 -lowrange 190 -uprange 190
c9 speed 6 pc9 speed 6
c9 creep_offset 1 pc9 creep_offset 1
# Collimation motor 10 # Collimation motor 10
Motor c10 $motor_driver_type [params \ Motor pc10 $motor_driver_type [params \
asyncqueue mc3\ asyncqueue mc3\
host mc3-quokka\ host mc3-quokka\
port pmc3-quokka\ port pmc3-quokka\
@@ -633,19 +633,19 @@ Motor c10 $motor_driver_type [params \
maxDecel 1\ maxDecel 1\
stepsPerX $coll_StepsPerX\ stepsPerX $coll_StepsPerX\
absEnc 1\ absEnc 1\
absEncHome $c10_Home\ absEncHome $pc10_Home\
cntsPerX $coll_CntsPerX\ cntsPerX $coll_CntsPerX\
posit_count 5] posit_count 5]
c10 posit_1 [expr $c10_Empty + 81920] pc10 posit_1 [expr $pc10_Empty + 81920]
c10 posit_2 [expr $c10_Empty] pc10 posit_2 [expr $pc10_Empty]
c10 posit_3 [expr $c10_Guide] pc10 posit_3 [expr $pc10_Guide]
c10 posit_4 [expr $c10_Aperture] pc10 posit_4 [expr $pc10_Aperture]
c10 posit_5 [expr $c10_Aperture - 81920] pc10 posit_5 [expr $pc10_Aperture - 81920]
c10 part collimator pc10 part collimator
c10 long_name c10 pc10 long_name pc10
setHomeandRange -motor c10 -home 0 -lowrange 190 -uprange 190 setHomeandRange -motor pc10 -home 0 -lowrange 190 -uprange 190
c10 speed 6 pc10 speed 6
c10 creep_offset 1 pc10 creep_offset 1
# Pentaprism # Pentaprism
Motor pent $motor_driver_type [params \ Motor pent $motor_driver_type [params \
@@ -996,15 +996,15 @@ proc make_coll_motor_2 { vm1 vm1_name pm1 pm2 aunits } {
# http://www.unidata.ucar.edu/software/udunits/udunits-1/udunits.txt # http://www.unidata.ucar.edu/software/udunits/udunits-1/udunits.txt
# So we use "count" for dimensionless decimal numbers # So we use "count" for dimensionless decimal numbers
set vc_units count set vc_units count
make_coll_motor_2 vc01 section_1 c1 c2 $vc_units make_coll_motor_2 c1 section_1 pc1 pc2 $vc_units
make_coll_motor_1 vc02 section_2 c3 $vc_units make_coll_motor_1 c2 section_2 pc3 $vc_units
make_coll_motor_1 vc03 section_3 c4 $vc_units make_coll_motor_1 c3 section_3 pc4 $vc_units
make_coll_motor_1 vc04 section_4 c5 $vc_units make_coll_motor_1 c4 section_4 pc5 $vc_units
make_coll_motor_1 vc05 section_5 c6 $vc_units make_coll_motor_1 c5 section_5 pc6 $vc_units
make_coll_motor_1 vc06 section_6 c7 $vc_units make_coll_motor_1 c6 section_6 pc7 $vc_units
make_coll_motor_1 vc07 section_7 c8 $vc_units make_coll_motor_1 c7 section_7 pc8 $vc_units
make_coll_motor_1 vc08 section_8 c9 $vc_units make_coll_motor_1 c8 section_8 pc9 $vc_units
make_coll_motor_1 vc09 section_9 c10 $vc_units make_coll_motor_1 c9 section_9 pc10 $vc_units
unset vc_units unset vc_units
namespace eval guide { namespace eval guide {