Merged release 2.1

r2664 | ffr | 2008-07-18 14:33:39 +1000 (Fri, 18 Jul 2008) | 2 lines

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

@@ -45,9 +45,7 @@ set sphi_home 7450470
 set sx_home 8574000
 set sy_home 7500000
 set sz_home 8927484
-#set dy_home 8161489
-#set dy_home 9226449
-set dy_home 9051645
+set dy_home 8838649
 set dz_home 7805000
 
 #Measured or computed step rate for sz (Sample Raise)
@@ -467,7 +465,7 @@ Motor sz $motor_driver_type [params \
   units mm\
   hardlowerlim 0\
   hardupperlim 280.0\
-  maxSpeed 2\
+  maxSpeed 1.5\
   maxAccel 1\
   maxDecel 2\
   stepsPerX $szStepRate\
@@ -481,7 +479,7 @@ sz long_name translate_z
 sz softlowerlim 0
 sz softupperlim 280.0
 sz home 0
-sz speed 2
+sz speed 1.5
 sz backlash_offset -0.1
 sz creep_offset 0.05
 sz creep_precision 0.0005
@@ -506,6 +504,7 @@ dz long_name vertical_translation
 dz softlowerlim 0
 dz softupperlim 1351
 dz home 0
+dz speed 2
 dz backlash_offset -0.5
 dz creep_offset 0.05
 dz creep_precision 0.001

site_ansto/instrument/reflectometer/platypus_configuration.tcl

@@ -1,5 +1,5 @@
-# $Revision: 1.19 $
-# $Date: 2008-07-11 01:09:57 $
+# $Revision: 1.20 $
+# $Date: 2008-07-18 04:33:39 $
 # Author: Ferdi Franceschini (ffr@ansto.gov.au)
 # Last revision by: $Author: ffr $
 
@@ -47,8 +47,8 @@ catch {
   ::anticollider::init
   server_init
 
-  if [file exists extraconfig.tcl] {
-    fileeval extraconfig.tcl
+  if [file exists ../extraconfig.tcl] {
+    fileeval ../extraconfig.tcl
   }
 
   buildHDB instrument_dictionary