Merged 2.4 branch

r2828 | ffr | 2009-11-25 09:56:49 +1100 (Wed, 25 Nov 2009) | 2 lines

site_ansto/instrument/hrpd/config/motors/motor_configuration.tcl

@@ -1,5 +1,5 @@
-# $Revision: 1.35 $
-# $Date: 2009-03-31 06:25:19 $
+# $Revision: 1.36 $
+# $Date: 2009-11-24 22:56:47 $
 # Author: Ferdi Franceschini (ffr@ansto.gov.au)
 # Last revision by: $Author: ffr $
 
@@ -36,10 +36,12 @@ set mphi_Home 11839906
 set mchi_Home 8417936
 set my_Home 7781389
 set mx_Home 7580366
-set mom_Home 13442930
+#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 sphi_Home 7924507
 set schi_Home 7542917
 set sy_Home 7626584
@@ -160,7 +162,7 @@ Motor mchi $motor_driver_type [params \
   asyncqueue mc1\
   axis B\
   units degrees\
-  hardlowerlim 88\
+  hardlowerlim -2\
   hardupperlim 92\
   maxSpeed 1\
   maxAccel 1\
@@ -169,8 +171,7 @@ Motor mchi $motor_driver_type [params \
   absEnc 1\
   absEncHome $mchi_Home\
   cntsPerX 8192]
-mchi 90.1
-mchi softlowerlim 88
+mchi softlowerlim -2 
 mchi softupperlim 92
 mchi speed 1
 mchi movecount $move_count
@@ -326,6 +327,27 @@ pcr precision 0.01
 pcr part collimator
 pcr long_name primary_collimator_rotation
 
+# Secondary Collimator Rotation
+Motor scr $motor_driver_type [params \
+  asyncqueue mc2\
+  axis G\
+  units degrees\
+  hardlowerlim -10\
+  hardupperlim 10\
+  maxSpeed 1.0\
+  maxAccel 0.1\
+  maxDecel 0.1\
+  stepsPerX 12500\
+  absEnc 1\
+  absEncHome $scr_Home\
+  cntsPerX 4096]
+setHomeandRange -motor scr -home 0 -lowrange 5 -uprange 185
+scr speed 1
+scr movecount $move_count
+scr precision 0.01
+scr part collimator
+scr long_name secondary_collimator_rotation
+
 ############################
 # Motor Controller 2
 # Motor Controller 2
@@ -498,6 +520,8 @@ mf1 speed 0.1
 mf1 movecount $move_count
 mf1 precision 0.01
 mf1 creep_offset 0.1
+mf1 part crystal
+mf1 long_name mf1
 
 # Slit 1, right
 Motor ss1r $motor_driver_type [params \