From 9e0346f7184955d84a50fe9cb9d4ea59eb0bd2aa Mon Sep 17 00:00:00 2001
From: Douglas Clowes <dcl@ansto.gov.au>
Date: Thu, 22 Feb 2007 18:05:57 +1100
Subject: [PATCH] Update primary collimator and monochromator config

r1545 | dcl | 2007-02-22 18:05:57 +1100 (Thu, 22 Feb 2007) | 2 lines
---
 .../config/motors/motor_configuration.tcl     | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/site_ansto/instrument/hrpd/config/motors/motor_configuration.tcl b/site_ansto/instrument/hrpd/config/motors/motor_configuration.tcl
index 92c2cda1..2d8975e8 100644
--- a/site_ansto/instrument/hrpd/config/motors/motor_configuration.tcl
+++ b/site_ansto/instrument/hrpd/config/motors/motor_configuration.tcl
@@ -1,7 +1,7 @@
-# $Revision: 1.1 $
-# $Date: 2007-02-16 05:43:59 $
+# $Revision: 1.2 $
+# $Date: 2007-02-22 07:05:57 $
 # Author: Ferdi Franceschini (ffr@ansto.gov.au)
-# Last revision by: $Author: ffr $
+# Last revision by: $Author: dcl $
 
 # START MOTOR CONFIGURATION
 
@@ -26,8 +26,8 @@ set my_Home 7781389
 set mx_Home 7580366
 set mom_Home 13442930
 set mtth_Home 11534660
-set pcx_Home 8345644
-set pcr_Home 6197934
+set pcx_Home 8345600
+set pcr_Home 5440000
 set sphi_Home 7924507
 set schi_Home 7542917
 set sy_Home 7626584
@@ -170,8 +170,8 @@ Motor mom DMC2280 [params \
   port $dmc2280_controller1(port)\
   axis E\
   units degrees\
-  hardlowerlim -180\
-  hardupperlim 180\
+  hardlowerlim -10\
+  hardupperlim 150\
   maxSpeed 1\
   maxAccel 1\
   maxDecel 1\
@@ -179,7 +179,7 @@ Motor mom DMC2280 [params \
   absEnc 1\
   absEncHome $mom_Home\
   cntsPerX -4096]
-setHomeandRange -motor mom -home 0 -lowrange 180 -uprange 180
+setHomeandRange -motor mom -home 0 -lowrange 10 -uprange 150
 mom speed 1
 mom movecount $move_count
 mom precision 0.01
@@ -190,7 +190,7 @@ Motor mtth DMC2280 [params \
   port $dmc2280_controller1(port)\
   axis F\
   units degrees\
-  hardlowerlim 90\
+  hardlowerlim 87\
   hardupperlim 137\
   maxSpeed 0.2\
   maxAccel 0.2\
@@ -199,7 +199,7 @@ Motor mtth DMC2280 [params \
   absEnc 1\
   absEncHome $mtth_Home\
   cntsPerX -93207]
-mtth softlowerlim 90
+mtth softlowerlim 87
 mtth softupperlim 137
 mtth home 90
 mtth speed 0.2
@@ -217,7 +217,7 @@ Motor pcx DMC2280 [params \
   axis G\
   units mm\
   hardlowerlim 0\
-  hardupperlim 140\
+  hardupperlim 137.5\
   maxSpeed 10\
   maxAccel 1\
   maxDecel 1\
@@ -237,15 +237,15 @@ Motor pcr DMC2280 [params \
   axis H\
   units degrees\
   hardlowerlim -10\
-  hardupperlim 10\
-  maxSpeed 0.1\
+  hardupperlim 190\
+  maxSpeed 1.0\
   maxAccel 0.1\
   maxDecel 0.1\
-  stepsPerX [expr -25000/(360/100)]\
+  stepsPerX [expr -(25000*100)/360]\
   absEnc 1\
   absEncHome $pcr_Home\
-  cntsPerX [expr 8192/(360/100)]]
-setHomeandRange -motor pcr -home 0 -lowrange 10 -uprange 10
+  cntsPerX [expr (8192*100)/360]]
+setHomeandRange -motor pcr -home 0 -lowrange 5 -uprange 185
 pcr speed 0.1
 pcr movecount $move_count
 pcr precision 0.01